Merge pull request #2338 from BogdanovKirill/httpwritefix3

[HttpConnection] Bug fix: HttpListener's "IgnoreWriteExceptions" property value is ignored when "Expect: 100-Continue" header set in request

That problem was discussed previously here: https://github.com/mono/mono/pull/2300
I want to offer alternative solution now.

diff --git a/Makefile.am b/Makefile.am
index 14232e66858e4039714eb065b4db8ecf08f5461c..d48ca3110e8e7693c7110ccce764547772724328 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,13 +25,14 @@ update_submodules:
 .PHONY: update_submodules
 
 EXTRA_DIST= \
-        README.md \
-           LICENSE \
-           autogen.sh \
-           mkinstalldirs \
-           mono-uninstalled.pc.in \
-           winconfig.h \
-           external
+       README.md               \
+       LICENSE                 \
+       autogen.sh              \
+       mkinstalldirs           \
+       mono-uninstalled.pc.in  \
+       winconfig.h             \
+       code_of_conduct.md      \
+       external
 
 DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 

diff --git a/acceptance-tests/SUBMODULES.json b/acceptance-tests/SUBMODULES.json
index 8624aa789e2e55c3e83dce7f674ff77ab59a7091..e0335f40f7de3e375f209b4dae3846a63965e71b 100644 (file)
--- a/acceptance-tests/SUBMODULES.json
+++ b/acceptance-tests/SUBMODULES.json
@@ -10,7 +10,7 @@
   {
     "name": "coreclr", 
     "url": "git://github.com/mono/coreclr.git", 
-    "rev": "ffe6263398591cfbd8100070ac8a191ff2080fbb", 
+    "rev": "96cf61f96b42cf9d013e641609cb7787f6e3a71f", 
     "remote-branch": "origin/mono", 
     "branch": "mono", 
     "directory": "coreclr"
@@ -18,7 +18,7 @@
   {
     "name": "ms-test-suite", 
     "url": "git@github.com:xamarin/ms-test-suite.git", 
-    "rev": "19f2a7dd44a2bfcf6006fd38033222383e8b81bf", 
+    "rev": "8eb26bd72a38e2c78675db45b13e89237dbdf4f2", 
     "remote-branch": "origin/master", 
     "branch": "master", 
     "directory": "ms-test-suite"

diff --git a/code_of_conduct.md b/code_of_conduct.md
new file mode 100644 (file)
index 0000000..84bad19
--- /dev/null
+++ b/code_of_conduct.md
@@ -0,0 +1,50 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting a project maintainer at miguel@xamarin.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. Maintainers are
+obligated to maintain confidentiality with regard to the reporter of an
+incident.
+
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

diff --git a/configure.ac b/configure.ac
index be1e231bd300cd04cb94c6240fd59b29383a27b2..7714b10f2546986a5f4c25d2579cf601285582da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 #AC_PREREQ([2.62])
 
-AC_INIT(mono, [4.3.0],
+AC_INIT(mono, [4.3.2],
         [http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
 
 AC_CONFIG_SRCDIR([README.md])
@@ -417,7 +417,7 @@ AC_PROG_LD_GNU
 AM_ICONV()
 
 AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h sys/param.h sys/sysctl.h libproc.h sys/prctl.h)
-AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h sys/inotify.h arpa/inet.h complex.h unwind.h)
+AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h sys/inotify.h arpa/inet.h complex.h unwind.h)
 AC_CHECK_HEADERS([linux/netlink.h linux/rtnetlink.h],
                   [], [], [#include <stddef.h>
                  #include <sys/socket.h>
@@ -731,7 +731,7 @@ DISABLED_FEATURES=none
 AC_ARG_ENABLE(minimal, [  --enable-minimal=LIST      drop support for LIST subsystems.
      LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier, 
      reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, assembly_remapping, shared_perfcounters, remoting,
-        security, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying, shared_handles.],
+        security, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying.],
 [
        for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
                eval "mono_feature_disable_$feature='yes'"
@@ -906,11 +906,6 @@ if test "x$mono_feature_disable_sgen_copying" = "xyes"; then
        AC_MSG_NOTICE([Disabled major=copying support in SGEN.])
 fi
 
-if test "x$mono_feature_disable_shared_handles" = "xyes"; then
-       AC_DEFINE(DISABLE_SHARED_HANDLES, 1, [Disable inter-process shared handles])
-       AC_SUBST(DISABLE_SHARED_HANDLES)
-fi
-
 AC_ARG_ENABLE(executables, [  --disable-executables disable the build of the runtime executables], enable_executables=$enableval, enable_executables=yes)
 AM_CONDITIONAL(DISABLE_EXECUTABLES, test x$enable_executables = xno)
 
@@ -2443,15 +2438,6 @@ if test "x$ac_cv_have_dev_random" = "xno" \
 *** variable MONO_EGD_SOCKET to point to the daemon's socket to use that.
 ***]])
 fi
- 
-AC_MSG_CHECKING([if inter-process shared handles are requested])
-# Same as --enable-minimal=shared_handles
-AC_ARG_ENABLE(shared-handles, [  --disable-shared-handles disable inter-process shared handles], try_shared_handles=$enableval, try_shared_handles=no)
-AC_MSG_RESULT($try_shared_handles)
-if test "x$try_shared_handles" != "xyes"; then
-       AC_DEFINE(DISABLE_SHARED_HANDLES, 1, [Disable inter-process shared handles])
-       AC_SUBST(DISABLE_SHARED_HANDLES)
-fi
 
 AC_ARG_ENABLE(bcl-opt, [  --disable-bcl-opt    BCL is compiled with no optimizations (allows accurate BCL debugging)], test_bcl_opt=$enableval, test_bcl_opt=yes)
 
@@ -2725,6 +2711,7 @@ case "$host" in
        mips*)
                TARGET=MIPS;
                arch_target=mips;
+               with_tls=pthread;
                ACCESS_UNALIGNED="no"
 
                AC_MSG_CHECKING(for mips n32)
@@ -3619,7 +3606,7 @@ AC_SUBST(X11)
 AC_SUBST(GDKX11)
 AC_SUBST(GTKX11)
 AC_SUBST(XINERAMA)
-AC_DEFINE_UNQUOTED(ARCHITECTURE,"$arch_target",[The architecture this is running on])
+AC_DEFINE_UNQUOTED(MONO_ARCHITECTURE,"$arch_target",[The architecture this is running on])
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)

diff --git a/data/Makefile.am b/data/Makefile.am
index 2cfd5202b65cf01da419f10a70ccdeed2e40d0ed..b5b83fa69f1fd96a73d903f9e06498757f4efe78 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,7 +14,8 @@ EXTRA_DIST =          \
        net_1_1/machine.config \
        gdb/mono-gdb.py \
        gdb/gdb-python.diff     \
-       lldb/mono.py
+       lldb/mono.py \
+       lldb/monobt.py
 
 pkgconfigdir = $(libdir)/pkgconfig
 

diff --git a/data/lldb/monobt.py b/data/lldb/monobt.py
new file mode 100644 (file)
index 0000000..0e47138
--- /dev/null
+++ b/data/lldb/monobt.py
@@ -0,0 +1,56 @@
+import lldb
+
+def print_frames(thread, num_frames, current_thread):
+    # TODO: Make output header similar to bt.
+    print '%c thread #%i' % ('*' if current_thread else ' ', thread.idx)
+
+    if current_thread:
+        selected_frame = thread.GetSelectedFrame()
+
+    for frame in thread.frames[:+num_frames]:
+        pc = str(frame.addr)
+        fmt = '  %c %s'
+        var = frame
+        if pc[0] == '0':
+            try:
+                framestr = frame.EvaluateExpression('(char*)mono_pmip((void*)%s)' % pc).summary[1:-1]
+                var = 'frame #%i: %s%s' % (frame.idx, pc, framestr)
+            except:
+                pass
+
+        print fmt % ('*' if current_thread and frame.idx == selected_frame.idx else ' ', var)
+
+def monobt(debugger, command, result, dict):
+    opts = {'all_bt': False, 'num_frames': None}
+
+    if command == 'all':
+        opts['all_bt'] = True
+    elif command.isdigit():
+        opts['num_frames'] = int(command)
+    elif command != '':
+        print 'error: monobt [<number>|all]'
+        return
+
+    target = debugger.GetSelectedTarget()
+    process = target.process
+
+    if not process.IsValid():
+        print 'error: invalid process'
+        return
+
+    if opts['all_bt']:
+        for thread in process.threads:
+            print_frames(thread, len(thread), process.selected_thread == thread)
+            print ''
+    else:
+        thread = process.selected_thread
+        num_frames = len(thread) if opts['num_frames'] is None else opts['num_frames']
+        print_frames(thread, num_frames, True)
+
+    return None
+
+def __lldb_init_module (debugger, dict):
+    # This initializer is being run from LLDB in the embedded command interpreter
+    # Add any commands contained in this module to LLDB
+    debugger.HandleCommand('command script add -f monobt.monobt monobt')
+    print '"monobt" command installed'
\ No newline at end of file

diff --git a/external/referencesource b/external/referencesource
index 8259de00d0ea77ecdcbf4bf62a3446f86cf4a1ac..8382c4605d622d56354e7340bf872caaf36b972a 160000 (submodule)
--- a/external/referencesource
+++ b/external/referencesource
@@ -1 +1 @@
-Subproject commit 8259de00d0ea77ecdcbf4bf62a3446f86cf4a1ac
+Subproject commit 8382c4605d622d56354e7340bf872caaf36b972a

diff --git a/libgc/alloc.c b/libgc/alloc.c
index b6bc1832c994da99c04ecbaa475200159c9103f4..2ffafd441d7ed48dde9265fb787ffb92c6ba806c 100644 (file)
--- a/libgc/alloc.c
+++ b/libgc/alloc.c
@@ -644,9 +644,17 @@ GC_stop_func stop_func;
    }
 }
 
-void (*GC_notify_event) GC_PROTO((GCEventType e));
+void (*GC_notify_event) GC_PROTO((GC_EventType e));
 void (*GC_on_heap_resize) GC_PROTO((size_t new_size));
 
+GC_API void GC_set_on_collection_event (void (*fn) (GC_EventType))
+{
+       DCL_LOCK_STATE;
+       LOCK();
+       GC_notify_event = fn;
+       UNLOCK();
+}
+
 /* Finish up a collection.  Assumes lock is held, signals are disabled,        */
 /* but the world is otherwise running.                                 */
 void GC_finish_collection()

diff --git a/libgc/finalize.c b/libgc/finalize.c
index 5626e8721370071bbefdbfb1710911b86a17bb50..39224f94ed695c24bbdedb2d2e1b7693b6be1e54 100644 (file)
--- a/libgc/finalize.c
+++ b/libgc/finalize.c
@@ -313,7 +313,7 @@ typedef struct {
        GC_hidden_pointer weak_ref;
 } GCToggleRef;
 
-static int (*GC_toggleref_callback) (GC_PTR obj);
+static GC_ToggleRefStatus (*GC_toggleref_callback) (GC_PTR obj);
 static GCToggleRef *GC_toggleref_array;
 static int GC_toggleref_array_size;
 static int GC_toggleref_array_capacity;
@@ -326,7 +326,7 @@ GC_process_togglerefs (void)
        int toggle_ref_counts [3] = { 0, 0, 0 };
 
        for (i = w = 0; i < GC_toggleref_array_size; ++i) {
-               int res;
+               GC_ToggleRefStatus res;
                GCToggleRef r = GC_toggleref_array [i];
 
                GC_PTR obj;
@@ -341,14 +341,14 @@ GC_process_togglerefs (void)
                res = GC_toggleref_callback (obj);
                ++toggle_ref_counts [res];
                switch (res) {
-               case 0:
+               case GC_TOGGLE_REF_DROP:
                        break;
-               case 1:
+               case GC_TOGGLE_REF_STRONG:
                        GC_toggleref_array [w].strong_ref = obj;
                        GC_toggleref_array [w].weak_ref = (GC_hidden_pointer)NULL;
                        ++w;
                        break;
-               case 2:
+               case GC_TOGGLE_REF_WEAK:
                        GC_toggleref_array [w].strong_ref = NULL;
                        GC_toggleref_array [w].weak_ref = HIDE_POINTER (obj);
                        ++w;
@@ -370,7 +370,7 @@ GC_process_togglerefs (void)
 static void (*GC_object_finalized_proc) (GC_PTR obj);
 
 void
-GC_set_finalizer_notify_proc (void (*proc) (GC_PTR obj))
+GC_set_await_finalize_proc (void (*proc) (GC_PTR obj))
 {
        GC_object_finalized_proc = proc;
 }
@@ -423,17 +423,19 @@ static void GC_clear_togglerefs ()
 
 
 
-void GC_toggleref_register_callback(int (*proccess_toggleref) (GC_PTR obj))
+void GC_set_toggleref_func(GC_ToggleRefStatus (*proccess_toggleref) (GC_PTR obj))
 {
        GC_toggleref_callback = proccess_toggleref;
 }
 
-static void
+static GC_bool
 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)
+                       return FALSE;
        }
        if (GC_toggleref_array_size + capacity >= GC_toggleref_array_capacity) {
                GCToggleRef *tmp;
@@ -442,15 +444,19 @@ ensure_toggleref_capacity (int capacity)
                        GC_toggleref_array_capacity *= 2;
 
                tmp = (GCToggleRef *) GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE (GC_toggleref_array_capacity * sizeof (GCToggleRef), NORMAL);
+               if (!tmp)
+                       return FALSE;
                memcpy (tmp, GC_toggleref_array, GC_toggleref_array_size * sizeof (GCToggleRef));
                GC_INTERNAL_FREE (GC_toggleref_array);
                GC_toggleref_array = tmp;
        }
+       return TRUE;
 }
 
-void
+int
 GC_toggleref_add (GC_PTR object, int strong_ref)
 {
+       int res = GC_SUCCESS;
     DCL_LOCK_STATE;
 # ifdef THREADS
        DISABLE_SIGNALS();
@@ -460,7 +466,10 @@ GC_toggleref_add (GC_PTR object, int strong_ref)
        if (!GC_toggleref_callback)
                goto end;
 
-       ensure_toggleref_capacity (1);
+       if (!ensure_toggleref_capacity (1)) {
+               res = GC_NO_MEMORY;
+               goto end;
+       }
        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;
@@ -470,6 +479,7 @@ end:
        UNLOCK();
        ENABLE_SIGNALS();
 # endif
+       return res;
 }
 
 

diff --git a/libgc/include/gc.h b/libgc/include/gc.h
index dd7fb7a86c8d0f90eda6eb4e6aaaa762a28129d9..e7929918ad0bb9df8d12b07a7803f660a8a3244f 100644 (file)
--- a/libgc/include/gc.h
+++ b/libgc/include/gc.h
@@ -104,11 +104,11 @@ typedef enum {
        GC_EVENT_POST_STOP_WORLD,
        GC_EVENT_PRE_START_WORLD,
        GC_EVENT_POST_START_WORLD
-} GCEventType;
+} GC_EventType;
 
-GC_API void (*GC_notify_event) GC_PROTO((GCEventType event_type));
-                       /* Invoked at specific points during every collection.
-                        */
+GC_API void GC_set_on_collection_event GC_PROTO((void (*) (GC_EventType)));
+                       /* Set callback invoked at specific points      */
+                       /* during every collection.                     */
                         
 GC_API void (*GC_on_heap_resize) GC_PROTO((size_t new_size));
                        /* Invoked when the heap grows or shrinks        */
@@ -431,7 +431,10 @@ int GC_get_suspend_signal GC_PROTO((void));
 
 /* Return the signal used by the gc to resume threads on posix platforms. */
 /* Return -1 otherwise. */
-int GC_get_restart_signal GC_PROTO((void));
+int GC_get_thr_restart_signal GC_PROTO((void));
+
+/* Explicitly enable GC_register_my_thread() invocation.               */
+GC_API void GC_allow_register_threads GC_PROTO((void));
 
 /* Disable garbage collection.  Even GC_gcollect calls will be                 */
 /* ineffective.                                                                */
@@ -773,13 +776,21 @@ 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 */));
 
+typedef enum {
+       GC_TOGGLE_REF_DROP,
+       GC_TOGGLE_REF_STRONG,
+       GC_TOGGLE_REF_WEAK
+} GC_ToggleRefStatus;
 
 /* 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);
+GC_API void GC_set_toggleref_func GC_PROTO(
+               (GC_ToggleRefStatus (*proccess_toggleref) (GC_PTR obj)));
+GC_API int GC_toggleref_add (GC_PTR object, int strong_ref);
+       /* Returns GC_SUCCESS if registration succeeded (or no callback */
+       /* registered yet), GC_NO_MEMORY if failed for lack of memory.  */
 
 /* finalizer callback support */
-GC_API void GC_set_finalizer_notify_proc GC_PROTO((void (*object_finalized) (GC_PTR obj)));
+GC_API void GC_set_await_finalize_proc GC_PROTO((void (*object_finalized) (GC_PTR obj)));
 
 
 /* Returns !=0  if GC_invoke_finalizers has something to do.           */
@@ -859,6 +870,21 @@ GC_API GC_PTR GC_is_visible GC_PROTO((GC_PTR p));
 /* Always returns its argument.                                                */
 GC_API GC_PTR GC_is_valid_displacement GC_PROTO((GC_PTR        p));
 
+#define GC_SUCCESS 0
+#define GC_DUPLICATE 1         /* Was already registered.              */
+#define GC_NO_MEMORY 2         /* Failure due to lack of memory.       */
+#define GC_UNIMPLEMENTED 3     /* Not yet implemented on the platform. */
+
+/* Structure representing the base of a thread stack.                  */
+struct GC_stack_base {
+       void * mem_base; /* Base of memory stack. */
+};
+
+/* Register the current thread, with the indicated stack base.         */
+/* Returns GC_SUCCESS on success, GC_DUPLICATE if already registered.  */
+/* On some platforms it returns GC_UNIMPLEMENTED.                      */
+GC_API int GC_register_my_thread GC_PROTO((struct GC_stack_base *));
+
 /* Returns 1 if the calling thread is registered with the GC, 0 otherwise */
 GC_API int GC_thread_is_registered GC_PROTO((void));
 
@@ -949,7 +975,9 @@ extern void GC_thr_init(void);      /* Needed for Solaris/X86       */
 #if defined(GC_WIN32_THREADS) && !defined(__CYGWIN32__) && !defined(__CYGWIN__)
 # include <windows.h>
 
+# ifdef GC_INSIDE_DLL
    BOOL WINAPI GC_DllMain(HINSTANCE inst, ULONG reason, LPVOID reserved);
+# endif
 
   /*
    * All threads must be created using GC_CreateThread, so that they will be

diff --git a/libgc/include/private/gc_priv.h b/libgc/include/private/gc_priv.h
index 10c095e7d2fa25183c42563e4897ec0e62c0d872..ab77402e4cd466eb3e5bcc6c82d597a54386fa78 100644 (file)
--- a/libgc/include/private/gc_priv.h
+++ b/libgc/include/private/gc_priv.h
@@ -1214,6 +1214,8 @@ extern long GC_large_alloc_warn_suppressed;
   extern GC_bool GC_world_stopped;
 #endif
 
+extern void (*GC_notify_event) GC_PROTO((GC_EventType));
+
 /* Operations */
 # ifndef abs
 #   define abs(x)  ((x) < 0? (-(x)) : (x))

diff --git a/libgc/include/private/pthread_support.h b/libgc/include/private/pthread_support.h
index 4046a2666b846d404ddf5edc4aada8945f5a00fd..bcb89b6a1982ab53a0ee338491c61a35997d0ba2 100644 (file)
--- a/libgc/include/private/pthread_support.h
+++ b/libgc/include/private/pthread_support.h
@@ -16,6 +16,23 @@
 
 /* We use the allocation lock to protect thread-related data structures. */
 
+#ifdef THREAD_LOCAL_ALLOC
+#   if CPP_WORDSZ == 64 && defined(ALIGN_DOUBLE)
+#      define GRANULARITY 16
+#      define NFREELISTS 49
+#   else
+#      define GRANULARITY 8
+#      define NFREELISTS 65
+#   endif
+    struct thread_local_freelists {
+       ptr_t ptrfree_freelists[NFREELISTS];
+       ptr_t normal_freelists[NFREELISTS];
+#      ifdef GC_GCJ_SUPPORT
+           ptr_t gcj_freelists[NFREELISTS];
+#      endif
+    };
+#endif
+
 /* The set of all known threads.  We intercept thread creation and     */
 /* joins.                                                              */
 /* Protected by allocation/GC lock.                                    */
@@ -60,23 +77,12 @@ typedef struct GC_Thread_Rep {
                                /* reclamation of any data it might     */
                                /* reference.                           */
 #   ifdef THREAD_LOCAL_ALLOC
-#      if CPP_WORDSZ == 64 && defined(ALIGN_DOUBLE)
-#          define GRANULARITY 16
-#          define NFREELISTS 49
-#      else
-#          define GRANULARITY 8
-#          define NFREELISTS 65
-#      endif
        /* The ith free list corresponds to size i*GRANULARITY */
 #      define INDEX_FROM_BYTES(n) ((ADD_SLOP(n) + GRANULARITY - 1)/GRANULARITY)
 #      define BYTES_FROM_INDEX(i) ((i) * GRANULARITY - EXTRA_BYTES)
 #      define SMALL_ENOUGH(bytes) (ADD_SLOP(bytes) <= \
                                    (NFREELISTS-1)*GRANULARITY)
-       ptr_t ptrfree_freelists[NFREELISTS];
-       ptr_t normal_freelists[NFREELISTS];
-#      ifdef GC_GCJ_SUPPORT
-         ptr_t gcj_freelists[NFREELISTS];
-#      endif
+       struct thread_local_freelists tlfs;
                /* Free lists contain either a pointer or a small count */
                /* reflecting the number of granules allocated at that  */
                /* size.                                                */

diff --git a/libgc/misc.c b/libgc/misc.c
index 3fa00a8b063b998163cb1df527fe9a802ee5f6fc..480759c57b9a750d505e053ca2f29a99a5c2a770 100644 (file)
--- a/libgc/misc.c
+++ b/libgc/misc.c
@@ -480,7 +480,7 @@ int GC_get_suspend_signal GC_PROTO(())
 #endif
 }
 
-int GC_get_restart_signal GC_PROTO(())
+int GC_get_thr_restart_signal GC_PROTO(())
 {
 #if defined(SIG_THR_RESTART) && defined(GC_PTHREADS) && !defined(GC_MACOSX_THREADS) && !defined(GC_OPENBSD_THREADS)
        return SIG_THR_RESTART;

diff --git a/libgc/pthread_support.c b/libgc/pthread_support.c
index a8c8b330a36d3f81462b2933ffaad2262ff412ea..623a94e7c8c22fb4c670d9fbff4e12869e087ee9 100644 (file)
--- a/libgc/pthread_support.c
+++ b/libgc/pthread_support.c
@@ -294,17 +294,17 @@ void GC_init_thread_local(GC_thread p)
        ABORT("Failed to set thread specific allocation pointers");
     }
     for (i = 1; i < NFREELISTS; ++i) {
-       p -> ptrfree_freelists[i] = (ptr_t)1;
-       p -> normal_freelists[i] = (ptr_t)1;
+       p -> tlfs.ptrfree_freelists[i] = (ptr_t)1;
+       p -> tlfs.normal_freelists[i] = (ptr_t)1;
 #      ifdef GC_GCJ_SUPPORT
-         p -> gcj_freelists[i] = (ptr_t)1;
+         p -> tlfs.gcj_freelists[i] = (ptr_t)1;
 #      endif
     }   
     /* Set up the size 0 free lists.   */
-    p -> ptrfree_freelists[0] = (ptr_t)(&size_zero_object);
-    p -> normal_freelists[0] = (ptr_t)(&size_zero_object);
+    p -> tlfs.ptrfree_freelists[0] = (ptr_t)(&size_zero_object);
+    p -> tlfs.normal_freelists[0] = (ptr_t)(&size_zero_object);
 #   ifdef GC_GCJ_SUPPORT
-        p -> gcj_freelists[0] = (ptr_t)(-1);
+       p -> tlfs.gcj_freelists[0] = (ptr_t)(-1);
 #   endif
 }
 
@@ -320,10 +320,10 @@ void GC_destroy_thread_local(GC_thread p)
 #   ifndef HANDLE_FORK
       GC_ASSERT(GC_getspecific(GC_thread_key) == (void *)p);
 #   endif
-    return_freelists(p -> ptrfree_freelists, GC_aobjfreelist);
-    return_freelists(p -> normal_freelists, GC_objfreelist);
+    return_freelists(p -> tlfs.ptrfree_freelists, GC_aobjfreelist);
+    return_freelists(p -> tlfs.normal_freelists, GC_objfreelist);
 #   ifdef GC_GCJ_SUPPORT
-       return_freelists(p -> gcj_freelists, GC_gcjobjfreelist);
+       return_freelists(p -> tlfs.gcj_freelists, GC_gcjobjfreelist);
 #   endif
 }
 
@@ -357,7 +357,7 @@ GC_PTR GC_local_malloc(size_t bytes)
          GC_ASSERT(tsd == (void *)GC_lookup_thread(pthread_self()));
          UNLOCK();
 #      endif
-       my_fl = ((GC_thread)tsd) -> normal_freelists + index;
+       my_fl = ((GC_thread)tsd) -> tlfs.normal_freelists + index;
        my_entry = *my_fl;
        if (EXPECT((word)my_entry >= HBLKSIZE, 1)) {
            ptr_t next = obj_link(my_entry);
@@ -384,7 +384,7 @@ GC_PTR GC_local_malloc_atomic(size_t bytes)
     } else {
        int index = INDEX_FROM_BYTES(bytes);
        ptr_t * my_fl = ((GC_thread)GC_getspecific(GC_thread_key))
-                       -> ptrfree_freelists + index;
+                       -> tlfs.ptrfree_freelists + index;
        ptr_t my_entry = *my_fl;
     
        if (EXPECT((word)my_entry >= HBLKSIZE, 1)) {
@@ -424,7 +424,7 @@ GC_PTR GC_local_gcj_malloc(size_t bytes,
     } else {
        int index = INDEX_FROM_BYTES(bytes);
        ptr_t * my_fl = ((GC_thread)GC_getspecific(GC_thread_key))
-                       -> gcj_freelists + index;
+                       -> tlfs.gcj_freelists + index;
        ptr_t my_entry = *my_fl;
        if (EXPECT((word)my_entry >= HBLKSIZE, 1)) {
            GC_PTR result = (GC_PTR)my_entry;
@@ -463,7 +463,7 @@ GC_PTR GC_local_gcj_malloc(size_t bytes,
 void * GC_local_gcj_fast_malloc(size_t lw, void * ptr_to_struct_containing_descr)
 {
        ptr_t * my_fl = ((GC_thread)GC_getspecific(GC_thread_key))
-               -> gcj_freelists + lw;
+               -> tlfs.gcj_freelists + lw;
        ptr_t my_entry = *my_fl;
 
     GC_ASSERT(GC_gcj_malloc_initialized);
@@ -666,12 +666,12 @@ void GC_mark_thread_local_free_lists(void)
     for (i = 0; i < THREAD_TABLE_SZ; ++i) {
       for (p = GC_threads[i]; 0 != p; p = p -> next) {
        for (j = 1; j < NFREELISTS; ++j) {
-         q = p -> ptrfree_freelists[j];
+         q = p -> tlfs.ptrfree_freelists[j];
          if ((word)q > HBLKSIZE) GC_set_fl_marks(q);
-         q = p -> normal_freelists[j];
+         q = p -> tlfs.normal_freelists[j];
          if ((word)q > HBLKSIZE) GC_set_fl_marks(q);
 #        ifdef GC_GCJ_SUPPORT
-           q = p -> gcj_freelists[j];
+           q = p -> tlfs.gcj_freelists[j];
            if ((word)q > HBLKSIZE) GC_set_fl_marks(q);
 #        endif /* GC_GCJ_SUPPORT */
        }
@@ -1462,13 +1462,18 @@ void * GC_start_routine_head(void * arg, void *base_addr,
     return me;
 }
 
-int GC_thread_register_foreign (void *base_addr)
+void GC_allow_register_threads (void)
+{
+    /* No-op for GC pre-v7. */
+}
+
+int GC_register_my_thread (struct GC_stack_base *sb)
 {
     struct start_info si = { 0, }; /* stacked for legibility & locking */
     GC_thread me;
 
 #   ifdef DEBUG_THREADS
-        GC_printf1( "GC_thread_register_foreign %p\n", &si );
+        GC_printf1( "GC_register_my_thread %p\n", &si );
 #   endif
 
     si.flags = FOREIGN_THREAD;
@@ -1476,12 +1481,13 @@ int GC_thread_register_foreign (void *base_addr)
     if (!parallel_initialized) GC_init_parallel();
     LOCK();
     if (!GC_thr_initialized) GC_thr_init();
-
+    me = GC_lookup_thread(pthread_self());
     UNLOCK();
+    if (me != NULL)
+       return GC_DUPLICATE;
 
-    me = GC_start_routine_head(&si, base_addr, NULL, NULL);
-
-    return me != NULL;
+    (void)GC_start_routine_head(&si, sb -> mem_base, NULL, NULL);
+    return GC_SUCCESS;
 }
 
 void * GC_start_routine(void * arg)

diff --git a/libgc/solaris_threads.c b/libgc/solaris_threads.c
index 8ca8fa3b3a21323a6480fe54843a5109624c97db..e67c514c7988a59a7fea854669ac86f397405f98 100644 (file)
--- a/libgc/solaris_threads.c
+++ b/libgc/solaris_threads.c
@@ -642,10 +642,15 @@ int GC_thread_is_registered (void)
        return ptr ? 1 : 0;
 }
 
-int GC_thread_register_foreign (void *base_addr)
+void GC_allow_register_threads (void)
+{
+       /* No-op for GC pre-v7. */
+}
+
+int GC_register_my_thread (struct GC_stack_base *sb)
 {
        /* FIXME: */
-       return 0;
+       return GC_UNIMPLEMENTED;
 }
 
 void GC_register_altstack (void *stack, int stack_size, void *altstack, int altstack_size)

diff --git a/libgc/win32_threads.c b/libgc/win32_threads.c
index a60363b4d6f7a89833cfc96a5897b6018d2e63c0..16a6fb6d003a0bdd7091fe7001b114482fdb826a 100644 (file)
--- a/libgc/win32_threads.c
+++ b/libgc/win32_threads.c
@@ -85,6 +85,22 @@ int GC_thread_is_registered (void)
 #endif
 }
 
+void GC_allow_register_threads (void)
+{
+    /* No-op for GC pre-v7. */
+}
+
+int GC_register_my_thread (struct GC_stack_base *sb)
+{
+#   if defined(GC_DLL) || defined(GC_INSIDE_DLL)
+       /* Registered by DllMain. */
+       return GC_DUPLICATE;
+#   else
+       /* TODO: Implement. */
+       return GC_UNIMPLEMENTED;
+#   endif
+}
+
 void GC_register_altstack (void *stack, int stack_size, void *altstack, int altstack_size)
 {
 }

diff --git a/man/mono.1 b/man/mono.1
index a9f8641107ddcaeba4f0319336c40da29195bb07..164ec31fcc37ec1bc84784ebeec4af2b28e70f7c 100644 (file)
--- a/man/mono.1
+++ b/man/mono.1
@@ -931,7 +931,12 @@ by setting the option
 Turns off the garbage collection in Mono.  This should be only used
 for debugging purposes
 .TP
-\fBLVM_COUNT\fR
+\fBHTTP_PROXY\fR
+(Also \fBhttp_proxy\fR) If set, web requests using the Mono
+Class Library will be automatically proxied through the given URL.
+Not supported on Windows, Mac OS, iOS or Android. See also \fBNO_PROXY\fR.
+.TP
+\fBLLVM_COUNT\fR
 When Mono is compiled with LLVM support, this instructs the runtime to
 stop using LLVM after the specified number of methods are JITed.
 This is a tool used in diagnostics to help isolate problems in the
@@ -999,7 +1004,12 @@ where V is the architecture number 4, 5, 6, 7 and the options can be currently b
 .TP
 \fBMONO_ARM_FORCE_SOFT_FLOAT\fR
 When Mono is built with a soft float fallback on ARM and this variable is set to
-"1", Mono will always emit soft float code, even if a VFP unit is detected.
+"1", Mono will always emit soft float code, even if a VFP unit is
+detected.
+.TP
+\fBMONO_DARWIN_WATCHER_MAXFDS\fR
+This is a debugging aid used to force limits on the FileSystemWatcher
+implementation in Darwin.   There is no limit by default.
 .TP
 \fBMONO_DISABLE_AIO\fR
 If set, tells mono NOT to attempt using native asynchronous I/O services. In
@@ -1533,6 +1543,13 @@ ftps, smtps...).  The default is 'nocheck', which performs no revocation check
 at all. The other possible values are 'offline', which performs CRL check (not
 implemented yet) and 'online' which uses OCSP and CRL to verify the revocation
 status (not implemented yet).
+.TP
+\fBNO_PROXY\fR
+(Also \fBno_proxy\fR) If both \fBHTTP_PROXY\fR and \fBNO_PROXY\fR are
+set, \fBNO_PROXY\fR will be treated as a comma-separated list of "bypass" domains
+which will not be sent through the proxy. Domains in \fBNO_PROXY\fR may contain
+wildcards, as in "*.mono-project.com" or "build????.local". Not supported on
+Windows, Mac OS, iOS or Android.
 .SH ENVIRONMENT VARIABLES FOR DEBUGGING
 .TP
 \fBMONO_ASPNET_NODELETE\fR

diff --git a/mcs/build/profiles/monotouch_tv.make b/mcs/build/profiles/monotouch_tv.make
index 084af615caaa1c8545b7fe4c808c76cb929458f7..2a36da9c2032ce1918ab7042c33d0a42731096e9 100644 (file)
--- a/mcs/build/profiles/monotouch_tv.make
+++ b/mcs/build/profiles/monotouch_tv.make
@@ -5,3 +5,4 @@ PROFILE_MCS_FLAGS += \
 
 NO_THREAD_ABORT=1
 NO_THREAD_SUSPEND_RESUME=1
+NO_PROCESS_START=1

diff --git a/mcs/build/profiles/monotouch_tv_runtime.make b/mcs/build/profiles/monotouch_tv_runtime.make
index 6ea1b4ab2d6f7437bfa75a9ba37c586f7eda3e67..552442ac1291fdef30447ebd231f37d1ed133c20 100644 (file)
--- a/mcs/build/profiles/monotouch_tv_runtime.make
+++ b/mcs/build/profiles/monotouch_tv_runtime.make
@@ -5,3 +5,6 @@ PROFILE_MCS_FLAGS += \
 
 NO_THREAD_ABORT=1
 NO_THREAD_SUSPEND_RESUME=1
+# The binding generator (btv) still needs to execute processes,
+# so we need a System.dll that can do that.
+#NO_PROCESS_START=1

diff --git a/mcs/build/profiles/monotouch_watch.make b/mcs/build/profiles/monotouch_watch.make
index 9a68dcf9eb59a795eae74630dde54523f33fc7cf..8534aaf1f7750a334d83bb265da4b26af1e22def 100644 (file)
--- a/mcs/build/profiles/monotouch_watch.make
+++ b/mcs/build/profiles/monotouch_watch.make
@@ -5,3 +5,4 @@ PROFILE_MCS_FLAGS += \
 
 NO_THREAD_ABORT=1
 NO_THREAD_SUSPEND_RESUME=1
+NO_PROCESS_START=1

diff --git a/mcs/build/profiles/monotouch_watch_runtime.make b/mcs/build/profiles/monotouch_watch_runtime.make
index 920042750ddf45493abe94bcf26dd15d013b9193..7b3eb80a551dc7325b9cfde0edc5728899696bf2 100644 (file)
--- a/mcs/build/profiles/monotouch_watch_runtime.make
+++ b/mcs/build/profiles/monotouch_watch_runtime.make
@@ -5,3 +5,6 @@ PROFILE_MCS_FLAGS += \
 
 NO_THREAD_ABORT=1
 NO_THREAD_SUSPEND_RESUME=1
+# The binding generator (bwatch) still needs to execute processes,
+# so we need a System.dll that can do that.
+#NO_PROCESS_START=1

diff --git a/mcs/class/Accessibility/Accessibility-net_4_5.csproj b/mcs/class/Accessibility/Accessibility-net_4_5.csproj
deleted file mode 100644 (file)
index db41186..0000000
--- a/mcs/class/Accessibility/Accessibility-net_4_5.csproj
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FACE8136-C95A-4788-90B2-DB0ECF7A020A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Accessibility</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Accessibility\IAccessible.cs" />\r
-    <Compile Include="Accessibility\IAccessibleHandler.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_5.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_5.csproj
deleted file mode 100644 (file)
index 5bc143a..0000000
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_5.csproj
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4399F601-CF0A-4D5B-9FCB-2EFB8A5D982E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Commons.Xml.Relaxng</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlBuiltInValidationProvider.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlCompileContext.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlConfig.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlException.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlFilteredXmlReader.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlReader.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlRelaxngSupport.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlSimplified.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlStructures.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlValidatingReader.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlValidationProvider.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlValidator.cs" />\r
-    <Compile Include="Commons.Xml.Nvdl\NvdlXsdSupport.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpContentType.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpNameClasses.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpObjects.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpPatterns.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Derivative\Util.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Inference\RelaxngInference.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\RncTokenizer.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\RncWriter.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\XmlChar.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\Misc.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngDatatype.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngDatatypeProvider.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngDefaultDatatypes.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngException.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngGrammar.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngMergedProvider.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngNameClass.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngPattern.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngPatternType.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngReader.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />\r
-    <Compile Include="Commons.Xml\XmlDefaultReader.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/relaxng.rng">\r
-      <LogicalName>relaxng.rng</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_4_5.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 1eb68a2..0000000
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_4_5.csproj
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8017F2F8-5276-411F-A2C8-581BA6C9ED17}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Commons.Xml.Relaxng-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Commons.Xml.Relaxng_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\NvdlValidatingReaderTests.cs" />\r
-    <Compile Include="Test\RdpPatternTests.cs" />\r
-    <Compile Include="Test\RelaxngDatatypeProviderTests.cs" />\r
-    <Compile Include="Test\RelaxngReaderTests.cs" />\r
-    <Compile Include="Test\RelaxngValidatingReaderTests.cs" />\r
-    <Compile Include="Test\RncTests.cs" />\r
-    <Compile Include="Test\XsdDatatypeTests.cs" />\r
-    <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_4_5.csproj">\r
-      <Project>{4399F601-CF0A-4D5B-9FCB-2EFB8A5D982E}</Project>\r
-      <Name>Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/relaxng.rng">\r
-      <LogicalName>relaxng.rng</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Cscompmgd/Cscompmgd-net_4_5.csproj b/mcs/class/Cscompmgd/Cscompmgd-net_4_5.csproj
deleted file mode 100644 (file)
index d62e767..0000000
--- a/mcs/class/Cscompmgd/Cscompmgd-net_4_5.csproj
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7CC1624B-EBC8-45E6-A30B-951A31ADC150}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>cscompmgd</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp\Compiler.cs" />\r
-    <Compile Include="Microsoft.CSharp\CompilerError.cs" />\r
-    <Compile Include="Microsoft.CSharp\ErrorLevel.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Cscompmgd/Cscompmgd-tests-net_4_5.csproj b/mcs/class/Cscompmgd/Cscompmgd-tests-net_4_5.csproj
deleted file mode 100644 (file)
index dc9bf77..0000000
--- a/mcs/class/Cscompmgd/Cscompmgd-tests-net_4_5.csproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{843703E1-7EE5-4D68-85CD-FBDA426C30F1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Cscompmgd-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Cscompmgd_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Microsoft.CSharp\CompilerTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Cscompmgd\Cscompmgd-net_4_5.csproj">\r
-      <Project>{7CC1624B-EBC8-45E6-A30B-951A31ADC150}</Project>\r
-      <Name>Cscompmgd\Cscompmgd-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/CustomMarshalers/CustomMarshalers-net_4_5.csproj b/mcs/class/CustomMarshalers/CustomMarshalers-net_4_5.csproj
deleted file mode 100644 (file)
index cc675d2..0000000
--- a/mcs/class/CustomMarshalers/CustomMarshalers-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E957A4A5-677B-44C9-93A7-C11CE514C07B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>CustomMarshalers</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumerableToDispatchMarshaler.cs" />\r
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumeratorToEnumVariantMarshaler.cs" />\r
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\ExpandoToDispatchExMarshaler.cs" />\r
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\TypeToTypeInfoMarshaler.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Collections.Concurrent/System.Collections.Concurrent-net_4_5.csproj b/mcs/class/Facades/System.Collections.Concurrent/System.Collections.Concurrent-net_4_5.csproj
deleted file mode 100644 (file)
index f85c52d..0000000
--- a/mcs/class/Facades/System.Collections.Concurrent/System.Collections.Concurrent-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{675F041D-3D9F-4195-B713-8BD1CA16E16E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Collections.Concurrent</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Collections/System.Collections-net_4_5.csproj b/mcs/class/Facades/System.Collections/System.Collections-net_4_5.csproj
deleted file mode 100644 (file)
index ef3f1ce..0000000
--- a/mcs/class/Facades/System.Collections/System.Collections-net_4_5.csproj
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{64CA4DB7-C8DA-49CC-A114-1C20038A0469}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Collections</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.ComponentModel.Annotations/System.ComponentModel.Annotations-net_4_5.csproj b/mcs/class/Facades/System.ComponentModel.Annotations/System.ComponentModel.Annotations-net_4_5.csproj
deleted file mode 100644 (file)
index 5a472d8..0000000
--- a/mcs/class/Facades/System.ComponentModel.Annotations/System.ComponentModel.Annotations-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7B94E990-3BC4-44B6-98FF-102A3459AF92}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ComponentModel.Annotations</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
-      <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync-net_4_5.csproj b/mcs/class/Facades/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync-net_4_5.csproj
deleted file mode 100644 (file)
index d58e278..0000000
--- a/mcs/class/Facades/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F550AB44-48A5-47F1-8EBB-5BA1CAF3366E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ComponentModel.EventBasedAsync</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.ComponentModel/System.ComponentModel-net_4_5.csproj b/mcs/class/Facades/System.ComponentModel/System.ComponentModel-net_4_5.csproj
deleted file mode 100644 (file)
index ecf9c35..0000000
--- a/mcs/class/Facades/System.ComponentModel/System.ComponentModel-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A13F59CB-1F71-4ECE-82A1-9A3D6760E5D2}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ComponentModel</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Diagnostics.Contracts/System.Diagnostics.Contracts-net_4_5.csproj b/mcs/class/Facades/System.Diagnostics.Contracts/System.Diagnostics.Contracts-net_4_5.csproj
deleted file mode 100644 (file)
index e3fd280..0000000
--- a/mcs/class/Facades/System.Diagnostics.Contracts/System.Diagnostics.Contracts-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{BDCFB32D-9CCE-4A2F-ABBB-490C3D49BBE0}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Diagnostics.Contracts</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Diagnostics.Debug/System.Diagnostics.Debug-net_4_5.csproj b/mcs/class/Facades/System.Diagnostics.Debug/System.Diagnostics.Debug-net_4_5.csproj
deleted file mode 100644 (file)
index 9e3361b..0000000
--- a/mcs/class/Facades/System.Diagnostics.Debug/System.Diagnostics.Debug-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{37D2FA30-09B8-4E38-982A-1890D7275F42}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Diagnostics.Debug</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Diagnostics.Tools/System.Diagnostics.Tools-net_4_5.csproj b/mcs/class/Facades/System.Diagnostics.Tools/System.Diagnostics.Tools-net_4_5.csproj
deleted file mode 100644 (file)
index f3b0dfd..0000000
--- a/mcs/class/Facades/System.Diagnostics.Tools/System.Diagnostics.Tools-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3A324F98-B121-44F2-B1AD-6DC4D3D27A89}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Diagnostics.Tools</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Diagnostics.Tracing/System.Diagnostics.Tracing-net_4_5.csproj b/mcs/class/Facades/System.Diagnostics.Tracing/System.Diagnostics.Tracing-net_4_5.csproj
deleted file mode 100644 (file)
index f3ae6df..0000000
--- a/mcs/class/Facades/System.Diagnostics.Tracing/System.Diagnostics.Tracing-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{34C2ACED-602C-41CD-AB40-3813B3420625}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Diagnostics.Tracing</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Dynamic.Runtime/System.Dynamic.Runtime-net_4_5.csproj b/mcs/class/Facades/System.Dynamic.Runtime/System.Dynamic.Runtime-net_4_5.csproj
deleted file mode 100644 (file)
index ca7f89b..0000000
--- a/mcs/class/Facades/System.Dynamic.Runtime/System.Dynamic.Runtime-net_4_5.csproj
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6E17967A-FBC5-4F44-AE4F-CBE1E70F862E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Dynamic.Runtime</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Globalization/System.Globalization-net_4_5.csproj b/mcs/class/Facades/System.Globalization/System.Globalization-net_4_5.csproj
deleted file mode 100644 (file)
index aba8b9f..0000000
--- a/mcs/class/Facades/System.Globalization/System.Globalization-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5DF5E924-6F3B-42DB-A3E0-1FB63028F189}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Globalization</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.IO/System.IO-net_4_5.csproj b/mcs/class/Facades/System.IO/System.IO-net_4_5.csproj
deleted file mode 100644 (file)
index 568f694..0000000
--- a/mcs/class/Facades/System.IO/System.IO-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{188DBB84-D591-48CC-B8B2-E7E12A0EE0BE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.IO</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Linq.Expressions/System.Linq.Expressions-net_4_5.csproj b/mcs/class/Facades/System.Linq.Expressions/System.Linq.Expressions-net_4_5.csproj
deleted file mode 100644 (file)
index 38174e5..0000000
--- a/mcs/class/Facades/System.Linq.Expressions/System.Linq.Expressions-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FD626146-F48C-4E29-9D4C-872FB5AEA5C1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Linq.Expressions</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Linq.Parallel/System.Linq.Parallel-net_4_5.csproj b/mcs/class/Facades/System.Linq.Parallel/System.Linq.Parallel-net_4_5.csproj
deleted file mode 100644 (file)
index 71c2a1c..0000000
--- a/mcs/class/Facades/System.Linq.Parallel/System.Linq.Parallel-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F8EB53BB-0BD5-4775-9EE7-2D4C7403B898}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Linq.Parallel</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Linq.Queryable/System.Linq.Queryable-net_4_5.csproj b/mcs/class/Facades/System.Linq.Queryable/System.Linq.Queryable-net_4_5.csproj
deleted file mode 100644 (file)
index c762099..0000000
--- a/mcs/class/Facades/System.Linq.Queryable/System.Linq.Queryable-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C2025B80-1555-4CBE-8982-8E0DFCFC9F16}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Linq.Queryable</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Linq/System.Linq-net_4_5.csproj b/mcs/class/Facades/System.Linq/System.Linq-net_4_5.csproj
deleted file mode 100644 (file)
index d742875..0000000
--- a/mcs/class/Facades/System.Linq/System.Linq-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F97C589C-5F94-4C4F-B465-13432ABF4744}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Linq</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Net.NetworkInformation/System.Net.NetworkInformation-net_4_5.csproj b/mcs/class/Facades/System.Net.NetworkInformation/System.Net.NetworkInformation-net_4_5.csproj
deleted file mode 100644 (file)
index 8e4028e..0000000
--- a/mcs/class/Facades/System.Net.NetworkInformation/System.Net.NetworkInformation-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A2069635-0635-40BA-B82C-DC458AFB3A9E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Net.NetworkInformation</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Net.Primitives/System.Net.Primitives-net_4_5.csproj b/mcs/class/Facades/System.Net.Primitives/System.Net.Primitives-net_4_5.csproj
deleted file mode 100644 (file)
index 6982431..0000000
--- a/mcs/class/Facades/System.Net.Primitives/System.Net.Primitives-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D5541A16-CFFD-4699-BC6D-EE859A38737F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Net.Primitives</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Net.Requests/System.Net.Requests-net_4_5.csproj b/mcs/class/Facades/System.Net.Requests/System.Net.Requests-net_4_5.csproj
deleted file mode 100644 (file)
index 2f80022..0000000
--- a/mcs/class/Facades/System.Net.Requests/System.Net.Requests-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5DC73C5F-E943-473B-BE4D-0EB115C3F1AF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Net.Requests</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.ObjectModel/System.ObjectModel-net_4_5.csproj b/mcs/class/Facades/System.ObjectModel/System.ObjectModel-net_4_5.csproj
deleted file mode 100644 (file)
index a65c450..0000000
--- a/mcs/class/Facades/System.ObjectModel/System.ObjectModel-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9A11D4E5-5C4C-471C-9912-AAB6C9851CF9}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ObjectModel</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration-net_4_5.csproj b/mcs/class/Facades/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration-net_4_5.csproj
deleted file mode 100644 (file)
index 53fece0..0000000
--- a/mcs/class/Facades/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{71E1B60C-1AF2-4AE8-B5F5-118AC38B64DB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reflection.Emit.ILGeneration</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight-net_4_5.csproj b/mcs/class/Facades/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight-net_4_5.csproj
deleted file mode 100644 (file)
index a1a8005..0000000
--- a/mcs/class/Facades/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{56035DDD-F2DD-46ED-88EF-DF8636198D36}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reflection.Emit.Lightweight</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Reflection.Emit/System.Reflection.Emit-net_4_5.csproj b/mcs/class/Facades/System.Reflection.Emit/System.Reflection.Emit-net_4_5.csproj
deleted file mode 100644 (file)
index 99ca163..0000000
--- a/mcs/class/Facades/System.Reflection.Emit/System.Reflection.Emit-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6ABB9197-8B7B-4566-B42A-5B7A8CDE3D4E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reflection.Emit</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Reflection.Extensions/System.Reflection.Extensions-net_4_5.csproj b/mcs/class/Facades/System.Reflection.Extensions/System.Reflection.Extensions-net_4_5.csproj
deleted file mode 100644 (file)
index ad54afb..0000000
--- a/mcs/class/Facades/System.Reflection.Extensions/System.Reflection.Extensions-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{670D61FE-7031-4734-87FB-E7DC401F7D99}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reflection.Extensions</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Reflection.Primitives/System.Reflection.Primitives-net_4_5.csproj b/mcs/class/Facades/System.Reflection.Primitives/System.Reflection.Primitives-net_4_5.csproj
deleted file mode 100644 (file)
index 3b1cf96..0000000
--- a/mcs/class/Facades/System.Reflection.Primitives/System.Reflection.Primitives-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{080E1A07-4A13-4D86-966E-4BED488972E9}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reflection.Primitives</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Reflection/System.Reflection-net_4_5.csproj b/mcs/class/Facades/System.Reflection/System.Reflection-net_4_5.csproj
deleted file mode 100644 (file)
index b40c94c..0000000
--- a/mcs/class/Facades/System.Reflection/System.Reflection-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{00F1AED2-A30C-4FE4-9B8C-1DCB271AD050}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reflection</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Resources.ResourceManager/System.Resources.ResourceManager-net_4_5.csproj b/mcs/class/Facades/System.Resources.ResourceManager/System.Resources.ResourceManager-net_4_5.csproj
deleted file mode 100644 (file)
index 9d9d133..0000000
--- a/mcs/class/Facades/System.Resources.ResourceManager/System.Resources.ResourceManager-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4A4281A7-0EBB-4FA4-ABC8-354253A9DDAF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Resources.ResourceManager</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Runtime.Extensions/System.Runtime.Extensions-net_4_5.csproj b/mcs/class/Facades/System.Runtime.Extensions/System.Runtime.Extensions-net_4_5.csproj
deleted file mode 100644 (file)
index 0fa1a43..0000000
--- a/mcs/class/Facades/System.Runtime.Extensions/System.Runtime.Extensions-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{CD67F8F0-C543-4BBA-AB81-F6A9FCD4BD62}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Extensions</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/System.Runtime.InteropServices.WindowsRuntime-net_4_5.csproj b/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/System.Runtime.InteropServices.WindowsRuntime-net_4_5.csproj
deleted file mode 100644 (file)
index 65e8631..0000000
--- a/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/System.Runtime.InteropServices.WindowsRuntime-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{045F952B-9AB3-4DB1-ADBB-D260B4B5E0E1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.InteropServices.WindowsRuntime</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Runtime.InteropServices/System.Runtime.InteropServices-net_4_5.csproj b/mcs/class/Facades/System.Runtime.InteropServices/System.Runtime.InteropServices-net_4_5.csproj
deleted file mode 100644 (file)
index 6562fdf..0000000
--- a/mcs/class/Facades/System.Runtime.InteropServices/System.Runtime.InteropServices-net_4_5.csproj
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{516204B8-800B-4508-8DA1-E103A1985B5A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.InteropServices</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Runtime.Numerics/System.Runtime.Numerics-net_4_5.csproj b/mcs/class/Facades/System.Runtime.Numerics/System.Runtime.Numerics-net_4_5.csproj
deleted file mode 100644 (file)
index 6819ca0..0000000
--- a/mcs/class/Facades/System.Runtime.Numerics/System.Runtime.Numerics-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{798C666E-FA52-4B49-B8E3-49167F2E0D26}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Numerics</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Numerics/System.Numerics-net_4_5.csproj">\r
-      <Project>{14631AC9-FDC6-4561-A04C-6913947C939E}</Project>\r
-      <Name>System.Numerics-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json-net_4_5.csproj b/mcs/class/Facades/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json-net_4_5.csproj
deleted file mode 100644 (file)
index 7b20277..0000000
--- a/mcs/class/Facades/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{66CACE39-45D9-4F11-9606-CEDC9F4FB94E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization.Json</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives-net_4_5.csproj b/mcs/class/Facades/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives-net_4_5.csproj
deleted file mode 100644 (file)
index f08f7ca..0000000
--- a/mcs/class/Facades/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F113ADCC-80CA-4CCC-A59B-3628CB0F534C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization.Primitives</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml-net_4_5.csproj b/mcs/class/Facades/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml-net_4_5.csproj
deleted file mode 100644 (file)
index b45c1bf..0000000
--- a/mcs/class/Facades/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml-net_4_5.csproj
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5EC82F0C-7FAF-44DE-BD77-57CFE2FEB1D5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization.Xml</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Runtime/System.Runtime-net_4_5.csproj b/mcs/class/Facades/System.Runtime/System.Runtime-net_4_5.csproj
deleted file mode 100644 (file)
index 0f22c82..0000000
--- a/mcs/class/Facades/System.Runtime/System.Runtime-net_4_5.csproj
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FE41441F-91F5-48AC-84DA-23056DD7386B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_5.csproj">\r
-      <Project>{81352E26-6AB7-4AA3-8FB1-28A476E82748}</Project>\r
-      <Name>System.ComponentModel.Composition-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Security.Principal/System.Security.Principal-net_4_5.csproj b/mcs/class/Facades/System.Security.Principal/System.Security.Principal-net_4_5.csproj
deleted file mode 100644 (file)
index 9784c71..0000000
--- a/mcs/class/Facades/System.Security.Principal/System.Security.Principal-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{09F21748-CA1B-49EF-BE06-64542DBDD927}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Security.Principal</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.ServiceModel.Http/System.ServiceModel.Http-net_4_5.csproj b/mcs/class/Facades/System.ServiceModel.Http/System.ServiceModel.Http-net_4_5.csproj
deleted file mode 100644 (file)
index d249f67..0000000
--- a/mcs/class/Facades/System.ServiceModel.Http/System.ServiceModel.Http-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5FB7CE3D-3BF8-4539-AC0B-37A473DA75C6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Http</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
-      <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.ServiceModel.Primitives/System.ServiceModel.Primitives-net_4_5.csproj b/mcs/class/Facades/System.ServiceModel.Primitives/System.ServiceModel.Primitives-net_4_5.csproj
deleted file mode 100644 (file)
index 4679619..0000000
--- a/mcs/class/Facades/System.ServiceModel.Primitives/System.ServiceModel.Primitives-net_4_5.csproj
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{339D127E-6EC9-4DC2-A6E9-1306B4AAC18A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Primitives</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
-      <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.ServiceModel.Security/System.ServiceModel.Security-net_4_5.csproj b/mcs/class/Facades/System.ServiceModel.Security/System.ServiceModel.Security-net_4_5.csproj
deleted file mode 100644 (file)
index 5f48298..0000000
--- a/mcs/class/Facades/System.ServiceModel.Security/System.ServiceModel.Security-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{EF11BD41-8AF8-4A15-A6B7-344BC9852EF6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Security</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
-      <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions-net_4_5.sln b/mcs/class/Facades/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions-net_4_5.sln
new file mode 100644 (file)
index 0000000..82d6caa
--- /dev/null
+++ b/mcs/class/Facades/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions-net_4_5.sln
@@ -0,0 +1,17 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 11.00\r
+# Visual Studio 2010\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.Extensions-net_4_5", "System.Text.Encoding.Extensions-net_4_5.csproj", "{DEAA541C-1414-4C17-9DB1-F63F83B0C182}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Any CPU = Debug|Any CPU\r
+               Release|Any CPU = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {DEAA541C-1414-4C17-9DB1-F63F83B0C182}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {DEAA541C-1414-4C17-9DB1-F63F83B0C182}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {DEAA541C-1414-4C17-9DB1-F63F83B0C182}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {DEAA541C-1414-4C17-9DB1-F63F83B0C182}.Release|Any CPU.Build.0 = Release|Any CPU\r
+       EndGlobalSection\r
+EndGlobal\r

diff --git a/mcs/class/Facades/System.Text.Encoding/System.Text.Encoding-net_4_5.csproj b/mcs/class/Facades/System.Text.Encoding/System.Text.Encoding-net_4_5.csproj
deleted file mode 100644 (file)
index ce884f9..0000000
--- a/mcs/class/Facades/System.Text.Encoding/System.Text.Encoding-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4AB957DC-5A83-40D2-AB0B-DA1583C40181}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Text.Encoding</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Text.RegularExpressions/System.Text.RegularExpressions-net_4_5.csproj b/mcs/class/Facades/System.Text.RegularExpressions/System.Text.RegularExpressions-net_4_5.csproj
deleted file mode 100644 (file)
index a60fd9f..0000000
--- a/mcs/class/Facades/System.Text.RegularExpressions/System.Text.RegularExpressions-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{189011AC-76B3-4364-B999-A54B72B69DF7}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Text.RegularExpressions</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel-net_4_5.csproj b/mcs/class/Facades/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel-net_4_5.csproj
deleted file mode 100644 (file)
index 144c522..0000000
--- a/mcs/class/Facades/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3FC77F23-AFB8-4FB6-A18F-5E76D6B4A309}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Threading.Tasks.Parallel</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Threading.Tasks/System.Threading.Tasks-net_4_5.csproj b/mcs/class/Facades/System.Threading.Tasks/System.Threading.Tasks-net_4_5.csproj
deleted file mode 100644 (file)
index fe3002c..0000000
--- a/mcs/class/Facades/System.Threading.Tasks/System.Threading.Tasks-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{CA73F804-277A-40B5-A9F7-5E3FD913629B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Threading.Tasks</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Threading.Timer/System.Threading.Timer-net_4_5.csproj b/mcs/class/Facades/System.Threading.Timer/System.Threading.Timer-net_4_5.csproj
deleted file mode 100644 (file)
index d2b3fc1..0000000
--- a/mcs/class/Facades/System.Threading.Timer/System.Threading.Timer-net_4_5.csproj
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{93FB6CF4-26B5-4D43-A485-E9A052A82749}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Threading.Timer</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Threading/System.Threading-net_4_5.csproj b/mcs/class/Facades/System.Threading/System.Threading-net_4_5.csproj
deleted file mode 100644 (file)
index 345389e..0000000
--- a/mcs/class/Facades/System.Threading/System.Threading-net_4_5.csproj
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4DE82EEA-1FE0-4D13-B1DA-7221E52CD3EE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Threading</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Xml.ReaderWriter/System.Xml.ReaderWriter-net_4_5.csproj b/mcs/class/Facades/System.Xml.ReaderWriter/System.Xml.ReaderWriter-net_4_5.csproj
deleted file mode 100644 (file)
index 876bce7..0000000
--- a/mcs/class/Facades/System.Xml.ReaderWriter/System.Xml.ReaderWriter-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{32D7A81F-E7B5-4E08-BE4C-2BC0FF902C66}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml.ReaderWriter</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Xml.XDocument/System.Xml.XDocument-net_4_5.csproj b/mcs/class/Facades/System.Xml.XDocument/System.Xml.XDocument-net_4_5.csproj
deleted file mode 100644 (file)
index 9b565e5..0000000
--- a/mcs/class/Facades/System.Xml.XDocument/System.Xml.XDocument-net_4_5.csproj
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F47D56BD-BA6E-4503-B2FA-435A331338B5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml.XDocument</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
-      <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Facades/System.Xml.XmlSerializer/System.Xml.XmlSerializer-net_4_5.csproj b/mcs/class/Facades/System.Xml.XmlSerializer/System.Xml.XmlSerializer-net_4_5.csproj
deleted file mode 100644 (file)
index bbb6f75..0000000
--- a/mcs/class/Facades/System.Xml.XmlSerializer/System.Xml.XmlSerializer-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{799C90EA-628C-40EB-8C8C-6EA21B2ECE80}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5/Facades</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml.XmlSerializer</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/I18N/CJK/I18N.CJK-net_4_5.csproj b/mcs/class/I18N/CJK/I18N.CJK-net_4_5.csproj
deleted file mode 100644 (file)
index 5cbf46c..0000000
--- a/mcs/class/I18N/CJK/I18N.CJK-net_4_5.csproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E1E28FDB-826D-4FEB-B3B9-3FF98BD2E43F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.CJK</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>DISABLE_UNSAFE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CodeTable.cs" />\r
-    <Compile Include="CP51932.cs" />\r
-    <Compile Include="CP932.cs" />\r
-    <Compile Include="CP936.cs" />\r
-    <Compile Include="CP949.cs" />\r
-    <Compile Include="CP950.cs" />\r
-    <Compile Include="DbcsConvert.cs" />\r
-    <Compile Include="DbcsEncoding.cs" />\r
-    <Compile Include="GB18030Encoding.cs" />\r
-    <Compile Include="GB18030Source.cs" />\r
-    <Compile Include="ISO2022JP.cs" />\r
-    <Compile Include="JISConvert.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Common/I18N-net_4_5.csproj">\r
-      <Project>{C337A9A4-3797-4339-AD23-493DF062CD76}</Project>\r
-      <Name>I18N-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="big5.table">\r
-      <LogicalName>big5.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="gb2312.table">\r
-      <LogicalName>gb2312.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="jis.table">\r
-      <LogicalName>jis.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="ks.table">\r
-      <LogicalName>ks.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="gb18030.table">\r
-      <LogicalName>gb18030.table</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/I18N/CJK/I18N.CJK-tests-net_4_5.csproj b/mcs/class/I18N/CJK/I18N.CJK-tests-net_4_5.csproj
deleted file mode 100644 (file)
index ba41310..0000000
--- a/mcs/class/I18N/CJK/I18N.CJK-tests-net_4_5.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{06AF7FA1-1355-4A2F-8627-2AA11C5B2689}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\I18N.CJK-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.CJK_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\I18N.CJK.Test.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_4_5.csproj">\r
-      <Project>{C337A9A4-3797-4339-AD23-493DF062CD76}</Project>\r
-      <Name>Common\I18N-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\CJK\I18N.CJK-net_4_5.csproj">\r
-      <Project>{E1E28FDB-826D-4FEB-B3B9-3FF98BD2E43F}</Project>\r
-      <Name>CJK\I18N.CJK-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="big5.table">\r
-      <LogicalName>big5.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="gb2312.table">\r
-      <LogicalName>gb2312.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="jis.table">\r
-      <LogicalName>jis.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="ks.table">\r
-      <LogicalName>ks.table</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="gb18030.table">\r
-      <LogicalName>gb18030.table</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/I18N/Common/I18N-net_4_5.csproj b/mcs/class/I18N/Common/I18N-net_4_5.csproj
deleted file mode 100644 (file)
index e2a4948..0000000
--- a/mcs/class/I18N/Common/I18N-net_4_5.csproj
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C337A9A4-3797-4339-AD23-493DF062CD76}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>DISABLE_UNSAFE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="ByteEncoding.cs" />\r
-    <Compile Include="ByteSafeEncoding.cs" />\r
-    <Compile Include="DefaultEncoder.cs" />\r
-    <Compile Include="Handlers.cs" />\r
-    <Compile Include="Manager.cs" />\r
-    <Compile Include="MonoEncoding.cs" />\r
-    <Compile Include="MonoSafeEncoding.cs" />\r
-    <Compile Include="Strings.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/I18N/MidEast/I18N.MidEast-net_4_5.csproj b/mcs/class/I18N/MidEast/I18N.MidEast-net_4_5.csproj
deleted file mode 100644 (file)
index 9fd9533..0000000
--- a/mcs/class/I18N/MidEast/I18N.MidEast-net_4_5.csproj
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C2ADDD2F-602B-4787-8688-F06C3DED0DA5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.MidEast</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CP1254.cs" />\r
-    <Compile Include="CP1255.cs" />\r
-    <Compile Include="CP1256.cs" />\r
-    <Compile Include="CP28596.cs" />\r
-    <Compile Include="CP28598.cs" />\r
-    <Compile Include="CP28599.cs" />\r
-    <Compile Include="CP38598.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Common/I18N-net_4_5.csproj">\r
-      <Project>{C337A9A4-3797-4339-AD23-493DF062CD76}</Project>\r
-      <Name>I18N-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/I18N/MidEast/I18N.MidEast-tests-net_4_5.csproj b/mcs/class/I18N/MidEast/I18N.MidEast-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 3dea5df..0000000
--- a/mcs/class/I18N/MidEast/I18N.MidEast-tests-net_4_5.csproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3537138C-2770-42E5-BFFE-D690889FA603}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\I18N.MidEast-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.MidEast_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\I18N.MidEast.Test.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_4_5.csproj">\r
-      <Project>{C337A9A4-3797-4339-AD23-493DF062CD76}</Project>\r
-      <Name>Common\I18N-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\MidEast\I18N.MidEast-net_4_5.csproj">\r
-      <Project>{C2ADDD2F-602B-4787-8688-F06C3DED0DA5}</Project>\r
-      <Name>MidEast\I18N.MidEast-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/I18N/Other/I18N.Other-net_4_5.csproj b/mcs/class/I18N/Other/I18N.Other-net_4_5.csproj
deleted file mode 100644 (file)
index cb274ec..0000000
--- a/mcs/class/I18N/Other/I18N.Other-net_4_5.csproj
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B77661D6-F5C9-4FB2-8613-06F645D6E227}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.Other</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CP1251.cs" />\r
-    <Compile Include="CP1257.cs" />\r
-    <Compile Include="CP1258.cs" />\r
-    <Compile Include="CP20866.cs" />\r
-    <Compile Include="CP21866.cs" />\r
-    <Compile Include="CP28594.cs" />\r
-    <Compile Include="CP28595.cs" />\r
-    <Compile Include="CP57002.cs" />\r
-    <Compile Include="CP874.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Common/I18N-net_4_5.csproj">\r
-      <Project>{C337A9A4-3797-4339-AD23-493DF062CD76}</Project>\r
-      <Name>I18N-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/I18N/Rare/I18N.Rare-net_4_5.csproj b/mcs/class/I18N/Rare/I18N.Rare-net_4_5.csproj
deleted file mode 100644 (file)
index 1029f77..0000000
--- a/mcs/class/I18N/Rare/I18N.Rare-net_4_5.csproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{ED2E80E0-D1B2-48D3-8EF9-F20CB9D0FA98}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.Rare</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CP1026.cs" />\r
-    <Compile Include="CP1047.cs" />\r
-    <Compile Include="CP1140.cs" />\r
-    <Compile Include="CP1141.cs" />\r
-    <Compile Include="CP1142.cs" />\r
-    <Compile Include="CP1143.cs" />\r
-    <Compile Include="CP1144.cs" />\r
-    <Compile Include="CP1145.cs" />\r
-    <Compile Include="CP1146.cs" />\r
-    <Compile Include="CP1147.cs" />\r
-    <Compile Include="CP1148.cs" />\r
-    <Compile Include="CP1149.cs" />\r
-    <Compile Include="CP20273.cs" />\r
-    <Compile Include="CP20277.cs" />\r
-    <Compile Include="CP20278.cs" />\r
-    <Compile Include="CP20280.cs" />\r
-    <Compile Include="CP20284.cs" />\r
-    <Compile Include="CP20285.cs" />\r
-    <Compile Include="CP20290.cs" />\r
-    <Compile Include="CP20297.cs" />\r
-    <Compile Include="CP20420.cs" />\r
-    <Compile Include="CP20424.cs" />\r
-    <Compile Include="CP20871.cs" />\r
-    <Compile Include="CP21025.cs" />\r
-    <Compile Include="CP37.cs" />\r
-    <Compile Include="CP500.cs" />\r
-    <Compile Include="CP708.cs" />\r
-    <Compile Include="CP852.cs" />\r
-    <Compile Include="CP855.cs" />\r
-    <Compile Include="CP857.cs" />\r
-    <Compile Include="CP858.cs" />\r
-    <Compile Include="CP862.cs" />\r
-    <Compile Include="CP864.cs" />\r
-    <Compile Include="CP866.cs" />\r
-    <Compile Include="CP869.cs" />\r
-    <Compile Include="CP870.cs" />\r
-    <Compile Include="CP875.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Common/I18N-net_4_5.csproj">\r
-      <Project>{C337A9A4-3797-4339-AD23-493DF062CD76}</Project>\r
-      <Name>I18N-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/I18N/West/I18N.West-net_4_5.csproj b/mcs/class/I18N/West/I18N.West-net_4_5.csproj
deleted file mode 100644 (file)
index 0d49f88..0000000
--- a/mcs/class/I18N/West/I18N.West-net_4_5.csproj
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C95AC6B1-7D75-40D5-8B6D-F62278587227}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.West</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="CP10000.cs" />\r
-    <Compile Include="CP10079.cs" />\r
-    <Compile Include="CP1250.cs" />\r
-    <Compile Include="CP1252.cs" />\r
-    <Compile Include="CP1253.cs" />\r
-    <Compile Include="CP28592.cs" />\r
-    <Compile Include="CP28593.cs" />\r
-    <Compile Include="CP28597.cs" />\r
-    <Compile Include="CP28605.cs" />\r
-    <Compile Include="CP437.cs" />\r
-    <Compile Include="CP850.cs" />\r
-    <Compile Include="CP860.cs" />\r
-    <Compile Include="CP861.cs" />\r
-    <Compile Include="CP863.cs" />\r
-    <Compile Include="CP865.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Common/I18N-net_4_5.csproj">\r
-      <Project>{C337A9A4-3797-4339-AD23-493DF062CD76}</Project>\r
-      <Name>I18N-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/I18N/West/I18N.West-tests-net_4_5.csproj b/mcs/class/I18N/West/I18N.West-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 90f2c06..0000000
--- a/mcs/class/I18N/West/I18N.West-tests-net_4_5.csproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FB1F5992-FA12-4ABF-9614-43CC917A588F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\I18N.West-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>I18N.West_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\I18N.West.Test.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\Common\I18N-net_4_5.csproj">\r
-      <Project>{C337A9A4-3797-4339-AD23-493DF062CD76}</Project>\r
-      <Name>Common\I18N-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\I18N\West\I18N.West-net_4_5.csproj">\r
-      <Project>{C95AC6B1-7D75-40D5-8B6D-F62278587227}</Project>\r
-      <Name>West\I18N.West-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2-net_4_5.csproj b/mcs/class/IBM.Data.DB2/IBM.Data.DB2-net_4_5.csproj
deleted file mode 100644 (file)
index 465ee15..0000000
--- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2-net_4_5.csproj
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7A0D9630-19F1-4AC0-951C-D0F1EA609049}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>IBM.Data.DB2</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ClientUtils.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2CLIWrapper.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Command.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2CommandBuilder.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Connection.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ConnectionPool.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ConnectionSettings.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Constants.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2DataAdapter.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2DataReader.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Environment.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Error.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ErrorCollection.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Exception.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2InfoMessageEventHandler.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2OpenConnection.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Parameter.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2ParameterCollection.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventArgs.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventHandler.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventArgs.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventHandler.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Transaction.cs" />\r
-    <Compile Include=".\IBM.Data.DB2\DB2Type.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_5.csproj b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_5.csproj
deleted file mode 100644 (file)
index 3bc4cbb..0000000
--- a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_5.csproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0B587DBA-BA92-4B92-821A-AA200C612A7E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>ICSharpCode.SharpZipLib</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="ICSharpCode.SharpZipLib\AssemblyInfo.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2Constants.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2Exception.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2InputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2OutputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Checksums\Adler32.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Checksums\CRC32.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Checksums\IChecksum.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Checksums\StrangeCRC.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Core\FileSystemScanner.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Core\INameTransform.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Core\NameFilter.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Core\PathFilter.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Encryption\PkzipClassic.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\GZip\GZIPConstants.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\GZip\GZipException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\GZip\GzipInputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\GZip\GzipOutputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Main.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\SharpZipBaseException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\InvalidHeaderException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarArchive.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarBuffer.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarEntry.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarHeader.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarInputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Tar\TarOutputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Deflater.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterConstants.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterEngine.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterHuffman.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterPending.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Inflater.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\InflaterDynHeader.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\PendingBuffer.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\OutputWindow.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\FastZip.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipConstants.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipEntry.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipException.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipFile.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipInputStream.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipNameTransform.cs" />\r
-    <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipOutputStream.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs
index ccfc0fa3a0ea8a46c1a5018af0732e84820892b4..ea302826b87e8d016b234b12937fcfeca96693e1 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs
@@ -464,6 +464,7 @@ namespace Microsoft.Build.BuildEngine {
                        List<string> args = new List<string> ();
                        int parens = 0;
                        bool backticks = false;
+                       bool inquotes = false;
                        int start = pos;
                        for (; pos < text.Length; ++pos) {
                                var ch = text [pos];
@@ -476,6 +477,11 @@ namespace Microsoft.Build.BuildEngine {
                                if (backticks)
                                        continue;
 
+                               if (ch == '\"') {
+                                       inquotes = !inquotes;
+                                       continue;
+                               }
+
                                if (ch == '(') {
                                        ++parens;
                                        continue;
@@ -498,7 +504,7 @@ namespace Microsoft.Build.BuildEngine {
                                if (parens != 0)
                                        continue;
 
-                               if (ch == ',') {
+                               if (ch == ',' && !inquotes) {
                                        args.Add (text.Substring (start, pos - start));
                                        start = pos + 1;
                                        continue;

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/MemberInvocationReference.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/MemberInvocationReference.cs
index c2383e5025397d6e7c4487d992f2eff3d94351f5..3cb27d959fbd97a1fc4fa10a0bb04703a4851e21 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/MemberInvocationReference.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/MemberInvocationReference.cs
@@ -32,6 +32,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Globalization;
 using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
 using System.Text;
 
 namespace Microsoft.Build.BuildEngine
@@ -280,7 +281,10 @@ namespace Microsoft.Build.BuildEngine
 
                public ITaskItem[] ConvertToITaskItemArray (Project project, ExpressionOptions options)
                {
-                       throw new NotImplementedException ();
+                       var items = new ITaskItem[1];
+                       items[0] = new TaskItem (ConvertToString (project, options));
+
+                       return items;
                }
        }
 }
\ No newline at end of file

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_5.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_5.csproj
deleted file mode 100644 (file)
index cbf99b3..0000000
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_5.csproj
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{54DFC5A7-7C1D-4BA5-A0F7-F0B312E1E076}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Engine</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\SolutionParser.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="..\Microsoft.Build.Framework\Mono.XBuild.Framework\AssemblyLoadInfo.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\ReservedNameUtils.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BatchingImplBase.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildChoose.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildEngine.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildItem.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroup.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildItemGroupCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildProperty.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroup.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildPropertyGroupCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildSettings.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTask.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTaskItem.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTaskItemGroup.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildTaskPropertyGroup.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\BuildWhen.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ChangeType.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ColorResetter.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ColorSetter.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionAndExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionFactorExpresion.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionFunctionExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionNotExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionOrExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionParser.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionRelationalExpression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConditionTokenizer.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ConsoleLogger.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\DirectoryScanner.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Engine.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\EventSource.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Expression.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ExpressionCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ExpressionEvaluationException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ExpressionParseException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\FileLogger.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\GroupingCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\IBuildTask.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Import.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ImportCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ImportedProject.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\InternalLoggerException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\InvalidProjectFileException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\MemberInvocationReference.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\MetadataReference.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\PredefinedPropertyFunctions.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Project.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ProjectLoadSettings.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\PropertyPosition.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\PropertyReference.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Target.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TargetBatchingImpl.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TargetCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\TaskExecutionMode.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Token.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\ToolsetDefinitionLocations.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\UsingTask.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\UsingTaskCollection.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\Utilities.cs" />\r
-    <Compile Include="Microsoft.Build.BuildEngine\WriteHandler.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_5.csproj">\r
-      <Project>{DA3B9FEE-8FBD-4587-B760-65420765256A}</Project>\r
-      <Name>Microsoft.Build.Framework-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_5.csproj">\r
-      <Project>{6E1C7BDE-7B9E-47B0-A7B2-1561822FE922}</Project>\r
-      <Name>Microsoft.Build.Utilities-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_4_5.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 1a8564b..0000000
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-tests-net_4_5.csproj
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{EBF59584-3F6F-4881-B2FF-E4FBE2A4D1F1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Microsoft.Build.Engine-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Engine_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\Microsoft.Build.Tasks\Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildChooseTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemGroupTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildItemTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyGroupTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildPropertyTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\BuildTaskTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ConsoleLoggerTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\Consts.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\EngineTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ImportTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\InternalLoggerExceptionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\InvalidProjectFileExceptionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\ProjectTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\TargetTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\TestNamespaceManager.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\UsingTaskTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.BuildEngine\UtilitiesTest.cs" />\r
-    <Compile Include="Test\various\Build.cs" />\r
-    <Compile Include="Test\various\Conditions.cs" />\r
-    <Compile Include="Test\various\DefaultTasks.cs" />\r
-    <Compile Include="Test\various\EvaluationOrder.cs" />\r
-    <Compile Include="Test\various\Items.cs" />\r
-    <Compile Include="Test\various\ProjectElement.cs" />\r
-    <Compile Include="Test\various\Properties.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_5.csproj">\r
-      <Project>{54DFC5A7-7C1D-4BA5-A0F7-F0B312E1E076}</Project>\r
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5.csproj">\r
-      <Project>{DA3B9FEE-8FBD-4587-B760-65420765256A}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_5.csproj">\r
-      <Project>{6E1C7BDE-7B9E-47B0-A7B2-1561822FE922}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs
index 48aba112fb9912a680cd586375c3d53ed7d0aa2d..594c0858777c80db3bceec5a5fb434aaef8ddb78 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs
+++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs
@@ -67,7 +67,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                void Message (object sender, BuildMessageEventArgs args)
                {
                }
-               
+
                void Warning (object sender, BuildWarningEventArgs args)
                {
                }
@@ -97,7 +97,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                        Project project;
                        string documentString =
                                "<Project></Project>";
-                       
+
                        engine = new Engine (Consts.BinPath);
 
                        DateTime time = DateTime.Now;
@@ -127,7 +127,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                        Project project;
                        string documentString =
                                "<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\"></Project>";
-                       
+
                        engine = new Engine (Consts.BinPath);
                        DateTime time = DateTime.Now;
                        project = engine.CreateNewProject ();
@@ -310,7 +310,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 
                        string documentString = @"
                                <Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
-                                       <Target 
+                                       <Target
                                                Name='Main'
                                                Inputs='a;b;c'
                                                Outputs='d;e;f'
@@ -345,7 +345,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                        Engine engine;
                        Project project;
                        IDictionary hashtable = new Hashtable ();
-                       
+
                        string documentString = @"
                                <Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
                                        <Target Name='Main'>
@@ -353,7 +353,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                                        </Target>
                                </Project>
                        ";
-                       
+
                        engine = new Engine (Consts.BinPath);
                        project = engine.CreateNewProject ();
                        project.LoadXml (documentString);
@@ -769,12 +769,12 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                {
                        Engine engine;
                        Project project;
-                       
+
                        string documentString = @"
                                <Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
                                </Project>
                        ";
-                       
+
                        engine = new Engine (Consts.BinPath);
                        project = engine.CreateNewProject ();
                        project.LoadXml (documentString);
@@ -787,15 +787,15 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                {
                        Engine engine;
                        Project project;
-                       
+
                        string documentString = @"
                                <Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
                                </Project>
                        ";
-                       
+
                        engine = new Engine (Consts.BinPath);
                        engine.GlobalProperties.SetProperty ("Property", "Value");
-                       
+
                        project = engine.CreateNewProject ();
                        project.LoadXml (documentString);
 
@@ -815,12 +815,12 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                {
                        Engine engine;
                        Project project;
-                       
+
                        string documentString = @"
                                <Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
                                </Project>
                        ";
-                       
+
                        engine = new Engine (Consts.BinPath);
                        project = engine.CreateNewProject ();
                        project.LoadXml (documentString);
@@ -834,7 +834,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                {
                        Engine engine;
                        Project project;
-                       
+
                        string documentString = @"
                                <Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
                                        <PropertyGroup>
@@ -842,7 +842,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                                        </PropertyGroup>
                                </Project>
                        ";
-                       
+
                        engine = new Engine (Consts.BinPath);
                        project = engine.CreateNewProject ();
                        project.LoadXml (documentString);
@@ -861,7 +861,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                {
                        Engine engine;
                        Project project;
-                       
+
                        string documentString = @"
                                <Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
                                        <PropertyGroup>
@@ -869,7 +869,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                                        </PropertyGroup>
                                </Project>
                        ";
-                       
+
                        engine = new Engine (Consts.BinPath);
                        project = engine.CreateNewProject ();
                        project.LoadXml (documentString);
@@ -914,7 +914,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                {
                        Engine engine;
                        Project project;
-                       
+
                        engine = new Engine (Consts.BinPath);
                        project = engine.CreateNewProject ();
 
@@ -1076,18 +1076,18 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                        Assert.AreEqual (3, tl.TargetStartedEvents, "A1");
                        Assert.AreEqual (3, tl.TargetFinishedEvents, "A1");
                }
-               
+
                [Test]
                public void TestSchemaFile ()
                {
                        Engine engine;
                        Project project;
-                       
+
                        string documentString = @"
                                <Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
                                </Project>
                        ";
-                       
+
                        engine = new Engine (Consts.BinPath);
                        project = engine.CreateNewProject ();
                        project.LoadXml (documentString);
@@ -2092,7 +2092,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                         <MeTAdata1>md3</MeTAdata1>
                         <Metadata2>md4</Metadata2>
                 </Abc>
-        </ItemGroup> 
+        </ItemGroup>
         <PropertyGroup><ProP1>ValueProp</ProP1></PropertyGroup>
        <Target Name=""Main"">
                <MesSAGE Text=""Full item: @(ABC)""/>
@@ -2159,7 +2159,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                                        Path.Combine ("fr-FR", "Lib2.resources.dll"),
                                        "Lib4.dll", "Lib4" + debug_extn
                                },
-                               
+
                                // lib1
                                new string [] {
                                        // lib1 files
@@ -2216,7 +2216,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 
                        Project project = engine.CreateNewProject ();
                        project.Load (Path.Combine (basepath, "Project01.sln.proj"));
-                       
+
                        bool result = project.Build ();
                        if (!result) {
                                logger.DumpMessages ();
@@ -2373,5 +2373,24 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 
                        return project;
                }
+
+               [Test]
+               public void CheckCommaInQuotes ()
+               {
+                       string testString = "Test.string.with.Commas";
+                       string documentString = string.Format (@"
+                       <Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
+                               <PropertyGroup>
+                                       <TestString>{0}</TestString>
+                                       <TestString2>$(TestString.Replace(&quot;.&quot;,&quot;,&quot;))</TestString2>
+                               </PropertyGroup>
+                       </Project>", testString);
+
+                       Project project = new Project ();
+      project.LoadXml (documentString);
+
+                       string result = project.EvaluatedProperties ["TestString2"].FinalValue;
+      Assert.AreEqual (testString.Replace (".", ","), result, "A1");
+               }
        }
 }

diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_5.csproj b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_5.csproj
deleted file mode 100644 (file)
index e9db279..0000000
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_5.csproj
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DA3B9FEE-8FBD-4587-B760-65420765256A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Framework</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\AnyEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildEngineResult.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildErrorEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildErrorEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildEventContext.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildFinishedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildMessageEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildMessageEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildStartedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildStatusEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildStatusEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildWarningEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\BuildWarningEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\CustomBuildEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\CustomBuildEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ExternalProjectFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ExternalProjectStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IBuildEngine.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IBuildEngine2.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IBuildEngine3.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IBuildEngine4.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ICancelableTask.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IEventRedirector.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IEventSource.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\IForwardingLogger.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ILogger.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\INodeLogger.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITask.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskFactory.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskFactory2.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskHost.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskItem.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ITaskItem2.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\LazyFormattedBuildEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\LoadInSeparateAppDomainAttribute.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\LoggerException.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\LoggerVerbosity.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\MessageImportance.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\OutputAttribute.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ProjectFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ProjectFinishedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ProjectStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\ProjectStartedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\RegisteredTaskObjectLifetime.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\RequiredAttribute.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TargetFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TargetFinishedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TargetStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TargetStartedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskCommandLineEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskFinishedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskFinishedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskPropertyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskStartedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Framework\TaskStartedEventHandler.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-tests-net_4_5.csproj b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 20ea844..0000000
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-tests-net_4_5.csproj
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6F4A0357-C391-41B0-A1E1-BCA43ED57C90}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Microsoft.Build.Framework-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Framework_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildErrorEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildEventContextTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildMessageEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildStartedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\BuildWarningEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\ExternalProjectFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\ExternalProjectStartedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\LoggerExceptionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\ProjectFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\ProjectStartedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TargetFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TargetStartedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TaskCommandLineEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TaskFinishedEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Framework\TaskStartedEventArgsTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5.csproj">\r
-      <Project>{DA3B9FEE-8FBD-4587-B760-65420765256A}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_5.csproj b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_5.csproj
deleted file mode 100644 (file)
index dac54af..0000000
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_5.csproj
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A76A398F-08C0-4B3D-A624-690717233736}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Tasks.v4.0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\DirectoryScanner.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\UnknownToolsVersionException.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BootstrapperBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BuildMessage.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BuildMessageSeverity.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BuildResults.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\BuildSettings.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\ComponentsLocation.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IBootstrapperBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IBuildMessage.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IBuildResults.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IBuildSettings.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IProduct.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IProductBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IProductBuilderCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\IProductCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\Product.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\ProductBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\ProductBuilderCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.Bootstrapper\ProductCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ApplicationIdentity.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ApplicationManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyIdentity.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyReferenceCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\AssemblyReferenceType.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\BaseReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ComClass.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\DeployManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\FileReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\FileReferenceCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\Manifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ManifestReader.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ManifestWriter.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\OutputMessage.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\OutputMessageCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\OutputMessageType.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\ProxyStub.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\SecurityUtilities.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\TrustInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\TypeLib.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\UpdateMode.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\UpdateUnit.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Deployment.ManifestUtilities\WindowClass.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Hosting\ICscHostObject.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Hosting\ICscHostObject4.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks.Hosting\IVbcHostObject.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AL.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AppDomainIsolatedTaskExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AspNetCompiler.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AssemblyResolver.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AssignCulture.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AssignLinkMetadata.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AssignProjectConfiguration.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\AssignTargetPath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CallTarget.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CodeTaskFactory.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CombinePath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CommandLineBuilderExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Copy.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateCSharpManifestResourceName.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateItem.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateManifestResourceName.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateProperty.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateTemporaryVCProject.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\CreateVisualBasicManifestResourceName.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Csc.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Delete.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Error.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Exec.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ExtractedClassName.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\FindAppConfigFile.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\FindUnderPath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\FormatUrl.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\FormatVersion.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateApplicationManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateBootstrapper.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateDeploymentManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateManifestBase.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateResource.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GenerateTrustInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GetAssemblyIdentity.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GetFrameworkPath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GetFrameworkSdkPath.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\GetReferenceAssemblyPaths.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\LC.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\MakeDir.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ManagedCompiler.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Message.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\MSBuild.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ReadLinesFromFile.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\RegisterAssembly.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\RemoveDir.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\RemoveDuplicates.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ResolveAssemblyReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ResolvedReference.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ResolveManifestFiles.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ResolveProjectBase.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\SGen.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\SignFile.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\TaskExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\TaskLoggingHelperExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\ToolTaskExtension.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Touch.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\UnregisterAssembly.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\UpdateManifest.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Vbc.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\VCBuild.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\Warning.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\WriteCodeFragment.cs" />\r
-    <Compile Include="Microsoft.Build.Tasks\WriteLinesToFile.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceReader.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceWriter.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\TxtResourceReader.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\TxtResourceWriter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_5.csproj">\r
-      <Project>{6E1C7BDE-7B9E-47B0-A7B2-1561822FE922}</Project>\r
-      <Name>Microsoft.Build.Utilities-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_5.csproj">\r
-      <Project>{DA3B9FEE-8FBD-4587-B760-65420765256A}</Project>\r
-      <Name>Microsoft.Build.Framework-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_5.csproj">\r
-      <Project>{54DFC5A7-7C1D-4BA5-A0F7-F0B312E1E076}</Project>\r
-      <Name>Microsoft.Build.Engine-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_4_5.csproj">\r
-      <Project>{73FB1B7E-09F9-4E7F-A63A-C407A93BCA59}</Project>\r
-      <Name>Mono.XBuild.Tasks-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_x.csproj b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_x.csproj
index a3479d79693bfed6e60e51e553610107f5058f84..9bd62c80a9d97068530457ee669fc6391a41fa25 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_x.csproj
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_x.csproj
@@ -162,6 +162,7 @@
     <Compile Include="Microsoft.Build.Tasks\Warning.cs" />\r
     <Compile Include="Microsoft.Build.Tasks\WriteCodeFragment.cs" />\r
     <Compile Include="Microsoft.Build.Tasks\WriteLinesToFile.cs" />\r
+    <Compile Include="Microsoft.Build.Tasks\XmlPeek.cs" />\r
     <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceReader.cs" />\r
     <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceWriter.cs" />\r
     <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\TxtResourceReader.cs" />\r

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-tests-net_4_5.csproj b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-tests-net_4_5.csproj
deleted file mode 100644 (file)
index ae75316..0000000
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-tests-net_4_5.csproj
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{48DFBC3C-F8C1-488E-B1E2-15555551B796}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Microsoft.Build.Tasks-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Tasks_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\Microsoft.Build.Engine\Test\Microsoft.Build.BuildEngine\Consts.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\ALTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\AssignCultureTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\AssignProjectConfigurationTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\AssignTargetPathTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CombinePathTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CopyTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CreateCSharpManifestResourceNameTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CreateItemTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CreatePropertyTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CreateVisualBasicManifestResourceNameTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\CscTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\DeleteTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\ErrorTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\FindAppConfigFileTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\GetFrameworkPathTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\GetFrameworkSdkPathTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\LCTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\MakeDirTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\ManagedCompilerTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\MessageTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\RemoveDirTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\RemoveDuplicatesTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\ResolveAssemblyReferenceTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\TaskBatchingTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\TestEngine.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\TestMessageLogger.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\WarningTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Tasks\WriteLinesToFileTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Tasks\Microsoft.Build.Tasks-net_4_5.csproj">\r
-      <Project>{A76A398F-08C0-4B3D-A624-690717233736}</Project>\r
-      <Name>Microsoft.Build.Tasks\Microsoft.Build.Tasks-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_5.csproj">\r
-      <Project>{54DFC5A7-7C1D-4BA5-A0F7-F0B312E1E076}</Project>\r
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5.csproj">\r
-      <Project>{DA3B9FEE-8FBD-4587-B760-65420765256A}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_4_5.csproj">\r
-      <Project>{73FB1B7E-09F9-4E7F-A63A-C407A93BCA59}</Project>\r
-      <Name>Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_5.csproj">\r
-      <Project>{6E1C7BDE-7B9E-47B0-A7B2-1561822FE922}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-xbuild_12.csproj b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-xbuild_12.csproj
index 92566e79f64ec14e55daf37c76f824280bd01e41..642da43767b659aef566f33acbaaf625c7cd4502 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-xbuild_12.csproj
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-xbuild_12.csproj
@@ -159,6 +159,7 @@
     <Compile Include="Microsoft.Build.Tasks\VCBuild.cs" />\r
     <Compile Include="Microsoft.Build.Tasks\Warning.cs" />\r
     <Compile Include="Microsoft.Build.Tasks\WriteLinesToFile.cs" />\r
+    <Compile Include="Microsoft.Build.Tasks\XmlPeek.cs" />\r
     <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceReader.cs" />\r
     <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceWriter.cs" />\r
     <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\TxtResourceReader.cs" />\r

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.dll.sources b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.dll.sources
index 2261d7af65e926d8406757b5752a382fcdd75949..8830df5151b59012308811ad9526594e39e61760 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.dll.sources
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.dll.sources
@@ -112,6 +112,7 @@ Microsoft.Build.Tasks/VCBuild.cs
 Microsoft.Build.Tasks/Warning.cs
 Microsoft.Build.Tasks/WriteCodeFragment.cs
 Microsoft.Build.Tasks/WriteLinesToFile.cs
+Microsoft.Build.Tasks/XmlPeek.cs
 Mono.XBuild.Tasks.GenerateResourceInternal/PoResourceReader.cs
 Mono.XBuild.Tasks.GenerateResourceInternal/PoResourceWriter.cs
 Mono.XBuild.Tasks.GenerateResourceInternal/TxtResourceReader.cs

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssignProjectConfiguration.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssignProjectConfiguration.cs
index 789af4762ae9dcc420eb0a44637bee260a9f96e3..6fd7954ab42c949f141c90ef3aeeec886a16c22d 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssignProjectConfiguration.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssignProjectConfiguration.cs
@@ -87,14 +87,15 @@ namespace Microsoft.Build.Tasks {
                                string config;
 
                                string guid_str = item.GetMetadata ("Project");
-                               Guid guid;
-                               if (!TryParseGuid (guid_str, out guid)) {
+
+                               Guid guid = Guid.Empty;
+                               if (!string.IsNullOrEmpty(guid_str) && !TryParseGuid (guid_str, out guid)) {
                                        Log.LogError ("Project reference '{0}' has invalid or missing guid for metadata 'Project'.",
                                                        item.ItemSpec);
                                        return false;
                                }
 
-                               if (guidToConfigPlatform.TryGetValue (guid, out config)) {
+                               if (guid != Guid.Empty && guidToConfigPlatform.TryGetValue (guid, out config)) {
                                        string [] parts = config.Split (new char [] {'|'}, 2);
 
                                        ITaskItem new_item = new TaskItem (item);

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/XmlPeek.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/XmlPeek.cs
new file mode 100644 (file)
index 0000000..1e8cc21
--- /dev/null
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/XmlPeek.cs
@@ -0,0 +1,371 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//-----------------------------------------------------------------------
+// </copyright>
+// <summary>Returns the value specified by XPath.</summary>
+//-----------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Security;
+using System.Security.Permissions;
+using System.Text;
+using System.Xml;
+using System.Xml.Xsl;
+using System.Xml.XPath;
+
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.Build.Tasks
+{
+       /// <summary>
+       /// A task that returns values as specified by XPath Query
+       /// from an XML file.
+       /// </summary>
+       public class XmlPeek : TaskExtension
+       {
+               #region Members
+
+               /// <summary>
+               /// The XML input as a file path.
+               /// </summary>
+               private ITaskItem _xmlInputPath;
+
+               /// <summary>
+               /// The XML input as a string.
+               /// </summary>
+               private string _xmlContent;
+
+               /// <summary>
+               /// The XPath Query.
+               /// </summary>
+               private string _query;
+
+               /// <summary>
+               /// The results that this task will return.
+               /// </summary>
+               private ITaskItem[] _result;
+
+               /// <summary>
+               /// The namespaces for XPath query's prefixes.
+               /// </summary>
+               private string _namespaces;
+
+               #endregion
+
+               #region Properties
+
+               /// <summary>
+               /// The XML input as a file path.
+               /// </summary>
+               public ITaskItem XmlInputPath {
+                       get {
+                               return _xmlInputPath;
+                       }
+
+                       set {
+                               _xmlInputPath = value;
+                       }
+               }
+
+               /// <summary>
+               /// The XML input as a string.
+               /// </summary>
+               public string XmlContent {
+                       get {
+                               return _xmlContent;
+                       }
+
+                       set {
+                               _xmlContent = value;
+                       }
+               }
+
+               /// <summary>
+               /// The XPath Query.
+               /// </summary>
+               public string Query {
+                       get {
+                               if (_query == null)
+                                       throw new ArgumentNullException ("Query");
+                               return _query;
+                       }
+
+                       set {
+                               _query = value;
+                       }
+               }
+
+               /// <summary>
+               /// The results returned by this task.
+               /// </summary>
+               [Output]
+               public ITaskItem[] Result {
+                       get {
+                               return _result;
+                       }
+               }
+
+               /// <summary>
+               /// The namespaces for XPath query's prefixes.
+               /// </summary>
+               public string Namespaces {
+                       get {
+                               return _namespaces;
+                       }
+
+                       set {
+                               _namespaces = value;
+                       }
+               }
+
+               #endregion
+
+
+               internal static bool IsCriticalException (Exception e)
+               {
+                       if (e is StackOverflowException
+                           || e is OutOfMemoryException
+                           || e is AccessViolationException) {
+                               return true;
+                       }
+                       return false;
+               }
+
+               /// <summary>
+               /// Executes the XMLPeek task.
+               /// </summary>
+               /// <returns>true if transformation succeeds.</returns>
+               public override bool Execute ()
+               {
+                       XmlInput xmlinput;
+                       if (_query == null)
+                               throw new ArgumentNullException ("Query");
+
+                       try {
+                               xmlinput = new XmlInput (_xmlInputPath, _xmlContent);
+                       } catch (Exception e) {
+                               if (IsCriticalException (e)) {
+                                       throw;
+                               }
+
+                               Log.LogErrorWithCodeFromResources ("XmlPeek.ArgumentError", e.Message);
+                               return false;
+                       }
+
+                       XPathDocument xpathdoc;
+                       try {
+                               // Load the XPath Document
+                               using (XmlReader xr = xmlinput.CreateReader ()) {
+                                       xpathdoc = new XPathDocument (xr);
+                                       xr.Close ();
+                               }
+                       } catch (Exception e) {
+                               if (IsCriticalException (e)) {
+                                       throw;
+                               }
+
+                               Log.LogErrorWithCodeFromResources ("XmlPeekPoke.InputFileError", _xmlInputPath.ItemSpec, e.Message);
+                               return false;
+                       } finally {
+                               xmlinput.CloseReader ();
+                       }
+
+                       XPathNavigator nav = xpathdoc.CreateNavigator ();
+                       XPathExpression expr = null;
+                       try {
+                               // Create the expression from query
+                               expr = nav.Compile (_query);
+                       } catch (Exception e) {
+                               if (IsCriticalException (e)) {
+                                       throw;
+                               }
+
+                               Log.LogErrorWithCodeFromResources ("XmlPeekPoke.XPathError", _query, e.Message);
+                               return false;
+                       }
+
+                       // Create the namespace manager and parse the input.
+                       XmlNamespaceManager xmlNamespaceManager = new XmlNamespaceManager (nav.NameTable);
+
+                       try {
+                               LoadNamespaces (ref xmlNamespaceManager, _namespaces);
+                       } catch (Exception e) {
+                               if (IsCriticalException (e)) {
+                                       throw;
+                               }
+
+                               Log.LogErrorWithCodeFromResources ("XmlPeek.NamespacesError", e.Message);
+                               return false;
+                       }
+
+                       try {
+                               expr.SetContext (xmlNamespaceManager);
+                       } catch (XPathException e) {
+                               Log.LogErrorWithCodeFromResources ("XmlPeek.XPathContextError", e.Message);
+                               return false;
+                       }
+
+                       XPathNodeIterator iter = nav.Select (expr);
+
+                       List<string> peekValues = new List<string> ();
+                       while (iter.MoveNext ()) {
+                               if (iter.Current.NodeType == XPathNodeType.Attribute
+                                               || iter.Current.NodeType == XPathNodeType.Text) {
+                                       peekValues.Add (iter.Current.Value);
+                               } else {
+                                       peekValues.Add (iter.Current.OuterXml);
+                               }
+                       }
+
+                       _result = new ITaskItem[peekValues.Count];
+                       int i = 0;
+                       foreach (string item in peekValues) {
+                               _result [i++] = new TaskItem (item);
+
+                               // This can be logged a lot, so low importance
+                               Log.LogMessageFromResources (MessageImportance.Low, "XmlPeek.Found", item);
+                       }
+
+                       if (_result.Length == 0) {
+                               // Logged no more than once per execute of this task
+                               Log.LogMessageFromResources ("XmlPeek.NotFound");
+                       }
+
+                       return true;
+               }
+
+               /// <summary>
+               /// Loads the namespaces specified at Namespaces parameter to XmlNSManager.
+               /// </summary>
+               /// <param name="namespaceManager">The namespace manager to load namespaces to.</param>
+               /// <param name="namepaces">The namespaces as XML snippet.</param>
+               private void LoadNamespaces (ref XmlNamespaceManager namespaceManager, string namepaces)
+               {
+                       XmlDocument doc = new XmlDocument ();
+                       try {
+                               XmlReaderSettings settings = new XmlReaderSettings ();
+                               settings.DtdProcessing = DtdProcessing.Ignore;
+
+                               using (XmlReader reader = XmlReader.Create (new StringReader ("<Namespaces>" + namepaces + "</Namespaces>"), settings)) {
+                                       doc.Load (reader);
+                               }
+                       } catch (XmlException xe) {
+                               throw new ArgumentException ("The specified Namespaces attribute is not a well-formed XML fragment.", xe);
+                       }
+
+                       XmlNodeList xnl = doc.SelectNodes ("/Namespaces/*[local-name() = 'Namespace']");
+                       for (int i = 0; i < xnl.Count; i++) {
+                               XmlNode xn = xnl [i];
+
+                               if (xn.Attributes ["Prefix"] == null) {
+                                       throw new ArgumentException (string.Format ("The specified Namespaces attribute doesn't have attribute \"{0}\".", "Name"));
+                               }
+
+                               if (xn.Attributes ["Uri"] == null) {
+                                       throw new ArgumentException (string.Format ("The specified Namespaces attribute doesn't have attribute \"{0}\".", "Uri"));
+                               }
+
+                               namespaceManager.AddNamespace (xn.Attributes ["Prefix"].Value, xn.Attributes ["Uri"].Value);
+                       }
+               }
+
+               /// <summary>
+               /// This class prepares XML input from XMLInputPath and XMLContent parameters
+               /// </summary>
+               internal class XmlInput
+               {
+                       /// <summary>
+                       /// What XML input type are we at.
+                       /// </summary>
+                       private XmlModes _xmlMode;
+
+                       /// <summary>
+                       /// This either contains the raw Xml or the path to Xml file.
+                       /// </summary>
+                       private string _data;
+
+                       /// <summary>
+                       /// Filestream used to read XML.
+                       /// </summary>
+                       private FileStream _fs;
+
+                       /// <summary>
+                       /// Constructor.
+                       /// Only one parameter should be non null or will throw ArgumentException.
+                       /// </summary>
+                       /// <param name="xmlInputPath">The path to XML file or null.</param>
+                       /// <param name="xmlContent">The raw XML.</param>
+                       public XmlInput (ITaskItem xmlInputPath, string xmlContent)
+                       {
+                               if (xmlInputPath != null && xmlContent != null) {
+                                       throw new ArgumentException ("Only one of XmlContent or XmlInputPaths arguments can be set.");
+                               } else if (xmlInputPath == null && xmlContent == null) {
+                                       throw new ArgumentException ("One of XmlContent or XmlInputPaths arguments must be set.");
+                               }
+
+                               if (xmlInputPath != null) {
+                                       _xmlMode = XmlModes.XmlFile;
+                                       _data = xmlInputPath.ItemSpec;
+                               } else {
+                                       _xmlMode = XmlModes.Xml;
+                                       _data = xmlContent;
+                               }
+                       }
+
+                       /// <summary>
+                       /// Possible accepted types of XML input.
+                       /// </summary>
+                       public enum XmlModes
+                       {
+                               /// <summary>
+                               /// If the mode is a XML file.
+                               /// </summary>
+                               XmlFile,
+
+                               /// <summary>
+                               /// If the mode is a raw XML.
+                               /// </summary>
+                               Xml
+                       }
+
+                       /// <summary>
+                       /// Returns the current mode of the XmlInput
+                       /// </summary>
+                       public XmlModes XmlMode {
+                               get {
+                                       return _xmlMode;
+                               }
+                       }
+
+                       /// <summary>
+                       /// Creates correct reader based on the input type.
+                       /// </summary>
+                       /// <returns>The XmlReader object</returns>
+                       public XmlReader CreateReader ()
+                       {
+                               if (_xmlMode == XmlModes.XmlFile) {
+                                       _fs = new FileStream (_data, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+                                       return XmlReader.Create (_fs);
+                               } else { // xmlModes.Xml 
+                                       return XmlReader.Create (new StringReader (_data));
+                               }
+                       }
+
+                       /// <summary>
+                       /// Closes the reader.
+                       /// </summary>
+                       public void CloseReader ()
+                       {
+                               if (_fs != null) {
+                                       _fs.Close ();
+                                       _fs = null;
+                               }
+                       }
+               }
+       }
+}

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_5.csproj b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_5.csproj
deleted file mode 100644 (file)
index a2bd202..0000000
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_5.csproj
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6E1C7BDE-7B9E-47B0-A7B2-1561822FE922}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Utilities.v4.0</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\AppDomainIsolatedTask.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\CommandLineBuilder.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\HostObjectInitializationStatus.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\IAsyncOperation.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\IProcessAsyncOperation.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\Logger.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\MSBuildErrorParser.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\ProcessService.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\ProcessWrapper.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\TargetDotNetFrameworkVersion.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\Task.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\TaskItem.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\TaskLoggingHelper.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\ToolLocationHelper.cs" />\r
-    <Compile Include="Microsoft.Build.Utilities\ToolTask.cs" />\r
-    <Compile Include="Mono.XBuild.Utilities\MonoLocationHelper.cs" />\r
-    <Compile Include="Mono.XBuild.Utilities\MSBuildUtils.cs" />\r
-    <Compile Include="Mono.XBuild.Utilities\ReservedNameUtils.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_5.csproj">\r
-      <Project>{DA3B9FEE-8FBD-4587-B760-65420765256A}</Project>\r
-      <Name>Microsoft.Build.Framework-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-tests-net_4_5.csproj b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 9348f77..0000000
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-tests-net_4_5.csproj
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DD1C0229-22E8-4C95-9CE5-4E656D48D15D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Microsoft.Build.Utilities-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build.Utilities_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Microsoft.Build.Utilities\CommandLineBuilderTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Utilities\LoggerTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Utilities\TaskItemTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Utilities\TaskLoggingHelperTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Utilities\ToolTaskTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_5.csproj">\r
-      <Project>{6E1C7BDE-7B9E-47B0-A7B2-1561822FE922}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0.csproj">\r
-      <Project>{4E55B240-B470-43B4-ABDA-8C03E7B1BF8E}</Project>\r
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5.csproj">\r
-      <Project>{DA3B9FEE-8FBD-4587-B760-65420765256A}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
index df09e1c8ec3abf2b7a8d939245646c51555e47ca..5a050e1a4aa8f5d30c680767a3ddee0020b6465a 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
@@ -48,11 +48,12 @@ namespace Microsoft.Build.Utilities
                Version451,
 #endif
 #if XBUILD_14
-               Version453,
+               Version46,
+               Version461,
 #endif
 
 #if XBUILD_14
-               VersionLatest = Version453
+               VersionLatest = Version461
 #elif XBUILD_12
                VersionLatest = Version451
 #else

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
index 64ed0757a90fd04d1047d4af9ae78bd361c102f2..8806c73e72d08ba7d1f1068ba3e2bbda0a34032d 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
@@ -61,41 +61,44 @@ namespace Microsoft.Build.Utilities
                        runningOnDotNet = !string.IsNullOrEmpty (windowsPath) && lib_mono_dir.StartsWith (windowsPath);
 
                        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_dir = new string [] {                   // TargetDotNetFrameworkVersion:
+                                       Path.Combine (lib_mono_dir, "net_1_0"),  // Version11
+                                       Path.Combine (lib_mono_dir, "net_2_0"),  // Version20
+                                       Path.Combine (lib_mono_dir, "net_2_0"),  // Version30
+                                       Path.Combine (lib_mono_dir, "net_3_5"),  // Version35
                                        // 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_x"),
-                                       Path.Combine (lib_mono_dir, "net_4_x"),
-                                       Path.Combine (lib_mono_dir, "net_4_x"),
-                                       Path.Combine (lib_mono_dir, "net_4_x")                                  
+                                       Path.Combine (lib_mono_dir, "net_4_x"),  // Version40
+                                       Path.Combine (lib_mono_dir, "net_4_x"),  // Version45
+                                       Path.Combine (lib_mono_dir, "net_4_x"),  // Version451
+                                       Path.Combine (lib_mono_dir, "net_4_x"),  // Version46
+                                       Path.Combine (lib_mono_dir, "net_4_x"),  // Version461
                                };      
                        } else if (runningOnDotNet) {
                                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"),
-                                       Path.Combine (lib_mono_dir, "v4.0.30319")                                       
+                                       Path.Combine (lib_mono_dir, "v1.0.3705"),   // Version11
+                                       Path.Combine (lib_mono_dir, "v2.0.50727"),  // Version20
+                                       Path.Combine (lib_mono_dir, "v2.0.50727"),  // Version30
+                                       Path.Combine (lib_mono_dir, "v3.5"),        // Version35
+                                       Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version40
+                                       Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version45
+                                       Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version451
+                                       Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version46
+                                       Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version461
                                };
                        } 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"),
+                                       Path.Combine (lib_mono_dir, "1.0"),  // Version11
+                                       Path.Combine (lib_mono_dir, "2.0"),  // Version20
+                                       Path.Combine (lib_mono_dir, "2.0"),  // Version30
+                                       Path.Combine (lib_mono_dir, "3.5"),  // Version35
                                        // 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.5")
+                                       Path.Combine (lib_mono_dir, "4.5"),  // Version40
+                                       Path.Combine (lib_mono_dir, "4.5"),  // Version45
+                                       Path.Combine (lib_mono_dir, "4.5"),  // Version451
+                                       Path.Combine (lib_mono_dir, "4.5"),  // Version46
+                                       Path.Combine (lib_mono_dir, "4.5"),  // Version461
                                };
                        }
 

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build-net_4_5.csproj b/mcs/class/Microsoft.Build/Microsoft.Build-net_4_5.csproj
deleted file mode 100644 (file)
index 63ecb93..0000000
--- a/mcs/class/Microsoft.Build/Microsoft.Build-net_4_5.csproj
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1379065B-9195-4ED3-95A7-9508211A7A7E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MICROSOFT_BUILD_DLL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MICROSOFT_BUILD_DLL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\ColorResetter.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\ColorSetter.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\ConsoleLogger.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\DirectoryScanner.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\EventSource.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\FileLogger.cs" />\r
-    <Compile Include="..\Microsoft.Build.Engine\Microsoft.Build.BuildEngine\WriteHandler.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities\TargetDotNetFrameworkVersion.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities\TaskItem.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities\ToolLocationHelper.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\ReservedNameUtils.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ElementLocation.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectChooseElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectCommentElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectElementContainer.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectExtensionsElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectImportElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectImportGroupElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectItemDefinitionElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectItemDefinitionGroupElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectItemElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectItemGroupElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectMetadataElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectOnErrorElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectOtherwiseElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectOutputElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectPropertyElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectPropertyGroupElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectRootElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectTargetElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectTaskElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectUsingTaskBodyElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectUsingTaskElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectUsingTaskParameterElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\ProjectWhenElement.cs" />\r
-    <Compile Include="Microsoft.Build.Construction\UsingTaskParameterGroupElement.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\Project.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectCollection.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectCollectionChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectCollectionChangedState.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectItem.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectItemDefinition.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectLoadSettings.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectMetadata.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectProperty.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ProjectXmlChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ResolvedImport.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\SubToolset.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\Toolset.cs" />\r
-    <Compile Include="Microsoft.Build.Evaluation\ToolsetDefinitionLocations.cs" />\r
-    <Compile Include="Microsoft.Build.Exceptions\BuildAbortedException.cs" />\r
-    <Compile Include="Microsoft.Build.Exceptions\InternalLoggerException.cs" />\r
-    <Compile Include="Microsoft.Build.Exceptions\InvalidProjectFileException.cs" />\r
-    <Compile Include="Microsoft.Build.Exceptions\InvalidToolsetDefinitionException.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildManager.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildParameters.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildRequestData.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildRequestDataFlags.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildResult.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildResultCode.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildSubmission.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\BuildSubmissionCompleteCallback.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\HostServices.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ITargetResult.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\NodeAffinity.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\NodeEngineShutdownReason.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\OutOfProcNode.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectItemDefinitionInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectItemGroupTaskInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectItemGroupTaskItemInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectItemGroupTaskMetadataInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectItemInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectMetadataInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectOnErrorInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectPropertyGroupTaskInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectPropertyGroupTaskPropertyInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectPropertyInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectTargetInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectTargetInstanceChild.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectTaskInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectTaskInstanceChild.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectTaskOutputItemInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\ProjectTaskOutputPropertyInstance.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\TargetResult.cs" />\r
-    <Compile Include="Microsoft.Build.Execution\TargetResultCode.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\BuildEngine4.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\BuildNodeManager.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\BuildTaskDatabase.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\BuildTaskFactory.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\CollectionFromEnumerable.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ExpressionConstructs.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ExpressionEvaluator.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ExpressionParserManual.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ExpressionTokenizer.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\FilteredEnumerable.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ProjectTaskItem.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ReverseEnumerable.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\WindowsCompatibilityExtensions.cs" />\r
-    <Compile Include="Microsoft.Build.Logging\ConfigurableForwardingLogger.cs" />\r
-    <Compile Include="Microsoft.Build.Logging\ForwardingLoggerRecord.cs" />\r
-    <Compile Include="Microsoft.Build.Logging\LoggerDescription.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ExpressionParser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_5.csproj">\r
-      <Project>{54DFC5A7-7C1D-4BA5-A0F7-F0B312E1E076}</Project>\r
-      <Name>Microsoft.Build.Engine-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_5.csproj">\r
-      <Project>{DA3B9FEE-8FBD-4587-B760-65420765256A}</Project>\r
-      <Name>Microsoft.Build.Framework-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_5.csproj">\r
-      <Project>{54DFC5A7-7C1D-4BA5-A0F7-F0B312E1E076}</Project>\r
-      <Name>Microsoft.Build.Engine-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_5.csproj">\r
-      <Project>{DA3B9FEE-8FBD-4587-B760-65420765256A}</Project>\r
-      <Name>Microsoft.Build.Framework-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build-tests-net_4_5.csproj b/mcs/class/Microsoft.Build/Microsoft.Build-tests-net_4_5.csproj
deleted file mode 100644 (file)
index e82e1e5..0000000
--- a/mcs/class/Microsoft.Build/Microsoft.Build-tests-net_4_5.csproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{328A697E-59B7-442A-AE1E-0D4C49C2D7E0}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Microsoft.Build-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Build_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MICROSOFT_BUILD_DLL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MICROSOFT_BUILD_DLL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\FunctionalTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Construction\ProjectItemElementTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Construction\ProjectRootElementTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Evaluation\ProjectCollectionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Evaluation\ProjectItemDefinitionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Evaluation\ProjectItemTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Evaluation\ProjectPropertyTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Evaluation\ProjectTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Evaluation\ResolvedImportTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Evaluation\ToolsetTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Execution\BuildManagerTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Execution\BuildParametersTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Execution\BuildRequestDataTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Execution\BuildSubmissionTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Execution\ProjectInstanceTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Execution\ProjectMetadataInstanceTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Execution\ProjectTargetInstanceTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Internal\CollectionFromEnumerableTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Internal\ExpressionParserTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Logging\ConsoleLoggerTest.cs" />\r
-    <Compile Include="Test\Microsoft.Build.Logging\LoggerDescriptionTest.cs" />\r
-    <Compile Include="Microsoft.Build.Internal\ExpressionParser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build\Microsoft.Build-net_4_5.csproj">\r
-      <Project>{1379065B-9195-4ED3-95A7-9508211A7A7E}</Project>\r
-      <Name>Microsoft.Build\Microsoft.Build-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_5.csproj">\r
-      <Project>{54DFC5A7-7C1D-4BA5-A0F7-F0B312E1E076}</Project>\r
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5.csproj">\r
-      <Project>{DA3B9FEE-8FBD-4587-B760-65420765256A}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_5.csproj">\r
-      <Project>{6E1C7BDE-7B9E-47B0-A7B2-1561822FE922}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_5.csproj b/mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_5.csproj
deleted file mode 100644 (file)
index f58a89f..0000000
--- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_5.csproj
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D554618C-5D38-413A-82BA-7A70B6FC61A3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.CSharp</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\Binder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpArgumentInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpArgumentInfoFlags.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpBinaryOperationBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpBinderFlags.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpConvertBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpGetIndexBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpGetMemberBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpInvokeBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpInvokeConstructorBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpInvokeMemberBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpIsEventBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpSetIndexBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpSetMemberBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\CSharpUnaryOperationBinder.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\DynamicContext.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\ErrorPrinter.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\Extensions.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\RuntimeBinderContext.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\RuntimeBinderException.cs" />\r
-    <Compile Include="Microsoft.CSharp.RuntimeBinder\RuntimeBinderInternalCompilerException.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.CSharp/Mono.CSharp-net_4_5.csproj">\r
-      <Project>{811AC316-9CC2-497D-A45E-7B6B1E0E481B}</Project>\r
-      <Name>Mono.CSharp-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Microsoft.VisualC/Microsoft.VisualC-net_4_5.csproj b/mcs/class/Microsoft.VisualC/Microsoft.VisualC-net_4_5.csproj
deleted file mode 100644 (file)
index 880811d..0000000
--- a/mcs/class/Microsoft.VisualC/Microsoft.VisualC-net_4_5.csproj
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D2B40179-234C-4709-82A2-AE91FA7AD106}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.VisualC</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.VisualC\DebugInfoInPDBAttribute.cs" />\r
-    <Compile Include="Microsoft.VisualC\DecoratedNameAttribute.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsConstModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsCXXReferenceModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsLongModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsSignedModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\IsVolatileModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\MiscellaneousBitsAttribute.cs" />\r
-    <Compile Include="Microsoft.VisualC\NeedsCopyConstructorModifier.cs" />\r
-    <Compile Include="Microsoft.VisualC\NoSignSpecifiedModifier.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_5.csproj b/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_5.csproj
deleted file mode 100644 (file)
index 3117b57..0000000
--- a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_5.csproj
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{50DC9191-2D18-4EDB-A929-4ECAB7981A1C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Microsoft.Web.Infrastructure</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Microsoft.Web.Infrastructure.DynamicModuleHelper\DynamicModuleUtility.cs" />\r
-    <Compile Include=".\Microsoft.Web.Infrastructure.DynamicValidationHelper\LazyWebROCollection.cs" />\r
-    <Compile Include=".\Microsoft.Web.Infrastructure.DynamicValidationHelper\ValidationUtility.cs" />\r
-    <Compile Include=".\Microsoft.Web.Infrastructure\HttpContextHelper.cs" />\r
-    <Compile Include=".\Microsoft.Web.Infrastructure\InfrastructureHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.C5/Mono.C5-net_4_5.csproj b/mcs/class/Mono.C5/Mono.C5-net_4_5.csproj
deleted file mode 100644 (file)
index 96531f1..0000000
--- a/mcs/class/Mono.C5/Mono.C5-net_4_5.csproj
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4A54C7EC-01F3-4C6E-9181-84F178FD0F97}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.C5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="C5\arrays\ArrayList.cs" />\r
-    <Compile Include="C5\arrays\CircularQueue.cs" />\r
-    <Compile Include="C5\arrays\HashedArrayList.cs" />\r
-    <Compile Include="C5\arrays\SortedArray.cs" />\r
-    <Compile Include="C5\AssemblyInfo.cs" />\r
-    <Compile Include="C5\Attributes.cs" />\r
-    <Compile Include="C5\Builtin.cs" />\r
-    <Compile Include="C5\Collections.cs" />\r
-    <Compile Include="C5\Comparer.cs" />\r
-    <Compile Include="C5\Delegates.cs" />\r
-    <Compile Include="C5\Dictionaries.cs" />\r
-    <Compile Include="C5\Enums.cs" />\r
-    <Compile Include="C5\Events.cs" />\r
-    <Compile Include="C5\Exceptions.cs" />\r
-    <Compile Include="C5\Formatting.cs" />\r
-    <Compile Include="C5\Hashers.cs" />\r
-    <Compile Include="C5\hashing\HashBag.cs" />\r
-    <Compile Include="C5\hashing\HashDictionary.cs" />\r
-    <Compile Include="C5\hashing\HashTable.cs" />\r
-    <Compile Include="C5\heaps\IntervalHeap.cs" />\r
-    <Compile Include="C5\Interfaces.cs" />\r
-    <Compile Include="C5\linkedlists\HashedLinkedList.cs" />\r
-    <Compile Include="C5\linkedlists\LinkedList.cs" />\r
-    <Compile Include="C5\MappedEnumerators.cs" />\r
-    <Compile Include="C5\Random.cs" />\r
-    <Compile Include="C5\Records.cs" />\r
-    <Compile Include="C5\Sorting.cs" />\r
-    <Compile Include="C5\trees\RedBlackTreeBag.cs" />\r
-    <Compile Include="C5\trees\RedBlackTreeDictionary.cs" />\r
-    <Compile Include="C5\trees\RedBlackTreeSet.cs" />\r
-    <Compile Include="C5\ViewSupport.cs" />\r
-    <Compile Include="C5\WrappedArray.cs" />\r
-    <Compile Include="C5\Wrappers.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.C5/Mono.C5-tests-net_4_5.csproj b/mcs/class/Mono.C5/Mono.C5-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 28308f2..0000000
--- a/mcs/class/Mono.C5/Mono.C5-tests-net_4_5.csproj
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8D349606-02F4-4AAF-83AF-676A50F6D6B6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.C5-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.C5_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\arrays\ArrayListTest.cs" />\r
-    <Compile Include="Test\arrays\CircularQueueTest.cs" />\r
-    <Compile Include="Test\arrays\HashedArrayListTest.cs" />\r
-    <Compile Include="Test\arrays\SortedArrayTests.cs" />\r
-    <Compile Include="Test\AssemblyInfo.cs" />\r
-    <Compile Include="Test\BasesTest.cs" />\r
-    <Compile Include="Test\hashing\HashBagTests.cs" />\r
-    <Compile Include="Test\hashing\HashDictionaryTests.cs" />\r
-    <Compile Include="Test\hashing\HashTableTests.cs" />\r
-    <Compile Include="Test\heaps\HeapTests.cs" />\r
-    <Compile Include="Test\InterfacesTest.cs" />\r
-    <Compile Include="Test\linkedlists\HashedLinkedListTest.cs" />\r
-    <Compile Include="Test\linkedlists\LinkedListTest.cs" />\r
-    <Compile Include="Test\Records.cs" />\r
-    <Compile Include="Test\Sorting.cs" />\r
-    <Compile Include="Test\SupportClasses.cs" />\r
-    <Compile Include="Test\templates\Clone.cs" />\r
-    <Compile Include="Test\templates\Events.cs" />\r
-    <Compile Include="Test\templates\GenericCollectionTester.cs" />\r
-    <Compile Include="Test\templates\List.cs" />\r
-    <Compile Include="Test\trees\Bag.cs" />\r
-    <Compile Include="Test\trees\Dictionary.cs" />\r
-    <Compile Include="Test\trees\RedBlackTreeSetTests.cs" />\r
-    <Compile Include="Test\WrappersTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.C5\Mono.C5-net_4_5.csproj">\r
-      <Project>{4A54C7EC-01F3-4C6E-9181-84F178FD0F97}</Project>\r
-      <Name>Mono.C5\Mono.C5-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.CSharp/Mono.CSharp-net_4_5.csproj b/mcs/class/Mono.CSharp/Mono.CSharp-net_4_5.csproj
deleted file mode 100644 (file)
index 57e10a9..0000000
--- a/mcs/class/Mono.CSharp/Mono.CSharp-net_4_5.csproj
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{811AC316-9CC2-497D-A45E-7B6B1E0E481B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.CSharp</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />\r
-    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />\r
-    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\SourceMethodBuilder.cs" />\r
-    <Compile Include="..\..\class\Mono.Security\Mono.Security.Cryptography\CryptoConvert.cs" />\r
-    <Compile Include="..\..\mcs\anonymous.cs" />\r
-    <Compile Include="..\..\mcs\argument.cs" />\r
-    <Compile Include="..\..\mcs\assembly.cs" />\r
-    <Compile Include="..\..\mcs\assign.cs" />\r
-    <Compile Include="..\..\mcs\async.cs" />\r
-    <Compile Include="..\..\mcs\attribute.cs" />\r
-    <Compile Include="..\..\mcs\cfold.cs" />\r
-    <Compile Include="..\..\mcs\class.cs" />\r
-    <Compile Include="..\..\mcs\codegen.cs" />\r
-    <Compile Include="..\..\mcs\complete.cs" />\r
-    <Compile Include="..\..\mcs\const.cs" />\r
-    <Compile Include="..\..\mcs\constant.cs" />\r
-    <Compile Include="..\..\mcs\context.cs" />\r
-    <Compile Include="..\..\mcs\convert.cs" />\r
-    <Compile Include="..\..\mcs\cs-parser.cs" />\r
-    <Compile Include="..\..\mcs\cs-tokenizer.cs" />\r
-    <Compile Include="..\..\mcs\decl.cs" />\r
-    <Compile Include="..\..\mcs\delegate.cs" />\r
-    <Compile Include="..\..\mcs\doc.cs" />\r
-    <Compile Include="..\..\mcs\driver.cs" />\r
-    <Compile Include="..\..\mcs\dynamic.cs" />\r
-    <Compile Include="..\..\mcs\ecore.cs" />\r
-    <Compile Include="..\..\mcs\enum.cs" />\r
-    <Compile Include="..\..\mcs\eval.cs" />\r
-    <Compile Include="..\..\mcs\expression.cs" />\r
-    <Compile Include="..\..\mcs\field.cs" />\r
-    <Compile Include="..\..\mcs\flowanalysis.cs" />\r
-    <Compile Include="..\..\mcs\generic.cs" />\r
-    <Compile Include="..\..\mcs\import.cs" />\r
-    <Compile Include="..\..\mcs\iterators.cs" />\r
-    <Compile Include="..\..\mcs\lambda.cs" />\r
-    <Compile Include="..\..\mcs\linq.cs" />\r
-    <Compile Include="..\..\mcs\literal.cs" />\r
-    <Compile Include="..\..\mcs\location.cs" />\r
-    <Compile Include="..\..\mcs\membercache.cs" />\r
-    <Compile Include="..\..\mcs\method.cs" />\r
-    <Compile Include="..\..\mcs\modifiers.cs" />\r
-    <Compile Include="..\..\mcs\module.cs" />\r
-    <Compile Include="..\..\mcs\namespace.cs" />\r
-    <Compile Include="..\..\mcs\nullable.cs" />\r
-    <Compile Include="..\..\mcs\parameter.cs" />\r
-    <Compile Include="..\..\mcs\pending.cs" />\r
-    <Compile Include="..\..\mcs\property.cs" />\r
-    <Compile Include="..\..\mcs\reflection.cs" />\r
-    <Compile Include="..\..\mcs\report.cs" />\r
-    <Compile Include="..\..\mcs\settings.cs" />\r
-    <Compile Include="..\..\mcs\statement.cs" />\r
-    <Compile Include="..\..\mcs\support.cs" />\r
-    <Compile Include="..\..\mcs\typemanager.cs" />\r
-    <Compile Include="..\..\mcs\typespec.cs" />\r
-    <Compile Include="..\..\mcs\visit.cs" />\r
-    <Compile Include="..\..\tools\monop\outline.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.CSharp/Mono.CSharp-net_4_x.csproj b/mcs/class/Mono.CSharp/Mono.CSharp-net_4_x.csproj
index 440042170c2b647bce469c7d2f3f06f9d002c58d..b36796d24395a480f418c81965978f4b9d4d11a6 100644 (file)
--- a/mcs/class/Mono.CSharp/Mono.CSharp-net_4_x.csproj
+++ b/mcs/class/Mono.CSharp/Mono.CSharp-net_4_x.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>\r
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;MONO_FEATURE_THREAD_ABORT</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -33,7 +33,7 @@
     <DebugType>pdbonly</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>\r
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;MONO_FEATURE_THREAD_ABORT</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r

diff --git a/mcs/class/Mono.CSharp/Mono.CSharp-tests-net_4_5.csproj b/mcs/class/Mono.CSharp/Mono.CSharp-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 7635480..0000000
--- a/mcs/class/Mono.CSharp/Mono.CSharp-tests-net_4_5.csproj
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{76213E4A-6D78-4274-9EB9-FCE25187E353}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.CSharp-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.CSharp_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\AssertReportPrinter.cs" />\r
-    <Compile Include="Test\Evaluator\BuildinCommands.cs" />\r
-    <Compile Include="Test\Evaluator\CompletionTest.cs" />\r
-    <Compile Include="Test\Evaluator\EvaluatorFixture.cs" />\r
-    <Compile Include="Test\Evaluator\EvaluatorTest.cs" />\r
-    <Compile Include="Test\Evaluator\ExpressionsTest.cs" />\r
-    <Compile Include="Test\Evaluator\TypesTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.CSharp\Mono.CSharp-net_4_5.csproj">\r
-      <Project>{811AC316-9CC2-497D-A45E-7B6B1E0E481B}</Project>\r
-      <Name>Mono.CSharp\Mono.CSharp-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Cairo/Mono.Cairo-net_4_5.csproj b/mcs/class/Mono.Cairo/Mono.Cairo-net_4_5.csproj
deleted file mode 100644 (file)
index 59a40bb..0000000
--- a/mcs/class/Mono.Cairo/Mono.Cairo-net_4_5.csproj
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C07C4C90-8F45-49A8-8F22-919577916756}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Cairo</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Cairo\Antialias.cs" />\r
-    <Compile Include=".\Mono.Cairo\Cairo.cs" />\r
-    <Compile Include=".\Mono.Cairo\CairoDebug.cs" />\r
-    <Compile Include=".\Mono.Cairo\Color.cs" />\r
-    <Compile Include=".\Mono.Cairo\Content.cs" />\r
-    <Compile Include=".\Mono.Cairo\Context.cs" />\r
-    <Compile Include=".\Mono.Cairo\DirectFBSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\Distance.cs" />\r
-    <Compile Include=".\Mono.Cairo\Extend.cs" />\r
-    <Compile Include=".\Mono.Cairo\FillRule.cs" />\r
-    <Compile Include=".\Mono.Cairo\Filter.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontExtents.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontFace.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontOptions.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontSlant.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontType.cs" />\r
-    <Compile Include=".\Mono.Cairo\FontWeight.cs" />\r
-    <Compile Include=".\Mono.Cairo\Format.cs" />\r
-    <Compile Include=".\Mono.Cairo\GlitzSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\Glyph.cs" />\r
-    <Compile Include=".\Mono.Cairo\Gradient.cs" />\r
-    <Compile Include=".\Mono.Cairo\HintMetrics.cs" />\r
-    <Compile Include=".\Mono.Cairo\HintStyle.cs" />\r
-    <Compile Include=".\Mono.Cairo\ImageSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\LinearGradient.cs" />\r
-    <Compile Include=".\Mono.Cairo\LineCap.cs" />\r
-    <Compile Include=".\Mono.Cairo\LineJoin.cs" />\r
-    <Compile Include=".\Mono.Cairo\Matrix.cs" />\r
-    <Compile Include=".\Mono.Cairo\NativeMethods.cs" />\r
-    <Compile Include=".\Mono.Cairo\Operator.cs" />\r
-    <Compile Include=".\Mono.Cairo\Path.cs" />\r
-    <Compile Include=".\Mono.Cairo\Pattern.cs" />\r
-    <Compile Include=".\Mono.Cairo\PatternType.cs" />\r
-    <Compile Include=".\Mono.Cairo\PdfSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\Point.cs" />\r
-    <Compile Include=".\Mono.Cairo\PointD.cs" />\r
-    <Compile Include=".\Mono.Cairo\PSSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\RadialGradient.cs" />\r
-    <Compile Include=".\Mono.Cairo\Rectangle.cs" />\r
-    <Compile Include=".\Mono.Cairo\Region.cs" />\r
-    <Compile Include=".\Mono.Cairo\ScaledFont.cs" />\r
-    <Compile Include=".\Mono.Cairo\SolidPattern.cs" />\r
-    <Compile Include=".\Mono.Cairo\Status.cs" />\r
-    <Compile Include=".\Mono.Cairo\SubpixelOrder.cs" />\r
-    <Compile Include=".\Mono.Cairo\Surface.cs" />\r
-    <Compile Include=".\Mono.Cairo\SurfacePattern.cs" />\r
-    <Compile Include=".\Mono.Cairo\SurfaceType.cs" />\r
-    <Compile Include=".\Mono.Cairo\SvgSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\SvgVersion.cs" />\r
-    <Compile Include=".\Mono.Cairo\TextExtents.cs" />\r
-    <Compile Include=".\Mono.Cairo\Win32Surface.cs" />\r
-    <Compile Include=".\Mono.Cairo\XcbSurface.cs" />\r
-    <Compile Include=".\Mono.Cairo\XlibSurface.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_5.csproj b/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_5.csproj
deleted file mode 100644 (file)
index 37147f3..0000000
--- a/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_5.csproj
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9ABB7BB9-5EA1-4081-B205-5658A602C1F5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Cecil.Mdb</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../mono.snk</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;CECIL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;CECIL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\MdbReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\MdbWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\SymbolWriterImpl.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Cecil/Mono.Cecil-net_4_5.csproj">\r
-      <Project>{F6DD456E-ADE4-419D-997F-41ECA0CE79F7}</Project>\r
-      <Name>Mono.Cecil-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Cecil/Mono.Cecil-net_4_5.csproj b/mcs/class/Mono.Cecil/Mono.Cecil-net_4_5.csproj
deleted file mode 100644 (file)
index 39726d0..0000000
--- a/mcs/class/Mono.Cecil/Mono.Cecil-net_4_5.csproj
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F6DD456E-ADE4-419D-997F-41ECA0CE79F7}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Cecil</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../mono.snk</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Code.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\CodeReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\CodeWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Document.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\ExceptionHandler.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\ILProcessor.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Instruction.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\MethodBody.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\OpCode.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\OpCodes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\SequencePoint.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Symbols.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\VariableDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\VariableReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\BlobHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Buffers.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\CodedIndex.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\ElementType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\GuidHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Heap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\MetadataToken.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Row.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\StringHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\TableHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\TokenType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\UserStringHeap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Utilities.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\BinaryStreamReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\BinaryStreamWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ByteBuffer.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ByteBufferEqualityComparer.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\DataDirectory.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\Image.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ImageReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ImageWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\Section.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\TextMap.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ArrayType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyFlags.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyHashAlgorithm.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyLinkedResource.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyNameDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyNameReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyReader.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyWriter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\BaseAssemblyResolver.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\CallSite.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\CustomAttribute.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\DefaultAssemblyResolver.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\EmbeddedResource.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\EventAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\EventDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\EventReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ExportedType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FieldAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FieldDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FieldReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FileAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\FunctionPointerType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\GenericInstanceMethod.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\GenericInstanceType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\GenericParameter.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\GenericParameterAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IConstantProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ICustomAttributeProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IGenericInstance.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IGenericParameterProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMarshalInfoProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMemberDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMetadataScope.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMetadataTokenProvider.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\IMethodSignature.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\Import.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\LinkedResource.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ManifestResourceAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MarshalInfo.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MemberDefinitionCollection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MemberReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MetadataResolver.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MetadataSystem.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodCallingConvention.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodImplAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodReturnType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodSemanticsAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\MethodSpecification.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\Modifiers.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ModuleDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ModuleKind.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ModuleReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\NativeType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterDefinitionCollection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PinnedType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PInvokeAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PInvokeInfo.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PointerType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PropertyAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PropertyDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PropertyReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\ReferenceType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\Resource.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\SecurityDeclaration.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\SentinelType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TargetRuntime.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeAttributes.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeDefinition.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeDefinitionCollection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeParser.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeReference.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeSpecification.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeSystem.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\VariantType.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Collections.Generic\Collection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Collections.Generic\ReadOnlyCollection.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\CryptoConvert.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\CryptoService.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono\Actions.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono\Empty.cs" />\r
-    <Compile Include="..\..\..\external\cecil\Mono\Funcs.cs" />\r
-    <Compile Include="..\..\..\external\cecil\System.Runtime.CompilerServices\ExtensionAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.CodeContracts/Mono.CodeContracts-net_4_5.csproj b/mcs/class/Mono.CodeContracts/Mono.CodeContracts-net_4_5.csproj
deleted file mode 100644 (file)
index b8ca798..0000000
--- a/mcs/class/Mono.CodeContracts/Mono.CodeContracts-net_4_5.csproj
+++ /dev/null
@@ -1,473 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5A56819B-A874-42CF-991C-8DD1B97115B3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.CodeContracts</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\Expr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprAdd.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprBinaryOp.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprBinaryOpArithmetic.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprBinaryOpComparison.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprBox.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprCall.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprCompareEqual.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprCompareGreaterThan.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprCompareLessThan.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprConv.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprLoadArg.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprLoadConstant.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprNop.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprReturn.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprSub.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprType.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.Ast\Sn.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\CompileVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\ExprVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\InstructionExtentVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\SourcePositionVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\AssemblyRef.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\ConditionTextExtractor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\ContractRequiresInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\ContractsRuntime.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\Decompile.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\ExprGen.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\MethodInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\PerformRewrite.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\Rewriter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\RewriterOptions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\RewriterResults.cs" />\r
-    <Compile Include="Mono.CodeContracts.Rewrite\TransformContractsVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\AnalysisDriver.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\BasicAnalysisDriver.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\BasicMethodDriver.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\CodeContractsAnalysisDriver.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\IBasicAnalysisDriver.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\IBasicMethodDriver.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\IMethodAnalysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\IMethodAnalysisFixPoint.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\IMethodDriver.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\IMethodResult.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\FullExpressionDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\IFullExpressionDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\QueryVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForIsBinaryExpression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForIsInst.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForIsNull.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForIsUnaryExpression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForSizeOf.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForUnderlyingVariable.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForValueOf.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForVariable.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Decoding\VisitorForVariablesIn.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Expressions\BinaryExpr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Expressions\ConstExpr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Expressions\Expr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Expressions\IsInstExpr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Expressions\NullExpr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Expressions\SizeOfExpr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis.Expressions\UnaryExpr.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\AnalysisDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\AssumeDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\ExprDomain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\ExpressionAnalysisFacade.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\ExpressionDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\ExpressionDecoderAdapter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\ExpressionPrinterFactory.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\ILDecoderAdapter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.ExpressionAnalysis\ValueAnalysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\AccessPathFilter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\IVisibilityCheck.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\MethodCallPathElement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\ParameterPathElement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathElement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathElement`1.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathElementBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\SpecialPathElement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\SpecialPathElementKind.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\AbstractDomainUpdate.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\EdgeUpdate.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\EliminateEdgeUpdate.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\EqualityPair.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\EqualityUpdate.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\IMergeInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\MergeInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\MultiEdge.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\MultiEdgeUpdate.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\SymGraph.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\SymGraphTerm.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.SymbolicGraph\Update.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\AbstractType.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\AnalysisDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\Domain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\FunctionsTable.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\HeapAnalysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\IAbstractDomainForEGraph.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\IConstantInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\ISymGraph.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\LabeledSymbol.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\MethodWrapper.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\ParameterWrapper.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\StackToSymbolicAdapter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\SymbolicValue.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\SymFunction.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\SymValue.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\TypeCache.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\ValueContextProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\ValueDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\Wrapper.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.NonNull\Analysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.NonNull\ExpressionAssertDischarger.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.NonNull\ExpressionAssumeDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.NonNull\NonNullAnalysisFacade.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.NonNull\NonNullDomain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\AbstractInterpretationException.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysers.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.ConstantEvaluator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.GenericNumericalAnalysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.GenericValueAnalysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\AssumeFalseVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\AssumeTrueVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\BoxedExpressionDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\BoxedExpressionEncoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\BoxedVariable.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ConstantEvaluatorVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ConstToIntervalEvaluator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Counter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\DisInterval.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\DisIntervalAssumer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\DisIntervalContext.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\DisIntervalEnvironment.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\EvaluateArithmeticWithOverflow.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\EvaluateExpressionVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ExpressionOperator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ExpressionType.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ExpressionViaStringComparer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\GenericExpressionVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\GenericTypeExpressionVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\GetThresholdVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IEnvironmentDomain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IExpressionDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IExpressionEncoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IIntervalEnvironment.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Interval.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumeFalseVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumerBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumeTrueVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalContext.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalContextBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalEnvironment.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalEnvironmentBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalInference.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalRationalAssumerBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalRationalContextBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\LongToIntegerConstantEvaluator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Monomial.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ObjectExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Polynomial.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Rational.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\RationalThreshold.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Threshold.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\TresholdDB.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ValueExpressionDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.StackAnalysis\APCMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.StackAnalysis\SequenceGenerator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.StackAnalysis\StackDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.StackAnalysis\StackDepthFactory.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.StackAnalysis\StackDepthProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.StackAnalysis\StackInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis.StackAnalysis\StackInfo`1.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\CodeLayer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\CodeLayerFactory.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\ICodeLayer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IExpressionContext.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IExpressionContextProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\ILPrinter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IMethodContext.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IMethodContextProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IStackContext.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IStackContextProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IValueContext.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\IValueContextProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Analysis\PrinterFactory.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\CodeVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\DefaultNodeVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IAggregateVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ICodeConsumer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IExpressionILVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IILVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ILVisitorBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IMethodCodeConsumer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ISymbolicExpressionVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ISyntheticILVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\NodeInspector.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\NodeVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ValueCodeVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\ArrayTypeNode.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\AssemblyNode.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\AssignmentStatement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\BinaryExpression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\BinaryOperator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Block.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\BlockExpression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\BodyParser.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Branch.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\CatchFilter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Class.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Construct.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\CoreSystemTypes.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\EndFinally.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Ensures.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\ExceptionHandler.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Expression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\ExpressionStatement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\FaultHandler.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Field.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Literal.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Local.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Member.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\MemberBinding.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Method.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\MethodCall.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\MethodContract.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\MethodContractElement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Module.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\NaryExpression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Node.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\NodeType.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\OperatorExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Parameter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Property.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Reference.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Requires.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Return.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Statement.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\This.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\TypeNode.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\UnaryExpression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\UnaryOperator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.AST\Variable.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ContractExtraction\ContractExtractor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ContractExtraction\ContractNodes.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ContractExtraction\GatherLocals.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ContractExtraction\HelperMethods.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ContractExtraction\RepresentationForAttribute.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\AssumeBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\BlockBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\BlockWithLabels.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\CatchFilterEntryBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\EnsuresBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\EntryBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\EntryExitBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\LabelAdapter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\MethodCallBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Blocks\NewObjCallBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\BlockBuilder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\BlockStartGatherer.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\EnsuresFactory.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\RequiresFactory.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\SimpleSubroutineBuilder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\SubroutineBuilder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\SubroutineFactory.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines.Builders\SubroutineWithHandlersBuilder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\EnsuresSubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\FaultFinallySubroutineBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\FaultSubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\FinallySubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\MethodContractSubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\MethodSubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\OldScanStateMachine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\OldValueSubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\RequiresSubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\SimpleSubroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\SubroutineBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\SubroutineFacade.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow.Subroutines\SubroutineWithHandlers.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\APC.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\APCDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\CFGBlock.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\ContractFilteredCFG.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\ControlFlowGraph.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\Edge.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\EdgeMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\EdgeTag.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\EdgeTagExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\EdgeVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\ICFG.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\IConstantInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\IHandlerFilter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\IMethodInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\IStackInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\RemoveBranchDelegator.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\Subroutine.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.ControlFlow\SubroutineKind.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\DataFlowAnalysisBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\EdgeBasedWidening.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\EdgeConverter.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\ForwardAnalysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\ForwardDataFlowAnalysisBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\IAnalysis.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\IFixPointInfo.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\IWidenStrategy.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\Joiner.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataFlowAnalysis\StepWidening.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures.Patricia\BranchNode.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures.Patricia\EmptyNode.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures.Patricia\LeafNode.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures.Patricia\PatriciaTrieNode.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\AbstractWorkList.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\BooleanExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\DecoratorHelper.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\DepthFirst.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\DoubleDictionary.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\DoubleImmutableMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\Dummy.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\EdgeVisitor.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\GraphWrapper.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IGraph.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IImmutableIntMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IImmutableMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IImmutableSet.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IIndexable.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableIntKeyMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableIntMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableMap.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableSet.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableSetExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\Indexable.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IPropertyCollection.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IWorkList.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\Optional.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\Pair.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\PriorityQueue.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\PropertyCollection.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\Sequence.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\SequenceExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\TypedKey.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\VisitStatus.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\WorkList.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Extensions\Extensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Lattices\AbstractDomainExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Lattices\EnvironmentDomain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Lattices\FlatDomain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Lattices\IAbstractDomain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Lattices\SetDomain.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\CodeContractDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\CodeProviderImpl.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\ICodeProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\IContractProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\IILDecoder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\IMetaDataProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\IMethodCodeProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Providers\MetaDataProvider.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\AssertionFinder.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\BasicFacts.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\BoxedExpression.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\BoxedExpressionExtensions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\ComposedFactQuery.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\ConstantPropagationFactQuery.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\IFactBase.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\IFactQuery.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static.Proving\SimpleLogicInference.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static\Checker.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static\CheckOptions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static\CheckResults.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static\DebugOptions.cs" />\r
-    <Compile Include="Mono.CodeContracts.Static\ProofOutcome.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Cecil/Mono.Cecil-net_4_5.csproj">\r
-      <Project>{F6DD456E-ADE4-419D-997F-41ECA0CE79F7}</Project>\r
-      <Name>Mono.Cecil-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_5.csproj">\r
-      <Project>{9ABB7BB9-5EA1-4081-B205-5658A602C1F5}</Project>\r
-      <Name>Mono.Cecil.Mdb-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.CodeContracts/Mono.CodeContracts-tests-net_4_5.csproj b/mcs/class/Mono.CodeContracts/Mono.CodeContracts-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 8dd4587..0000000
--- a/mcs/class/Mono.CodeContracts/Mono.CodeContracts-tests-net_4_5.csproj
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{ECA3830F-C627-47A4-8F3B-CB9C5172475D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.CodeContracts-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.CodeContracts_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\RewriteAndLoad.cs" />\r
-    <Compile Include="Test\TestCCRewrite.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.CodeContracts\Mono.CodeContracts-net_4_5.csproj">\r
-      <Project>{5A56819B-A874-42CF-991C-8DD1B97115B3}</Project>\r
-      <Name>Mono.CodeContracts\Mono.CodeContracts-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter-net_4_5.csproj b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter-net_4_5.csproj
deleted file mode 100644 (file)
index 4de7301..0000000
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7980DE5E-4B22-4E00-AD22-7A570D207828}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.CompilerServices.SymbolWriter</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="MonoSymbolFile.cs" />\r
-    <Compile Include="MonoSymbolTable.cs" />\r
-    <Compile Include="MonoSymbolWriter.cs" />\r
-    <Compile Include="SourceMethodBuilder.cs" />\r
-    <Compile Include="SymbolWriterImpl.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_5.csproj b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_5.csproj
deleted file mode 100644 (file)
index 37dd83e..0000000
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_5.csproj
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{41476FBD-C1CB-4B3C-8078-3281EB1E0EAB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Data.Sqlite</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;SQLITE_STANDARD</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;SQLITE_STANDARD</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\LINQ\SQLiteConnection_Linq.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\LINQ\SQLiteFactory_Linq.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\MonoPInvokeCallbackAttribute.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLite3.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLite3_UTF16.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteBase.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteCommand.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteCommandBuilder.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteConnection.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteConnectionPool.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteConnectionStringBuilder.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteConvert.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteDataAdapter.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteDataReader.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SqliteDataSourceEnumerator.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteEnlistment.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteException.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteFactory.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteFunction.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteFunctionAttribute.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteKeyReader.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteMetaDataCollectionNames.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteParameter.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteParameterCollection.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteStatement.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SQLiteTransaction.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\SR.Designer.cs" />\r
-    <Compile Include="Mono.Data.Sqlite_2.0\UnsafeNativeMethods.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Transactions/System.Transactions-net_4_5.csproj">\r
-      <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/SR.resources">\r
-      <LogicalName>SR.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteCommand.bmp">\r
-      <LogicalName>SQLiteCommand.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteConnection.bmp">\r
-      <LogicalName>SQLiteConnection.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteDataAdapter.bmp">\r
-      <LogicalName>SQLiteDataAdapter.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-tests-net_4_5.csproj b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 1d5d64b..0000000
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-tests-net_4_5.csproj
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D322C5A4-B938-4D3C-8309-27535751DFCC}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Data.Sqlite-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Data.Sqlite_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;SQLITE_STANDARD</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;SQLITE_STANDARD</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\SqliteCommandUnitTests.cs" />\r
-    <Compile Include="Test\SqliteConnectionTest.cs" />\r
-    <Compile Include="Test\SqliteDataAdapterUnitTests.cs" />\r
-    <Compile Include="Test\SqliteDataReaderTest.cs" />\r
-    <Compile Include="Test\SqliteExceptionUnitTests.cs" />\r
-    <Compile Include="Test\SqliteFunctionTests.cs" />\r
-    <Compile Include="Test\SqliteParameterUnitTests.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_5.csproj">\r
-      <Project>{41476FBD-C1CB-4B3C-8078-3281EB1E0EAB}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_4_5.csproj">\r
-      <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/SR.resources">\r
-      <LogicalName>SR.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteCommand.bmp">\r
-      <LogicalName>SQLiteCommand.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteConnection.bmp">\r
-      <LogicalName>SQLiteConnection.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SQLiteDataAdapter.bmp">\r
-      <LogicalName>SQLiteDataAdapter.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs
index d2ef1f6316506238873624a00af6f19eea7c7ec1..6f757238cd4139809efe4ca4230369ff3344c0bc 100644 (file)
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs
+++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs
@@ -499,6 +499,8 @@ namespace Mono.Data.Sqlite
 #if !SQLITE_STANDARD\r
       int len;\r
       return UTF8ToString(UnsafeNativeMethods.sqlite3_column_origin_name_interop(stmt._sqlite_stmt, index, out len), len);\r
+#elif MONOTOUCH\r
+      throw new NotImplementedException ();\r
 #else\r
       return UTF8ToString(UnsafeNativeMethods.sqlite3_column_origin_name(stmt._sqlite_stmt, index), -1);\r
 #endif\r
@@ -509,6 +511,8 @@ namespace Mono.Data.Sqlite
 #if !SQLITE_STANDARD\r
       int len;\r
       return UTF8ToString(UnsafeNativeMethods.sqlite3_column_database_name_interop(stmt._sqlite_stmt, index, out len), len);\r
+#elif MONOTOUCH\r
+      throw new NotImplementedException ();\r
 #else\r
       return UTF8ToString(UnsafeNativeMethods.sqlite3_column_database_name(stmt._sqlite_stmt, index), -1);\r
 #endif\r
@@ -519,6 +523,8 @@ namespace Mono.Data.Sqlite
 #if !SQLITE_STANDARD\r
       int len;\r
       return UTF8ToString(UnsafeNativeMethods.sqlite3_column_table_name_interop(stmt._sqlite_stmt, index, out len), len);\r
+#elif MONOTOUCH\r
+      throw new NotImplementedException ();\r
 #else\r
       return UTF8ToString(UnsafeNativeMethods.sqlite3_column_table_name(stmt._sqlite_stmt, index), -1);\r
 #endif\r
@@ -923,6 +929,17 @@ namespace Mono.Data.Sqlite
       return UnsafeNativeMethods.sqlite3_aggregate_context(context, 1);\r
     }\r
 \r
+#if MONOTOUCH\r
+       internal override void SetPassword(byte[] passwordBytes)\r
+       {\r
+               throw new NotImplementedException ();\r
+       }\r
+\r
+       internal override void ChangePassword(byte[] newPasswordBytes)\r
+       {\r
+               throw new NotImplementedException ();\r
+       }\r
+#else\r
     internal override void SetPassword(byte[] passwordBytes)\r
     {\r
       int n = UnsafeNativeMethods.sqlite3_key(_sql, passwordBytes, passwordBytes.Length);\r
@@ -934,6 +951,7 @@ namespace Mono.Data.Sqlite
       int n = UnsafeNativeMethods.sqlite3_rekey(_sql, newPasswordBytes, (newPasswordBytes == null) ? 0 : newPasswordBytes.Length);\r
       if (n > 0) throw new SqliteException(n, SQLiteLastError());\r
     }\r
+#endif\r
                \r
 #if MONOTOUCH\r
     SQLiteUpdateCallback update_callback;\r

diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3_UTF16.cs b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3_UTF16.cs
index 6ad8762b77667e80a0607906244496df5553ff61..16c7cdf3e66fe48ab168d96cce5cfa81f70c1819 100644 (file)
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3_UTF16.cs
+++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3_UTF16.cs
@@ -112,6 +112,8 @@ namespace Mono.Data.Sqlite
 #if !SQLITE_STANDARD\r
       int len;\r
       return UTF16ToString(UnsafeNativeMethods.sqlite3_column_origin_name16_interop(stmt._sqlite_stmt, index, out len), len);\r
+#elif MONOTOUCH\r
+      throw new NotImplementedException ();\r
 #else\r
       return UTF16ToString(UnsafeNativeMethods.sqlite3_column_origin_name16(stmt._sqlite_stmt, index), -1);\r
 #endif\r
@@ -122,6 +124,8 @@ namespace Mono.Data.Sqlite
 #if !SQLITE_STANDARD\r
       int len;\r
       return UTF16ToString(UnsafeNativeMethods.sqlite3_column_database_name16_interop(stmt._sqlite_stmt, index, out len), len);\r
+#elif MONOTOUCH\r
+      throw new NotImplementedException ();\r
 #else\r
       return UTF16ToString(UnsafeNativeMethods.sqlite3_column_database_name16(stmt._sqlite_stmt, index), -1);\r
 #endif\r
@@ -132,6 +136,8 @@ namespace Mono.Data.Sqlite
 #if !SQLITE_STANDARD\r
       int len;\r
       return UTF16ToString(UnsafeNativeMethods.sqlite3_column_table_name16_interop(stmt._sqlite_stmt, index, out len), len);\r
+#elif MONOTOUCH\r
+      throw new NotImplementedException ();\r
 #else\r
       return UTF16ToString(UnsafeNativeMethods.sqlite3_column_table_name16(stmt._sqlite_stmt, index), -1);\r
 #endif\r

diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/UnsafeNativeMethods.cs b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/UnsafeNativeMethods.cs
index 4b440b951ed56cd07ede1b2c0f6aa3a3ebc21615..ba16a1763ff92b3141d7515bf8f463affd6c2ab4 100644 (file)
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/UnsafeNativeMethods.cs
+++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/UnsafeNativeMethods.cs
@@ -200,6 +200,8 @@ namespace Mono.Data.Sqlite
 #endif\r
     internal static extern IntPtr sqlite3_bind_parameter_name(IntPtr stmt, int index);\r
 \r
+// Apple does not include those symbols in it's libsqlite3\r
+#if !MONOTOUCH\r
 #if !PLATFORM_COMPACTFRAMEWORK\r
     [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]\r
 #else\r
@@ -213,6 +215,7 @@ namespace Mono.Data.Sqlite
     [DllImport(SQLITE_DLL)]\r
 #endif\r
     internal static extern IntPtr sqlite3_column_database_name16(IntPtr stmt, int index);\r
+#endif\r
 \r
 #if !PLATFORM_COMPACTFRAMEWORK\r
     [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]\r
@@ -242,6 +245,7 @@ namespace Mono.Data.Sqlite
 #endif\r
     internal static extern IntPtr sqlite3_column_name16(IntPtr stmt, int index);\r
 \r
+#if !MONOTOUCH\r
 #if !PLATFORM_COMPACTFRAMEWORK\r
     [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]\r
 #else\r
@@ -269,6 +273,7 @@ namespace Mono.Data.Sqlite
     [DllImport(SQLITE_DLL)]\r
 #endif\r
     internal static extern IntPtr sqlite3_column_table_name16(IntPtr stmt, int index);\r
+#endif // !MONOTOUCH\r
 \r
 #if !PLATFORM_COMPACTFRAMEWORK\r
     [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]\r
@@ -646,6 +651,7 @@ namespace Mono.Data.Sqlite
 #endif\r
     internal static extern void sqlite3_result_text16(IntPtr context, string strName, int nLen, IntPtr pvReserved);\r
 \r
+#if !MONOTOUCH\r
 #if !PLATFORM_COMPACTFRAMEWORK\r
     [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]\r
 #else\r
@@ -659,6 +665,7 @@ namespace Mono.Data.Sqlite
     [DllImport(SQLITE_DLL)]\r
 #endif\r
     internal static extern int sqlite3_rekey(IntPtr db, byte[] key, int keylen);\r
+#endif\r
 \r
 #if !PLATFORM_COMPACTFRAMEWORK\r
     [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]\r

diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds-net_4_5.csproj b/mcs/class/Mono.Data.Tds/Mono.Data.Tds-net_4_5.csproj
deleted file mode 100644 (file)
index e7455ca..0000000
--- a/mcs/class/Mono.Data.Tds/Mono.Data.Tds-net_4_5.csproj
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{CB7949AC-5FA7-4FAB-893A-8FAF436BF514}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Data.Tds</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds42.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds50.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds70.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\Tds80.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsAsyncResult.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsAsyncState.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsBigDecimal.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsBulkCopy.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsCollation.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsColumnStatus.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsColumnType.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsComm.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsConnectionParameters.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsConnectionPool.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsDataColumn.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsDataColumnCollection.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsDataRow.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsEnvPacketSubType.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalError.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalErrorCollection.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalErrorMessageEventArgs.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalErrorMessageEventHandler.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalException.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalInfoMessageEventArgs.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsInternalInfoMessageEventHandler.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsPacketSubType.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsPacketType.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsRpcProcId.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsTimeoutException.cs" />\r
-    <Compile Include="Mono.Data.Tds.Protocol\TdsVersion.cs" />\r
-    <Compile Include="Mono.Data.Tds\TdsMetaParameter.cs" />\r
-    <Compile Include="Mono.Data.Tds\TdsMetaParameterCollection.cs" />\r
-    <Compile Include="Mono.Data.Tds\TdsParameterDirection.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds-tests-net_4_5.csproj b/mcs/class/Mono.Data.Tds/Mono.Data.Tds-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 4fafd52..0000000
--- a/mcs/class/Mono.Data.Tds/Mono.Data.Tds-tests-net_4_5.csproj
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E4210383-92E4-4D94-9BCD-7A1985EC45E1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Data.Tds-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Data.Tds_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\bug-4786.cs" />\r
-    <Compile Include="Test\ConnLifetime.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Tds\Mono.Data.Tds-net_4_5.csproj">\r
-      <Project>{CB7949AC-5FA7-4FAB-893A-8FAF436BF514}</Project>\r
-      <Name>Mono.Data.Tds\Mono.Data.Tds-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Net\System.Net-net_4_0.csproj">\r
-      <Project>{018D907D-AF28-4DB2-8D7D-24AB62ED97BC}</Project>\r
-      <Name>System.Net\System.Net-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-net_4_5.csproj b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-net_4_5.csproj
deleted file mode 100644 (file)
index 6b469d8..0000000
--- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-net_4_5.csproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7DFAE255-C562-4F72-8DE4-4D578491A10A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Debugger.Soft</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../mono.snk</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AbsentInformationException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AppDomainCreateEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AppDomainMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AppDomainUnloadEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ArrayMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AssemblyLoadEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AssemblyLoadEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AssemblyMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\AssemblyUnloadEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\BreakpointEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\BreakpointEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Connection.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\CustomAttributeDataMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\CustomAttributeNamedArgumentMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\CustomAttributeTypedArgumentMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\DataConverter.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EnumMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Event.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EventQueueImpl.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EventSet.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\EventType.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ExceptionEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ExceptionEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\FieldInfoMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\IInvokeAsyncResult.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ILExceptionHandler.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ILInstruction.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ILInterpreter.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\IMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\InterfaceMappingMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\InvalidStackFrameException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\InvocationException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\InvokeOptions.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ITargetProcess.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\LocalVariable.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Location.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodBodyMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodEntryEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodEntryEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodExitEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodExitEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\MethodMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Mirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ModuleMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ObjectCollectedException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ObjectMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ParameterInfoMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\PointerValue.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\PrimitiveValue.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\PropertyInfoMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StackFrame.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StepEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StepEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StringMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\StructMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\SuspendPolicy.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ThreadDeathEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ThreadMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\ThreadStartEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\TypeLoadEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\TypeLoadEventRequest.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\TypeMirror.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\UserBreakEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\UserLogEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\Value.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VirtualMachine.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VirtualMachineManager.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMDeathEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMDisconnectedException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMDisconnectEvent.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMMismatchException.cs" />\r
-    <Compile Include="Mono.Debugger.Soft\VMStartEvent.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Cecil/Mono.Cecil-net_4_5.csproj">\r
-      <Project>{F6DD456E-ADE4-419D-997F-41ECA0CE79F7}</Project>\r
-      <Name>Mono.Cecil-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-tests-net_4_5.csproj b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 66f61a9..0000000
--- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-tests-net_4_5.csproj
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{52B1D397-D4B8-4EF1-98C7-61AD82FD4A58}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Debugger.Soft-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Debugger.Soft_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\dtest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Debugger.Soft\Mono.Debugger.Soft-net_4_5.csproj">\r
-      <Project>{7DFAE255-C562-4F72-8DE4-4D578491A10A}</Project>\r
-      <Name>Mono.Debugger.Soft\Mono.Debugger.Soft-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Cecil\Mono.Cecil-net_4_5.csproj">\r
-      <Project>{F6DD456E-ADE4-419D-997F-41ECA0CE79F7}</Project>\r
-      <Name>Mono.Cecil\Mono.Cecil-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Http/Mono.Http-net_4_5.csproj b/mcs/class/Mono.Http/Mono.Http-net_4_5.csproj
deleted file mode 100644 (file)
index a0c93b3..0000000
--- a/mcs/class/Mono.Http/Mono.Http-net_4_5.csproj
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8D430163-3294-4930-B9BA-510385010CE1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Http</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Http.Configuration\AcceptEncodingConfig.cs" />\r
-    <Compile Include="Mono.Http.Configuration\AcceptEncodingSectionHandler.cs" />\r
-    <Compile Include="Mono.Http.Modules\AcceptEncodingModule.cs" />\r
-    <Compile Include="Mono.Http.Modules\AuthenticationModule.cs" />\r
-    <Compile Include="Mono.Http.Modules\BasicAuthenticationModule.cs" />\r
-    <Compile Include="Mono.Http.Modules\DigestAuthenticationModule.cs" />\r
-    <Compile Include="Mono.Http\GZipWebRequest.cs" />\r
-    <Compile Include="Mono.Http\GZipWebRequestCreator.cs" />\r
-    <Compile Include="Mono.Http\GZipWebResponse.cs" />\r
-    <Compile Include="Mono.Http\GZipWriteFilter.cs" />\r
-    <Compile Include="Mono.Http\NtlmClient.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_5.csproj">\r
-      <Project>{0B587DBA-BA92-4B92-821A-AA200C612A7E}</Project>\r
-      <Name>ICSharpCode.SharpZipLib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Management/Mono.Management-net_4_5.csproj b/mcs/class/Mono.Management/Mono.Management-net_4_5.csproj
deleted file mode 100644 (file)
index 9e4ce31..0000000
--- a/mcs/class/Mono.Management/Mono.Management-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{38262197-48BD-4D8A-9968-4C6E60C814BB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Management</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Attach\VirtualMachine.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Posix/Mono.Posix-net_4_5.csproj">\r
-      <Project>{85A9B29B-58FF-4FBE-8998-B0A89AC22880}</Project>\r
-      <Name>Mono.Posix-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-net_4_5.csproj b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-net_4_5.csproj
deleted file mode 100644 (file)
index 6712867..0000000
--- a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-net_4_5.csproj
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B96416B1-91AE-466C-BDD0-9A8FF4331E61}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Messaging.RabbitMQ</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\IMessagingContext.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\MessageFactory.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\MessagingContext.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\MessagingContextPool.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessageEnumerator.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessageQueue.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessageQueueTransaction.cs" />\r
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessagingProvider.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Messaging/System.Messaging-net_4_5.csproj">\r
-      <Project>{1CBEC0FC-5926-42FA-A0CF-A19617FABB78}</Project>\r
-      <Name>System.Messaging-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Messaging/Mono.Messaging-net_4_5.csproj">\r
-      <Project>{DDCC93B5-9425-4E9A-95DC-3400D0028508}</Project>\r
-      <Name>Mono.Messaging-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_5.csproj">\r
-      <Project>{55AA0C89-63D9-438E-A139-3ED9F72AE295}</Project>\r
-      <Name>RabbitMQ.Client-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-tests-net_4_5.csproj b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 79c81c6..0000000
--- a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-tests-net_4_5.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B24C3A44-693C-4B91-BF99-A34445844673}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Messaging.RabbitMQ-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Messaging.RabbitMQ_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\BinaryMessageFormatterTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\FailuresTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\MessageBaseTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\MessageEnumeratorExceptionTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\MessageTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\MessagingContextPoolTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\RabbitMQMessagingProviderTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\TestUtils.cs" />\r
-    <Compile Include="Test\Mono.Messaging.RabbitMQ\XmlMessageFormatterTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging.RabbitMQ\Mono.Messaging.RabbitMQ-net_4_5.csproj">\r
-      <Project>{B96416B1-91AE-466C-BDD0-9A8FF4331E61}</Project>\r
-      <Name>Mono.Messaging.RabbitMQ\Mono.Messaging.RabbitMQ-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_4_5.csproj">\r
-      <Project>{1CBEC0FC-5926-42FA-A0CF-A19617FABB78}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging\Mono.Messaging-net_4_5.csproj">\r
-      <Project>{DDCC93B5-9425-4E9A-95DC-3400D0028508}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\RabbitMQ.Client\src\client\RabbitMQ.Client-net_4_5.csproj">\r
-      <Project>{55AA0C89-63D9-438E-A139-3ED9F72AE295}</Project>\r
-      <Name>client\RabbitMQ.Client-net_4_5</Name>\r
-    </ProjectReference>\r
-    <Reference Include="nunit.mocks.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>nunit.mocks.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Messaging/Mono.Messaging-net_4_5.csproj b/mcs/class/Mono.Messaging/Mono.Messaging-net_4_5.csproj
deleted file mode 100644 (file)
index 426d19b..0000000
--- a/mcs/class/Mono.Messaging/Mono.Messaging-net_4_5.csproj
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DDCC93B5-9425-4E9A-95DC-3400D0028508}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Messaging</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Messaging\AcknowledgeTypes.cs" />\r
-    <Compile Include=".\Mono.Messaging\Acknowledgment.cs" />\r
-    <Compile Include=".\Mono.Messaging\CompletedEventArgs.cs" />\r
-    <Compile Include=".\Mono.Messaging\CompletedEventHandler.cs" />\r
-    <Compile Include=".\Mono.Messaging\ConcurrentLinkedQueue.cs" />\r
-    <Compile Include=".\Mono.Messaging\ConnectionException.cs" />\r
-    <Compile Include=".\Mono.Messaging\CryptographicProviderType.cs" />\r
-    <Compile Include=".\Mono.Messaging\EncryptionAlgorithm.cs" />\r
-    <Compile Include=".\Mono.Messaging\EncryptionRequired.cs" />\r
-    <Compile Include=".\Mono.Messaging\HashAlgorithm.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessage.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessageEnumerator.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessageQueue.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessageQueueTransaction.cs" />\r
-    <Compile Include=".\Mono.Messaging\IMessagingProvider.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageBase.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessagePriority.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageQueueBase.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageQueueTransactionStatus.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageQueueTransactionType.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageType.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessageUnavailableException.cs" />\r
-    <Compile Include=".\Mono.Messaging\MessagingProviderLocator.cs" />\r
-    <Compile Include=".\Mono.Messaging\MonoMessagingException.cs" />\r
-    <Compile Include=".\Mono.Messaging\QueueReference.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Messaging/Mono.Messaging-tests-net_4_5.csproj b/mcs/class/Mono.Messaging/Mono.Messaging-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 77af523..0000000
--- a/mcs/class/Mono.Messaging/Mono.Messaging-tests-net_4_5.csproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2AFCBA1D-10F6-4A5B-A68C-6817DA966A2D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Messaging-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Messaging_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Messaging\ConcurrentLinkedQueueTest.cs" />\r
-    <Compile Include="Test\Mono.Messaging\QueueReferenceTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging\Mono.Messaging-net_4_5.csproj">\r
-      <Project>{DDCC93B5-9425-4E9A-95DC-3400D0028508}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_4_0.csproj">\r
-      <Project>{5854BF27-FC35-44F5-BE59-580900694E32}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_4_0</Name>\r
-    </ProjectReference>\r
-    <Reference Include="nunit.mocks.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>nunit.mocks.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Options/Mono.Options-net_4_5.csproj b/mcs/class/Mono.Options/Mono.Options-net_4_5.csproj
deleted file mode 100644 (file)
index 3d5c2b4..0000000
--- a/mcs/class/Mono.Options/Mono.Options-net_4_5.csproj
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6DAA3E35-6FC9-477B-9D4D-538D9ECE7283}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Options</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Options\Options.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Options/Mono.Options-tests-net_4_5.csproj b/mcs/class/Mono.Options/Mono.Options-tests-net_4_5.csproj
deleted file mode 100644 (file)
index d07237a..0000000
--- a/mcs/class/Mono.Options/Mono.Options-tests-net_4_5.csproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4B6B2285-AE59-4E3A-8692-1E0479688BA1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Options-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Options_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Options\BaseRocksFixture.cs" />\r
-    <Compile Include="Test\Mono.Options\CollectionContract.cs" />\r
-    <Compile Include="Test\Mono.Options\ListContract.cs" />\r
-    <Compile Include="Test\Mono.Options\OptionContextTest.cs" />\r
-    <Compile Include="Test\Mono.Options\OptionSetTest.cs" />\r
-    <Compile Include="Test\Mono.Options\OptionTest.cs" />\r
-    <Compile Include="Test\Mono.Options\Utils.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Options\Mono.Options-net_4_5.csproj">\r
-      <Project>{6DAA3E35-6FC9-477B-9D4D-538D9ECE7283}</Project>\r
-      <Name>Mono.Options\Mono.Options-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_4_5.csproj">\r
-      <Project>{85A9B29B-58FF-4FBE-8998-B0A89AC22880}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Parallel/Mono.Parallel-net_4_5.csproj b/mcs/class/Mono.Parallel/Mono.Parallel-net_4_5.csproj
deleted file mode 100644 (file)
index af4fe1c..0000000
--- a/mcs/class/Mono.Parallel/Mono.Parallel-net_4_5.csproj
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{CA0DDCCE-2190-4D9B-88D6-237682D21BC3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Parallel</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;INSIDE_MONO_PARALLEL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;INSIDE_MONO_PARALLEL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Collections.Concurrent\ConcurrentOrderedList.cs" />\r
-    <Compile Include="Mono.Collections.Concurrent\ConcurrentSkipList.cs" />\r
-    <Compile Include="Mono.Threading.Tasks\CyclicDeque.cs" />\r
-    <Compile Include="Mono.Threading.Tasks\IConcurrentDeque.cs" />\r
-    <Compile Include="Mono.Threading.Tasks\PopResult.cs" />\r
-    <Compile Include="Mono.Threading\AtomicBoolean.cs" />\r
-    <Compile Include="Mono.Threading\CSnzi.cs" />\r
-    <Compile Include="Mono.Threading\ReaderWriterLockSlimmer.cs" />\r
-    <Compile Include="Mono.Threading\Snzi.cs" />\r
-    <Compile Include="Mono.Threading\SpinLockWrapper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Parallel/Mono.Parallel-tests-net_4_5.csproj b/mcs/class/Mono.Parallel/Mono.Parallel-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 837a9e3..0000000
--- a/mcs/class/Mono.Parallel/Mono.Parallel-tests-net_4_5.csproj
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F408F42C-51DD-4A6F-AEEF-C2EA9F2D9012}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Parallel-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Parallel_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Collections.Concurrent\CollectionStressTestHelper.cs" />\r
-    <Compile Include="Test\Mono.Collections.Concurrent\ConcurrentSkipListTests.cs" />\r
-    <Compile Include="Test\Mono.Threading\ParallelTestHelper.cs" />\r
-    <Compile Include="Test\Mono.Threading\SnziTests.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Parallel\Mono.Parallel-net_4_5.csproj">\r
-      <Project>{CA0DDCCE-2190-4D9B-88D6-237682D21BC3}</Project>\r
-      <Name>Mono.Parallel\Mono.Parallel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Posix/Mono.Posix-net_4_5.csproj b/mcs/class/Mono.Posix/Mono.Posix-net_4_5.csproj
deleted file mode 100644 (file)
index 7b48302..0000000
--- a/mcs/class/Mono.Posix/Mono.Posix-net_4_5.csproj
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{85A9B29B-58FF-4FBE-8998-B0A89AC22880}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Posix</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Posix\Catalog.cs" />\r
-    <Compile Include=".\Mono.Posix\PeerCred.cs" />\r
-    <Compile Include=".\Mono.Posix\Syscall.cs" />\r
-    <Compile Include=".\Mono.Posix\UnixEndPoint.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryClientFormatterSink.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryClientFormatterSinkProvider.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryCore.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryServerFormatterSink.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryServerFormatterSinkProvider.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixChannel.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientChannel.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientTransportSink.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientTransportSinkProvider.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixConnectionPool.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixMessageIO.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixServerChannel.cs" />\r
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixServerTransportSink.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\CdeclFunction.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\FileNameMarshaler.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\MapAttribute.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\NativeConvert.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\NativeConvert.generated.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\RealTimeSignum.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\Stdlib.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\Syscall.cs" />\r
-    <Compile Include=".\Mono.Unix.Native\TypeAttributes.cs" />\r
-    <Compile Include=".\Mono.Unix\AbstractUnixEndPoint.cs" />\r
-    <Compile Include=".\Mono.Unix\Catalog.cs" />\r
-    <Compile Include=".\Mono.Unix\FileAccessPattern.cs" />\r
-    <Compile Include=".\Mono.Unix\FileAccessPermissions.cs" />\r
-    <Compile Include=".\Mono.Unix\FileHandleOperations.cs" />\r
-    <Compile Include=".\Mono.Unix\FileSpecialAttributes.cs" />\r
-    <Compile Include=".\Mono.Unix\FileTypes.cs" />\r
-    <Compile Include=".\Mono.Unix\PeerCred.cs" />\r
-    <Compile Include=".\Mono.Unix\StdioFileStream.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixClient.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixDirectoryInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixDriveInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixEncoding.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixEndPoint.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixEnvironment.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixFileInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixFileSystemInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixGroupInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixIOException.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixListener.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixMarshal.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixPath.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixPipes.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixProcess.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixSignal.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixStream.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixSymbolicLinkInfo.cs" />\r
-    <Compile Include=".\Mono.Unix\UnixUserInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Posix/Mono.Posix-tests-net_4_5.csproj b/mcs/class/Mono.Posix/Mono.Posix-tests-net_4_5.csproj
deleted file mode 100644 (file)
index a0c5cf1..0000000
--- a/mcs/class/Mono.Posix/Mono.Posix-tests-net_4_5.csproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7D57A17D-4F08-46F8-86D4-C54D0B84325F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,219,618</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Posix-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Posix_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,219,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,219,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Unix.Native\RealTimeSignumTests.cs" />\r
-    <Compile Include="Test\Mono.Unix.Native\SocketTest.cs" />\r
-    <Compile Include="Test\Mono.Unix.Native\StdlibTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\ReadlinkTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\StdioFileStreamTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixEncodingTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixGroupTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixMarshalTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixPathTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixSignalTest.cs" />\r
-    <Compile Include="Test\Mono.Unix\UnixUserTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_4_5.csproj">\r
-      <Project>{85A9B29B-58FF-4FBE-8998-B0A89AC22880}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_4_5.csproj">\r
-      <Project>{85A9B29B-58FF-4FBE-8998-B0A89AC22880}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Posix/Mono.Unix.Native/Stdlib.cs b/mcs/class/Mono.Posix/Mono.Unix.Native/Stdlib.cs
index c2e50b8d259eecf638d0c6738d2fe4ca677119f4..e4c34cba317f28629d885cb370e536fc3cabb29f 100644 (file)
--- a/mcs/class/Mono.Posix/Mono.Unix.Native/Stdlib.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix.Native/Stdlib.cs
@@ -381,6 +381,42 @@ namespace Mono.Unix.Native {
                internal const string LIBC = "msvcrt";
                internal const string MPH  = "MonoPosixHelper";
 
+               // It is possible for Mono.Posix and MonoPosixHelper to get out of sync,
+               // for example if NuGet does something weird. To mitigate this, anyone
+               // editing Mono.Posix needs to observe two rules:
+               //   1. When introducing C-interface changes to MonoPosixHelper, update
+               //      the version strings in VersionCheck below and also
+               //      Mono_Unix_VersionString in the C sources.
+               //   2. Any class which performs a DllImport on Stdlib.MPH needs to call
+               //      Stdlib.VersionCheck in its static constructor.
+
+               [DllImport (Stdlib.MPH, CallingConvention=CallingConvention.Cdecl,
+                               EntryPoint="Mono_Unix_VersionString")]
+               private static extern IntPtr VersionStringPtr ();
+               private static bool versionCheckPerformed = false;
+               internal static void VersionCheck ()
+               {
+                       if (versionCheckPerformed)
+                               return;
+
+                       // This string is arbitrary; it matters only that it is unique.
+                       string assemblyVersion = "MonoProject-2015-12-1";
+                       string nativeVersion = Marshal.PtrToStringAnsi (VersionStringPtr ());
+                       if (assemblyVersion != nativeVersion)
+                       {
+                               throw new Exception ("Mono.Posix assembly loaded with a different version (\""
+                                       + assemblyVersion + "\") than MonoPosixHelper (\"" + nativeVersion
+                                   + "\"). You may need to reinstall Mono.Posix.");
+                       }
+
+                       versionCheckPerformed = true;
+               }
+
+               static Stdlib ()
+               {
+                       VersionCheck ();
+               }
+
                internal Stdlib () {}
 
                #region <errno.h> Declarations

diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs
index 883e044aea137f147f8ba0dd4a61bc2f0cb50272..8e4eb5b84639c63cc417ce8b43634c484e3c7d2e 100644 (file)
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs
@@ -39,6 +39,11 @@ namespace Mono.Unix {
                private int signum;
                private IntPtr signal_info;
 
+               static UnixSignal ()
+               {
+                       Stdlib.VersionCheck ();
+               }
+
                public UnixSignal (Signum signum)
                {
                        this.signum = NativeConvert.FromSignum (signum);
@@ -145,10 +150,12 @@ namespace Mono.Unix {
                        set {Interlocked.Exchange (ref Info->count, value);}
                }
 
+               // signum, count, write_fd, pipecnt, and pipelock are read from a signal handler thread
+               // count and pipelock are both read and written from the signal handler thread
                [Map]
                struct SignalInfo {
-                       public int signum, count, read_fd, write_fd, have_handler, pipecnt;
-                       public IntPtr handler;
+                       public int signum, count, read_fd, write_fd, pipecnt, pipelock, have_handler;
+                       public IntPtr handler; // Backed-up handler to restore when signal unregistered
                }
 
                #region WaitHandle overrides

diff --git a/mcs/class/Mono.Posix/Test/Mono.Unix/UnixSignalTest.cs b/mcs/class/Mono.Posix/Test/Mono.Unix/UnixSignalTest.cs
index 14613104d9b7c0198895e604cd4fbc5149329719..d621ad51d4533a336398b6c87bb69069dc59d790 100644 (file)
--- a/mcs/class/Mono.Posix/Test/Mono.Unix/UnixSignalTest.cs
+++ b/mcs/class/Mono.Posix/Test/Mono.Unix/UnixSignalTest.cs
@@ -456,6 +456,7 @@ namespace MonoTests.Mono.Unix {
                                s.Close ();
                }
 
+               // Create thread that issues many signals from a set of harmless signals
                static Thread CreateRaiseStormThread (int max)
                {
                        return new Thread (delegate () {
@@ -486,6 +487,7 @@ namespace MonoTests.Mono.Unix {
                        CloseSignals (usignals);
                }
 
+               // Create thread that repeatedly registers then unregisters signal handlers
                static Thread CreateSignalCreatorThread ()
                {
                        return new Thread (delegate () {
@@ -523,6 +525,7 @@ namespace MonoTests.Mono.Unix {
                        CloseSignals (usignals);
                }
 
+               // Create thread that blocks until at least one of the given signals is received
                static Thread CreateWaitAnyThread (params UnixSignal[] usignals)
                {
                        return new Thread (delegate () {

diff --git a/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet-net_4_x.csproj b/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet-net_4_x.csproj
new file mode 100644 (file)
index 0000000..5199a37
--- /dev/null
+++ b/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet-net_4_x.csproj
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>9.0.30729</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{391EDD2B-85AC-4FCA-B607-AAD6C51E6799}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <NoWarn>1699,1030</NoWarn>\r
+    <OutputPath>./../../class/lib/net_4_x</OutputPath>\r
+    <NoStdLib>True</NoStdLib>\r
+    <NoConfig>True</NoConfig>\r
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>\r
+    </RootNamespace>\r
+    <AssemblyName>Mono.Security.Providers.DotNet</AssemblyName>\r
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
+    <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>\r
+    <SignAssembly>true</SignAssembly>\r
+    <DelaySign>true</DelaySign>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <AssemblyOriginatorKeyFile>../mono.pub</AssemblyOriginatorKeyFile>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <NoWarn>1699,1030</NoWarn>\r
+    <Optimize>false</Optimize>\r
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <NoWarn>1699,1030</NoWarn>\r
+    <Optimize>true</Optimize>\r
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
+  is a problem to compile the Mono mscorlib.dll -->\r
+  <PropertyGroup>\r
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
+  </PropertyGroup>\r
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
+  <ItemGroup>\r
+    <Compile Include="..\..\build\common\Consts.cs" />\r
+    <Compile Include="..\..\build\common\Locale.cs" />\r
+    <Compile Include=".\Mono.Security.Providers.DotNet\DotNetSslStreamImpl.cs" />\r
+    <Compile Include=".\Mono.Security.Providers.DotNet\DotNetTlsProvider.cs" />\r
+    <Compile Include=".\Properties\AssemblyInfo.cs" />\r  </ItemGroup>\r
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
+       Other similar extension points exist, see Microsoft.Common.targets.\r
+  <Target Name="BeforeBuild">\r
+  </Target>\r
+  <Target Name="AfterBuild">\r
+  </Target>\r
+  -->\r
+  <PropertyGroup>\r
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
+\r
+    </PreBuildEvent>\r
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
+\r
+    </PreBuildEvent>\r
+\r
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
+\r
+    </PostBuildEvent>\r
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
+\r
+    </PostBuildEvent>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="../corlib/corlib-net_4_x.csproj">\r
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>\r
+      <Name>corlib-net_4_x</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="../System/System-net_4_x.csproj">\r
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>\r
+      <Name>System-net_4_x</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_x.csproj">\r
+      <Project>{42D59DE7-586F-4ACF-BDD5-E7869E39E3EF}</Project>\r
+      <Name>Mono.Security-net_4_x</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Folder Include="Properties\" />\r
+  </ItemGroup>\r
+</Project>\r
+

diff --git a/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet/DotNetSslStreamImpl.cs b/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet/DotNetSslStreamImpl.cs
index 12fabc8f58f8c3246f8b59fa15ec469c381f22e1..7453f8d196a914eb6845e35380ad474dde7b2187 100644 (file)
--- a/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet/DotNetSslStreamImpl.cs
+++ b/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet/DotNetSslStreamImpl.cs
@@ -33,11 +33,11 @@ using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
 using System.Security.Principal;
 using System.Security.Cryptography;
-using Mono.Security.Interface;
+using MSI = Mono.Security.Interface;
 
 namespace Mono.Security.Providers.DotNet
 {
-       class DotNetSslStreamImpl : MonoSslStream
+       class DotNetSslStreamImpl : MSI.IMonoSslStream
        {
                SslStream impl;
 
@@ -59,208 +59,208 @@ namespace Mono.Security.Providers.DotNet
                                userCertificateSelectionCallback);
                }
 
-               public override void AuthenticateAsClient (string targetHost)
+               public void AuthenticateAsClient (string targetHost)
                {
                        Impl.AuthenticateAsClient (targetHost);
                }
 
-               public override void AuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SslProtocols enabledSslProtocols, bool checkCertificateRevocation)
+               public void AuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SslProtocols enabledSslProtocols, bool checkCertificateRevocation)
                {
                        Impl.AuthenticateAsClient (targetHost, clientCertificates, enabledSslProtocols, checkCertificateRevocation);
                }
 
-               public override IAsyncResult BeginAuthenticateAsClient (string targetHost, AsyncCallback asyncCallback, object asyncState)
+               public IAsyncResult BeginAuthenticateAsClient (string targetHost, AsyncCallback asyncCallback, object asyncState)
                {
                        return Impl.BeginAuthenticateAsClient (targetHost, asyncCallback, asyncState);
                }
 
-               public override IAsyncResult BeginAuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState)
+               public IAsyncResult BeginAuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState)
                {
                        return Impl.BeginAuthenticateAsClient (targetHost, clientCertificates, enabledSslProtocols, checkCertificateRevocation, asyncCallback, asyncState);
                }
 
-               public override void EndAuthenticateAsClient (IAsyncResult asyncResult)
+               public void EndAuthenticateAsClient (IAsyncResult asyncResult)
                {
                        Impl.EndAuthenticateAsClient (asyncResult);
                }
 
-               public override void AuthenticateAsServer (X509Certificate serverCertificate)
+               public void AuthenticateAsServer (X509Certificate serverCertificate)
                {
                        Impl.AuthenticateAsServer (serverCertificate);
                }
 
-               public override void AuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, SslProtocols enabledSslProtocols, bool checkCertificateRevocation)
+               public void AuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, SslProtocols enabledSslProtocols, bool checkCertificateRevocation)
                {
                        Impl.AuthenticateAsServer (serverCertificate, clientCertificateRequired, enabledSslProtocols, checkCertificateRevocation);
                }
 
-               public override IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, AsyncCallback asyncCallback, object asyncState)
+               public IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, AsyncCallback asyncCallback, object asyncState)
                {
                        return Impl.BeginAuthenticateAsServer (serverCertificate, asyncCallback, asyncState);
                }
 
-               public override IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, SslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState)
+               public IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, SslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState)
                {
                        return Impl.BeginAuthenticateAsServer (serverCertificate, clientCertificateRequired, enabledSslProtocols, checkCertificateRevocation, asyncCallback, asyncState);
                }
 
-               public override void EndAuthenticateAsServer (IAsyncResult asyncResult)
+               public void EndAuthenticateAsServer (IAsyncResult asyncResult)
                {
                        Impl.EndAuthenticateAsServer (asyncResult);
                }
 
-               public override Task AuthenticateAsClientAsync (string targetHost)
+               public Task AuthenticateAsClientAsync (string targetHost)
                {
                        return Impl.AuthenticateAsClientAsync (targetHost);
                }
 
-               public override Task AuthenticateAsClientAsync (string targetHost, X509CertificateCollection clientCertificates, SslProtocols enabledSslProtocols, bool checkCertificateRevocation)
+               public Task AuthenticateAsClientAsync (string targetHost, X509CertificateCollection clientCertificates, SslProtocols enabledSslProtocols, bool checkCertificateRevocation)
                {
                        return Impl.AuthenticateAsClientAsync (targetHost, clientCertificates, enabledSslProtocols, checkCertificateRevocation);
                }
 
-               public override Task AuthenticateAsServerAsync (X509Certificate serverCertificate)
+               public Task AuthenticateAsServerAsync (X509Certificate serverCertificate)
                {
                        return Impl.AuthenticateAsServerAsync (serverCertificate);
                }
 
-               public override Task AuthenticateAsServerAsync (X509Certificate serverCertificate, bool clientCertificateRequired, SslProtocols enabledSslProtocols, bool checkCertificateRevocation)
+               public Task AuthenticateAsServerAsync (X509Certificate serverCertificate, bool clientCertificateRequired, SslProtocols enabledSslProtocols, bool checkCertificateRevocation)
                {
                        return Impl.AuthenticateAsServerAsync (serverCertificate, clientCertificateRequired, enabledSslProtocols, checkCertificateRevocation);
                }
 
-               public override void Flush ()
+               public void Flush ()
                {
                        Impl.Flush ();
                }
 
-               public override int Read (byte[] buffer, int offset, int count)
+               public int Read (byte[] buffer, int offset, int count)
                {
                        return Impl.Read (buffer, offset, count);
                }
 
-               public override void Write (byte[] buffer)
+               public void Write (byte[] buffer)
                {
                        Impl.Write (buffer);
                }
 
-               public override void Write (byte[] buffer, int offset, int count)
+               public void Write (byte[] buffer, int offset, int count)
                {
                        Impl.Write (buffer, offset, count);
                }
 
-               public override IAsyncResult BeginRead (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState)
+               public IAsyncResult BeginRead (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState)
                {
                        return Impl.BeginRead (buffer, offset, count, asyncCallback, asyncState);
                }
 
-               public override int EndRead (IAsyncResult asyncResult)
+               public int EndRead (IAsyncResult asyncResult)
                {
                        return Impl.EndRead (asyncResult);
                }
 
-               public override IAsyncResult BeginWrite (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState)
+               public IAsyncResult BeginWrite (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState)
                {
                        return Impl.BeginWrite (buffer, offset, count, asyncCallback, asyncState);
                }
 
-               public override void EndWrite (IAsyncResult asyncResult)
+               public void EndWrite (IAsyncResult asyncResult)
                {
                        Impl.EndWrite (asyncResult);
                }
 
-               public override TransportContext TransportContext {
+               public TransportContext TransportContext {
                        get { throw new NotSupportedException (); }
                }
 
-               public override bool IsAuthenticated {
+               public bool IsAuthenticated {
                        get { return Impl.IsAuthenticated; }
                }
 
-               public override bool IsMutuallyAuthenticated {
+               public bool IsMutuallyAuthenticated {
                        get { return Impl.IsMutuallyAuthenticated; }
                }
 
-               public override bool IsEncrypted {
+               public bool IsEncrypted {
                        get { return Impl.IsEncrypted; }
                }
 
-               public override bool IsSigned {
+               public bool IsSigned {
                        get { return Impl.IsSigned; }
                }
 
-               public override bool IsServer {
+               public bool IsServer {
                        get { return Impl.IsServer; }
                }
 
-               public override CipherAlgorithmType CipherAlgorithm {
+               public CipherAlgorithmType CipherAlgorithm {
                        get { return Impl.CipherAlgorithm; }
                }
 
-               public override int CipherStrength {
+               public int CipherStrength {
                        get { return Impl.CipherStrength; }
                }
 
-               public override HashAlgorithmType HashAlgorithm {
+               public HashAlgorithmType HashAlgorithm {
                        get { return Impl.HashAlgorithm; }
                }
 
-               public override int HashStrength {
+               public int HashStrength {
                        get { return Impl.HashStrength; }
                }
 
-               public override ExchangeAlgorithmType KeyExchangeAlgorithm {
+               public ExchangeAlgorithmType KeyExchangeAlgorithm {
                        get { return Impl.KeyExchangeAlgorithm; }
                }
 
-               public override int KeyExchangeStrength {
+               public int KeyExchangeStrength {
                        get { return KeyExchangeStrength; }
                }
 
-               public override bool CanRead {
+               public bool CanRead {
                        get { return Impl.CanRead; }
                }
 
-               public override bool CanTimeout {
+               public bool CanTimeout {
                        get { return Impl.CanTimeout; }
                }
 
-               public override bool CanWrite {
+               public bool CanWrite {
                        get { return Impl.CanWrite; }
                }
 
-               public override long Length {
+               public long Length {
                        get { return Impl.Length; }
                }
 
-               public override long Position {
+               public long Position {
                        get { return Impl.Position; }
                }
 
-               public override void SetLength (long value)
+               public void SetLength (long value)
                {
                        Impl.SetLength (value);
                }
 
-               public override AuthenticatedStream AuthenticatedStream {
+               public AuthenticatedStream AuthenticatedStream {
                        get { return Impl; }
                }
 
-               public override int ReadTimeout {
+               public int ReadTimeout {
                        get { return Impl.ReadTimeout; }
                        set { Impl.ReadTimeout = value; }
                }
 
-               public override int WriteTimeout {
+               public int WriteTimeout {
                        get { return Impl.WriteTimeout; }
                        set { Impl.WriteTimeout = value; }
                }
 
-               public override bool CheckCertRevocationStatus {
+               public bool CheckCertRevocationStatus {
                        get { return Impl.CheckCertRevocationStatus; }
                }
 
-               public override X509Certificate InternalLocalCertificate {
+               public X509Certificate InternalLocalCertificate {
                        get {
                                try {
                                        return LocalCertificate;
@@ -270,15 +270,15 @@ namespace Mono.Security.Providers.DotNet
                        }
                }
 
-               public override X509Certificate LocalCertificate {
+               public X509Certificate LocalCertificate {
                        get { return Impl.LocalCertificate; }
                }
 
-               public override X509Certificate RemoteCertificate {
+               public X509Certificate RemoteCertificate {
                        get { return Impl.RemoteCertificate; }
                }
 
-               public override SslProtocols SslProtocol {
+               public SslProtocols SslProtocol {
                        get { return Impl.SslProtocol; }
                }
 
@@ -288,7 +288,13 @@ namespace Mono.Security.Providers.DotNet
                                throw new ObjectDisposedException ("MonoSslStream");
                }
 
-               protected override void Dispose (bool disposing)
+               public void Dispose ()
+               {
+                       Dispose (true);
+                       GC.SuppressFinalize (this);
+               }
+
+               protected void Dispose (bool disposing)
                {
                        if (impl != null && disposing) {
                                impl.Dispose ();

diff --git a/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet/DotNetTlsProvider.cs b/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet/DotNetTlsProvider.cs
index 855edfee8921ec63ff431326216166dcd3a817bf..b96f828b90fd9e6ecc6839c36363cf524d0a01d4 100644 (file)
--- a/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet/DotNetTlsProvider.cs
+++ b/mcs/class/Mono.Security.Providers.DotNet/Mono.Security.Providers.DotNet/DotNetTlsProvider.cs
@@ -40,6 +40,16 @@ namespace Mono.Security.Providers.DotNet
         */
        public class DotNetTlsProvider : MonoTlsProvider
        {
+               static readonly Guid id = new Guid ("3a7b3a26-0dbd-4572-a5b8-fdce766bf0dd");
+
+               public override Guid ID {
+                       get { return id; }
+               }
+
+               public override string Name {
+                       get { return "dotnet"; }
+               }
+
                public override bool SupportsSslStream {
                        get { return true; }
                }
@@ -56,7 +66,7 @@ namespace Mono.Security.Providers.DotNet
                        get { return (SslProtocols)ServicePointManager.SecurityProtocol; }
                }
 
-               public override MonoSslStream CreateSslStream (
+               public override IMonoSslStream CreateSslStream (
                        Stream innerStream, bool leaveInnerStreamOpen,
                        MonoTlsSettings settings = null)
                {

diff --git a/mcs/class/Mono.Security.Providers.NewSystemSource/Mono.Security.Providers.NewSystemSource-net_4_x.csproj b/mcs/class/Mono.Security.Providers.NewSystemSource/Mono.Security.Providers.NewSystemSource-net_4_x.csproj
new file mode 100644 (file)
index 0000000..9df975f
--- /dev/null
+++ b/mcs/class/Mono.Security.Providers.NewSystemSource/Mono.Security.Providers.NewSystemSource-net_4_x.csproj
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>9.0.30729</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{0BB4541F-9B1A-4CBC-BEB1-00B31B37F74E}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <NoWarn>1699,1030</NoWarn>\r
+    <OutputPath>./../../class/lib/net_4_x</OutputPath>\r
+    <NoStdLib>True</NoStdLib>\r
+    <NoConfig>True</NoConfig>\r
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>\r
+    </RootNamespace>\r
+    <AssemblyName>Mono.Security.Providers.NewSystemSource</AssemblyName>\r
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
+    <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>\r
+    <SignAssembly>true</SignAssembly>\r
+    <DelaySign>true</DelaySign>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <AssemblyOriginatorKeyFile>../mono.pub</AssemblyOriginatorKeyFile>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <NoWarn>1699,1030</NoWarn>\r
+    <Optimize>false</Optimize>\r
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;SECURITY_DEP;MONO_SECURITY_ALIAS;MONO;FEATURE_PAL;MONO_FEATURE_NEW_TLS;MONO_FEATURE_NEW_SYSTEM_SOURCE;DISABLE_CAS_USE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <NoWarn>1699,1030</NoWarn>\r
+    <Optimize>true</Optimize>\r
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;SECURITY_DEP;MONO_SECURITY_ALIAS;MONO;FEATURE_PAL;MONO_FEATURE_NEW_TLS;MONO_FEATURE_NEW_SYSTEM_SOURCE;DISABLE_CAS_USE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
+  is a problem to compile the Mono mscorlib.dll -->\r
+  <PropertyGroup>\r
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
+  </PropertyGroup>\r
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
+  <ItemGroup>\r
+    <Compile Include="..\..\..\external\referencesource\mscorlib\InternalApis\NDP_Common\inc\PinnableBufferCache.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LazyAsyncResult.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LoggingObject.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_NTAuthentication.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_SecureChannel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_SslSessionsCache.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Logging.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\_FixedSizeReader.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\_HelperAsyncResults.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\_SslState.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\_SslStream.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\SecureProtocols\SslStream.cs" />\r
+    <Compile Include="..\..\build\common\Consts.cs" />\r
+    <Compile Include="..\..\build\common\Locale.cs" />\r
+    <Compile Include="..\..\build\common\SR.cs" />\r
+    <Compile Include="..\System\Mono.Net.Security\CallbackHelpers.cs" />\r
+    <Compile Include="..\System\Mono.Net.Security\IMonoTlsProvider.cs" />\r
+    <Compile Include="..\System\Mono.Net.Security\MonoTlsProviderFactory.cs" />\r
+    <Compile Include="..\System\Mono.Net.Security\MonoTlsProviderWrapper.cs" />\r
+    <Compile Include="..\System\ReferenceSources\_SecureChannel.cs" />\r
+    <Compile Include="..\System\ReferenceSources\_SslState.cs" />\r
+    <Compile Include="..\System\ReferenceSources\_SslStream.cs" />\r
+    <Compile Include="..\System\ReferenceSources\Internal.cs" />\r
+    <Compile Include="..\System\ReferenceSources\SR.cs" />\r
+    <Compile Include="..\System\ReferenceSources\SR2.cs" />\r
+    <Compile Include="..\System\ReferenceSources\SslStream.cs" />\r
+    <Compile Include="..\System\ReferenceSources\SSPIConfiguration.cs" />\r
+    <Compile Include="..\System\ReferenceSources\SSPISafeHandles.cs" />\r
+    <Compile Include="..\System\ReferenceSources\SSPIWrapper.cs" />\r
+    <Compile Include=".\Properties\AssemblyInfo.cs" />\r  </ItemGroup>\r
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
+       Other similar extension points exist, see Microsoft.Common.targets.\r
+  <Target Name="BeforeBuild">\r
+  </Target>\r
+  <Target Name="AfterBuild">\r
+  </Target>\r
+  -->\r
+  <PropertyGroup>\r
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
+\r
+    </PreBuildEvent>\r
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
+\r
+    </PreBuildEvent>\r
+\r
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
+\r
+    </PostBuildEvent>\r
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
+\r
+    </PostBuildEvent>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="../corlib/corlib-net_4_x.csproj">\r
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>\r
+      <Name>corlib-net_4_x</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="../System/System-net_4_x.csproj">\r
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>\r
+      <Name>System-net_4_x</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_x.csproj">\r
+      <Project>{42D59DE7-586F-4ACF-BDD5-E7869E39E3EF}</Project>\r
+      <Name>Mono.Security-net_4_x</Name>\r
+      <Aliases>MonoSecurity</Aliases>    </ProjectReference>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Folder Include="Properties\" />\r
+  </ItemGroup>\r
+</Project>\r
+

diff --git a/mcs/class/Mono.Security.Providers.OldTls/Mono.Security.Providers.OldTls-net_4_x.csproj b/mcs/class/Mono.Security.Providers.OldTls/Mono.Security.Providers.OldTls-net_4_x.csproj
new file mode 100644 (file)
index 0000000..7439af9
--- /dev/null
+++ b/mcs/class/Mono.Security.Providers.OldTls/Mono.Security.Providers.OldTls-net_4_x.csproj
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>9.0.30729</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{E485E885-59B1-4081-BC66-56AAAFD8771A}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <NoWarn>1699,1030</NoWarn>\r
+    <OutputPath>./../../class/lib/net_4_x</OutputPath>\r
+    <NoStdLib>True</NoStdLib>\r
+    <NoConfig>True</NoConfig>\r
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>\r
+    </RootNamespace>\r
+    <AssemblyName>Mono.Security.Providers.OldTls</AssemblyName>\r
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
+    <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>\r
+    <SignAssembly>true</SignAssembly>\r
+    <DelaySign>true</DelaySign>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <AssemblyOriginatorKeyFile>../mono.pub</AssemblyOriginatorKeyFile>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <NoWarn>1699,1030</NoWarn>\r
+    <Optimize>false</Optimize>\r
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;SECURITY_DEP</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <NoWarn>1699,1030</NoWarn>\r
+    <Optimize>true</Optimize>\r
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;SECURITY_DEP</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
+  is a problem to compile the Mono mscorlib.dll -->\r
+  <PropertyGroup>\r
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
+  </PropertyGroup>\r
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
+  <ItemGroup>\r
+    <Compile Include="..\..\build\common\Consts.cs" />\r
+    <Compile Include="..\..\build\common\Locale.cs" />\r
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD5SHA1.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\TlsHMAC.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificate.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificateVerify.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientFinished.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientHello.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientKeyExchange.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificate.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificateRequest.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerFinished.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHello.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHelloDone.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerKeyExchange.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificate.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificateVerify.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientFinished.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientHello.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientKeyExchange.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificate.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificateRequest.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerFinished.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHello.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHelloDone.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerKeyExchange.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake\ClientCertificateType.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake\HandshakeMessage.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls.Handshake\HandshakeType.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\Alert.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\CipherAlgorithmType.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\CipherSuite.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\CipherSuiteCollection.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\CipherSuiteFactory.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\ClientContext.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\ClientRecordProtocol.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\ClientSessionCache.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\ContentType.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\Context.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\DebugHelper.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\ExchangeAlgorithmType.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\HandshakeState.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\HashAlgorithmType.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\HttpsClientStream.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\RecordProtocol.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\RSASslSignatureDeformatter.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\RSASslSignatureFormatter.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\SecurityCompressionType.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\SecurityParameters.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\ServerContext.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\ServerRecordProtocol.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\SslCipherSuite.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\SslClientStream.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\SslHandshakeHash.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\SslServerStream.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\SslStreamBase.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\TlsCipherSuite.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\TlsClientSettings.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\TlsException.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\TlsServerSettings.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.Protocol.Tls\TlsStream.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtension.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\ExtendedKeyUsageExtension.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\GeneralNames.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\NetscapeCertTypeExtension.cs" />\r
+    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\SubjectAltNameExtension.cs" />\r
+    <Compile Include="..\System\Mono.Net.Security\LegacySslStream.cs" />\r
+    <Compile Include=".\Mono.Security.Providers.OldTls\OldTlsProvider.cs" />\r
+    <Compile Include=".\Properties\AssemblyInfo.cs" />\r  </ItemGroup>\r
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
+       Other similar extension points exist, see Microsoft.Common.targets.\r
+  <Target Name="BeforeBuild">\r
+  </Target>\r
+  <Target Name="AfterBuild">\r
+  </Target>\r
+  -->\r
+  <PropertyGroup>\r
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
+\r
+    </PreBuildEvent>\r
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
+\r
+    </PreBuildEvent>\r
+\r
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
+\r
+    </PostBuildEvent>\r
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
+\r
+    </PostBuildEvent>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="../corlib/corlib-net_4_x.csproj">\r
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>\r
+      <Name>corlib-net_4_x</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="../System/System-net_4_x.csproj">\r
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>\r
+      <Name>System-net_4_x</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_x.csproj">\r
+      <Project>{42D59DE7-586F-4ACF-BDD5-E7869E39E3EF}</Project>\r
+      <Name>Mono.Security-net_4_x</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Folder Include="Properties\" />\r
+  </ItemGroup>\r
+</Project>\r
+

diff --git a/mcs/class/Mono.Security.Providers.OldTls/Mono.Security.Providers.OldTls/OldTlsProvider.cs b/mcs/class/Mono.Security.Providers.OldTls/Mono.Security.Providers.OldTls/OldTlsProvider.cs
index 5754f4fd87d8b876f18b5a6efe9948de8a20d8c3..9d3aa7c421033349955ce00ea0010ae6f4dea5e4 100644 (file)
--- a/mcs/class/Mono.Security.Providers.OldTls/Mono.Security.Providers.OldTls/OldTlsProvider.cs
+++ b/mcs/class/Mono.Security.Providers.OldTls/Mono.Security.Providers.OldTls/OldTlsProvider.cs
@@ -30,12 +30,22 @@ using System.Net.Security;
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
 using Mono.Security.Interface;
-using Mono.Net.Security;
+using MNS = Mono.Net.Security;
 
 namespace Mono.Security.Providers.OldTls
 {
        public class OldTlsProvider : MonoTlsProvider
        {
+               static readonly Guid id = new Guid ("cf8baa0d-c6ed-40ae-b512-dec8d097e9af");
+
+               public override Guid ID {
+                       get { return id; }
+               }
+
+               public override string Name {
+                       get { return "old"; }
+               }
+
                public override bool SupportsSslStream {
                        get { return true; }
                }
@@ -52,12 +62,12 @@ namespace Mono.Security.Providers.OldTls
                        get { return SslProtocols.Tls; }
                }
 
-               public override MonoSslStream CreateSslStream (
+               public override IMonoSslStream CreateSslStream (
                        Stream innerStream, bool leaveInnerStreamOpen,
                        MonoTlsSettings settings = null)
                {
-                       var impl = new LegacySslStream (innerStream, leaveInnerStreamOpen, this, settings);
-                       return new MonoSslStreamImpl (impl);
+                       var impl = new MNS.LegacySslStream (innerStream, leaveInnerStreamOpen, this, settings);
+                       return new MNS.MonoSslStreamImpl (impl);
                }
 
                public override IMonoTlsContext CreateTlsContext (

diff --git a/mcs/class/Mono.Security.Win32/Mono.Security.Win32-net_4_5.csproj b/mcs/class/Mono.Security.Win32/Mono.Security.Win32-net_4_5.csproj
deleted file mode 100644 (file)
index 3a71124..0000000
--- a/mcs/class/Mono.Security.Win32/Mono.Security.Win32-net_4_5.csproj
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1DEB5FAA-15BC-46F1-BAFA-EE6DF0BB6F76}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Security.Win32</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\CapiContext.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\CapiHash.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\CapiRandomNumberGenerator.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\CryptoAPI.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD2.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD2CryptoServiceProvider.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD4.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD4CryptoServiceProvider.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD5CryptoServiceProvider.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\RNGCryptoServiceProvider.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\SHA1CryptoServiceProvider.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Security/Makefile b/mcs/class/Mono.Security/Makefile
index 2bd2f1d7aa4e4f895ec064fa8d164c1c054e771d..f9508b9c8a66994e9269ece8b6d0ce94b71a7418 100644 (file)
--- a/mcs/class/Mono.Security/Makefile
+++ b/mcs/class/Mono.Security/Makefile
@@ -18,3 +18,7 @@ $(the_libdir_base)bare/System.dll:
 .NOTPARALLEL: $(the_libdir_base)bare/System.dll
 
 EXTRA_DISTFILES = Mono.Security.Interface/README.md
+
+#
+# Update this comment to trigger a build in System
+#

diff --git a/mcs/class/Mono.Security/Mono.Security-net_4_5.csproj b/mcs/class/Mono.Security/Mono.Security-net_4_5.csproj
deleted file mode 100644 (file)
index 78fe630..0000000
--- a/mcs/class/Mono.Security/Mono.Security-net_4_5.csproj
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D68D4FED-CA32-4800-A628-58BAE485562C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1030</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Security</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1030</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1030</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Math.Prime.Generator\NextPrimeFinder.cs" />\r
-    <Compile Include=".\Mono.Math.Prime.Generator\PrimeGeneratorBase.cs" />\r
-    <Compile Include=".\Mono.Math.Prime.Generator\SequentialSearchPrimeGeneratorBase.cs" />\r
-    <Compile Include=".\Mono.Math.Prime\ConfidenceFactor.cs" />\r
-    <Compile Include=".\Mono.Math.Prime\PrimalityTests.cs" />\r
-    <Compile Include=".\Mono.Math\BigInteger.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeBase.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeDeformatter.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeFormatter.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\PrivateKey.cs" />\r
-    <Compile Include=".\Mono.Security.Authenticode\SoftwarePublisherCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\ARC4Managed.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\CryptoConvert.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\CryptoTools.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\DHKeyGeneration.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\DHParameters.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\DiffieHellman.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\DiffieHellmanManaged.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\KeyPairPersistence.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD2.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD2Managed.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD4.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD4Managed.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\MD5SHA1.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\PKCS1.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\PKCS8.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\RC4.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\RSAManaged.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\SHA224.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\SHA224Managed.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\SymmetricTransform.cs" />\r
-    <Compile Include=".\Mono.Security.Cryptography\TlsHMAC.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\ChallengeResponse.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\ChallengeResponse2.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\MessageBase.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmAuthLevel.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmFlags.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmSettings.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type1Message.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type2Message.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type3Message.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificateVerify.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientFinished.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientHello.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientKeyExchange.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificateRequest.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerFinished.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHello.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHelloDone.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerKeyExchange.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificateVerify.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientFinished.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientHello.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientKeyExchange.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificate.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificateRequest.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerFinished.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHello.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHelloDone.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerKeyExchange.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\ClientCertificateType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\HandshakeMessage.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\HandshakeType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\Alert.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherAlgorithmType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuite.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuiteCollection.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuiteFactory.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientContext.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientRecordProtocol.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientSessionCache.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ContentType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\Context.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\DebugHelper.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ExchangeAlgorithmType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\HandshakeState.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\HashAlgorithmType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\HttpsClientStream.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\RecordProtocol.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\RSASslSignatureDeformatter.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\RSASslSignatureFormatter.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityCompressionType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityParameters.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ServerContext.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\ServerRecordProtocol.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslCipherSuite.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslClientStream.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslHandshakeHash.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslServerStream.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslStreamBase.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsCipherSuite.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsClientSettings.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsException.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsServerSettings.cs" />\r
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsStream.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\BasicConstraintsExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\CertificatePoliciesExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\CRLDistributionPointsExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\ExtendedKeyUsageExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\GeneralNames.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\KeyAttributesExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\KeyUsageExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\NetscapeCertTypeExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\PrivateKeyUsagePeriodExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\SubjectAltNameExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include=".\Mono.Security.X509\PKCS12.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X501Name.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Builder.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Certificate.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509CertificateBuilder.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509CertificateCollection.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Chain.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509ChainStatusFlags.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509CRL.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Extension.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Extensions.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Store.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509StoreManager.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X509Stores.cs" />\r
-    <Compile Include=".\Mono.Security.X509\X520Attributes.cs" />\r
-    <Compile Include=".\Mono.Security\ASN1.cs" />\r
-    <Compile Include=".\Mono.Security\ASN1Convert.cs" />\r
-    <Compile Include=".\Mono.Security\BitConverterLE.cs" />\r
-    <Compile Include=".\Mono.Security\PKCS7.cs" />\r
-    <Compile Include=".\Mono.Security\StrongName.cs" />\r
-    <Compile Include=".\Mono.Xml\MiniParser.cs" />\r
-    <Compile Include=".\Mono.Xml\SecurityParser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-bare-net_4_5.csproj">\r
-      <Project>{91CDF14E-F60F-4AB7-BC9D-5CBD7E669076}</Project>\r
-      <Name>System-bare-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Security/Mono.Security-net_4_x.csproj b/mcs/class/Mono.Security/Mono.Security-net_4_x.csproj
index cc51fcf06ec991df2c4ae0382b46d3f0bff17163..879cb7e517f9fbade9d03dd78896f053de538af6 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security-net_4_x.csproj
+++ b/mcs/class/Mono.Security/Mono.Security-net_4_x.csproj
@@ -80,6 +80,23 @@
     <Compile Include=".\Mono.Security.Cryptography\SHA224Managed.cs" />\r
     <Compile Include=".\Mono.Security.Cryptography\SymmetricTransform.cs" />\r
     <Compile Include=".\Mono.Security.Cryptography\TlsHMAC.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\Alert.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\CertificateValidationHelper.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\CipherAlgorithmType.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\CipherSuiteCode.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\ExchangeAlgorithmType.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\HashAlgorithmType.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\IBufferOffsetSize.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\IMonoSslStream.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\IMonoTlsContext.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\IMonoTlsEventSink.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\MonoTlsConnectionInfo.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\MonoTlsProvider.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\MonoTlsProviderFactory.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\MonoTlsSettings.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\TlsException.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\TlsProtocolCode.cs" />\r
+    <Compile Include=".\Mono.Security.Interface\TlsProtocols.cs" />\r
     <Compile Include=".\Mono.Security.Protocol.Ntlm\ChallengeResponse.cs" />\r
     <Compile Include=".\Mono.Security.Protocol.Ntlm\ChallengeResponse2.cs" />\r
     <Compile Include=".\Mono.Security.Protocol.Ntlm\MessageBase.cs" />\r

diff --git a/mcs/class/Mono.Security/Mono.Security-tests-net_4_5.csproj b/mcs/class/Mono.Security/Mono.Security-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 9f6dd3a..0000000
--- a/mcs/class/Mono.Security/Mono.Security-tests-net_4_5.csproj
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{823040EA-6C7C-49B1-9CA3-9236C9B629F5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1030,169,219,618,672</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Security-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Security_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1030,169,219,618,672</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1030,169,219,618,672</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Math\ArithmeticBigTest.cs" />\r
-    <Compile Include="Test\Mono.Math\BigIntegerSetTest.cs" />\r
-    <Compile Include="Test\Mono.Math\BigIntegerTest.cs" />\r
-    <Compile Include="Test\Mono.Math\BitwiseTest.cs" />\r
-    <Compile Include="Test\Mono.Math\GcdBigTest.cs" />\r
-    <Compile Include="Test\Mono.Math\ModInverseBigTest.cs" />\r
-    <Compile Include="Test\Mono.Math\ModRingTest.cs" />\r
-    <Compile Include="Test\Mono.Math\PrimeGenerationTest.cs" />\r
-    <Compile Include="Test\Mono.Math\PrimeTestingTest.cs" />\r
-    <Compile Include="Test\Mono.Math\SearchGeneratorTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Authenticode\AuthenticodeDeformatterTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Authenticode\PrivateKeyTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Authenticode\SoftwarePublisherCertificateTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\ARC4ManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\CryptoConvertTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\DiffieHellmanManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\KeyPairPersistenceTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\MD2ManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\MD2Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\MD4ManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\MD4Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\PKCS1Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\PKCS8Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\RSAManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\SHA224ManagedTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Cryptography\SHA224Test.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\ChallengeResponseTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\MessageBaseTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type1MessageTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type2MessageTest.cs" />\r
-    <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type3MessageTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\BasicConstraintsExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\ExtendedKeyUsageExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\KeyUsageExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\SubjectAltNameExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtensionTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\PKCS12Test.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\X501NameTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\X509CertificateTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\X509CrlTest.cs" />\r
-    <Compile Include="Test\Mono.Security.X509\X520AttributesTest.cs" />\r
-    <Compile Include="Test\Mono.Security\ASN1ConvertTest.cs" />\r
-    <Compile Include="Test\Mono.Security\PKCS7Test.cs" />\r
-    <Compile Include="Test\Mono.Security\StrongNameTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/Alert.cs b/mcs/class/Mono.Security/Mono.Security.Interface/Alert.cs
new file mode 100644 (file)
index 0000000..fdd0948
--- /dev/null
+++ b/mcs/class/Mono.Security/Mono.Security.Interface/Alert.cs
@@ -0,0 +1,277 @@
+//
+// Alert.cs
+//
+// Author:
+//       Martin Baulig <martin.baulig@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc.
+//
+// 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;
+
+namespace Mono.Security.Interface
+{
+       #region Enumerations
+
+       public enum AlertLevel : byte
+       {
+               Warning = 1,
+               Fatal   = 2
+       }
+
+       public enum AlertDescription : byte
+       {
+               CloseNotify                     = 0,
+               UnexpectedMessage               = 10,
+               BadRecordMAC                    = 20,
+               DecryptionFailed_RESERVED       = 21,
+               RecordOverflow                  = 22,
+               DecompressionFailure            = 30,
+               HandshakeFailure                = 40,
+               NoCertificate_RESERVED          = 41,   // should be used in SSL3
+               BadCertificate                  = 42,
+               UnsupportedCertificate          = 43,
+               CertificateRevoked              = 44,
+               CertificateExpired              = 45,
+               CertificateUnknown              = 46,
+               IlegalParameter                 = 47,
+               UnknownCA                       = 48,
+               AccessDenied                    = 49,
+               DecodeError                     = 50,
+               DecryptError                    = 51,
+               ExportRestriction               = 60,
+               ProtocolVersion                 = 70,
+               InsuficientSecurity             = 71,
+               InternalError                   = 80,
+               UserCancelled                   = 90,
+               NoRenegotiation                 = 100,
+               UnsupportedExtension            = 110
+       }
+
+       #endregion
+       
+       public class Alert
+       {
+               #region Fields
+
+               private AlertLevel                      level;
+               private AlertDescription        description;
+
+               #endregion
+
+               #region Properties
+
+               public AlertLevel Level
+               {
+                       get { return this.level; }
+               }
+
+               public AlertDescription Description
+               {
+                       get { return this.description; }
+               }
+
+               public string Message
+               {
+                       get { return Alert.GetAlertMessage(this.description); }
+               }
+
+               public bool IsWarning
+               {
+                       get { return this.level == AlertLevel.Warning ? true : false; }
+               }
+
+               /*
+               public bool IsFatal
+               {
+                       get { return this.level == AlertLevel.Fatal ? true : false; }
+               }
+               */
+
+               public bool IsCloseNotify
+               {
+                       get
+                       {
+                               if (this.IsWarning &&
+                                       this.description == AlertDescription.CloseNotify)
+                               {
+                                       return true;
+                               }
+
+                               return false;
+                       }
+               }
+
+               #endregion
+
+               #region Constructors
+
+               public Alert(AlertDescription description)
+               {
+                       this.description = description;
+                       this.inferAlertLevel();
+               }
+
+               public Alert(
+                       AlertLevel                      level,
+                       AlertDescription        description)
+               {
+                       this.level                      = level;
+                       this.description        = description;
+               }
+
+               #endregion
+
+               #region Private Methods
+
+               private void inferAlertLevel()
+               {
+                       switch (description)
+                       {
+                               case AlertDescription.CloseNotify:
+                               case AlertDescription.NoRenegotiation:
+                               case AlertDescription.UserCancelled:
+                                       this.level = AlertLevel.Warning;
+                                       break;
+
+                               case AlertDescription.AccessDenied:
+                               case AlertDescription.BadCertificate:
+                               case AlertDescription.BadRecordMAC:
+                               case AlertDescription.CertificateExpired:
+                               case AlertDescription.CertificateRevoked:
+                               case AlertDescription.CertificateUnknown:
+                               case AlertDescription.DecodeError:
+                               case AlertDescription.DecompressionFailure:
+                               case AlertDescription.DecryptError:
+                               case AlertDescription.DecryptionFailed_RESERVED:
+                               case AlertDescription.ExportRestriction:
+                               case AlertDescription.HandshakeFailure:
+                               case AlertDescription.IlegalParameter:
+                               case AlertDescription.InsuficientSecurity:
+                               case AlertDescription.InternalError:
+                               case AlertDescription.ProtocolVersion:
+                               case AlertDescription.RecordOverflow:
+                               case AlertDescription.UnexpectedMessage:
+                               case AlertDescription.UnknownCA:
+                               case AlertDescription.UnsupportedCertificate:
+                               case AlertDescription.UnsupportedExtension:
+                               default:
+                                       this.level = AlertLevel.Fatal;
+                                       break;
+                       }
+               }
+               
+               #endregion
+
+               public override string ToString ()
+               {
+                       return string.Format ("[Alert: {0}:{1}]", Level, Description);
+               }
+
+               #region Static Methods
+
+               public static string GetAlertMessage(AlertDescription description)
+               {
+                       #if (DEBUG)
+                       switch (description)
+                       {
+                               case AlertDescription.AccessDenied:
+                                       return "An inappropriate message was received.";
+
+                               case AlertDescription.BadCertificate:
+                                       return "TLSCiphertext decrypted in an invalid way.";
+
+                               case AlertDescription.BadRecordMAC:
+                                       return "Record with an incorrect MAC.";
+
+                               case AlertDescription.CertificateExpired:
+                                       return "Certificate has expired or is not currently valid";
+
+                               case AlertDescription.CertificateRevoked:
+                                       return "Certificate was revoked by its signer.";
+                                       
+                               case AlertDescription.CertificateUnknown:
+                                       return "Certificate Unknown.";
+
+                               case AlertDescription.CloseNotify:
+                                       return "Connection closed";
+
+                               case AlertDescription.DecodeError:
+                                       return "A message could not be decoded because some field was out of the specified range or the length of the message was incorrect.";
+
+                               case AlertDescription.DecompressionFailure:
+                                       return "The decompression function received improper input (e.g. data that would expand to excessive length).";
+
+                               case AlertDescription.DecryptError:
+                                       return "TLSCiphertext decrypted in an invalid way: either it wasn`t an even multiple of the block length or its padding values, when checked, weren`t correct.";
+
+                               case AlertDescription.DecryptionFailed_RESERVED:
+                                       return "Handshake cryptographic operation failed, including being unable to correctly verify a signature, decrypt a key exchange, or validate finished message.";
+
+                               case AlertDescription.ExportRestriction:
+                                       return "Negotiation not in compliance with export restrictions was detected.";
+
+                               case AlertDescription.HandshakeFailure:
+                                       return "Unable to negotiate an acceptable set of security parameters given the options available.";
+
+                               case AlertDescription.IlegalParameter:
+                                       return "A field in the handshake was out of range or inconsistent with other fields.";
+                                       
+                               case AlertDescription.InsuficientSecurity:
+                                       return "Negotiation has failed specifically because the server requires ciphers more secure than those supported by the client.";
+                                       
+                               case AlertDescription.InternalError:
+                                       return "Internal error unrelated to the peer or the correctness of the protocol makes it impossible to continue.";
+
+                               case AlertDescription.NoRenegotiation:
+                                       return "Invalid renegotiation.";
+
+                               case AlertDescription.ProtocolVersion:
+                                       return "Unsupported protocol version.";
+
+                               case AlertDescription.RecordOverflow:
+                                       return "Invalid length on TLSCiphertext record or TLSCompressed record.";
+
+                               case AlertDescription.UnexpectedMessage:
+                                       return "Invalid message received.";
+
+                               case AlertDescription.UnknownCA:
+                                       return "CA can't be identified as a trusted CA.";
+
+                               case AlertDescription.UnsupportedCertificate:
+                                       return "Certificate was of an unsupported type.";
+
+                               case AlertDescription.UserCancelled:
+                                       return "Handshake cancelled by user.";
+
+                               case AlertDescription.UnsupportedExtension:
+                                       return "Unsupported extension.";
+
+                               default:
+                                       return "";
+                       }
+                       #else
+                       return "The authentication or decryption has failed.";
+                       #endif
+               }
+
+               #endregion
+       }
+}

diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/CipherAlgorithmType.cs b/mcs/class/Mono.Security/Mono.Security.Interface/CipherAlgorithmType.cs
new file mode 100644 (file)
index 0000000..4a54fa7
--- /dev/null
+++ b/mcs/class/Mono.Security/Mono.Security.Interface/CipherAlgorithmType.cs
@@ -0,0 +1,39 @@
+//
+// CipherAlgorithmType.cs
+//
+// Author:
+//       Martin Baulig <martin.baulig@xamarin.com>
+//
+// Copyright (c) 2015 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;
+
+namespace Mono.Security.Interface
+{
+       public enum CipherAlgorithmType
+       {
+               None,
+               Aes128,
+               Aes256,
+               AesGcm128,
+               AesGcm256
+       }
+}

diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/CipherSuiteCode.cs b/mcs/class/Mono.Security/Mono.Security.Interface/CipherSuiteCode.cs
new file mode 100644 (file)
index 0000000..66980df
--- /dev/null
+++ b/mcs/class/Mono.Security/Mono.Security.Interface/CipherSuiteCode.cs
@@ -0,0 +1,398 @@
+//
+// CipherSuiteCode.cs
+//
+// Author:
+//       Martin Baulig <martin.baulig@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc.
+//
+// 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;
+
+namespace Mono.Security.Interface
+{
+       /// <summary>
+       /// RFC 2246 A.5
+       /// </summary>
+       public enum CipherSuiteCode : ushort
+       {
+               TLS_NULL_WITH_NULL_NULL = 0x0000,
+               TLS_RSA_WITH_NULL_MD5 = 0x0001,
+               TLS_RSA_WITH_NULL_SHA = 0x0002,
+               TLS_RSA_EXPORT_WITH_RC4_40_MD5 = 0x0003,
+               TLS_RSA_WITH_RC4_128_MD5 = 0x0004,
+               TLS_RSA_WITH_RC4_128_SHA = 0x0005,
+               TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5 = 0x0006,
+               TLS_RSA_WITH_IDEA_CBC_SHA = 0x0007,
+               TLS_RSA_EXPORT_WITH_DES40_CBC_SHA = 0x0008,
+               TLS_RSA_WITH_DES_CBC_SHA = 0x0009,
+               TLS_RSA_WITH_3DES_EDE_CBC_SHA = 0x000A,
+               TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA = 0x000B,
+               TLS_DH_DSS_WITH_DES_CBC_SHA = 0x000C,
+               TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA = 0x000D,
+               TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA = 0x000E,
+               TLS_DH_RSA_WITH_DES_CBC_SHA = 0x000F,
+               TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA = 0x0010,
+               TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA = 0x0011,
+               TLS_DHE_DSS_WITH_DES_CBC_SHA = 0x0012,
+               TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA = 0x0013,
+               TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA = 0x0014,
+               TLS_DHE_RSA_WITH_DES_CBC_SHA = 0x0015,
+               TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA = 0x0016,
+               TLS_DH_anon_EXPORT_WITH_RC4_40_MD5 = 0x0017,
+               TLS_DH_anon_WITH_RC4_128_MD5 = 0x0018,
+               TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA = 0x0019,
+               TLS_DH_anon_WITH_DES_CBC_SHA = 0x001A,
+               TLS_DH_anon_WITH_3DES_EDE_CBC_SHA = 0x001B,
+
+               /*
+                * Note: The cipher suite values { 0x00, 0x1C } and { 0x00, 0x1D } are reserved to avoid
+                * collision with Fortezza-based cipher suites in SSL 3.
+               */
+
+               /*
+                * RFC 3268
+               */
+               TLS_RSA_WITH_AES_128_CBC_SHA = 0x002F,
+               TLS_DH_DSS_WITH_AES_128_CBC_SHA = 0x0030,
+               TLS_DH_RSA_WITH_AES_128_CBC_SHA = 0x0031,
+               TLS_DHE_DSS_WITH_AES_128_CBC_SHA = 0x0032,
+               TLS_DHE_RSA_WITH_AES_128_CBC_SHA = 0x0033,
+               TLS_DH_anon_WITH_AES_128_CBC_SHA = 0x0034,
+               TLS_RSA_WITH_AES_256_CBC_SHA = 0x0035,
+               TLS_DH_DSS_WITH_AES_256_CBC_SHA = 0x0036,
+               TLS_DH_RSA_WITH_AES_256_CBC_SHA = 0x0037,
+               TLS_DHE_DSS_WITH_AES_256_CBC_SHA = 0x0038,
+               TLS_DHE_RSA_WITH_AES_256_CBC_SHA = 0x0039,
+               TLS_DH_anon_WITH_AES_256_CBC_SHA = 0x003A,
+
+               /*
+                * RFC 5932
+               */
+               TLS_RSA_WITH_CAMELLIA_128_CBC_SHA = 0x0041,
+               TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA = 0x0042,
+               TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA = 0x0043,
+               TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA = 0x0044,
+               TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA = 0x0045,
+               TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA = 0x0046,
+
+               TLS_RSA_WITH_CAMELLIA_256_CBC_SHA = 0x0084,
+               TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA = 0x0085,
+               TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA = 0x0086,
+               TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA = 0x0087,
+               TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA = 0x0088,
+               TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA = 0x0089,
+
+               TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256 = 0x00BA,
+               TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256 = 0x00BB,
+               TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256 = 0x00BC,
+               TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256 = 0x00BD,
+               TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 = 0x00BE,
+               TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256 = 0x00BF,
+
+               TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C0,
+               TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C1,
+               TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C2,
+               TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C3,
+               TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C4,
+               TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C5,
+
+               /*
+                * RFC 4162
+               */
+               TLS_RSA_WITH_SEED_CBC_SHA = 0x0096,
+               TLS_DH_DSS_WITH_SEED_CBC_SHA = 0x0097,
+               TLS_DH_RSA_WITH_SEED_CBC_SHA = 0x0098,
+               TLS_DHE_DSS_WITH_SEED_CBC_SHA = 0x0099,
+               TLS_DHE_RSA_WITH_SEED_CBC_SHA = 0x009A,
+               TLS_DH_anon_WITH_SEED_CBC_SHA = 0x009B,
+
+               /*
+                * RFC 4279
+               */
+               TLS_PSK_WITH_RC4_128_SHA = 0x008A,
+               TLS_PSK_WITH_3DES_EDE_CBC_SHA = 0x008B,
+               TLS_PSK_WITH_AES_128_CBC_SHA = 0x008C,
+               TLS_PSK_WITH_AES_256_CBC_SHA = 0x008D,
+               TLS_DHE_PSK_WITH_RC4_128_SHA = 0x008E,
+               TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA = 0x008F,
+               TLS_DHE_PSK_WITH_AES_128_CBC_SHA = 0x0090,
+               TLS_DHE_PSK_WITH_AES_256_CBC_SHA = 0x0091,
+               TLS_RSA_PSK_WITH_RC4_128_SHA = 0x0092,
+               TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA = 0x0093,
+               TLS_RSA_PSK_WITH_AES_128_CBC_SHA = 0x0094,
+               TLS_RSA_PSK_WITH_AES_256_CBC_SHA = 0x0095,
+
+               /*
+                * RFC 4492
+               */
+               TLS_ECDH_ECDSA_WITH_NULL_SHA = 0xC001,
+               TLS_ECDH_ECDSA_WITH_RC4_128_SHA = 0xC002,
+               TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA = 0xC003,
+               TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA = 0xC004,
+               TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA = 0xC005,
+               TLS_ECDHE_ECDSA_WITH_NULL_SHA = 0xC006,
+               TLS_ECDHE_ECDSA_WITH_RC4_128_SHA = 0xC007,
+               TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA = 0xC008,
+               TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA = 0xC009,
+               TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA = 0xC00A,
+               TLS_ECDH_RSA_WITH_NULL_SHA = 0xC00B,
+               TLS_ECDH_RSA_WITH_RC4_128_SHA = 0xC00C,
+               TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA = 0xC00D,
+               TLS_ECDH_RSA_WITH_AES_128_CBC_SHA = 0xC00E,
+               TLS_ECDH_RSA_WITH_AES_256_CBC_SHA = 0xC00F,
+               TLS_ECDHE_RSA_WITH_NULL_SHA = 0xC010,
+               TLS_ECDHE_RSA_WITH_RC4_128_SHA = 0xC011,
+               TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA = 0xC012,
+               TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA = 0xC013,
+               TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA = 0xC014,
+               TLS_ECDH_anon_WITH_NULL_SHA = 0xC015,
+               TLS_ECDH_anon_WITH_RC4_128_SHA = 0xC016,
+               TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA = 0xC017,
+               TLS_ECDH_anon_WITH_AES_128_CBC_SHA = 0xC018,
+               TLS_ECDH_anon_WITH_AES_256_CBC_SHA = 0xC019,
+
+               /*
+                * RFC 4785
+               */
+               TLS_PSK_WITH_NULL_SHA = 0x002C,
+               TLS_DHE_PSK_WITH_NULL_SHA = 0x002D,
+               TLS_RSA_PSK_WITH_NULL_SHA = 0x002E,
+
+               /*
+                * RFC 5054
+               */
+               TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA = 0xC01A,
+               TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA = 0xC01B,
+               TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA = 0xC01C,
+               TLS_SRP_SHA_WITH_AES_128_CBC_SHA = 0xC01D,
+               TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA = 0xC01E,
+               TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA = 0xC01F,
+               TLS_SRP_SHA_WITH_AES_256_CBC_SHA = 0xC020,
+               TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA = 0xC021,
+               TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA = 0xC022,
+
+               /*
+                * RFC 5246
+               */
+               TLS_RSA_WITH_NULL_SHA256 = 0x003B,
+               TLS_RSA_WITH_AES_128_CBC_SHA256 = 0x003C,
+               TLS_RSA_WITH_AES_256_CBC_SHA256 = 0x003D,
+               TLS_DH_DSS_WITH_AES_128_CBC_SHA256 = 0x003E,
+               TLS_DH_RSA_WITH_AES_128_CBC_SHA256 = 0x003F,
+               TLS_DHE_DSS_WITH_AES_128_CBC_SHA256 = 0x0040,
+               TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 = 0x0067,
+               TLS_DH_DSS_WITH_AES_256_CBC_SHA256 = 0x0068,
+               TLS_DH_RSA_WITH_AES_256_CBC_SHA256 = 0x0069,
+               TLS_DHE_DSS_WITH_AES_256_CBC_SHA256 = 0x006A,
+               TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 = 0x006B,
+               TLS_DH_anon_WITH_AES_128_CBC_SHA256 = 0x006C,
+               TLS_DH_anon_WITH_AES_256_CBC_SHA256 = 0x006D,
+
+               /*
+                * RFC 5288
+               */
+               TLS_RSA_WITH_AES_128_GCM_SHA256 = 0x009C,
+               TLS_RSA_WITH_AES_256_GCM_SHA384 = 0x009D,
+               TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 = 0x009E,
+               TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 = 0x009F,
+               TLS_DH_RSA_WITH_AES_128_GCM_SHA256 = 0x00A0,
+               TLS_DH_RSA_WITH_AES_256_GCM_SHA384 = 0x00A1,
+               TLS_DHE_DSS_WITH_AES_128_GCM_SHA256 = 0x00A2,
+               TLS_DHE_DSS_WITH_AES_256_GCM_SHA384 = 0x00A3,
+               TLS_DH_DSS_WITH_AES_128_GCM_SHA256 = 0x00A4,
+               TLS_DH_DSS_WITH_AES_256_GCM_SHA384 = 0x00A5,
+               TLS_DH_anon_WITH_AES_128_GCM_SHA256 = 0x00A6,
+               TLS_DH_anon_WITH_AES_256_GCM_SHA384 = 0x00A7,
+
+               /*
+                * RFC 5289
+               */
+               TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 = 0xC023,
+               TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 = 0xC024,
+               TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256 = 0xC025,
+               TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384 = 0xC026,
+               TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 = 0xC027,
+               TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 = 0xC028,
+               TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256 = 0xC029,
+               TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384 = 0xC02A,
+               TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 = 0xC02B,
+               TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 = 0xC02C,
+               TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256 = 0xC02D,
+               TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384 = 0xC02E,
+               TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 = 0xC02F,
+               TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 = 0xC030,
+               TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256 = 0xC031,
+               TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384 = 0xC032,
+
+               /*
+                * RFC 5487
+               */
+               TLS_PSK_WITH_AES_128_GCM_SHA256 = 0x00A8,
+               TLS_PSK_WITH_AES_256_GCM_SHA384 = 0x00A9,
+               TLS_DHE_PSK_WITH_AES_128_GCM_SHA256 = 0x00AA,
+               TLS_DHE_PSK_WITH_AES_256_GCM_SHA384 = 0x00AB,
+               TLS_RSA_PSK_WITH_AES_128_GCM_SHA256 = 0x00AC,
+               TLS_RSA_PSK_WITH_AES_256_GCM_SHA384 = 0x00AD,
+               TLS_PSK_WITH_AES_128_CBC_SHA256 = 0x00AE,
+               TLS_PSK_WITH_AES_256_CBC_SHA384 = 0x00AF,
+               TLS_PSK_WITH_NULL_SHA256 = 0x00B0,
+               TLS_PSK_WITH_NULL_SHA384 = 0x00B1,
+               TLS_DHE_PSK_WITH_AES_128_CBC_SHA256 = 0x00B2,
+               TLS_DHE_PSK_WITH_AES_256_CBC_SHA384 = 0x00B3,
+               TLS_DHE_PSK_WITH_NULL_SHA256 = 0x00B4,
+               TLS_DHE_PSK_WITH_NULL_SHA384 = 0x00B5,
+               TLS_RSA_PSK_WITH_AES_128_CBC_SHA256 = 0x00B6,
+               TLS_RSA_PSK_WITH_AES_256_CBC_SHA384 = 0x00B7,
+               TLS_RSA_PSK_WITH_NULL_SHA256 = 0x00B8,
+               TLS_RSA_PSK_WITH_NULL_SHA384 = 0x00B9,
+
+               /*
+                * RFC 5489
+               */
+               TLS_ECDHE_PSK_WITH_RC4_128_SHA = 0xC033,
+               TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA = 0xC034,
+               TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA = 0xC035,
+               TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA = 0xC036,
+               TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256 = 0xC037,
+               TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384 = 0xC038,
+               TLS_ECDHE_PSK_WITH_NULL_SHA = 0xC039,
+               TLS_ECDHE_PSK_WITH_NULL_SHA256 = 0xC03A,
+               TLS_ECDHE_PSK_WITH_NULL_SHA384 = 0xC03B,
+
+               /*
+                * RFC 5746
+               */
+               TLS_EMPTY_RENEGOTIATION_INFO_SCSV = 0x00FF,
+
+               /*
+                * RFC 6367
+               */
+               TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 = 0xC072,
+               TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 = 0xC073,
+               TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 = 0xC074,
+               TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 = 0xC075,
+               TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 = 0xC076,
+               TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384 = 0xC077,
+               TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256 = 0xC078,
+               TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384 = 0xC079,
+
+               TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256 = 0xC07A,
+               TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384 = 0xC07B,
+               TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256 = 0xC07C,
+               TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384 = 0xC07D,
+               TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256 = 0xC07E,
+               TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384 = 0xC07F,
+               TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256 = 0xC080,
+               TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384 = 0xC081,
+               TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256 = 0xC082,
+               TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384 = 0xC083,
+               TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256 = 0xC084,
+               TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384 = 0xC085,
+               TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256 = 0xC086,
+               TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384 = 0xC087,
+               TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256 = 0xC088,
+               TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384 = 0xC089,
+               TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256 = 0xC08A,
+               TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384 = 0xC08B,
+               TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256 = 0xC08C,
+               TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384 = 0xC08D,
+
+               TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256 = 0xC08E,
+               TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384 = 0xC08F,
+               TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256 = 0xC090,
+               TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384 = 0xC091,
+               TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256 = 0xC092,
+               TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384 = 0xC093,
+               TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256 = 0xC094,
+               TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384 = 0xC095,
+               TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 = 0xC096,
+               TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 = 0xC097,
+               TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256 = 0xC098,
+               TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384 = 0xC099,
+               TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 = 0xC09A,
+               TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 = 0xC09B,
+
+               /*
+                * RFC 6655
+               */
+               TLS_RSA_WITH_AES_128_CCM = 0xC09C,
+               TLS_RSA_WITH_AES_256_CCM = 0xC09D,
+               TLS_DHE_RSA_WITH_AES_128_CCM = 0xC09E,
+               TLS_DHE_RSA_WITH_AES_256_CCM = 0xC09F,
+               TLS_RSA_WITH_AES_128_CCM_8 = 0xC0A0,
+               TLS_RSA_WITH_AES_256_CCM_8 = 0xC0A1,
+               TLS_DHE_RSA_WITH_AES_128_CCM_8 = 0xC0A2,
+               TLS_DHE_RSA_WITH_AES_256_CCM_8 = 0xC0A3,
+               TLS_PSK_WITH_AES_128_CCM = 0xC0A4,
+               TLS_PSK_WITH_AES_256_CCM = 0xC0A5,
+               TLS_DHE_PSK_WITH_AES_128_CCM = 0xC0A6,
+               TLS_DHE_PSK_WITH_AES_256_CCM = 0xC0A7,
+               TLS_PSK_WITH_AES_128_CCM_8 = 0xC0A8,
+               TLS_PSK_WITH_AES_256_CCM_8 = 0xC0A9,
+               TLS_PSK_DHE_WITH_AES_128_CCM_8 = 0xC0AA,
+               TLS_PSK_DHE_WITH_AES_256_CCM_8 = 0xC0AB,
+
+               /*
+                * draft-agl-tls-chacha20poly1305-04
+               */
+               TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 = 0xCC13,
+               TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 = 0xCC14,
+               TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256 = 0xCC15,
+
+               /*
+                * draft-josefsson-salsa20-tls-04
+               */
+               TLS_RSA_WITH_ESTREAM_SALSA20_SHA1 = 0xE410,
+               TLS_RSA_WITH_SALSA20_SHA1 = 0xE411,
+               TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1 = 0xE412,
+               TLS_ECDHE_RSA_WITH_SALSA20_SHA1 = 0xE413,
+               TLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_SHA1 = 0xE414,
+               TLS_ECDHE_ECDSA_WITH_SALSA20_SHA1 = 0xE415,
+               TLS_PSK_WITH_ESTREAM_SALSA20_SHA1 = 0xE416,
+               TLS_PSK_WITH_SALSA20_SHA1 = 0xE417,
+               TLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_SHA1 = 0xE418,
+               TLS_ECDHE_PSK_WITH_SALSA20_SHA1 = 0xE419,
+               TLS_RSA_PSK_WITH_ESTREAM_SALSA20_SHA1 = 0xE41A,
+               TLS_RSA_PSK_WITH_SALSA20_SHA1 = 0xE41B,
+               TLS_DHE_PSK_WITH_ESTREAM_SALSA20_SHA1 = 0xE41C,
+               TLS_DHE_PSK_WITH_SALSA20_SHA1 = 0xE41D,
+               TLS_DHE_RSA_WITH_ESTREAM_SALSA20_SHA1 = 0xE41E,
+               TLS_DHE_RSA_WITH_SALSA20_SHA1 = 0xE41F,
+
+               /*
+                * draft-ietf-tls-downgrade-scsv-00
+               */
+               TLS_FALLBACK_SCSV = 0x5600,
+
+               /*
+               public static bool IsScsv (int cipherSuite)
+               {
+                       switch (cipherSuite) {
+                       case TLS_EMPTY_RENEGOTIATION_INFO_SCSV:
+                       case TLS_FALLBACK_SCSV:
+                               return true,
+                       default:
+                               return false,
+                       }
+               }
+               */
+       }
+}

diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/ExchangeAlgorithmType.cs b/mcs/class/Mono.Security/Mono.Security.Interface/ExchangeAlgorithmType.cs
new file mode 100644 (file)
index 0000000..c7a70aa
--- /dev/null
+++ b/mcs/class/Mono.Security/Mono.Security.Interface/ExchangeAlgorithmType.cs
@@ -0,0 +1,38 @@
+//
+// ExchangeAlgorithmType.cs
+//
+// Author:
+//       Martin Baulig <martin.baulig@xamarin.com>
+//
+// Copyright (c) 2015 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;
+
+namespace Mono.Security.Interface
+{
+       public enum ExchangeAlgorithmType
+       {
+               None,
+               Dhe,
+               Rsa,
+               EcDhe
+       }
+}

diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/HashAlgorithmType.cs b/mcs/class/Mono.Security/Mono.Security.Interface/HashAlgorithmType.cs
new file mode 100644 (file)
index 0000000..549e0b6
--- /dev/null
+++ b/mcs/class/Mono.Security/Mono.Security.Interface/HashAlgorithmType.cs
@@ -0,0 +1,44 @@
+//
+// HashAlgorithmType.cs
+//
+// Author:
+//       Martin Baulig <martin.baulig@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc.
+//
+// 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.
+
+namespace Mono.Security.Interface
+{
+       public enum HashAlgorithmType
+       {
+               // These values refer to the @HashAlgorithm enumeration in the TLS 1.2 spec.
+               None    = 0,
+               Md5     = 1,
+               Sha1    = 2,
+               Sha224  = 3,
+               Sha256  = 4,
+               Sha384  = 5,
+               Sha512  = 6,
+               Unknown = 255,
+
+               // Mono-specific addition, allowing us to reuse it IHashAlgorithm API for TLS 1.0 / 1.1.
+               Md5Sha1 = 254
+       }
+}

diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/IMonoSslStream.cs b/mcs/class/Mono.Security/Mono.Security.Interface/IMonoSslStream.cs
new file mode 100644 (file)
index 0000000..ae7a929
--- /dev/null
+++ b/mcs/class/Mono.Security/Mono.Security.Interface/IMonoSslStream.cs
@@ -0,0 +1,188 @@
+//
+// IMonoSslStream.cs
+//
+// Author:
+//       Martin Baulig <martin.baulig@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc.
+//
+// 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.IO;
+using System.Net;
+using System.Net.Security;
+using System.Threading.Tasks;
+using SSA = System.Security.Authentication;
+using System.Security.Cryptography.X509Certificates;
+using System.Security.Principal;
+using System.Security.Cryptography;
+using Mono.Net.Security;
+
+namespace Mono.Security.Interface
+{
+       public interface IMonoSslStream : IDisposable
+       {
+               void AuthenticateAsClient (string targetHost);
+
+               void AuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
+
+               IAsyncResult BeginAuthenticateAsClient (string targetHost, AsyncCallback asyncCallback, object asyncState);
+
+               IAsyncResult BeginAuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState);
+
+               void EndAuthenticateAsClient (IAsyncResult asyncResult);
+
+               void AuthenticateAsServer (X509Certificate serverCertificate);
+
+               void AuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
+
+               IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, AsyncCallback asyncCallback, object asyncState);
+
+               IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState);
+
+               void EndAuthenticateAsServer (IAsyncResult asyncResult);
+
+               Task AuthenticateAsClientAsync (string targetHost);
+
+               Task AuthenticateAsClientAsync (string targetHost, X509CertificateCollection clientCertificates, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
+
+               Task AuthenticateAsServerAsync (X509Certificate serverCertificate);
+
+               Task AuthenticateAsServerAsync (X509Certificate serverCertificate, bool clientCertificateRequired, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
+
+               void Flush ();
+
+               int Read (byte[] buffer, int offset, int count);
+
+               void Write (byte[] buffer);
+
+               void Write (byte[] buffer, int offset, int count);
+
+               IAsyncResult BeginRead (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState);
+
+               int EndRead (IAsyncResult asyncResult);
+
+               IAsyncResult BeginWrite (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState);
+
+               void EndWrite (IAsyncResult asyncResult);
+
+               TransportContext TransportContext {
+                       get;
+               }
+
+               bool IsAuthenticated {
+                       get;
+               }
+
+               bool IsMutuallyAuthenticated {
+                       get;
+               }
+
+               bool IsEncrypted {
+                       get;
+               }
+
+               bool IsSigned {
+                       get;
+               }
+
+               bool IsServer {
+                       get;
+               }
+
+               SSA.CipherAlgorithmType CipherAlgorithm {
+                       get;
+               }
+
+               int CipherStrength {
+                       get;
+               }
+
+               SSA.HashAlgorithmType HashAlgorithm {
+                       get;
+               }
+
+               int HashStrength {
+                       get;
+               }
+
+               SSA.ExchangeAlgorithmType KeyExchangeAlgorithm {
+                       get;
+               }
+
+               int KeyExchangeStrength {
+                       get;
+               }
+
+               bool CanRead {
+                       get;
+               }
+
+               bool CanTimeout {
+                       get;
+               }
+
+               bool CanWrite {
+                       get;
+               }
+
+               long Length {
+                       get;
+               }
+
+               long Position {
+                       get;
+               }
+
+               void SetLength (long value);
+
+               AuthenticatedStream AuthenticatedStream {
+                       get;
+               }
+
+               int ReadTimeout {
+                       get; set;
+               }
+
+               int WriteTimeout {
+                       get; set;
+               }
+
+               bool CheckCertRevocationStatus {
+                       get;
+               }
+
+               X509Certificate InternalLocalCertificate {
+                       get;
+               }
+
+               X509Certificate LocalCertificate {
+                       get;
+               }
+
+               X509Certificate RemoteCertificate {
+                       get;
+               }
+
+               SSA.SslProtocols SslProtocol {
+                       get;
+               }
+       }
+}
+

diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/MonoSslStream.cs b/mcs/class/Mono.Security/Mono.Security.Interface/MonoSslStream.cs
deleted file mode 100644 (file)
index 48fc51b..0000000
--- a/mcs/class/Mono.Security/Mono.Security.Interface/MonoSslStream.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-//
-// MonoSslStream.cs
-//
-// Author:
-//       Martin Baulig <martin.baulig@xamarin.com>
-//
-// Copyright (c) 2015 Xamarin, Inc.
-//
-// 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.IO;
-using System.Net;
-using System.Net.Security;
-using System.Threading.Tasks;
-using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-using System.Security.Principal;
-using System.Security.Cryptography;
-using Mono.Net.Security;
-
-namespace Mono.Security.Interface
-{
-       public abstract class MonoSslStream : IDisposable
-       {
-               public abstract void AuthenticateAsClient (string targetHost);
-
-               public abstract void AuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
-
-               public abstract IAsyncResult BeginAuthenticateAsClient (string targetHost, AsyncCallback asyncCallback, object asyncState);
-
-               public abstract IAsyncResult BeginAuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState);
-
-               public abstract void EndAuthenticateAsClient (IAsyncResult asyncResult);
-
-               public abstract void AuthenticateAsServer (X509Certificate serverCertificate);
-
-               public abstract void AuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
-
-               public abstract IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, AsyncCallback asyncCallback, object asyncState);
-
-               public abstract IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, SslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState);
-
-               public abstract void EndAuthenticateAsServer (IAsyncResult asyncResult);
-
-               public abstract Task AuthenticateAsClientAsync (string targetHost);
-
-               public abstract Task AuthenticateAsClientAsync (string targetHost, X509CertificateCollection clientCertificates, SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
-
-               public abstract Task AuthenticateAsServerAsync (X509Certificate serverCertificate);
-
-               public abstract Task AuthenticateAsServerAsync (X509Certificate serverCertificate, bool clientCertificateRequired, SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
-
-               public abstract void Flush ();
-
-               public abstract int Read (byte[] buffer, int offset, int count);
-
-               public abstract void Write (byte[] buffer);
-
-               public abstract void Write (byte[] buffer, int offset, int count);
-
-               public abstract IAsyncResult BeginRead (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState);
-
-               public abstract int EndRead (IAsyncResult asyncResult);
-
-               public abstract IAsyncResult BeginWrite (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState);
-
-               public abstract void EndWrite (IAsyncResult asyncResult);
-
-               public abstract TransportContext TransportContext {
-                       get;
-               }
-
-               public abstract bool IsAuthenticated {
-                       get;
-               }
-
-               public abstract bool IsMutuallyAuthenticated {
-                       get;
-               }
-
-               public abstract bool IsEncrypted {
-                       get;
-               }
-
-               public abstract bool IsSigned {
-                       get;
-               }
-
-               public abstract bool IsServer {
-                       get;
-               }
-
-               public abstract CipherAlgorithmType CipherAlgorithm {
-                       get;
-               }
-
-               public abstract int CipherStrength {
-                       get;
-               }
-
-               public abstract HashAlgorithmType HashAlgorithm {
-                       get;
-               }
-
-               public abstract int HashStrength {
-                       get;
-               }
-
-               public abstract ExchangeAlgorithmType KeyExchangeAlgorithm {
-                       get;
-               }
-
-               public abstract int KeyExchangeStrength {
-                       get;
-               }
-
-               public abstract bool CanRead {
-                       get;
-               }
-
-               public abstract bool CanTimeout {
-                       get;
-               }
-
-               public abstract bool CanWrite {
-                       get;
-               }
-
-               public abstract long Length {
-                       get;
-               }
-
-               public abstract long Position {
-                       get;
-               }
-
-               public abstract void SetLength (long value);
-
-               public abstract AuthenticatedStream AuthenticatedStream {
-                       get;
-               }
-
-               public abstract int ReadTimeout {
-                       get; set;
-               }
-
-               public abstract int WriteTimeout {
-                       get; set;
-               }
-
-               public abstract bool CheckCertRevocationStatus {
-                       get;
-               }
-
-               public abstract X509Certificate InternalLocalCertificate {
-                       get;
-               }
-
-               public abstract X509Certificate LocalCertificate {
-                       get;
-               }
-
-               public abstract X509Certificate RemoteCertificate {
-                       get;
-               }
-
-               public abstract SslProtocols SslProtocol {
-                       get;
-               }
-
-               public void Dispose ()
-               {
-                       Dispose (true);
-                       GC.SuppressFinalize (this);
-               }
-
-               protected virtual void Dispose (bool disposing)
-               {
-               }
-
-               ~MonoSslStream ()
-               {
-                       Dispose (false);
-               }
-       }
-}
-

diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsConnectionInfo.cs b/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsConnectionInfo.cs
index 46501fb9b30f0b377bad0dc2ca409d31b080d1d6..4bc5f436f454b6bb8e2e7e1896524836ddcc728f 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsConnectionInfo.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsConnectionInfo.cs
@@ -24,20 +24,35 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
 
 namespace Mono.Security.Interface
 {
        public class MonoTlsConnectionInfo
        {
-               public short CipherSuiteCode {
+               public CipherSuiteCode CipherSuiteCode {
                        get; set;
                }
 
                public TlsProtocols ProtocolVersion {
                        get; set;
                }
+
+               public CipherAlgorithmType CipherAlgorithmType {
+                       get; set;
+               }
+
+               public HashAlgorithmType HashAlgorithmType {
+                       get; set;
+               }
+
+               public ExchangeAlgorithmType ExchangeAlgorithmType {
+                       get; set;
+               }
+
+               public override string ToString ()
+               {
+                       return string.Format ("[MonoTlsConnectionInfo: {0}:{1}]", ProtocolVersion, CipherSuiteCode);
+               }
        }
 }
 

diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsProvider.cs b/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsProvider.cs
index dc81e862f2f07690e90e5cc01af83cbf38bc2f27..b1daa60e1fc4fc0fc50fd763d440386c0aaa9252 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsProvider.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsProvider.cs
@@ -72,6 +72,14 @@ namespace Mono.Security.Interface
 
        public abstract class MonoTlsProvider
        {
+               public abstract Guid ID {
+                       get;
+               }
+
+               public abstract string Name {
+                       get;
+               }
+
 #region SslStream
 
                /*
@@ -96,10 +104,10 @@ namespace Mono.Security.Interface
                }
 
                /*
-                * Obtain a @MonoSslStream instance.
+                * Obtain a @IMonoSslStream instance.
                 *
                 */
-               public abstract MonoSslStream CreateSslStream (
+               public abstract IMonoSslStream CreateSslStream (
                        Stream innerStream, bool leaveInnerStreamOpen,
                        MonoTlsSettings settings = null);
 

diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs b/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs
index 802f78f0aa13f7234187b62875f61f8f88713c1c..afa21ff1debc4216ecd6357afe1c71e72e9706cf 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using System.Threading;
 using System.Security.Cryptography.X509Certificates;
 
 namespace Mono.Security.Interface
@@ -93,6 +94,24 @@ namespace Mono.Security.Interface
                {
                }
 
+               volatile static MonoTlsSettings defaultSettings;
+
+               public static MonoTlsSettings DefaultSettings {
+                       get {
+                               if (defaultSettings == null)
+                                       Interlocked.CompareExchange (ref defaultSettings, new MonoTlsSettings (), null);
+                               return defaultSettings;
+                       }
+                       set {
+                               defaultSettings = value ?? new MonoTlsSettings ();
+                       }
+               }
+
+               public static MonoTlsSettings CopyDefaultSettings ()
+               {
+                       return DefaultSettings.Clone ();
+               }
+
                #region Private APIs
 
                /*
@@ -120,6 +139,11 @@ namespace Mono.Security.Interface
                        return copy;
                }
 
+               public MonoTlsSettings Clone ()
+               {
+                       return new MonoTlsSettings (this);
+               }
+
                MonoTlsSettings (MonoTlsSettings other)
                {
                        RemoteCertificateValidationCallback = other.RemoteCertificateValidationCallback;

diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/TlsException.cs b/mcs/class/Mono.Security/Mono.Security.Interface/TlsException.cs
new file mode 100644 (file)
index 0000000..fabf4ee
--- /dev/null
+++ b/mcs/class/Mono.Security/Mono.Security.Interface/TlsException.cs
@@ -0,0 +1,84 @@
+//
+// TlsException.cs
+//
+// Author:
+//       Martin Baulig <martin.baulig@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc.
+//
+// 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.Text;
+using System.Runtime.Serialization;
+
+namespace Mono.Security.Interface
+{
+       public sealed class TlsException : Exception
+       {
+               #region Fields
+
+               private Alert alert;
+
+               #endregion
+
+               #region Properties
+
+               public Alert Alert {
+                       get { return this.alert; }
+               }
+
+               #endregion
+
+               #region Constructors
+
+               public TlsException (Alert alert)
+                       : this (alert, alert.Description.ToString())
+               {
+               }
+
+               public TlsException (Alert alert, string message)
+                       : base (message)
+               {
+                       this.alert = alert;
+               }
+
+               public TlsException (AlertLevel level, AlertDescription description)
+                       : this (new Alert (level, description))
+               {
+               }
+
+               public TlsException (AlertDescription description)
+                       : this (new Alert (description))
+               {
+               }
+
+               public TlsException (AlertDescription description, string message)
+                       : this (new Alert (description), message)
+               {
+               }
+
+               public TlsException (AlertDescription description, string format, params object[] args)
+                       : this (new Alert (description), string.Format (format, args))
+               {
+               }
+
+               #endregion
+       }
+}

diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/TlsProtocolCode.cs b/mcs/class/Mono.Security/Mono.Security.Interface/TlsProtocolCode.cs
new file mode 100644 (file)
index 0000000..e5a8e09
--- /dev/null
+++ b/mcs/class/Mono.Security/Mono.Security.Interface/TlsProtocolCode.cs
@@ -0,0 +1,38 @@
+//
+// TlsProtocolCode.cs
+//
+// Author:
+//       Martin Baulig <martin.baulig@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc.
+//
+// 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;
+
+namespace Mono.Security.Interface
+{
+       public enum TlsProtocolCode : short
+       {
+               Tls10 = 0x301,
+               Tls11 = 0x302,
+               Tls12 = 0x303
+       }
+}
+

diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/TlsProtocols.cs b/mcs/class/Mono.Security/Mono.Security.Interface/TlsProtocols.cs
index d3ef9d76b25900c4b2fd89a3d09bc9cd1f8f1c02..614a25a98ad283e373680db23901e40093ab40d6 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.Interface/TlsProtocols.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Interface/TlsProtocols.cs
@@ -1,3 +1,29 @@
+//
+// TlsProtocols.cs
+//
+// Author:
+//       Martin Baulig <martin.baulig@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc.
+//
+// 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;
 
 namespace Mono.Security.Interface

diff --git a/mcs/class/Mono.Security/Mono.Security.dll.sources b/mcs/class/Mono.Security/Mono.Security.dll.sources
index 3847d8d3ce3be0e52d1d762d84c759a8b9a19be8..7d6e4aaca19172150a6f2e8f4d3f3d4c8ed95aa7 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.dll.sources
+++ b/mcs/class/Mono.Security/Mono.Security.dll.sources
@@ -135,13 +135,20 @@
 ./Mono.Xml/MiniParser.cs
 ./Mono.Xml/SecurityParser.cs
 
+./Mono.Security.Interface/Alert.cs
 ./Mono.Security.Interface/CertificateValidationHelper.cs
+./Mono.Security.Interface/CipherAlgorithmType.cs
+./Mono.Security.Interface/CipherSuiteCode.cs
+./Mono.Security.Interface/ExchangeAlgorithmType.cs
+./Mono.Security.Interface/HashAlgorithmType.cs
 ./Mono.Security.Interface/IBufferOffsetSize.cs
 ./Mono.Security.Interface/IMonoTlsEventSink.cs
 ./Mono.Security.Interface/IMonoTlsContext.cs
-./Mono.Security.Interface/MonoSslStream.cs
+./Mono.Security.Interface/IMonoSslStream.cs
 ./Mono.Security.Interface/MonoTlsConnectionInfo.cs
 ./Mono.Security.Interface/MonoTlsProvider.cs
 ./Mono.Security.Interface/MonoTlsProviderFactory.cs
 ./Mono.Security.Interface/MonoTlsSettings.cs
+./Mono.Security.Interface/TlsException.cs
+./Mono.Security.Interface/TlsProtocolCode.cs
 ./Mono.Security.Interface/TlsProtocols.cs

diff --git a/mcs/class/Mono.Security/xammac_Mono.Security.dll.sources b/mcs/class/Mono.Security/xammac_Mono.Security.dll.sources
index c0e5f667dbb4ca0b47b385a50517ab07d0a83783..4c67ff62a13254be3c7d4442fdecc534db51fc09 100644 (file)
--- a/mcs/class/Mono.Security/xammac_Mono.Security.dll.sources
+++ b/mcs/class/Mono.Security/xammac_Mono.Security.dll.sources
@@ -1,11 +1,18 @@
 #include monotouch_Mono.Security.dll.sources
 
+./Mono.Security.Interface/Alert.cs
+./Mono.Security.Interface/CipherAlgorithmType.cs
+./Mono.Security.Interface/CipherSuiteCode.cs
+./Mono.Security.Interface/ExchangeAlgorithmType.cs
+./Mono.Security.Interface/HashAlgorithmType.cs
 ./Mono.Security.Interface/IBufferOffsetSize.cs
 ./Mono.Security.Interface/IMonoTlsEventSink.cs
 ./Mono.Security.Interface/IMonoTlsContext.cs
-./Mono.Security.Interface/MonoSslStream.cs
+./Mono.Security.Interface/IMonoSslStream.cs
 ./Mono.Security.Interface/MonoTlsConnectionInfo.cs
 ./Mono.Security.Interface/MonoTlsProvider.cs
 ./Mono.Security.Interface/MonoTlsProviderFactory.cs
 ./Mono.Security.Interface/MonoTlsSettings.cs
+./Mono.Security.Interface/TlsException.cs
+./Mono.Security.Interface/TlsProtocolCode.cs
 ./Mono.Security.Interface/TlsProtocols.cs

diff --git a/mcs/class/Mono.Simd/Mono.Simd-net_4_5.csproj b/mcs/class/Mono.Simd/Mono.Simd-net_4_5.csproj
deleted file mode 100644 (file)
index 267cff6..0000000
--- a/mcs/class/Mono.Simd/Mono.Simd-net_4_5.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DA829B50-E4EF-40B3-9156-F1CB488D1D73}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Simd</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Simd\AccelerationAttribute.cs" />\r
-    <Compile Include="Mono.Simd\AccelMode.cs" />\r
-    <Compile Include="Mono.Simd\ArrayExtensions.cs" />\r
-    <Compile Include="Mono.Simd\SimdRuntime.cs" />\r
-    <Compile Include="Mono.Simd\Vector16b.cs" />\r
-    <Compile Include="Mono.Simd\Vector16sb.cs" />\r
-    <Compile Include="Mono.Simd\Vector2d.cs" />\r
-    <Compile Include="Mono.Simd\Vector2l.cs" />\r
-    <Compile Include="Mono.Simd\Vector2ul.cs" />\r
-    <Compile Include="Mono.Simd\Vector4f.cs" />\r
-    <Compile Include="Mono.Simd\Vector4i.cs" />\r
-    <Compile Include="Mono.Simd\Vector4ui.cs" />\r
-    <Compile Include="Mono.Simd\Vector8s.cs" />\r
-    <Compile Include="Mono.Simd\Vector8us.cs" />\r
-    <Compile Include="Mono.Simd\VectorOperations.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_5.csproj b/mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_5.csproj
deleted file mode 100644 (file)
index 0f1cac0..0000000
--- a/mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_5.csproj
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{03182F0E-A8A9-42FE-B4BD-915B16DF8B16}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.Tasklets</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Tasklets\Continuation.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.WebBrowser/Mono.WebBrowser-net_4_5.csproj b/mcs/class/Mono.WebBrowser/Mono.WebBrowser-net_4_5.csproj
deleted file mode 100644 (file)
index 1ef082e..0000000
--- a/mcs/class/Mono.WebBrowser/Mono.WebBrowser-net_4_5.csproj
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1D660912-8164-4499-A2D7-A3B2FE742E17}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.WebBrowser</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Mozilla\AsciiString.cs" />\r
-    <Compile Include="Mono.Mozilla\Base.cs" />\r
-    <Compile Include="Mono.Mozilla\Callback.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Attribute.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\AttributeCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\ContentListener.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Document.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\DocumentEncoder.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\DocumentType.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\DOMImplementation.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\DOMObject.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Element.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\EventListener.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\History.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\HTMLElement.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\HTMLElementCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\NamedNodeMap.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Navigation.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Node.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\NodeList.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Stream.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Stylesheet.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\StylesheetList.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\Window.cs" />\r
-    <Compile Include="Mono.Mozilla\DOM\WindowCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\DocumentEncoderFlags.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\NodeType.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\nsIReadSegmentFun.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\nsITimerCallbackDelegate.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\nsIWriteSegmentFun.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\extras\Options.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessibilityService.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessible.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessibleDocument.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessibleRelation.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessibleRetrieval.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessNode.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIArray.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsICancelable.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIChannel.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIClassInfo.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDocCharset.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDocumentEncoder.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDocumentEncoderNodeFixup.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMAbstractView.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMAttr.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMBarProp.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCDATASection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCharacterData.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMComment.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCounter.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSPrimitiveValue.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSRule.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSRuleList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSStyleDeclaration.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSStyleSheet.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSValue.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocument.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentFragment.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentRange.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentStyle.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentType.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentView.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDOMImplementation.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDOMStringList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMEntityReference.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMEventListener.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMEventTarget.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLBodyElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLDocument.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLStyleElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMKeyEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMMediaList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMMouseEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNamedNodeMap.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNode.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNodeList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNSHTMLElement.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNSRange.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMProcessingInstruction.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMRange.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMRect.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMRGBColor.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMStyleSheet.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMStyleSheetList.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMText.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMUIEvent.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMViewCSS.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMWindow.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMWindowCollection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIErrorService.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIFile.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIHistoryEntry.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIInputStream.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIInterfaceRequestor.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIIOService.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsILoadGroup.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIObserver.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIOutputStream.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIPersistentProperties.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIPrefBranch.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIPrefService.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIProperties.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIProtocolHandler.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIRequest.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIRequestObserver.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsISelection.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIServiceManager.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsISHistory.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsISHistoryListener.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsISimpleEnumerator.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIStreamListener.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsITimer.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsITimerCallback.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIURI.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIURIContentListener.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWeakReference.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowser.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserChrome.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserChromeFocus.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserFocus.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserPersist.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserStream.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebNavigation.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebProgress.cs" />\r
-    <Compile Include="Mono.Mozilla\interfaces\nsIWebProgressListener.cs" />\r
-    <Compile Include="Mono.Mozilla\UniString.cs" />\r
-    <Compile Include="Mono.Mozilla\WebBrowser.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\EventArgs.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\EventHandlers.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IAttribute.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IAttributeCollection.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IDocument.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IDocumentType.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IDOMImplementation.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IElement.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IElementCollection.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IHistory.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IMediaList.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\INamedNodeMap.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\INavigation.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\INode.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\INodeList.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IStylesheet.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IStylesheetList.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IWindow.cs" />\r
-    <Compile Include="Mono.WebBrowser\DOM\IWindowCollection.cs" />\r
-    <Compile Include="Mono.WebBrowser\Exception.cs" />\r
-    <Compile Include="Mono.WebBrowser\IWebBrowser.cs" />\r
-    <Compile Include="Mono.WebBrowser\Manager.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_4_5.csproj b/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_4_5.csproj
deleted file mode 100644 (file)
index b1dbdd2..0000000
--- a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_4_5.csproj
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{73FB1B7E-09F9-4E7F-A63A-C407A93BCA59}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.XBuild.Tasks</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />\r
-    <Compile Include="..\Microsoft.Build.Utilities\Mono.XBuild.Utilities\MSBuildUtils.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks\LibraryPcFileCache.cs" />\r
-    <Compile Include="Mono.XBuild.Tasks\PcFileCache.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-tests-net_4_5.csproj b/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-tests-net_4_5.csproj
deleted file mode 100644 (file)
index d088f09..0000000
--- a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-tests-net_4_5.csproj
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2A967FCC-19E4-407D-9187-9D2126768B18}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.XBuild.Tasks-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Mono.XBuild.Tasks_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.XBuild.Tasks\PcFileCacheTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_4_5.csproj">\r
-      <Project>{73FB1B7E-09F9-4E7F-A63A-C407A93BCA59}</Project>\r
-      <Name>Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_5.csproj b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_5.csproj
deleted file mode 100644 (file)
index 21a258b..0000000
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_5.csproj
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E6070FFA-2CBA-4C24-99C1-63A4F5052821}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,612</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Novell.Directory.Ldap</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,612</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,612</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs.in" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Boolean.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Choice.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Decoder.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Encoder.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Enumerated.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Identifier.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Integer.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Length.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Null.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Numeric.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Object.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1OctetString.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Sequence.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1SequenceOf.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Set.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1SetOf.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Structured.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Tagged.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\LBERDecoder.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Asn1\LBEREncoder.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapEntryChangeControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapPersistSearchControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapSortControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapSortKey.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapSortResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapVirtualListControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Controls\LdapVirtualListResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\BaseEdirEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\BinderyObjectEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ChangeAddressEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ConnectionStateEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\DebugEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\DebugParameter.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\DSETimeStamp.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\EntryEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\GeneralDSEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ModuleStateEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\NetworkAddressEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ReferralAddress.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\SecurityEquivalenceEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ValueEventData.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventIntermediateResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventSource.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\EdirEventSpecifier.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\MonitorEventRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events.Edir\MonitorEventResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\BaseEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\DirectoryEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\DirectoryExceptionEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\LdapEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\LdapEventConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\LdapEventSource.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\PSearchEventSource.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\SearchReferralEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Events\SearchResultEventArgs.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\AbortPartitionOperationRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\AddReplicaRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\BackupRestoreConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ChangeReplicaTypeRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetBindDNRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetBindDNResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetEffectivePrivilegesRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetEffectivePrivilegesResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetReplicaInfoRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetReplicaInfoResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetReplicationFilterRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\GetReplicationFilterResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\LdapBackupRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\LdapBackupResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\LdapRestoreRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ListReplicasRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ListReplicasResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\MergePartitionsRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\NamingContextConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\PartitionEntryCountRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\PartitionEntryCountResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\PartitionSyncRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ReceiveAllUpdatesRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\RefreshLdapServerRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\RemoveOrphanPartitionRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\RemoveReplicaRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\ReplicationConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SchemaSyncRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SendAllUpdatesRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SetReplicationFilterRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SplitOrphanPartitionRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\SplitPartitionRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Extensions\TriggerBackgroundProcessRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAbandonRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAddRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAddResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAssertionValue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeDescription.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeDescriptionList.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeList.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeTypeAndValues.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeValue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAttributeValueAssertion.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcAuthenticationChoice.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcBindRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcBindResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcCompareRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcCompareResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcControls.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcDelRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcDelResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcExtendedRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcExtendedResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcFilter.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcIntermediateResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapMessage.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapOID.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapResult.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapString.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcLdapSuperDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcMatchingRuleAssertion.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcMatchingRuleId.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcMessageID.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcModifyDNRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcModifyDNResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcModifyRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcModifyResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcReferral.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcRelativeLdapDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSaslCredentials.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSearchRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSearchResultDone.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSearchResultEntry.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSearchResultReference.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcSubstringFilter.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Rfc2251\RfcUnbindRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ArrayEnumeration.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\AttributeQualifier.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\Base64.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\BindProperties.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\CharacterTypes.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\DN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\EnumeratedIterator.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ExceptionMessages.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ExtResponseFactory.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\IntermediateResponseFactory.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\RDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ReferralInfo.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ResourcesHandler.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\RespControlVector.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\RespExtensionSet.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\ResultCodeMessages.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\SchemaParser.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\SchemaTokenCreator.cs" />\r
-    <Compile Include="Novell.Directory.Ldap.Utilclass\TokenTypes.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\AssemblyInfo.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\AuthenticationTypes.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\Connection.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\InterThreadException.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAbandonRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAddRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAttribute.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAttributeSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAttributeSet.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAuthHandler.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapAuthProvider.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapBindHandler.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapBindRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapCompareAttrNames.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapCompareRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapConnection.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapConstraints.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapControl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDeleteRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDITContentRuleSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDITStructureRuleSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDN.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapDSConstants.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapEntry.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapException.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapExtendedOperation.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapExtendedRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapExtendedResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapIntermediateResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapLocalException.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapMatchingRuleSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapMatchingRuleUseSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapMessage.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapMessageQueue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapModification.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapModifyDNRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapModifyRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapNameFormSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapObjectClassSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapReferralException.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapReferralHandler.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapResponse.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapResponseQueue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSchemaElement.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchConstraints.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchQueue.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchResult.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchResultReference.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSearchResults.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapSyntaxSchema.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapUnbindRequest.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapUnsolicitedNotificationListener.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\LdapUrl.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\Message.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\MessageAgent.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\MessageVector.cs" />\r
-    <Compile Include="Novell.Directory.Ldap\SupportClass.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resources">\r
-      <LogicalName>ResultCodeMessages.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-tests-net_4_5.csproj b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 8c4f23a..0000000
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-tests-net_4_5.csproj
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{EE523013-EA6C-449D-B2F2-3414EDFB4406}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Novell.Directory.Ldap-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>Novell.Directory.Ldap_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\bug-436775_Test.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Novell.Directory.Ldap\Novell.Directory.Ldap-net_4_5.csproj">\r
-      <Project>{E6070FFA-2CBA-4C24-99C1-63A4F5052821}</Project>\r
-      <Name>Novell.Directory.Ldap\Novell.Directory.Ldap-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/PEAPI/PEAPI-net_4_5.csproj b/mcs/class/PEAPI/PEAPI-net_4_5.csproj
deleted file mode 100644 (file)
index 1af9fa8..0000000
--- a/mcs/class/PEAPI/PEAPI-net_4_5.csproj
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{127B367D-2E2C-4F7F-A13E-0F7307D96F2D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>PEAPI</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Code.cs" />\r
-    <Compile Include="Metadata.cs" />\r
-    <Compile Include="PEAPI.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_5.csproj b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_5.csproj
deleted file mode 100644 (file)
index 170672a..0000000
--- a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_5.csproj
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{71FBB832-7D96-4B79-A7F6-CCC43FE70291}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>RabbitMQ.Client.Apigen</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\client\api\AmqpTimestamp.cs" />\r
-    <Compile Include="..\client\api\IBasicConsumer.cs" />\r
-    <Compile Include="..\client\api\IBasicProperties.cs" />\r
-    <Compile Include="..\client\api\IContentHeader.cs" />\r
-    <Compile Include="..\client\api\IFileProperties.cs" />\r
-    <Compile Include="..\client\api\IModel.cs" />\r
-    <Compile Include="..\client\api\IStreamProperties.cs" />\r
-    <Compile Include="..\client\api\PublicationAddress.cs" />\r
-    <Compile Include="..\client\api\ShutdownEventArgs.cs" />\r
-    <Compile Include="..\client\api\ShutdownInitiator.cs" />\r
-    <Compile Include="..\client\events\BasicReturnEventArgs.cs" />\r
-    <Compile Include="..\client\events\BasicReturnEventHandler.cs" />\r
-    <Compile Include="..\client\events\CallbackExceptionEventArgs.cs" />\r
-    <Compile Include="..\client\events\CallbackExceptionEventHandler.cs" />\r
-    <Compile Include="..\client\events\ModelShutdownEventHandler.cs" />\r
-    <Compile Include="AmqpClass.cs" />\r
-    <Compile Include="AmqpEntity.cs" />\r
-    <Compile Include="AmqpField.cs" />\r
-    <Compile Include="AmqpMethod.cs" />\r
-    <Compile Include="Apigen.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_5.csproj b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_5.csproj
deleted file mode 100644 (file)
index 02d97be..0000000
--- a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_5.csproj
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{55AA0C89-63D9-438E-A139-3ED9F72AE295}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>RabbitMQ.Client</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\docs\specs\net_4_5-api-0-8.cs" />\r
-    <Compile Include="..\..\docs\specs\net_4_5-api-0-9.cs" />\r
-    <Compile Include="..\..\docs\specs\net_4_5-api-qpid-0-8.cs" />\r
-    <Compile Include="..\util\BlockingCell.cs" />\r
-    <Compile Include="..\util\DebugUtil.cs" />\r
-    <Compile Include="..\util\Either.cs" />\r
-    <Compile Include="..\util\IntAllocator.cs" />\r
-    <Compile Include="..\util\NetworkBinaryReader.cs" />\r
-    <Compile Include="..\util\NetworkBinaryWriter.cs" />\r
-    <Compile Include="..\util\Semaphore.cs" />\r
-    <Compile Include="..\util\SharedQueue.cs" />\r
-    <Compile Include="..\util\XmlUtil.cs" />\r
-    <Compile Include=".\api\AmqpTcpEndpoint.cs" />\r
-    <Compile Include=".\api\AmqpTimestamp.cs" />\r
-    <Compile Include=".\api\AmqpVersion.cs" />\r
-    <Compile Include=".\api\BinaryTableValue.cs" />\r
-    <Compile Include=".\api\ConnectionFactory.cs" />\r
-    <Compile Include=".\api\DefaultBasicConsumer.cs" />\r
-    <Compile Include=".\api\ExchangeType.cs" />\r
-    <Compile Include=".\api\IBasicConsumer.cs" />\r
-    <Compile Include=".\api\IBasicProperties.cs" />\r
-    <Compile Include=".\api\IConnection.cs" />\r
-    <Compile Include=".\api\IContentHeader.cs" />\r
-    <Compile Include=".\api\IFileProperties.cs" />\r
-    <Compile Include=".\api\IMethod.cs" />\r
-    <Compile Include=".\api\IModel.cs" />\r
-    <Compile Include=".\api\IProtocol.cs" />\r
-    <Compile Include=".\api\IStreamProperties.cs" />\r
-    <Compile Include=".\api\Protocols.cs" />\r
-    <Compile Include=".\api\PublicationAddress.cs" />\r
-    <Compile Include=".\api\QueueingBasicConsumer.cs" />\r
-    <Compile Include=".\api\ShutdownEventArgs.cs" />\r
-    <Compile Include=".\api\ShutdownInitiator.cs" />\r
-    <Compile Include=".\api\ShutdownReportEntry.cs" />\r
-    <Compile Include=".\api\SslHelper.cs" />\r
-    <Compile Include=".\api\SslOption.cs" />\r
-    <Compile Include=".\AssemblyInfo.cs" />\r
-    <Compile Include=".\content\BasicMessageBuilder.cs" />\r
-    <Compile Include=".\content\BasicMessageReader.cs" />\r
-    <Compile Include=".\content\BytesMessageBuilder.cs" />\r
-    <Compile Include=".\content\BytesMessageReader.cs" />\r
-    <Compile Include=".\content\BytesWireFormatting.cs" />\r
-    <Compile Include=".\content\IBytesMessageBuilder.cs" />\r
-    <Compile Include=".\content\IBytesMessageReader.cs" />\r
-    <Compile Include=".\content\IMapMessageBuilder.cs" />\r
-    <Compile Include=".\content\IMapMessageReader.cs" />\r
-    <Compile Include=".\content\IMessageBuilder.cs" />\r
-    <Compile Include=".\content\IMessageReader.cs" />\r
-    <Compile Include=".\content\IStreamMessageBuilder.cs" />\r
-    <Compile Include=".\content\IStreamMessageReader.cs" />\r
-    <Compile Include=".\content\MapMessageBuilder.cs" />\r
-    <Compile Include=".\content\MapMessageReader.cs" />\r
-    <Compile Include=".\content\MapWireFormatting.cs" />\r
-    <Compile Include=".\content\PrimitiveParser.cs" />\r
-    <Compile Include=".\content\StreamMessageBuilder.cs" />\r
-    <Compile Include=".\content\StreamMessageReader.cs" />\r
-    <Compile Include=".\content\StreamWireFormatting.cs" />\r
-    <Compile Include=".\events\BasicDeliverEventArgs.cs" />\r
-    <Compile Include=".\events\BasicDeliverEventHandler.cs" />\r
-    <Compile Include=".\events\BasicReturnEventArgs.cs" />\r
-    <Compile Include=".\events\BasicReturnEventHandler.cs" />\r
-    <Compile Include=".\events\CallbackExceptionEventArgs.cs" />\r
-    <Compile Include=".\events\CallbackExceptionEventHandler.cs" />\r
-    <Compile Include=".\events\ConnectionShutdownEventHandler.cs" />\r
-    <Compile Include=".\events\ConsumerEventArgs.cs" />\r
-    <Compile Include=".\events\ConsumerEventHandler.cs" />\r
-    <Compile Include=".\events\ConsumerShutdownEventHandler.cs" />\r
-    <Compile Include=".\events\EventingBasicConsumer.cs" />\r
-    <Compile Include=".\events\ModelShutdownEventHandler.cs" />\r
-    <Compile Include=".\exceptions\AlreadyClosedException.cs" />\r
-    <Compile Include=".\exceptions\BrokerUnreachableException.cs" />\r
-    <Compile Include=".\exceptions\ChannelAllocationException.cs" />\r
-    <Compile Include=".\exceptions\OperationInterruptedException.cs" />\r
-    <Compile Include=".\exceptions\PacketNotRecognizedException.cs" />\r
-    <Compile Include=".\exceptions\PossibleAuthenticationFailureException.cs" />\r
-    <Compile Include=".\exceptions\ProtocolVersionMismatchException.cs" />\r
-    <Compile Include=".\exceptions\UnexpectedMethodException.cs" />\r
-    <Compile Include=".\exceptions\UnsupportedMethodException.cs" />\r
-    <Compile Include=".\exceptions\UnsupportedMethodFieldException.cs" />\r
-    <Compile Include=".\exceptions\WireFormattingException.cs" />\r
-    <Compile Include=".\impl\AbstractProtocolBase.cs" />\r
-    <Compile Include=".\impl\BasicProperties.cs" />\r
-    <Compile Include=".\impl\ChannelErrorException.cs" />\r
-    <Compile Include=".\impl\Command.cs" />\r
-    <Compile Include=".\impl\CommandAssembler.cs" />\r
-    <Compile Include=".\impl\ConnectionBase.cs" />\r
-    <Compile Include=".\impl\ConnectionStartDetails.cs" />\r
-    <Compile Include=".\impl\ContentHeaderBase.cs" />\r
-    <Compile Include=".\impl\ContentHeaderPropertyReader.cs" />\r
-    <Compile Include=".\impl\ContentHeaderPropertyWriter.cs" />\r
-    <Compile Include=".\impl\FileProperties.cs" />\r
-    <Compile Include=".\impl\Frame.cs" />\r
-    <Compile Include=".\impl\HardProtocolException.cs" />\r
-    <Compile Include=".\impl\IFrameHandler.cs" />\r
-    <Compile Include=".\impl\IRpcContinuation.cs" />\r
-    <Compile Include=".\impl\ISession.cs" />\r
-    <Compile Include=".\impl\MainSession.cs" />\r
-    <Compile Include=".\impl\MalformedFrameException.cs" />\r
-    <Compile Include=".\impl\MethodArgumentReader.cs" />\r
-    <Compile Include=".\impl\MethodArgumentWriter.cs" />\r
-    <Compile Include=".\impl\MethodBase.cs" />\r
-    <Compile Include=".\impl\ModelBase.cs" />\r
-    <Compile Include=".\impl\ProtocolException.cs" />\r
-    <Compile Include=".\impl\QuiescingSession.cs" />\r
-    <Compile Include=".\impl\RedirectException.cs" />\r
-    <Compile Include=".\impl\RpcContinuationQueue.cs" />\r
-    <Compile Include=".\impl\Session.cs" />\r
-    <Compile Include=".\impl\SessionBase.cs" />\r
-    <Compile Include=".\impl\SessionManager.cs" />\r
-    <Compile Include=".\impl\ShutdownContinuation.cs" />\r
-    <Compile Include=".\impl\SimpleBlockingRpcContinuation.cs" />\r
-    <Compile Include=".\impl\SocketFrameHandler_0_9.cs" />\r
-    <Compile Include=".\impl\SoftProtocolException.cs" />\r
-    <Compile Include=".\impl\StreamProperties.cs" />\r
-    <Compile Include=".\impl\SyntaxError.cs" />\r
-    <Compile Include=".\impl\UnexpectedFrameException.cs" />\r
-    <Compile Include=".\impl\UnknownClassOrMethodException.cs" />\r
-    <Compile Include=".\impl\v0_8\Connection.cs" />\r
-    <Compile Include=".\impl\v0_8\ProtocolBase.cs" />\r
-    <Compile Include=".\impl\v0_8qpid\Connection.cs" />\r
-    <Compile Include=".\impl\v0_8qpid\ProtocolBase.cs" />\r
-    <Compile Include=".\impl\v0_9\Connection.cs" />\r
-    <Compile Include=".\impl\v0_9\ProtocolBase.cs" />\r
-    <Compile Include=".\impl\WireFormatting.cs" />\r
-    <Compile Include=".\messagepatterns\SimpleRpcClient.cs" />\r
-    <Compile Include=".\messagepatterns\SimpleRpcServer.cs" />\r
-    <Compile Include=".\messagepatterns\Subscription.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../../../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../../../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_5.csproj b/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_5.csproj
deleted file mode 100644 (file)
index 55921ab..0000000
--- a/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_5.csproj
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{81352E26-6AB7-4AA3-8FB1-28A476E82748}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,219,414</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ComponentModel.Composition</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,219,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;CLR40;USE_ECMA_KEY;FEATURE_REFLECTIONCONTEXT;FEATURE_REFLECTIONFILEIO;FEATURE_SERIALIZATION;FEATURE_SLIMLOCK</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,219,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;CLR40;USE_ECMA_KEY;FEATURE_REFLECTIONCONTEXT;FEATURE_REFLECTIONFILEIO;FEATURE_SERIALIZATION;FEATURE_SLIMLOCK</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="src\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="src\ComponentModel\ContractAdditions.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Assumes.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Assumes.InternalErrorException.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\AttributeServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\CollectionServices.CollectionOfObject.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\CollectionServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\EnumerableCardinality.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\WeakReferenceCollection.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\ContractServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\GenerationServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\LazyServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Lock.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Lock.Reader.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Lock.Writer.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\ReflectionInvoke.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\ReflectionServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Requires.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Runtime\Serialization\SerializationServices.cs" />\r
-    <Compile Include="src\ComponentModel\Microsoft\Internal\StringComparers.cs" />\r
-    <Compile Include="src\ComponentModel\PlatformWorkarounds.cs" />\r
-    <Compile Include="src\ComponentModel\Strings.Designer.cs" />\r
-    <Compile Include="src\ComponentModel\SuppressMessages.cs" />\r
-    <Compile Include="src\ComponentModel\SuppressMessagesBaselined.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModel\AttributedExportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModel\AttributedModelDiscovery.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModel\AttributedPartCreationInfo.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModelServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CatalogReflectionContextAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ChangeRejectedException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionContractMismatchException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionError.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionErrorDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionErrorId.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionExceptionDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionResult.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionResultOfT.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ConstraintServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ContractNameServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CreationPolicy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\CompositionTrace.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\CompositionTraceId.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\CompositionTraceSource.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\SilverlightTraceWriter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\TraceSourceTraceWriter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Diagnostics\TraceWriter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ErrorBuilder.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExceptionBuilder.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportCardinalityCheckResult.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportFactoryOfT.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportFactoryOfTTMetadata.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportLifetimeContextOfT.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportMetadataAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportServices.DisposableLazy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AggregateCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AggregateExportProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ApplicationCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AssemblyCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AssemblyCatalogDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AtomicComposition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AtomicCompositionExtensions.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogChangeProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogExport.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.FactoryExport.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.PartCreatorExport.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.ScopeFactoryExport.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.ScopeManager.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExtensions.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ComposablePartCatalogChangeEventArgs.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ComposablePartCatalogCollection.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ComposablePartExportProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionBatch.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionBatch.SingleExportComposablePart.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionConstants.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionContainer.CompositionServiceShim.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionContainer.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionLock.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionOptions.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionScopeDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionScopeDefinitionDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionService.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\DirectoryCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\DirectoryCatalog.DirectoryCatalogDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ExportProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ExportProvider.GetExportOverrides.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ExportsChangeEventArgs.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\FilteredCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\FilteredCatalog.DependenciesTraversal.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\FilteredCatalog.DependentsTraversal.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\FilteredCatalog.IComposablePartCatalogTraversal.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\FilteredCatalog.Traversal.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.EngineContext.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.PartManager.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.RecompositionManager.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportSourceImportDefinitionHelpers.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\INotifyComposablePartCatalogChanged.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ScopingExtensions.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\TypeCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\IAttributedImport.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ICompositionService.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportCardinalityMismatchException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportCardinalityMismatchExceptionDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportingConstructorAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportManyAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportSource.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\InheritedExportAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\IPartImportsSatisfiedNotification.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataAttributeAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataViewGenerator.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataViewImplementationAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataViewProvider.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartCreationPolicyAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartMetadataAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\PartNotDiscoverableAttribute.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePart.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePartCatalog.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePartCatalogDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePartDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePartException.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ComposablePartExceptionDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\CompositionElement.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\CompositionElementDebuggerProxy.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\CompositionElementExtensions.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ContractBasedImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\Export.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ExportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ExportedDelegate.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ICompositionElement.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ImportCardinality.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\IPartCreatorImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\PrimitivesServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\SerializableCompositionElement.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\DisposableReflectionComposablePart.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ExportfactoryCreator.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ExportfactoryCreator.LifetimeContext.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ExportingMember.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\GenericServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\GenericSpecializationPartCreationInfo.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportingItem.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportingMember.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportingParameter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportType.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\IReflectionPartCreationInfo.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\LazyMemberInfo.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\PartCreatorExportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\PartCreatorMemberImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\PartCreatorParameterImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePart.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionComposablePartDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionExtensions.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionField.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionItem.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionItemType.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionMember.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionMemberExportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionMemberImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionMethod.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionModelServices.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionParameter.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionParameterImportDefinition.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionProperty.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionType.cs" />\r
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionWritableMember.cs" />\r
-    <Compile Include="src\ComponentModel\System\LazyOfTTMetadata.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Microsoft.Internal.Strings.resources">\r
-      <LogicalName>Microsoft.Internal.Strings.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/DataAnnotationsResources.cs b/mcs/class/System.ComponentModel.DataAnnotations/DataAnnotationsResources.cs
index 2427cdd39ae7d12b1c09c8aae58a6a8c49818d2b..ed196f9e643cb60ec97a6aba8fa299b73fb69ced 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/DataAnnotationsResources.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/DataAnnotationsResources.cs
@@ -3,57 +3,57 @@ namespace System.ComponentModel.DataAnnotations.Resources
 static class DataAnnotationsResources
 {
        public const string ArgumentIsNullOrWhitespace = "The argument '{0}' cannot be null, empty or contain only white space.";
-       public const string AssociatedMetadataTypeTypeDescriptor_MetadataTypeContainsUnknownProperties = "AssociatedMetadataTypeTypeDescriptor_MetadataTypeContainsUnknownProperties";
-       public const string AttributeStore_Unknown_Property = "AttributeStore_Unknown_Property";
-       public const string Common_PropertyNotFound = "Common_PropertyNotFound";
+       public const string AssociatedMetadataTypeTypeDescriptor_MetadataTypeContainsUnknownProperties = "The associated metadata type for type '{0}' contains the following unknown properties or fields: {1}. Please make sure that the names of these members match the names of the properties on the main type.";
+       public const string AttributeStore_Unknown_Property = "The type '{0}' does not contain a public property named '{1}'.";
+       public const string Common_PropertyNotFound = "The property {0}.{1} could not be found.";
        public const string CompareAttribute_MustMatch = "'{0}' and '{1}' do not match.";
-       public const string CompareAttribute_UnknownProperty = "CompareAttribute_UnknownProperty";
-       public const string CreditCardAttribute_Invalid = "CreditCardAttribute_Invalid";
-       public const string CustomValidationAttribute_Method_Must_Return_ValidationResult = "CustomValidationAttribute_Method_Must_Return_ValidationResult";
-       public const string CustomValidationAttribute_Method_Not_Found = "CustomValidationAttribute_Method_Not_Found";
-       public const string CustomValidationAttribute_Method_Required = "CustomValidationAttribute_Method_Required";
-       public const string CustomValidationAttribute_Method_Signature = "CustomValidationAttribute_Method_Signature";
-       public const string CustomValidationAttribute_Type_Conversion_Failed = "CustomValidationAttribute_Type_Conversion_Failed";
-       public const string CustomValidationAttribute_Type_Must_Be_Public = "CustomValidationAttribute_Type_Must_Be_Public";
+       public const string CompareAttribute_UnknownProperty = "Could not find a property named {0}.";
+       public const string CreditCardAttribute_Invalid = "The {0} field is not a valid credit card number.";
+       public const string CustomValidationAttribute_Method_Must_Return_ValidationResult = "The CustomValidationAttribute method '{0}' in type '{1}' must return System.ComponentModel.DataAnnotations.ValidationResult.  Use System.ComponentModel.DataAnnotations.ValidationResult.Success to represent success.";
+       public const string CustomValidationAttribute_Method_Not_Found = "The CustomValidationAttribute method '{0}' does not exist in type '{1}' or is not public and static.";
+       public const string CustomValidationAttribute_Method_Required = "The CustomValidationAttribute.Method was not specified.";
+       public const string CustomValidationAttribute_Method_Signature = "The CustomValidationAttribute method '{0}' in type '{1}' must match the expected signature: public static ValidationResult {0}(object value, ValidationContext context).  The value can be strongly typed.  The ValidationContext parameter is optional.";
+       public const string CustomValidationAttribute_Type_Conversion_Failed = "Could not convert the value of type '{0}' to '{1}' as expected by method {2}.{3}.";
+       public const string CustomValidationAttribute_Type_Must_Be_Public = "The custom validation type '{0}' must be public.";
        public const string CustomValidationAttribute_ValidationError = "{0} is not valid.";
-       public const string CustomValidationAttribute_ValidatorType_Required = "CustomValidationAttribute_ValidatorType_Required";
-       public const string DataTypeAttribute_EmptyDataTypeString = "DataTypeAttribute_EmptyDataTypeString";
+       public const string CustomValidationAttribute_ValidatorType_Required = "The CustomValidationAttribute.ValidatorType was not specified.";
+       public const string DataTypeAttribute_EmptyDataTypeString = "The custom DataType string cannot be null or empty.";
        public const string DisplayAttribute_PropertyNotSet = "The {0} property has not been set.  Use the {1} method to get the value.";
-       public const string EmailAddressAttribute_Invalid = "The {0} field is not a valid email address";
-       public const string EnumDataTypeAttribute_TypeCannotBeNull = "EnumDataTypeAttribute_TypeCannotBeNull";
-       public const string EnumDataTypeAttribute_TypeNeedsToBeAnEnum = "EnumDataTypeAttribute_TypeNeedsToBeAnEnum";
-       public const string FileExtensionsAttribute_Invalid = "FileExtensionsAttribute_Invalid";
-       public const string LocalizableString_LocalizationFailed = "Cannot retrieve property '{0}' because localization failed. Type '{1}' is not public or does not contain a public static string property with the name '{2}'.";
+       public const string EmailAddressAttribute_Invalid = "The {0} field is not a valid e-mail address.";
+       public const string EnumDataTypeAttribute_TypeCannotBeNull = "The type provided for EnumDataTypeAttribute cannot be null.";
+       public const string EnumDataTypeAttribute_TypeNeedsToBeAnEnum = "The type '{0}' needs to represent an enumeration type.";
+       public const string FileExtensionsAttribute_Invalid = "The {0} field only accepts files with the following extensions: {1}";
+       public const string LocalizableString_LocalizationFailed = "Cannot retrieve property '{0}' because localization failed.  Type '{1}' is not public or does not contain a public static string property with the name '{2}'.";
        public const string MaxLengthAttribute_InvalidMaxLength = "MaxLengthAttribute must have a Length value that is greater than zero. Use MaxLength() without parameters to indicate that the string or array can have the maximum allowable length.";
        public const string MaxLengthAttribute_ValidationError = "The field {0} must be a string or array type with a maximum length of '{1}'.";
-       public const string MetadataTypeAttribute_TypeCannotBeNull = "MetadataTypeAttribute_TypeCannotBeNull";
+       public const string MetadataTypeAttribute_TypeCannotBeNull = "MetadataClassType cannot be null.";
        public const string MinLengthAttribute_InvalidMinLength = "MinLengthAttribute must have a Length value that is zero or greater.";
-       public const string MinLengthAttribute_ValidationError = "The field {0} must be a string or array type with a minimum length of '{1}'";
-       public const string PhoneAttribute_Invalid = "PhoneAttribute_Invalid";
-       public const string RangeAttribute_ArbitraryTypeNotIComparable = "RangeAttribute_ArbitraryTypeNotIComparable";
-       public const string RangeAttribute_MinGreaterThanMax = "RangeAttribute_MinGreaterThanMax";
-       public const string RangeAttribute_Must_Set_Min_And_Max = "RangeAttribute_Must_Set_Min_And_Max";
-       public const string RangeAttribute_Must_Set_Operand_Type = "RangeAttribute_Must_Set_Operand_Type";
+       public const string MinLengthAttribute_ValidationError = "The field {0} must be a string or array type with a minimum length of '{1}'.";
+       public const string PhoneAttribute_Invalid = "The {0} field is not a valid phone number.";
+       public const string RangeAttribute_ArbitraryTypeNotIComparable = "The type {0} must implement {1}.";
+       public const string RangeAttribute_MinGreaterThanMax = "The maximum value '{0}' must be greater than or equal to the minimum value '{1}'.";
+       public const string RangeAttribute_Must_Set_Min_And_Max = "The minimum and maximum values must be set.";
+       public const string RangeAttribute_Must_Set_Operand_Type = "The OperandType must be set when strings are used for minimum and maximum values.";
        public const string RangeAttribute_ValidationError = "The field {0} must be between {1} and {2}.";
-       public const string RegexAttribute_ValidationError = "The field {0} must match the regular expression {1}.";
+       public const string RegexAttribute_ValidationError = "The field {0} must match the regular expression '{1}'.";
        public const string RegularExpressionAttribute_Empty_Pattern = "The pattern must be set to a valid regular expression.";
        public const string RequiredAttribute_ValidationError = "The {0} field is required.";
-       public const string StringLengthAttribute_InvalidMaxLength = "StringLengthAttribute_InvalidMaxLength";
+       public const string StringLengthAttribute_InvalidMaxLength = "The maximum length must be a nonnegative integer.";
        public const string StringLengthAttribute_ValidationError = "The field {0} must be a string with a maximum length of {1}.";
-       public const string StringLengthAttribute_ValidationErrorIncludingMinimum = "StringLengthAttribute_ValidationErrorIncludingMinimum";
-       public const string UIHintImplementation_ControlParameterKeyIsNotAString = "UIHintImplementation_ControlParameterKeyIsNotAString";
-       public const string UIHintImplementation_ControlParameterKeyIsNull = "UIHintImplementation_ControlParameterKeyIsNull";
-       public const string UIHintImplementation_ControlParameterKeyOccursMoreThanOnce = "UIHintImplementation_ControlParameterKeyOccursMoreThanOnce";
-       public const string UIHintImplementation_NeedEvenNumberOfControlParameters = "UIHintImplementation_NeedEvenNumberOfControlParameters";
-       public const string UrlAttribute_Invalid = "UrlAttribute_Invalid";
-       public const string ValidationAttribute_Cannot_Set_ErrorMessage_And_Resource = "ValidationAttribute_Cannot_Set_ErrorMessage_And_Resource";
-       public const string ValidationAttribute_IsValid_NotImplemented = "ValidationAttribute_IsValid_NotImplemented";
-       public const string ValidationAttribute_NeedBothResourceTypeAndResourceName = "ValidationAttribute_NeedBothResourceTypeAndResourceName";
-       public const string ValidationAttribute_ResourcePropertyNotStringType = "ValidationAttribute_ResourcePropertyNotStringType";
-       public const string ValidationAttribute_ResourceTypeDoesNotHaveProperty = "ValidationAttribute_ResourceTypeDoesNotHaveProperty";
+       public const string StringLengthAttribute_ValidationErrorIncludingMinimum = "The field {0} must be a string with a minimum length of {2} and a maximum length of {1}.";
+       public const string UIHintImplementation_ControlParameterKeyIsNotAString = "The key parameter at position {0} with value '{1}' is not a string. Every key control parameter must be a string.";
+       public const string UIHintImplementation_ControlParameterKeyIsNull = "The key parameter at position {0} is null. Every key control parameter must be a string.";
+       public const string UIHintImplementation_ControlParameterKeyOccursMoreThanOnce = "The key parameter at position {0} with value '{1}' occurs more than once.";
+       public const string UIHintImplementation_NeedEvenNumberOfControlParameters = "The number of control parameters must be even.";
+       public const string UrlAttribute_Invalid = "The {0} field is not a valid fully-qualified http, https, or ftp URL.";
+       public const string ValidationAttribute_Cannot_Set_ErrorMessage_And_Resource = "Either ErrorMessageString or ErrorMessageResourceName must be set, but not both.";
+       public const string ValidationAttribute_IsValid_NotImplemented = "IsValid(object value) has not been implemented by this class.  The preferred entry point is GetValidationResult() and classes should override IsValid(object value, ValidationContext context).";
+       public const string ValidationAttribute_NeedBothResourceTypeAndResourceName = "Both ErrorMessageResourceType and ErrorMessageResourceName need to be set on this attribute.";
+       public const string ValidationAttribute_ResourcePropertyNotStringType = "The property '{0}' on resource type '{1}' is not a string type.";
+       public const string ValidationAttribute_ResourceTypeDoesNotHaveProperty = "The resource type '{0}' does not have an accessible static property named '{1}'.";
        public const string ValidationAttribute_ValidationError = "The field {0} is invalid.";
-       public const string ValidationContextServiceContainer_ItemAlreadyExists = "ValidationContextServiceContainer_ItemAlreadyExists";
-       public const string Validator_InstanceMustMatchValidationContextInstance = "Validator_InstanceMustMatchValidationContextInstance";
-       public const string Validator_Property_Value_Wrong_Type = "Validator_Property_Value_Wrong_Type";
+       public const string ValidationContextServiceContainer_ItemAlreadyExists = "A service of type '{0}' already exists in the container.";
+       public const string Validator_InstanceMustMatchValidationContextInstance = "The instance provided must match the ObjectInstance on the ValidationContext supplied.";
+       public const string Validator_Property_Value_Wrong_Type = "The value for property '{0}' must be of type '{1}'.";
 }
 }

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj
deleted file mode 100644 (file)
index ff8fad5..0000000
--- a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ComponentModel.DataAnnotations</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\AssociatedMetadataTypeTypeDescriptionProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\AssociatedMetadataTypeTypeDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\AssociationAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\BindableTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\CompareAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ConcurrencyCheckAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\CreditCardAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\CustomValidationAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DataType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DataTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DisplayAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DisplayColumnAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\DisplayFormatAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\EditableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\EmailAddressAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\EnumDataTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\FileExtensionsAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\FilterUIHintAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\IValidatableObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\KeyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\LocalizableString.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\MaxLengthAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\MetadataPropertyDescriptorWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\MetadataTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\MinLengthAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\PhoneAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\RangeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\RegularExpressionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\RequiredAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ScaffoldAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\ColumnAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\ComplexTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\DatabaseGeneratedAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\DatabaseGeneratedOption.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\ForeignKeyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\InversePropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\NotMappedAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Schema\TableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\StringLengthAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\TimestampAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\UIHintAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\UrlAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationAttributeStore.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\ValidationResult.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\Validator.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="DataAnnotationsResources.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-tests-net_4_5.csproj b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 30eddfa..0000000
--- a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-tests-net_4_5.csproj
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D3974636-0E65-4A2C-9FA8-118264995BC1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.ComponentModel.DataAnnotations-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ComponentModel.DataAnnotations_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web.DynamicData\Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\AssociatedMetadataTypeTypeDescriptionProviderTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\AssociationAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\CompareAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\CreditCardAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\CustomValidationAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\DisplayAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\EmailAddressAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\EnumDataTypeAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\FileExtensionsAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\FilterUIHintAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\PhoneAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\RangeAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\RegularExpressionAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\RequiredAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\StringLengthAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\UIHintAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\ValidationAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\ValidationContextTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\ValidationResultTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.DataAnnotations\ValidatorTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
-      <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.dll.sources b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.dll.sources
index 9bcea0403eb9d96f2ab0f339913116102381996e..ddebaf5f6d75f3244caf8c8ca8d6406fdae12c6e 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.dll.sources
+++ b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.dll.sources
@@ -1,5 +1,6 @@
 ../../build/common/Consts.cs
 Assembly/AssemblyInfo.cs
+../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/AppSettings.cs
 ../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/AssociatedMetadataTypeTypeDescriptionProvider.cs
 ../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/AssociatedMetadataTypeTypeDescriptor.cs
 ../../../external/referencesource/System.ComponentModel.DataAnnotations/DataAnnotations/AssociationAttribute.cs

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/DisplayAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/DisplayAttributeTest.cs
index c9db2ac448d8eb8128ab40e3dd2091149470f03c..5096568c1694125c55d16c42a3c31eeb1ba4c969 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/DisplayAttributeTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/DisplayAttributeTest.cs
@@ -70,7 +70,7 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
        public class DisplayAttributeTests
        {
                const string property_not_set_message = "The {0} property has not been set.  Use the Get{0} method to get the value.";
-               const string localization_failed_message = "Cannot retrieve property '{0}' because localization failed. Type '{1}' is not public or does not contain a public static string property with the name '{2}'.";
+               const string localization_failed_message = "Cannot retrieve property '{0}' because localization failed.  Type '{1}' is not public or does not contain a public static string property with the name '{2}'.";
        
                [Test]
                public void StringProperties_ReturnLiteralValues_Success()

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RegularExpressionAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RegularExpressionAttributeTest.cs
index 2462517cffa24875aad607175647b6923ef635c3..bb9852e1fc926e1801d541103b4a7772bf688fa3 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RegularExpressionAttributeTest.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/RegularExpressionAttributeTest.cs
@@ -56,7 +56,7 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                        var rea = new RegularExpressionAttributePoker (@"[A-Za-z]");
                        Assert.AreEqual (@"[A-Za-z]", rea.Pattern, "Patterns not saved correctly.");
                        Assert.AreEqual (null, rea.ErrorMessage, "Error message not null when not yet matched.");
-                       Assert.AreEqual ("The field {0} must match the regular expression {1}.", rea.GetErrorMessageString (), "Error message not valid.");
+                       Assert.AreEqual ("The field {0} must match the regular expression '{1}'.", rea.GetErrorMessageString (), "Error message not valid.");
                }
 
                [Test]
@@ -64,7 +64,7 @@ namespace MonoTests.System.ComponentModel.DataAnnotations
                {
                        var rea = new RegularExpressionAttributePoker (@"[A-Za-z]");
 
-                       Assert.AreEqual ("The field MyField must match the regular expression [A-Za-z].", 
+                       Assert.AreEqual ("The field MyField must match the regular expression '[A-Za-z]'.", 
                                rea.FormatErrorMessage ("MyField"), 
                                "Error message not correctly formatted.");
 

diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install-net_4_5.csproj b/mcs/class/System.Configuration.Install/System.Configuration.Install-net_4_5.csproj
deleted file mode 100644 (file)
index 270a0e2..0000000
--- a/mcs/class/System.Configuration.Install/System.Configuration.Install-net_4_5.csproj
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E6E1740E-37DD-487C-8947-F1C0612D4738}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Configuration.Install</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Configuration.Install\AssemblyInstaller.cs" />\r
-    <Compile Include="System.Configuration.Install\ComponentInstaller.cs" />\r
-    <Compile Include="System.Configuration.Install\IManagedInstaller.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallContext.cs" />\r
-    <Compile Include="System.Configuration.Install\Installer.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallerCollection.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallEventArgs.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallEventHandler.cs" />\r
-    <Compile Include="System.Configuration.Install\InstallException.cs" />\r
-    <Compile Include="System.Configuration.Install\ManagedInstallerClass.cs" />\r
-    <Compile Include="System.Configuration.Install\TransactedInstaller.cs" />\r
-    <Compile Include="System.Configuration.Install\UninstallAction.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Configuration/System.Configuration-net_4_5.csproj b/mcs/class/System.Configuration/System.Configuration-net_4_5.csproj
deleted file mode 100644 (file)
index 9b52ce2..0000000
--- a/mcs/class/System.Configuration/System.Configuration-net_4_5.csproj
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Configuration</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Configuration.Internal\DelegatingConfigHost.cs" />\r
-    <Compile Include="System.Configuration.Internal\IConfigErrorInfo.cs" />\r
-    <Compile Include="System.Configuration.Internal\IConfigSystem.cs" />\r
-    <Compile Include="System.Configuration.Internal\IConfigurationManagerHelper.cs" />\r
-    <Compile Include="System.Configuration.Internal\IConfigurationManagerInternal.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigClientHost.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigConfigurationFactory.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigHost.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigRecord.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigRoot.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigSettingsFactory.cs" />\r
-    <Compile Include="System.Configuration.Internal\IInternalConfigSystem.cs" />\r
-    <Compile Include="System.Configuration.Internal\InternalConfigEventArgs.cs" />\r
-    <Compile Include="System.Configuration.Internal\InternalConfigEventHandler.cs" />\r
-    <Compile Include="System.Configuration.Internal\StreamChangeCallback.cs" />\r
-    <Compile Include="System.Configuration.Provider\ProviderBase.cs" />\r
-    <Compile Include="System.Configuration.Provider\ProviderCollection.cs" />\r
-    <Compile Include="System.Configuration.Provider\ProviderException.cs" />\r
-    <Compile Include="System.Configuration\AppSettingsSection.cs" />\r
-    <Compile Include="System.Configuration\CallbackValidator.cs" />\r
-    <Compile Include="System.Configuration\CallbackValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\ClientConfigurationSystem.cs" />\r
-    <Compile Include="System.Configuration\CommaDelimitedStringCollection.cs" />\r
-    <Compile Include="System.Configuration\CommaDelimitedStringCollectionConverter.cs" />\r
-    <Compile Include="System.Configuration\ConfigHelper.cs" />\r
-    <Compile Include="System.Configuration\ConfigInfo.cs" />\r
-    <Compile Include="System.Configuration\Configuration.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationAllowDefinition.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationAllowExeDefinition.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationCollectionAttribute.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationConverterBase.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationElement.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationElementCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationElementCollectionType.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationElementProperty.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationErrorsException.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationFileMap.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationLocation.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationLocationCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationLockCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationManager.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPermission.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPermissionAttribute.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationProperty.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPropertyAttribute.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPropertyCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationPropertyOptions.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationRemoveElement.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSaveEventArgs.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSaveEventHandler.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSaveMode.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSectionCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSectionGroup.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSectionGroupCollection.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationUserLevel.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationValidatorBase.cs" />\r
-    <Compile Include="System.Configuration\ConfigXmlTextReader.cs" />\r
-    <Compile Include="System.Configuration\ConnectionStringSettings.cs" />\r
-    <Compile Include="System.Configuration\ConnectionStringSettingsCollection.cs" />\r
-    <Compile Include="System.Configuration\ConnectionStringsSection.cs" />\r
-    <Compile Include="System.Configuration\ContextInformation.cs" />\r
-    <Compile Include="System.Configuration\DefaultSection.cs" />\r
-    <Compile Include="System.Configuration\DefaultValidator.cs" />\r
-    <Compile Include="System.Configuration\DpapiProtectedConfigurationProvider.cs" />\r
-    <Compile Include="System.Configuration\ElementInformation.cs" />\r
-    <Compile Include="System.Configuration\ExeConfigurationFileMap.cs" />\r
-    <Compile Include="System.Configuration\ExeContext.cs" />\r
-    <Compile Include="System.Configuration\GenericEnumConverter.cs" />\r
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />\r
-    <Compile Include="System.Configuration\IgnoreSection.cs" />\r
-    <Compile Include="System.Configuration\InfiniteIntConverter.cs" />\r
-    <Compile Include="System.Configuration\InfiniteTimeSpanConverter.cs" />\r
-    <Compile Include="System.Configuration\IntegerValidator.cs" />\r
-    <Compile Include="System.Configuration\IntegerValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\InternalConfigurationFactory.cs" />\r
-    <Compile Include="System.Configuration\InternalConfigurationHost.cs" />\r
-    <Compile Include="System.Configuration\InternalConfigurationRoot.cs" />\r
-    <Compile Include="System.Configuration\KeyValueConfigurationCollection.cs" />\r
-    <Compile Include="System.Configuration\KeyValueConfigurationElement.cs" />\r
-    <Compile Include="System.Configuration\KeyValueInternalCollection.cs" />\r
-    <Compile Include="System.Configuration\LongValidator.cs" />\r
-    <Compile Include="System.Configuration\LongValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\NameValueConfigurationCollection.cs" />\r
-    <Compile Include="System.Configuration\NameValueConfigurationElement.cs" />\r
-    <Compile Include="System.Configuration\PositiveTimeSpanValidator.cs" />\r
-    <Compile Include="System.Configuration\PositiveTimeSpanValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\PropertyInformation.cs" />\r
-    <Compile Include="System.Configuration\PropertyInformationCollection.cs" />\r
-    <Compile Include="System.Configuration\PropertyValueOrigin.cs" />\r
-    <Compile Include="System.Configuration\ProtectedConfiguration.cs" />\r
-    <Compile Include="System.Configuration\ProtectedConfigurationProvider.cs" />\r
-    <Compile Include="System.Configuration\ProtectedConfigurationProviderCollection.cs" />\r
-    <Compile Include="System.Configuration\ProtectedConfigurationSection.cs" />\r
-    <Compile Include="System.Configuration\ProtectedProviderSettings.cs" />\r
-    <Compile Include="System.Configuration\ProviderSettings.cs" />\r
-    <Compile Include="System.Configuration\ProviderSettingsCollection.cs" />\r
-    <Compile Include="System.Configuration\RegexStringValidator.cs" />\r
-    <Compile Include="System.Configuration\RegexStringValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\RsaProtectedConfigurationProvider.cs" />\r
-    <Compile Include="System.Configuration\SectionGroupInfo.cs" />\r
-    <Compile Include="System.Configuration\SectionInfo.cs" />\r
-    <Compile Include="System.Configuration\SectionInformation.cs" />\r
-    <Compile Include="System.Configuration\StringValidator.cs" />\r
-    <Compile Include="System.Configuration\StringValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\SubclassTypeValidator.cs" />\r
-    <Compile Include="System.Configuration\SubclassTypeValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanMinutesConverter.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanMinutesOrInfiniteConverter.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanSecondsConverter.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanSecondsOrInfiniteConverter.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanValidator.cs" />\r
-    <Compile Include="System.Configuration\TimeSpanValidatorAttribute.cs" />\r
-    <Compile Include="System.Configuration\TypeNameConverter.cs" />\r
-    <Compile Include="System.Configuration\ValidatorCallback.cs" />\r
-    <Compile Include="System.Configuration\WhiteSpaceTrimStringConverter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-secxml-net_4_5.csproj">\r
-      <Project>{46F151F2-A422-4A1B-9D29-2E148CE73629}</Project>\r
-      <Name>System-secxml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-bare-net_4_5.csproj">\r
-      <Project>{21FB091E-0F84-479E-AB16-6503D36852F9}</Project>\r
-      <Name>System.Xml-bare-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Security/System.Security-net_4_5.csproj">\r
-      <Project>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</Project>\r
-      <Name>System.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Configuration/System.Configuration-tests-net_4_5.csproj b/mcs/class/System.Configuration/System.Configuration-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 2ff30cc..0000000
--- a/mcs/class/System.Configuration/System.Configuration-tests-net_4_5.csproj
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9A11832B-834C-4518-98E3-0E301CAD589D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.Configuration-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Configuration_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Configuration.Provider\ProviderBaseTest.cs" />\r
-    <Compile Include="Test\System.Configuration.Provider\ProviderCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\AppSettingsSectionTest.cs" />
-    <Compile Include="Test\System.Configuration\CallbackValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\CommaDelimitedStringCollectionConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\CommaDelimitedStringCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationElementTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationErrorsExceptionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationLockCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationManagerTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationPermissionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationPropertyTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationSaveTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationSectionGroupTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationSectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConnectionStringSettingsTest.cs" />\r
-    <Compile Include="Test\System.Configuration\DefaultValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ExeConfigurationFileMapTest.cs" />\r
-    <Compile Include="Test\System.Configuration\GenericEnumConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\InfiniteIntConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\InfiniteTimeSpanConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\IntegerValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\KeyValueConfigurationCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\KeyValueConfigurationElementTest.cs" />\r
-    <Compile Include="Test\System.Configuration\LongValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\PositiveTimeSpanValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\RegexStringValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\StringValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SubclassTypeValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanMinutesConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanMinutesOrInfiniteConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanSecondsConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanSecondsOrInfiniteConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TimeSpanValidatorTest.cs" />\r
-    <Compile Include="Test\System.Configuration\TypeNameConverterTest.cs" />\r
-    <Compile Include="Test\System.Configuration\WhiteSpaceTrimStringConverterTest.cs" />\r
-    <Compile Include="Test\Util\TestLabel.cs" />\r
-    <Compile Include="Test\Util\TestUtil.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-1.csproj">\r
-      <Project>{6822DF7D-F859-4F02-9946-F138AA756A0E}</Project>\r
-      <Name>System\System-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_4_5.csproj">\r
-      <Project>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</Project>\r
-      <Name>System.Security\System.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Core/ReferenceSources/SR.cs b/mcs/class/System.Core/ReferenceSources/SR.cs
index c52050141f7f7d6a3b8e8200fdd77ff4d93adf22..e38c5a16763b02e76ff18ecd7a5fbf31751d7614 100644 (file)
--- a/mcs/class/System.Core/ReferenceSources/SR.cs
+++ b/mcs/class/System.Core/ReferenceSources/SR.cs
@@ -100,8 +100,10 @@ partial class SR
        public const string Cryptography_UnknownEllipticCurve = "Cryptography_UnknownEllipticCurve";
        public const string Cryptography_UnknownEllipticCurveAlgorithm = "Cryptography_UnknownEllipticCurveAlgorithm";
        public const string Cryptography_UnknownPaddingMode = "Cryptography_UnknownPaddingMode";
+       public const string Cryptography_HashAlgorithmNameNullOrEmpty = "Cryptography_HashAlgorithmNameNullOrEmpty";
 
        public const string InvalidOperation_ViewIsNull = "InvalidOperation_ViewIsNull";
        public const string ObjectDisposed_ViewAccessorClosed = "ObjectDisposed_ViewAccessorClosed";
        public const string NotSupported_MMViewStreamsFixedLength = "NotSupported_MMViewStreamsFixedLength";
+       public const string NotSupported_SubclassOverride = "NotSupported_SubclassOverride";
 }

diff --git a/mcs/class/System.Core/System.Core-net_4_5.csproj b/mcs/class/System.Core/System.Core-net_4_5.csproj
deleted file mode 100644 (file)
index 2b21409..0000000
--- a/mcs/class/System.Core/System.Core-net_4_5.csproj
+++ /dev/null
@@ -1,407 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Core</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;FEATURE_PAL;PFX_LEGACY_3_5;FEATURE_NETCORE;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;FEATURE_PAL;PFX_LEGACY_3_5;FEATURE_NETCORE;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\DynamicExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\ExpressionVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Action.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Extension.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Function.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\StrongBox.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\BitHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\HashSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\HashSetDebugView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\HashSetEqualityComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\FuncAndAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\InvalidTimeZoneException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\Enums.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\MemoryMappedFiles\Enums.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedFileSecurity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Enumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Expressions\ExpressionVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\IQueryable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Channels\AsynchronousChannel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Channels\SynchronousChannel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\AggregationMinMaxHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\EmptyEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\EnumerableWrapperWeakToStrong.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\IParallelPartitionable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\OrderedParallelQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\ParallelEnumerableWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\ParallelQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\QueryAggregationOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\RangeEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\RepeatEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\ArrayMergeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\AsynchronousChannelMergeEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\DefaultMergeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\IMergeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\MergeEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\MergeExecutor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\OrderPreservingMergeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\OrderPreservingPipeliningMergeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\SynchronousChannelMergeEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\HashRepartitionEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\HashRepartitionStream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\IPartitionedStreamRecipient.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\OrderedHashRepartitionEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\OrderedHashRepartitionStream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\PartitionedDataSource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\PartitionedStream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\UnorderedHashRepartitionStream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\AssociativeAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\ExceptQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\GroupJoinQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\HashJoinQueryOperatorEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\IntersectQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\JoinQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\UnionQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\ZipQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\BinaryQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\CountAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\InlinedAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\InlinedAggregationOperatorEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongCountAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\ListQueryResults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Options\OrderingQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Options\QueryExecutionOption.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\OrdinalIndexState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\PartitionedStreamMerger.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\PartitionerQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOpeningEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOperatorEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryResults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QuerySettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\ScanQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\AnyAllSearchOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ConcatQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ContainsSearchOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\DefaultIfEmptyQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\DistinctQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ElementAtQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\FirstQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ForAllOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\GroupByQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\IndexedSelectQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\IndexedWhereQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\LastQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ReverseQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SelectManyQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SelectQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SingleQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SortQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\TakeOrSkipQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\TakeOrSkipWhileQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\WhereQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\UnaryQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\CancellationState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\OrderPreservingPipeliningSpoolingTask.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\OrderPreservingSpoolingTask.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryLifecycle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryTask.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryTaskGroupState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\Scheduling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\SpoolingTask.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\SpoolingTaskBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\CancellableEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ExceptionAggregator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ExchangeUtilities.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\FixedMaxHeap.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\GrowingArray.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\HashLookup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\IntValueEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ListChunk.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Lookup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Pair.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\PairComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ReverseComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Shared.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Sorting.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\TraceHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Util.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Wrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\WrapperEqualityComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\ParallelEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\ParallelExecutionMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\ParallelMergeOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\SequenceQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\TypeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Runtime\CompilerServices\DynamicAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Runtime\CompilerServices\ExecutionScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\Aes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\AesManaged.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\threading\ReaderWriterLockSlim\LockRecursionException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\threading\ReaderWriterLockSlim\ReaderWriterLockSlim.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\threading\Tasks\TaskExtensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\TimeZoneInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\TimeZoneNotFoundException.cs" />\r
-    <Compile Include="..\..\build\common\SR.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BinaryOperationBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BindingRestrictions.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallInfo.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSite.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteHelpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteOps.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ConvertBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CreateInstanceBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DeleteIndexBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DeleteMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicMetaObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicMetaObjectBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ExpandoClass.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ExpandoObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\GetIndexBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\GetMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\IDynamicMetaObjectProvider.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\IInvokeOnGetBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\InvokeBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\InvokeMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\RuleCache.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\SetIndexBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\SetMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\UnaryOperationBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\UpdateDelegates.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\BinaryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\BlockExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\CatchBlock.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ConditionalExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ConstantExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DebugInfoExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DebugViewWriter.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DefaultExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ElementInit.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\Expression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\Expression.DebuggerProxy.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionStringBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionType.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\GotoExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IArgumentProvider.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IndexExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\InvocationExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LabelExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LabelTarget.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LambdaExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ListArgumentProvider.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ListInitExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LoopExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberAssignment.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberBinding.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberInitExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberListBinding.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberMemberBinding.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MethodCallExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\NewArrayExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\NewExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ParameterExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\RuntimeVariablesExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SwitchCase.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SwitchExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SymbolDocumentInfo.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TypeBinaryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TypeUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\UnaryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\AnalyzedTree.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\AssemblyGen.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\BoundConstants.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\Closure.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\CompilerScope.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\CompilerScope.Storage.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ConstantCheck.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DebugInfoGenerator.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DelegateHelpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DelegateHelpers.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ExpressionQuoter.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\HoistedLocals.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ILGen.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\KeyedQueue.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LabelInfo.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Address.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Binary.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.ControlFlow.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Expressions.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Lambda.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Logical.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Statements.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Unary.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\OffsetTrackingILGenerator.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\RuntimeVariableList.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\Set.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Bindings.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Temps.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\SymbolDocumentGenerator.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\SymbolGuids.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\VariableBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\CacheDict.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\CollectionExtensions.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ContractUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ExceptionFactory.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\Helpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\IRuntimeVariables.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReadOnlyCollectionBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReadOnlyDictionary.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReferenceEqualityComparer.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReflectionUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TrueReadOnlyCollection.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TypeExtensions.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedFileHandle.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedViewHandle.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafePipeHandle.cs" />\r
-    <Compile Include="ReferenceSources\Error.cs" />\r
-    <Compile Include="ReferenceSources\SR.cs" />\r
-    <Compile Include="ReferenceSources\Strings.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFile.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedViewAccessor.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedViewStream.cs" />\r
-    <Compile Include="System.IO.Pipes\AnonymousPipeClientStream.cs" />\r
-    <Compile Include="System.IO.Pipes\AnonymousPipeServerStream.cs" />\r
-    <Compile Include="System.IO.Pipes\NamedPipeClientStream.cs" />\r
-    <Compile Include="System.IO.Pipes\NamedPipeServerStream.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAccessRights.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAccessRule.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAuditRule.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeDirection.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeInterfaces.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeOptions.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeSecurity.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeStream.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeStreamImpersonationWorker.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeTransmissionMode.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeUnix.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeWin32.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography\CngAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\CngAlgorithmGroup.cs" />\r
-    <Compile Include="System.Security.Cryptography\MD5Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512CryptoServiceProvider.cs" />\r
-    <Compile Include="System\Util.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Posix/Mono.Posix-net_4_5.csproj">\r
-      <Project>{85A9B29B-58FF-4FBE-8998-B0A89AC22880}</Project>\r
-      <Name>Mono.Posix-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Core/System.Core-net_4_x.csproj b/mcs/class/System.Core/System.Core-net_4_x.csproj
index 27c7975c9a94592ec5a1c5f9c62383a6287a82e3..f789945f01b6cdcb57bf03b6bf45c348d10f3588 100644 (file)
--- a/mcs/class/System.Core/System.Core-net_4_x.csproj
+++ b/mcs/class/System.Core/System.Core-net_4_x.csproj
@@ -47,6 +47,8 @@
   <ItemGroup>\r
     <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\DynamicExpression.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\ExpressionVisitor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\IArgumentProvider.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\IDynamicExpression.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Action.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Extension.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Function.cs" />\r
@@ -257,7 +259,6 @@
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionStringBuilder.cs" />\r
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionType.cs" />\r
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\GotoExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IArgumentProvider.cs" />\r
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IndexExpression.cs" />\r
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\InvocationExpression.cs" />\r
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LabelExpression.cs" />\r

diff --git a/mcs/class/System.Core/System.Core-plaincore-net_4_5.csproj b/mcs/class/System.Core/System.Core-plaincore-net_4_5.csproj
deleted file mode 100644 (file)
index fb9f148..0000000
--- a/mcs/class/System.Core/System.Core-plaincore-net_4_5.csproj
+++ /dev/null
@@ -1,407 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{7503D2B9-9ABB-451B-9193-08223A29603F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5/plaincore</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Core</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;FEATURE_PAL;PFX_LEGACY_3_5;FEATURE_NETCORE;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;FEATURE_PAL;PFX_LEGACY_3_5;FEATURE_NETCORE;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\DynamicExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\ExpressionVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Action.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Extension.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Function.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\StrongBox.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\BitHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\HashSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\HashSetDebugView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Collections\Generic\HashSetEqualityComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\FuncAndAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\InvalidTimeZoneException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\Enums.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\MemoryMappedFiles\Enums.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedFileSecurity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Enumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Expressions\ExpressionVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\IQueryable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Channels\AsynchronousChannel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Channels\SynchronousChannel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\AggregationMinMaxHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\EmptyEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\EnumerableWrapperWeakToStrong.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\IParallelPartitionable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\OrderedParallelQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\ParallelEnumerableWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\ParallelQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\QueryAggregationOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\RangeEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Enumerables\RepeatEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\ArrayMergeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\AsynchronousChannelMergeEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\DefaultMergeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\IMergeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\MergeEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\MergeExecutor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\OrderPreservingMergeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\OrderPreservingPipeliningMergeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Merging\SynchronousChannelMergeEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\HashRepartitionEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\HashRepartitionStream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\IPartitionedStreamRecipient.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\OrderedHashRepartitionEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\OrderedHashRepartitionStream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\PartitionedDataSource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\PartitionedStream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Partitioning\UnorderedHashRepartitionStream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\AssociativeAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\ExceptQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\GroupJoinQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\HashJoinQueryOperatorEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\IntersectQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\JoinQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\UnionQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Binary\ZipQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\BinaryQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\CountAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DecimalSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\DoubleSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\FloatSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\InlinedAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\InlinedAggregationOperatorEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\IntSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongCountAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\LongSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDecimalSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableDoubleSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableFloatSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableIntSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongAverageAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongMinMaxAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Inlined\NullableLongSumAggregationOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\ListQueryResults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Options\OrderingQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Options\QueryExecutionOption.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\OrdinalIndexState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\PartitionedStreamMerger.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\PartitionerQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOpeningEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryOperatorEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QueryResults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\QuerySettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\ScanQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\AnyAllSearchOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ConcatQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ContainsSearchOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\DefaultIfEmptyQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\DistinctQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ElementAtQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\FirstQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ForAllOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\GroupByQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\IndexedSelectQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\IndexedWhereQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\LastQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\ReverseQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SelectManyQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SelectQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SingleQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\SortQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\TakeOrSkipQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\TakeOrSkipWhileQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\Unary\WhereQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\QueryOperators\UnaryQueryOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\CancellationState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\OrderPreservingPipeliningSpoolingTask.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\OrderPreservingSpoolingTask.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryLifecycle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryTask.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\QueryTaskGroupState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\Scheduling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\SpoolingTask.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Scheduling\SpoolingTaskBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\CancellableEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ExceptionAggregator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ExchangeUtilities.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\FixedMaxHeap.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\GrowingArray.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\HashLookup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\IntValueEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ListChunk.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Lookup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Pair.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\PairComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\ReverseComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Shared.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Sorting.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\TraceHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Util.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\Wrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\Parallel\Utils\WrapperEqualityComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\ParallelEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\ParallelExecutionMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\ParallelMergeOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\SequenceQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Linq\TypeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Runtime\CompilerServices\DynamicAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Runtime\CompilerServices\ExecutionScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\Aes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\Security\Cryptography\AesManaged.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\threading\ReaderWriterLockSlim\LockRecursionException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\threading\ReaderWriterLockSlim\ReaderWriterLockSlim.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\threading\Tasks\TaskExtensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\TimeZoneInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Core\System\TimeZoneNotFoundException.cs" />\r
-    <Compile Include="..\..\build\common\SR.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BinaryOperationBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\BindingRestrictions.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallInfo.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSite.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteHelpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CallSiteOps.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ConvertBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\CreateInstanceBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DeleteIndexBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DeleteMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicMetaObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicMetaObjectBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\DynamicObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ExpandoClass.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\ExpandoObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\GetIndexBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\GetMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\IDynamicMetaObjectProvider.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\IInvokeOnGetBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\InvokeBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\InvokeMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\RuleCache.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\SetIndexBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\SetMemberBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\UnaryOperationBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Actions\UpdateDelegates.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\BinaryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\BlockExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\CatchBlock.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ConditionalExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ConstantExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DebugInfoExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DebugViewWriter.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\DefaultExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ElementInit.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\Expression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\Expression.DebuggerProxy.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionStringBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionType.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\GotoExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IArgumentProvider.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IndexExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\InvocationExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LabelExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LabelTarget.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LambdaExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ListArgumentProvider.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ListInitExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LoopExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberAssignment.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberBinding.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberInitExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberListBinding.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MemberMemberBinding.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\MethodCallExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\NewArrayExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\NewExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ParameterExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\RuntimeVariablesExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SwitchCase.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SwitchExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\SymbolDocumentInfo.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TypeBinaryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\TypeUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\UnaryExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\AnalyzedTree.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\AssemblyGen.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\BoundConstants.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\Closure.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\CompilerScope.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\CompilerScope.Storage.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ConstantCheck.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DebugInfoGenerator.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DelegateHelpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\DelegateHelpers.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ExpressionQuoter.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\HoistedLocals.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\ILGen.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\KeyedQueue.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LabelInfo.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Address.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Binary.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.ControlFlow.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Expressions.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Lambda.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Logical.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Statements.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\LambdaCompiler.Unary.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\OffsetTrackingILGenerator.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\RuntimeVariableList.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\Set.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Bindings.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\StackSpiller.Temps.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\SymbolDocumentGenerator.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\SymbolGuids.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Compiler\VariableBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\CacheDict.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\CollectionExtensions.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ContractUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ExceptionFactory.Generated.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\Helpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\IRuntimeVariables.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReadOnlyCollectionBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReadOnlyDictionary.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReferenceEqualityComparer.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\ReflectionUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TrueReadOnlyCollection.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Utils\TypeExtensions.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedFileHandle.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedViewHandle.cs" />\r
-    <Compile Include="Microsoft.Win32.SafeHandles\SafePipeHandle.cs" />\r
-    <Compile Include="ReferenceSources\Error.cs" />\r
-    <Compile Include="ReferenceSources\SR.cs" />\r
-    <Compile Include="ReferenceSources\Strings.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedFile.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedViewAccessor.cs" />\r
-    <Compile Include="System.IO.MemoryMappedFiles\MemoryMappedViewStream.cs" />\r
-    <Compile Include="System.IO.Pipes\AnonymousPipeClientStream.cs" />\r
-    <Compile Include="System.IO.Pipes\AnonymousPipeServerStream.cs" />\r
-    <Compile Include="System.IO.Pipes\NamedPipeClientStream.cs" />\r
-    <Compile Include="System.IO.Pipes\NamedPipeServerStream.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAccessRights.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAccessRule.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeAuditRule.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeDirection.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeInterfaces.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeOptions.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeSecurity.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeStream.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeStreamImpersonationWorker.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeTransmissionMode.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeUnix.cs" />\r
-    <Compile Include="System.IO.Pipes\PipeWin32.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\AesTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography\CngAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\CngAlgorithmGroup.cs" />\r
-    <Compile Include="System.Security.Cryptography\MD5Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA256CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA384CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA512CryptoServiceProvider.cs" />\r
-    <Compile Include="System\Util.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Posix/Mono.Posix-net_4_5.csproj">\r
-      <Project>{85A9B29B-58FF-4FBE-8998-B0A89AC22880}</Project>\r
-      <Name>Mono.Posix-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Core/System.Core-plaincore-net_4_x.csproj b/mcs/class/System.Core/System.Core-plaincore-net_4_x.csproj
index 8e4141ca05c0fa214b135697003f9c56b0a1481d..ef334979b349500834ed67ff23d5bf1c00dc244e 100644 (file)
--- a/mcs/class/System.Core/System.Core-plaincore-net_4_x.csproj
+++ b/mcs/class/System.Core/System.Core-plaincore-net_4_x.csproj
@@ -47,6 +47,8 @@
   <ItemGroup>\r
     <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\DynamicExpression.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\ExpressionVisitor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\IArgumentProvider.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Ast\IDynamicExpression.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Action.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Extension.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Core\Microsoft\Scripting\Utils\Function.cs" />\r
@@ -257,7 +259,6 @@
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionStringBuilder.cs" />\r
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\ExpressionType.cs" />\r
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\GotoExpression.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IArgumentProvider.cs" />\r
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\IndexExpression.cs" />\r
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\InvocationExpression.cs" />\r
     <Compile Include="..\dlr\Runtime\Microsoft.Scripting.Core\Ast\LabelExpression.cs" />\r

diff --git a/mcs/class/System.Core/System.Core-tests-net_4_5.csproj b/mcs/class/System.Core/System.Core-tests-net_4_5.csproj
deleted file mode 100644 (file)
index c4764d9..0000000
--- a/mcs/class/System.Core/System.Core-tests-net_4_5.csproj
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A4B33044-86DB-4146-8588-1F9400124B85}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>bin\Debug\System.Core-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Core_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_CORE_DLR;FEATURE_REFEMIT;FEATURE_PDBEMIT</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\HashAlgorithmTest.cs" />\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\SHA1Test.cs" />\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\SHA256Test.cs" />\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\SHA384Test.cs" />\r
-    <Compile Include="..\corlib\Test\System.Security.Cryptography\SHA512Test.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\HashSetTest.cs" />\r
-    <Compile Include="Test\System.IO.MemoryMappedFiles\MemoryMappedFileTest.cs" />\r
-    <Compile Include="Test\System.IO.Pipes\PipeSecurityTest.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Add.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_AddChecked.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_And.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_AndAlso.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ArrayIndex.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ArrayLength.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Bind.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Call.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Coalesce.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Condition.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Constant.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Convert.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Divide.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ElementInit.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Equal.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ExclusiveOr.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Field.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_GreaterThan.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_GreaterThanOrEqual.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Invoke.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Lambda.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_LeftShift.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_LessThan.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_LessThanOrEqual.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Lift.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ListBind.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_ListInit.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_MakeBinary.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_MemberBind.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_MemberInit.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Modulo.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Multiply.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_MultiplyChecked.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Negate.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_New.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_NewArrayBounds.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_NewArrayInit.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Not.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_NotEqual.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Or.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_OrElse.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Power.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Property.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_PropertyOrField.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Quote.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_RightShift.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Subtract.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_SubtractChecked.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_TypeAs.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_TypeIs.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_UnaryPlus.cs" />\r
-    <Compile Include="Test\System.Linq.Expressions\ExpressionTest_Utils.cs" />\r
-    <Compile Include="Test\System.Linq\EnumerableAsQueryableTest.cs" />\r
-    <Compile Include="Test\System.Linq\EnumerableFixture.cs" />\r
-    <Compile Include="Test\System.Linq\EnumerableMoreTest.cs" />\r
-    <Compile Include="Test\System.Linq\EnumerableTest.cs" />\r
-    <Compile Include="Test\System.Linq\LookupTest.cs" />\r
-    <Compile Include="Test\System.Linq\ParallelEnumerableTests.cs" />\r
-    <Compile Include="Test\System.Linq\ParallelTestHelper.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\DynamicAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AesCryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AesManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CngAlgorithmGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CngAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\MD5CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA1CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA256CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA256CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA384CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA384CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA512CngTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA512CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskExtensionsTests.cs" />\r
-    <Compile Include="Test\System.Threading\ReaderWriterLockSlimTest.cs" />\r
-    <Compile Include="Test\System\TimeZoneInfo.AdjustmentRuleTest.cs" />\r
-    <Compile Include="Test\System\TimeZoneInfo.TransitionTimeTest.cs" />\r
-    <Compile Include="Test\System\TimeZoneInfoTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_4_5.csproj">\r
-      <Project>{85A9B29B-58FF-4FBE-8998-B0A89AC22880}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-net_4_5.csproj b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-net_4_5.csproj
deleted file mode 100644 (file)
index 2f31775..0000000
--- a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-net_4_5.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9D2DBCBA-6C1E-405B-BCBA-20406EA9501F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.DataSetExtensions</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\DataRowComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\DataRowExtensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\DataSetUtil.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\DataTableExtensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\EnumerableRowCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\EnumerableRowCollectionExtensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\LinqDataView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\OrderedEnumerableRowCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\SortExpressionBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\TypedTableBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.DataSetExtensions\System\Data\TypedTableBaseExtensions.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="ReferenceSources\Strings.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-tests-net_4_5.csproj b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 53fc2d1..0000000
--- a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-tests-net_4_5.csproj
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{11D5C200-2AF3-49AD-8F72-2E239EB9D5D7}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data.DataSetExtensions-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.DataSetExtensions_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Data\DataRowComparerTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRowExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Data\EnumerableRowCollectionTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.DataSetExtensions\System.Data.DataSetExtensions-net_4_5.csproj">\r
-      <Project>{9D2DBCBA-6C1E-405B-BCBA-20406EA9501F}</Project>\r
-      <Name>System.Data.DataSetExtensions\System.Data.DataSetExtensions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_5-1.csproj">\r
-      <Project>{85F119B8-8463-4D6F-9852-DAB8C4070BD5}</Project>\r
-      <Name>System.Web\System.Web-net_4_5-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Data.Entity/System.Data.Entity-net_4_5.csproj b/mcs/class/System.Data.Entity/System.Data.Entity-net_4_5.csproj
deleted file mode 100644 (file)
index a441309..0000000
--- a/mcs/class/System.Data.Entity/System.Data.Entity-net_4_5.csproj
+++ /dev/null
@@ -1,840 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E902CD82-23AC-456B-9F4B-51CC193275F8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Entity</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\misc\HResults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\AbstractExpressions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Aggregates.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\BasicCommandTreeVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\BasicExpressionVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbCommandTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbDeleteCommandTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbExpressionVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbExpressionVisitor_TResultType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbFunctionCommandTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbInsertCommandTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbLambda.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbModificationClause.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbModificationCommandTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbQueryCommandTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbSetClause.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DbUpdateCommandTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\DefaultExpressionVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBindings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\DbExpressionBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\EdmFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\Internal\ArgumentValidation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\Internal\EnumerableValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\Row.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ExpressionBuilder\Spatial\SpatialEdmFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\DbExpressionRules.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionCopier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionDumper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionKeyGen.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ExpressionPrinter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ParameterRetriever.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\PatternMatchRules.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\Validator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\ViewSimplifier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Internal\XmlExpressionDumper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\OperatorExpressions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\RelationalExpressions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\ValueExpressions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\DataRecord.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\DataRecordInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\DbCommandDefinition.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\DbProviderManifest.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\DbProviderServices.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\DbXmlEnabledProviderManifest.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntityRecordInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\AliasedExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\AstNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\BuiltInExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\CaseExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\Command.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\ConstructorExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\CreateRefExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\DotExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\FunctionDefinition.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\GroupAggregateExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\GroupPartitionExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\Identifier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\Literal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\MethodExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\NamespaceImport.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\NavigationExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\ParenExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\QueryExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\QueryParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\QueryStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\RefExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\AST\TypeDefinition.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlErrorHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlLexer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlLexerHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlParserHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\CqlQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\EntitySqlParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\FunctionOverloadResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\ParseResult.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\ParserOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\SemanticAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\SemanticResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\StaticContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntitySql\TypeResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\EntityUtil.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\FieldMetadata.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\FieldNameLookup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\DbTypeMap.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\ColumnMapKeyBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\CompensatingCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\Coordinator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\CoordinatorFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\CoordinatorScratchpad.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\RecordState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\RecordStateFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\RecordStateScratchpad.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\Shaper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\ShaperFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\Translator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\Materialization\Util.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Internal\MultipartIdentifier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\CompiledQueryCacheEntry.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\CompiledQueryCacheKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\EntityClientCacheKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\EntitySqlQueryCacheKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\LinqQueryCacheKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\QueryCacheEntry.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\QueryCacheKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\QueryCacheManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\QueryCache\ShaperFactoryQueryCacheKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\AliasGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\BoolExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Clause.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\ConversionContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\DomainConstraint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\IdentifierService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\KnowledgeBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Literal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\NegationPusher.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Sentence.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Simplifier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Solver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Vertex.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Boolean\Visitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\ByValueEqualityComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\CommandHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\DisposableCollectionWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Helpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\InternalBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\KeyToListMap.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Memoizer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\MetadataHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\ModifiableIteratorCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Pair.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Set.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\Singleton.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\StringUtil.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\ThreadSafeList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\TrailingSpaceComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Common\Utils\TreePrinter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\DbConnectionOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\DbParameterCollectionHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\DbParameterHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityAdapter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityCommand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityCommandDefinition.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityConnection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityConnectionStringBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityDataReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityParameterCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityProviderFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityProviderServices.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\EntityTransaction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityClient\NameValuePair.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityCommandCompilationException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityCommandExecutionException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Action.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\BooleanFacetDescriptionElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ByteFacetDescriptionElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\CollectionKind.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\CollectionTypeElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ConcurrencyMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Documentation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerAssociationSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerAssociationSetEnd.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerEntitySet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerEntitySetDefiningQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerRelationshipSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityContainerRelationshipSetEnd.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\EntityKeyElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ErrorCode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FacetDescriptionElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FacetEnabledSchemaElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FilteredSchemaElementLookUpTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Function.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FunctionCommandText.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FunctionImportElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\IntegerFacetDescriptionElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\IRelationship.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\IRelationshipEnd.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ISchemaElementLookUpTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ItemType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\KeyProperty.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ModelFunction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ModelFunctionTypeElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\NavigationProperty.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\OnOperation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Operation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Parameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\PrimitiveSchema.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Property.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReferenceSchema.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReferenceTypeElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReferentialConstraint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReferentialConstraintRoleElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Relationship.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\RelationshipEnd.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\RelationshipEndCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReturnType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ReturnValue.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\RowTypeElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\RowTypePropertyElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ScalarType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Schema.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaComplexType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaDataModelOption.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaElementLookUpTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaElementLookUpTableEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaEnumMember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaEnumType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaLookupTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SchemaType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\SridFacetDescriptionElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\StoreGeneratedPattern.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\StructuredProperty.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\StructuredType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TextElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TypeElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TypeModifier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TypeRefElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\TypeUsageBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Utils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ValidationHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\XmlSchemaResource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntitySqlException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\EntityState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\IEntityAdapter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\IEntityStateEntry.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\IEntityStateManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\IExtendedDataRecord.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\InternalMappingException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\InvalidCommandTreeException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\BaseMetadataMappingVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\DefaultObjectMappingItemCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\EntityViewContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\EntityViewGenerationAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMapping.ReturnTypeRenameMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMappingComposable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMappingNonComposable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Mapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\MappingItemCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\MetadataMappingHasherVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\MetadataMappingHasherVisitor.HashSourceBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ObjectAssociationEndMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ObjectComplexPropertyMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ObjectMemberMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ObjectMslConstructs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ObjectNavigationPropertyMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ObjectPropertyMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ObjectTypeMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageAssociationSetMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageAssociationTypeMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageComplexPropertyMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageComplexTypeMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageConditionPropertyMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageEndPropertyMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageEntityContainerMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageEntitySetMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageEntityTypeMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingErrorCode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingFragment.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingItemCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingItemCollection.ViewDictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingItemLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageModificationFunctionMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageMslConstructs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StoragePropertyMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageScalarPropertyMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageSetMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\StorageTypeMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\AssociationSetMetadata.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\ChangeNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\CompositeKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\DynamicUpdateCommand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\ExtractedStateEntry.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\ExtractorMetadata.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\FunctionMappingTranslator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\FunctionUpdateCommand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Graph.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\KeyManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.Evaluator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.ExtentPlaceholderCreator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.JoinPropagator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.JoinPropagator.JoinPredicateVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.JoinPropagator.SubstitutingCloneVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\PropagatorFlags.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\PropagatorResult.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\RecordConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\RelationshipConstraintValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\SourceInterpreter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\TableChangeProcessor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UndirectedGraph.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateCommand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateCommandOrderer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateExpressionVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\UpdateTranslator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\ViewLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\BasicViewGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CellCreator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CellPartitioner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CellTreeSimplifier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ConfigViewGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\AliasedSlot.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\BooleanProjectedSlot.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\CaseCqlBlock.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\CqlBlock.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\CqlIdentifiers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\CqlWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\ExtentCqlBlock.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\JoinCqlBlock.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\SlotInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGeneration\UnionCqlBlock.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\CqlGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\DiscriminatorMap.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\GeneratedView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\FragmentQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\FragmentQueryKB.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\FragmentQueryProcessor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\QueryRewriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RewritingPass.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RewritingProcessor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RewritingSimplifier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RewritingValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\RoleBoolean.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\QueryRewriting\Tile.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\BoolExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\BoolExpressionVisitors.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\BoolLiteral.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CaseStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CaseStatementProjectedSlot.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\Cell.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellIdBoolean.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellLabel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellTreeNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellTreeNodeVisitors.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\CellTreeOpType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\Constant.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ConstantProjectedSlot.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\Domain.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ErrorLog.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\LeafCellTreeNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\LeftCellWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberDomainMap.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberMaps.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberPath.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberProjectedSlot.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberProjectionIndex.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\MemberRestriction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\NegatedConstant.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\OpCellTreeNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ProjectedSlot.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\QualifiedCellIdBoolean.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ScalarConstant.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\ScalarRestriction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\TypeConstant.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\TypeRestriction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Structures\WithStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Utils\ExceptionHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Utils\ExternalCalls.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Utils\ViewGenErrorCode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\BasicCellRelation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\BasicKeyConstraint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\CellRelation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ConstraintBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ErrorPatternMatcher.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ExtentKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ForeignConstraint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\KeyConstraint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\SchemaConstraints.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ViewCellRelation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ViewCellSlot.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ViewKeyConstraint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewgenContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewgenGatekeeper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewGenResults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Mapping\ViewValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\MappingException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\AspProxy.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\CacheForPrimitiveTypes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ClrPerspective.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\CustomAssemblyResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\DataSpace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\DefaultAssemblyResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationEndMember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationSetEnd.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AttributeKind.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\BuiltInKind.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\CollectionType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ComplexType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Documentation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmConstants.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmFunction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmMember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmProperty.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EdmType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntityContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntitySet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntitySetBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntitySetBaseCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntityType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EntityTypeBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EnumMember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\EnumType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Facet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FacetDescription.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FacetValueContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FacetValues.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FilteredReadOnlyMetadataCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\FunctionParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\GlobalItem.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ItemCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\LightweightCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MemberCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataItem.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataItem_Static.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataProperty.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataPropertyCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\MetadataPropertyvalue.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\NavigationProperty.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\NavigationPropertyAccessor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\OperationAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ParameterMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\PrimitiveType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\PrimitiveTypeKind.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Provider\ClrProviderManifest.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Provider\EdmProviderManifest.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Provider\EdmProviderManifestFunctionBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Provider\EdmProviderManifestSpatialFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ReadOnlyMetadataCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ReferentialConstraint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RefType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipEndMember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipMultiplicity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RowType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\SafeLink.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\SafeLinkCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\SimpleType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\StructuralType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\TypeUsage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Edm\util.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\EdmError.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemCollection.OcAssemblyCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemError.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\EdmSchemaError.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\EdmSchemaErrorSeverity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\EdmValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Helper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MappingMetadataHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactAssemblyResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderComposite.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderCompositeFile.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderCompositeResource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderFile.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderResource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactLoaderXmlReaderWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\MetadataWorkspace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ModelPerspective.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectItemCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\AssemblyCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\AssemblyCacheEntry.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ImmutableAssemblyCacheEntry.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\KnownAssembliesSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\KnownAssemblyEntry.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\LoadMessageLogger.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\LockedAssemblyCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\MetadataAssemblyHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\MutableAssemblyCacheEntry.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemAssemblyLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemAttributeAssemblyLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemCachedAssemblyLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemConventionAssemblyLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemLoadingSessionData.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemNoOpAssemblyLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\ParameterTypeSemantics.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\Perspective.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\StoreItemCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\StoreItemCollection.Loader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\TargetPerspective.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\TypeHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\TypeSemantics.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Metadata\XmlConstants.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\MetadataException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\ObjectNotFoundException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\AdditionalEntityFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\CompiledQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\ComplexObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmComplexPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmComplexTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmEntityTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmEnumTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmFunctionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmRelationshipNavigationPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmRelationshipRoleAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmScalarPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmSchemaAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EdmTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EntityCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EntityObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EntityReference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\EntityReference_TResultType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IEntityChangeTracker.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IEntityWithChangeTracker.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IEntityWithKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IEntityWithRelationships.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IRelatedEnd.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\IRelationshipFixer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelatedEnd.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelationshipFixer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelationshipKind.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelationshipManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\RelationshipNavigation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataClasses\StructuralObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\DataRecordObjectView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\BindingContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\CompiledELinqQueryState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ELinqQueryState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\EntityExpressionVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ExpressionConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ExpressionVisitorHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\Funcletizer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\InitializerFacet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\LinqExpressionNormalizer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\MethodCallTranslator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ObjectQueryProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\OrderByLifter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\ReflectionUtil.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\SpatialMethodCallTranslator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\SpatialPropertyTranslator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\Translator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ELinq\TypeSystem.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\EntityEntry.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\EntityFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\FieldDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\BaseEntityWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\ComplexTypeMaterializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityProxyFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityProxyTypeInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntitySqlQueryBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntitySqlQueryState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityWithChangeTrackerStrategy.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityWithKeyStrategy.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityWrapperFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\ForeignKeyFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\IChangeTrackingStrategy.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\IEntityKeyStrategy.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\IEntityWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\IPropertyAccessorStrategy.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\LazyLoadBehavior.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\LightweightEntityWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\NullEntityWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\ObjectFullSpanRewriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\ObjectQueryExecutionPlan.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\ObjectQueryState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\ObjectSpanRewriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\PocoEntityKeyStrategy.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\PocoPropertyAccessorStrategy.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\SnapshotChangeTrackingStrategy.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Internal\TransactionManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\IObjectSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\IObjectView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\IObjectViewData.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\MergeOption.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\NextResultGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectMaterializedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectParameterCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectQuery_EntitySqlExtensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectQuery_TResultType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectResult.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectResult_TResultType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntry.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntryBaseUpdatableDataRecord.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntryDbDataRecord.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntryDbUpdatableDataRecord.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateEntryOriginalDbUpdatableDataRecord.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectStateManagerMetadata.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectViewEntityCollectionData.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectViewFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectViewListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ObjectViewQueryResultData.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\ProxyDataContractResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\RefreshMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\RelationshipEntry.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\RelationshipWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\SaveOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\Span.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\SpanIndex.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\SqlClient\SqlFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Objects\SqlClient\SqlSpatialFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\OptimisticConcurrencyException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\PropertyConstraintException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\ProviderIncompatibleException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\AncillaryOps.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\BasicValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ColumnMap.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ColumnMapCopier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ColumnMapFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ColumnMapVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Command.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Dump.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ExplicitDiscriminatorMap.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Metadata.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\NodeCounter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\NodeInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Nodes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\OpCopier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Ops.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\PhysicalOps.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\RelOps.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\RelPropertyHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Rule.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\RulePatternOps.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\RuleProcessor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\ScalarOps.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Vars.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Visitors.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\AggregatePushdown.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\CodeGen.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ColumnMapProcessor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ColumnMapTranslator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\CommandPlan.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ConstraintManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\CTreeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ITreeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\JoinElimination.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\JoinGraph.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\KeyPullup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\NestPullup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\NominalTypeEliminator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\Normalizer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PlanCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PlanCompilerUtil.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\Predicate.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PreProcessor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ProjectionPruner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PropertyPushdownHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PropertyRef.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ProviderCommandInfoUtils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\StructuredTypeInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\SubqueryTrackingVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\TransformationRules.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\TypeInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\TypeUtils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\Validator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\VarInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\VarRefManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\VarRemapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\ResultAssembly\BridgeDataReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Query\ResultAssembly\BridgeDataRecord.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\DbGeography.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\DbGeographyWellKnownValue.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\DbGeometry.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\DbGeometryWellKnownValue.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\DbSpatialDataReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\DbSpatialServices.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\DefaultSpatialServices.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\ExtensionMethods.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\Internal\SpatialExceptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\Spatial\SpatialHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\IDbSpatialValue.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\DmlSqlGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\ISqlFragment.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\JoinSymbol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\OptionalColumn.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\Sql8ConformanceChecker.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\Sql8ExpressionRewriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlFunctionCallHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlSelectClauseBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlSelectStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SqlWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\Symbol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SymbolPair.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SymbolTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\SymbolUsageManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlGen\TopClause.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlProviderManifest.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlProviderServices.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlProviderUtilities.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlSpatialDataReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlSpatialServices.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlSpatialServices.Generated.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlTypesAssembly.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\SqlClient\SqlVersion.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\System\Data\UpdateException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.Entity\Util\AppSettings.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\SR.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="EntityRes.cs" />\r
-    <Compile Include="EntityResCategoryAttribute.cs" />\r
-    <Compile Include="EntityResDescriptionAttribute.cs" />\r
-    <Compile Include="Error.cs" />\r
-    <Compile Include="Strings.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
-      <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Transactions/System.Transactions-net_4_5.csproj">\r
-      <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
-      <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Data.Linq/System.Data.Linq-net_4_5.csproj b/mcs/class/System.Data.Linq/System.Data.Linq-net_4_5.csproj
deleted file mode 100644 (file)
index 8318ea1..0000000
--- a/mcs/class/System.Data.Linq/System.Data.Linq-net_4_5.csproj
+++ /dev/null
@@ -1,429 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Linq</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MONO_STRICT;MONO_DEPLOY</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MONO_STRICT;MONO_DEPLOY</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdDataContext.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.Firebird\FirebirdVendor.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresDataContext.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.Ingres\IngresVendor.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlDataContext.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.MySql\MySqlVendor.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleDataContext.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.Oracle\OracleVendor.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlDataContext.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlVendor.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\Schema\DataCommand.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteDataContext.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Constraints.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.Sqlite\SqliteVendor.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerDataContext.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerTypeConversions.cs" />\r
-    <Compile Include="src\DbLinq.SqlServer\SqlServerVendor.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\ChangeAction.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\ChangeSet.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\IDatabaseContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\IDatabaseTransaction.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseConnection.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseTransaction.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\TransactionalCommand.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Database\ITransactionalCommand.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\DataContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\DataLoadOptions.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\DBLinqExtendedAttributte.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\EntityRef.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\EntitySet.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\IdentityKey.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityReaderFactory.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityProviderReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityReaderFactory.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\IExecuteResult.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\IMemberModificationHandler.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\DisabledEntityTracker.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\EntityState.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\EntityTrack.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\EntityTracker.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\IEntityTracker.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\MemberModificationHandler.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\QueryProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Implementation\VendorProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\ITable.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\IVendorProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedAbstractMetaDataMember.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedAssociationMetaDataMember.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedColumnMetaDataMember.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaAssociation.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaFunction.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaModel.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaTable.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributeMappingSource.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\LambdaMetaAccessor.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\MappingContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\XmlMappingSource.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\RefreshMode.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlLiteralPart.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlParameterPart.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlPart.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlStatement.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlStatementBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\FirebirdProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\IngresProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\MySqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\OracleProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\PostgreSqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2000Provider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2005Provider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2008Provider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\SqliteProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\SqlServerProvider.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\AbstractQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\BuilderContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\DeleteQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\DirectQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Error.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionChain.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\ExpressionMutatorExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\ExpressionMutatorFactory.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\BinaryExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\ConditionalExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\ConstantExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\IMemberBindingMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\InvocationExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\LambdaExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\ListInitExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberAssignmentMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberBindingMutatorFactory.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberInitExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberListBindingMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MemberMemberBindingMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\MethodCallExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\NewArrayExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\NewExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\ParameterExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\TypeBinaryExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\UnaryExpressionMutator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionPrecedence.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\ColumnExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\CustomExpressionType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\EntitySetExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\ExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\GroupExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\IExecutableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\IMutableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\InputParameterExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\MetaTableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\MutableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\ObjectInputParameterExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\ObjectOutputParameterExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\OperandsMutableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\OrderByExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SelectExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SelectOperatorType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SpecialExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SpecialExpressionType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\StartIndexOffsetExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SubSelectExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\TableExpression.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\TableJoinType.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionTier.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IDataMapper.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IDataRecordReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionDispatcher.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionLanguageParser.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionOptimizer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionQualifier.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\DataMapper.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\DataRecordReader.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.Analyzer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.Registrar.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionLanguageParser.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionOptimizer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionQualifier.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\LineGrouping.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\PrequelAnalyzer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryBuilder.Upsert.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryCache.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryRunner.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\SpecialExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\SqlBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IPrequelAnalyzer.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryCache.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryRunner.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ISpecialExpressionTranslator.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ISqlBuilder.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ParameterizedQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\QueryContext.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\SelectQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\UpsertQuery.cs" />\r
-    <Compile Include="src\DbLinq\Data\Linq\Table.cs" />\r
-    <Compile Include="src\DbLinq\DbLinqToDoAttribute.cs" />\r
-    <Compile Include="src\DbLinq\Factory\DbLinqAttribute.cs" />\r
-    <Compile Include="src\DbLinq\Factory\Implementation\ReflectionObjectFactory.cs" />\r
-    <Compile Include="src\DbLinq\Factory\IObjectFactory.cs" />\r
-    <Compile Include="src\DbLinq\Factory\ObjectFactory.cs" />\r
-    <Compile Include="src\DbLinq\Language\ILanguages.cs" />\r
-    <Compile Include="src\DbLinq\Language\ILanguageWords.cs" />\r
-    <Compile Include="src\DbLinq\Language\Implementation\AbstractEndPluralWords.cs" />\r
-    <Compile Include="src\DbLinq\Language\Implementation\AbstractWords.cs" />\r
-    <Compile Include="src\DbLinq\Language\Implementation\Languages.cs" />\r
-    <Compile Include="src\DbLinq\Language\Implementation\NoLanguageWords.cs" />\r
-    <Compile Include="src\DbLinq\Schema\AssociationName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Case.cs" />\r
-    <Compile Include="src\DbLinq\Schema\ColumnName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\ArrayAdapter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\CsvArrayAdapter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\EnumType.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\INamedType.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\ISimpleList.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\Adapter\SpecifiedPropertyUpdater.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\DatabaseSerializer.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\DbmlSchema.Adapter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\DbmlSchema.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Dbml\DbmlSerializer.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Implementation\NameFormatter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\INameFormatter.cs" />\r
-    <Compile Include="src\DbLinq\Schema\Name.cs" />\r
-    <Compile Include="src\DbLinq\Schema\NameFormat.cs" />\r
-    <Compile Include="src\DbLinq\Schema\ParameterName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\ProcedureName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\SchemaName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\TableName.cs" />\r
-    <Compile Include="src\DbLinq\Schema\WordsExtraction.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\Binary.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ChangeConflictCollection.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ChangeConflictException.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\CompiledQuery.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ConflictMode.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\DBConvert.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\DuplicateKeyException.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ForeignKeyReferenceAlreadyHasValueException.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\IFunctionResult.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\IMultipleResults.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ISingleResult.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\Link.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\MemberChangeConflict.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ModifiedMemberInfo.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\ObjectChangeConflict.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\AssociationAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\AutoSync.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\ColumnAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\DataAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\DatabaseAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\FunctionAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\InheritanceMappingAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MappingSource.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaAccessor.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaAccessor_2.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaAssociation.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaDataMember.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaFunction.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaModel.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaParameter.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaTable.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\MetaType.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\ParameterAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\ProviderAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\ResultTypeAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\TableAttribute.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.Mapping\UpdateCheck.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.SqlClient.Implementation\ObjectMaterializer.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.SqlClient\SqlHelpers.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.SqlClient\SqlMethods.cs" />\r
-    <Compile Include="src\DbLinq\System.Data.Linq\System.Data.Linq.SqlClient\SqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Util\DataCommand.cs" />\r
-    <Compile Include="src\DbLinq\Util\DbmlExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\ExpressionChainEqualityComparer.cs" />\r
-    <Compile Include="src\DbLinq\Util\ExpressionEqualityComparer.cs" />\r
-    <Compile Include="src\DbLinq\Util\IDataRecordExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\IDataTypeExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\IDbDataParameterExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\IThreadSafeDictionary.cs" />\r
-    <Compile Include="src\DbLinq\Util\LambdaComparer.cs" />\r
-    <Compile Include="src\DbLinq\Util\MemberInfoExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\Output.cs" />\r
-    <Compile Include="src\DbLinq\Util\OutputLevel.cs" />\r
-    <Compile Include="src\DbLinq\Util\Page.cs" />\r
-    <Compile Include="src\DbLinq\Util\Profiler.cs" />\r
-    <Compile Include="src\DbLinq\Util\QuotesHelper.cs" />\r
-    <Compile Include="src\DbLinq\Util\ReferenceEqualityComparer.cs" />\r
-    <Compile Include="src\DbLinq\Util\ReflectionExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\ReflectionUtility.cs" />\r
-    <Compile Include="src\DbLinq\Util\StringExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\TextWriterExtension.cs" />\r
-    <Compile Include="src\DbLinq\Util\ThreadSafeDictionary.cs" />\r
-    <Compile Include="src\DbLinq\Util\TypeConvert.cs" />\r
-    <Compile Include="src\DbLinq\Util\TypeExtensions.cs" />\r
-    <Compile Include="src\DbLinq\Util\TypeLoader.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\DbSchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\IDataName.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\IDataTableColumn.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\IDataType.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.Columns.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.DataName.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.DataTableColumn.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.ForeignKey.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.Name.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.StoredProcedures.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.Tables.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.TypeMapping.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\SqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\Vendor.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\Implementation\Vendor.ProcedureResult.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\INameAliases.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\ISchemaLoader.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\ISqlProvider.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\IVendor.cs" />\r
-    <Compile Include="src\DbLinq\Vendor\VendorAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="./src/DbLinq/Schema/Dbml/DbmlSchema.xsd">\r
-      <LogicalName>DbLinq.Schema.Dbml.DbmlSchema.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Data.Linq/System.Data.Linq-tests-net_4_5.csproj b/mcs/class/System.Data.Linq/System.Data.Linq-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 369d86a..0000000
--- a/mcs/class/System.Data.Linq/System.Data.Linq-tests-net_4_5.csproj
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6A75FB46-8799-403B-A06C-EFF389CB297D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data.Linq-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Linq_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO_STRICT;MONO_DEPLOY</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO_STRICT;MONO_DEPLOY</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="src\DbLinq.SqlServer\Test\MsSqlDataContextTest.cs" />\r
-    <Compile Include="src\DbLinq\Test\BinaryTest.cs" />\r
-    <Compile Include="src\DbLinq\Test\DataContextTest.cs" />\r
-    <Compile Include="src\DbLinq\Test\EntitySetTest.cs" />\r
-    <Compile Include="src\DbLinq\Test\NullProvider.cs" />\r
-    <Compile Include="src\DbLinq\Test\PeopleTable.cs" />\r
-    <Compile Include="src\DbLinq\Test\Providers\DataContextTestBase.cs" />\r
-    <Compile Include="src\DbLinq\Test\TableTest.cs" />\r
-    <Compile Include="Test\dummy.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_4_5.csproj">\r
-      <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="./src/DbLinq/Schema/Dbml/DbmlSchema.xsd">\r
-      <LogicalName>DbLinq.Schema.Dbml.DbmlSchema.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_5.csproj b/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_5.csproj
deleted file mode 100644 (file)
index e2bbd97..0000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_5.csproj
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DB464643-D49E-43CE-B565-FE5446A79FC1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.OracleClient</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciAttributeType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciBindHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciCalls.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciColumnInfo.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciCredentialType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciDataType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciDateTimeDescriptor.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciDefineHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciDescriptorHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciEnvironmentHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciEnvironmentMode.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciErrorHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciErrorInfo.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciExecuteMode.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciHandleType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciIntervalDescriptor.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciLobLocator.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciLobType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciNlsServiceType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciParameterDescriptor.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciPointerType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciRowIdDescriptor.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciServerHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciServiceHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciSessionHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciSessionMode.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciStatementHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciStatementLanguage.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciStatementMode.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciStatementType.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciTransactionFlags.cs" />\r
-    <Compile Include="System.Data.OracleClient.Oci\OciTransactionHandle.cs" />\r
-    <Compile Include="System.Data.OracleClient\OciGlue.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleBFile.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleBinary.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleBoolean.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleClientFactory.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleCommand.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleCommandBuilder.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleConnection.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleConnectionPool.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleConnectionPoolManager.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleConnectionStringBuilder.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleDataAdapter.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleDataReader.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleDateTime.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleException.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleInfoMessageEventArgs.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleInfoMessageEventHandler.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleLob.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleLobOpenMode.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleMonthSpan.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleNumber.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleParameter.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleParameterCollection.cs" />\r
-    <Compile Include="System.Data.OracleClient\OraclePermission.cs" />\r
-    <Compile Include="System.Data.OracleClient\OraclePermissionAttribute.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleRowUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleRowUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleRowUpdatingEventArgs.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleRowUpdatingEventHandler.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleString.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleTimeSpan.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleTransaction.cs" />\r
-    <Compile Include="System.Data.OracleClient\OracleType.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj">\r
-      <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient-tests-net_4_5.csproj b/mcs/class/System.Data.OracleClient/System.Data.OracleClient-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 8cf6060..0000000
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient-tests-net_4_5.csproj
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{55B68673-F6AA-4D45-82BB-ADEAAC6C44F0}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data.OracleClient-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.OracleClient_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ADONetTesterClass.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ConnectedDataProvider.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParameter.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParametersCollection.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\GHTBase.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandText.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandTimeout.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandType.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Connection.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Dispose.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteNonQuery.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteReader.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteScalar.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_New.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Parameters.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Prepare.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Transaction.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleCommandBuilder\OracleCommandBuilder_DeriveParameters_O.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\IDBConnection_For_Oracle.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_BeginTransaction.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ChangeDatabase.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Close.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionString.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionTimeout.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_CreateCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Database.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_DataSource.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Equals.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_InfoMessage.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_New.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_State.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleConnection\OracleConnection_StateChange.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_AcceptChangesDuringFill.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ContinueUpdateOnError.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_O.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SO.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SS.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_DeleteCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Dispose.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_1.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_2.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_3.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds_Int_Int_Str.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_DsStr.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Dt.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillError.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DS.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DSS.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DsSt.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DtSch.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_GetFillParameters.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_InsertCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingMappingAction.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingSchemaAction.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdated.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdating.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_SelectCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_TableMappings.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ToString.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dr.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Ds.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_DsStr.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dt.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_UpdateCommand.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Close.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_ctor.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Depth.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBoolean.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetByte_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBytes_IIBII.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetChars.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDataTypeName.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDateTime.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDecimal_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDouble_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFieldType.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFloat_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetGuiid_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt16.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt32_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt64.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetName_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetOrdinal.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetSchemaTable.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetString_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetTimeSpan_I.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValue.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValues.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_HasRows.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_IsDBNull.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Item.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_NextResult.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Read.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_RecordsAffected.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SO.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOIPBBBSDO.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype_IS.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtypeI.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Add.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Contains.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Count.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Begin.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Commit.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Connection.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_ctor.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_IsolationLevel.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Rollback.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.jvm\OracleType\OracleType_Date.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient.Oci\OciDefineHandleTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleCommandTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleConnectionTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleLobTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleParameterCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleParameterTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OraclePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.OracleClient\OracleTimeSpanTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.OracleClient\System.Data.OracleClient-net_4_5.csproj">\r
-      <Project>{DB464643-D49E-43CE-B565-FE5446A79FC1}</Project>\r
-      <Name>System.Data.OracleClient\System.Data.OracleClient-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_5.csproj">\r
-      <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_5.csproj b/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_5.csproj
deleted file mode 100644 (file)
index 71ed260..0000000
--- a/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_5.csproj
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E9B87AE3-9A05-4146-83CC-082BE32D8EB2}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Services.Client</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\Client\Parameterized.System.Data.Services.Client.cs" />\r
-    <Compile Include=".\Client\System.Data.Services.Client.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\DataServiceExpressionVisitor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\DataServiceQueryProvider.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\Evaluator.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ExpressionNormalizer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ExpressionVisitor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ExpressionWriter.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\FilterQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\InputBinder.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\InputReferenceExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\NavigationPropertySingletonExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\OrderByQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ParameterReplacerVisitor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\PathBox.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ProjectionAnalyzer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ProjectionQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ProjectionRewriter.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\QueryComponents.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\QueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ReflectionUtil.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceBinder.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceExpressionType.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceSetExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\SkipQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\TakeQueryOptionExpression.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\TypeSystem.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\UriHelper.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\UriWriter.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ArraySet.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomContentProperty.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomDataKind.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomEntry.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomFeed.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomMaterializer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomMaterializerLog.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\AtomParser.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\BaseAsyncResult.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\BatchStream.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\BatchStreamState.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingEntityInfo.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingGraph.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingObserver.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingUtils.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\DataServiceCollectionOfT.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\DataServiceEntityAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\DataServiceSaveChangesEventArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\EntityChangedParams.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\EntityCollectionChangedParams.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\LoadCompletedEventArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ChangesetResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ClientConvert.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ClientType.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceClientException.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceContext.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceEntityAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceKeyAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceProtocolVersion.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQuery.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQueryContinuation.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQueryException.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQueryOfT.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequest.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequestArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequestException.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequestOfT.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceStreamResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Descriptor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\EntityDescriptor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\EntityPropertyMappingAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\EntityStates.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Epm\EpmSyndicationContentSerializer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Error.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\GetReadStreamResult.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\HasStreamAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\LinkDescriptor.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MaterializeFromAtom.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MediaEntryAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MemberAssignmentAnalysis.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MergeOption.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\MimeTypePropertyAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\OpenObject.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\OpenObjectAttribute.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\OperationResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPath.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPathBuilder.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPathSegment.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPlan.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPlanCompiler.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\QueryOperationResponseOfT.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\QueryResponse.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\QueryResult.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ReadingWritingEntityEventArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\ReferenceEqualityComparer.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\SaveChangesOptions.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\SendingRequestEventArgs.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Util.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\WebUtil.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Xml\XmlAtomErrorReader.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\Xml\XmlWrappingReader.cs" />\r
-    <Compile Include=".\Client\System\Data\Services\Client\XmlUtil.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmContentSerializerBase.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmCustomContentSerializer.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmCustomContentWriterNodeData.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmSourcePathSegment.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmSourceTree.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmTargetPathSegment.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmTargetTree.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\HttpProcessUtility.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Parsing\WebConvert.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\Providers\EntityPropertyMappingInfo.cs" />\r
-    <Compile Include=".\Server\System\Data\Services\XmlConstants.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
-      <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../WindowsBase/WindowsBase-net_4_5.csproj">\r
-      <Project>{8E6ED7D5-3B08-4A83-905E-8FB4CF0C160D}</Project>\r
-      <Name>WindowsBase-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Client/System.Data.Services.Client.resources">\r
-      <LogicalName>System.Data.Services.Client.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Data.Services/System.Data.Services-net_4_5.csproj b/mcs/class/System.Data.Services/System.Data.Services-net_4_5.csproj
deleted file mode 100644 (file)
index 9801ed8..0000000
--- a/mcs/class/System.Data.Services/System.Data.Services-net_4_5.csproj
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F3B101A1-2CC5-416E-9C64-AABAB5D4A625}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Services</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\System.Data.Services\ChangeInterceptorAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\DataService.cs" />\r
-    <Compile Include=".\System.Data.Services\DataServiceException.cs" />\r
-    <Compile Include=".\System.Data.Services\DataServiceHost.cs" />\r
-    <Compile Include=".\System.Data.Services\DataServiceHostFactory.cs" />\r
-    <Compile Include=".\System.Data.Services\EntitySetRights.cs" />\r
-    <Compile Include=".\System.Data.Services\ETagAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\ExpandSegment.cs" />\r
-    <Compile Include=".\System.Data.Services\ExpandSegmentCollection.cs" />\r
-    <Compile Include=".\System.Data.Services\HandleExceptionArgs.cs" />\r
-    <Compile Include=".\System.Data.Services\IDataServiceConfiguration.cs" />\r
-    <Compile Include=".\System.Data.Services\IDataServiceHost.cs" />\r
-    <Compile Include=".\System.Data.Services\IExpandedResult.cs" />\r
-    <Compile Include=".\System.Data.Services\IExpandProvider.cs" />\r
-    <Compile Include=".\System.Data.Services\IgnorePropertiesAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\IRequestHandler.cs" />\r
-    <Compile Include=".\System.Data.Services\IUpdatable.cs" />\r
-    <Compile Include=".\System.Data.Services\MimeTypeAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\ProcessRequestArgs.cs" />\r
-    <Compile Include=".\System.Data.Services\QueryInterceptorAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\ServiceOperationRights.cs" />\r
-    <Compile Include=".\System.Data.Services\SingleResultAttribute.cs" />\r
-    <Compile Include=".\System.Data.Services\UpdateOperations.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`1.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`10.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`11.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`12.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`13.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`2.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`3.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`4.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`5.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`6.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`7.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`8.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`9.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper0.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper1.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper2.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper3.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper4.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper5.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper6.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper7.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper8.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapperMany.cs" />\r
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapperManyEnd.cs" />\r
-    <Compile Include="System.Data.Services.Providers\DataServiceProviderMethods.cs" />\r
-    <Compile Include="System.Data.Services.Providers\IDataServiceMetadataProvider.cs" />\r
-    <Compile Include="System.Data.Services.Providers\IDataServicePagingProvider.cs" />\r
-    <Compile Include="System.Data.Services.Providers\IDataServiceQueryProvider.cs" />\r
-    <Compile Include="System.Data.Services.Providers\IDataServiceStreamProvider.cs" />\r
-    <Compile Include="System.Data.Services.Providers\IDataServiceUpdateProvider.cs" />\r
-    <Compile Include="System.Data.Services.Providers\OpenTypeMethods.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ResourceAssociationSet.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ResourceAssociationSetEnd.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ResourceProperty.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ResourcePropertyKind.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ResourceSet.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ResourceType.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ResourceTypeKind.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ServiceOperation.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ServiceOperationParameter.cs" />\r
-    <Compile Include="System.Data.Services.Providers\ServiceOperationResultKind.cs" />\r
-    <Compile Include="System.Data.Services\DataServiceBehavior.cs" />\r
-    <Compile Include="System.Data.Services\DataServiceConfiguration.cs" />\r
-    <Compile Include="System.Data.Services\DataServiceOperationContext.cs" />\r
-    <Compile Include="System.Data.Services\DataServiceProcessingPipeline.cs" />\r
-    <Compile Include="System.Data.Services\DataServiceProcessingPipelineEventArgs.cs" />\r
-    <Compile Include="System.Data.Services\IDataServiceHost2.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
-      <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel.Web/System.ServiceModel.Web-net_4_5.csproj">\r
-      <Project>{BD4DF654-42EE-40E8-A3F4-8A80959E7879}</Project>\r
-      <Name>System.ServiceModel.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data.Services.Client/System.Data.Services.Client-net_4_5.csproj">\r
-      <Project>{E9B87AE3-9A05-4146-83CC-082BE32D8EB2}</Project>\r
-      <Name>System.Data.Services.Client-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_5.csproj">\r
-      <Project>{E537F31B-BCB7-4935-ABF3-DF2FAC48DCB3}</Project>\r
-      <Name>System.ServiceModel.Activation-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Data.Services/System.Data.Services-tests-net_4_5.csproj b/mcs/class/System.Data.Services/System.Data.Services-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 7241ba3..0000000
--- a/mcs/class/System.Data.Services/System.Data.Services-tests-net_4_5.csproj
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A39E95C7-A667-472B-8A53-798974756DBD}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data.Services-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data.Services_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web.DynamicData\Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\.\ChangeInterceptorAttributeTests.cs" />\r
-    <Compile Include="Test\.\DataServiceExceptionTests.cs" />\r
-    <Compile Include="Test\.\DataServiceTests.cs" />\r
-    <Compile Include="Test\.\ETagAttributeTests.cs" />\r
-    <Compile Include="Test\.\ExpandSegmentCollectionTests.cs" />\r
-    <Compile Include="Test\.\ExpandSegmentTests.cs" />\r
-    <Compile Include="Test\.\IgnorePropertiesAttributeTests.cs" />\r
-    <Compile Include="Test\.\MimeTypeAttributeTests.cs" />\r
-    <Compile Include="Test\.\QueryInterceptorAttributeTests.cs" />\r
-    <Compile Include="Test\.\System.Data.Services.Providers\DataServiceProviderMethodsTest.cs" />\r
-    <Compile Include="Test\.\System.Data.Services.Providers\ResourceTypeTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Services\System.Data.Services-net_4_5.csproj">\r
-      <Project>{F3B101A1-2CC5-416E-9C64-AABAB5D4A625}</Project>\r
-      <Name>System.Data.Services\System.Data.Services-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_5-1.csproj">\r
-      <Project>{F1316A49-176B-4E68-8A5F-1BA718289D46}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Data/ReferenceSources/Res.cs b/mcs/class/System.Data/ReferenceSources/Res.cs
index d5d1dc9ba9f7e689484bbea1132b3329ed39539a..9c13a85f121a16c04d8d700d54dbb82e070eb1a3 100644 (file)
--- a/mcs/class/System.Data/ReferenceSources/Res.cs
+++ b/mcs/class/System.Data/ReferenceSources/Res.cs
@@ -1198,7 +1198,36 @@ public const string Xml_TooManyIsDataSetAtributeInSchema = "Xml_TooManyIsDataSet
 public const string Xml_UndefinedDatatype = "Xml_UndefinedDatatype";
 public const string Xml_ValueOutOfRange = "Xml_ValueOutOfRange";
 public const string collectionChangedEventDescr = "collectionChangedEventDescr";
-
+public const string DbConnectionString_TransparentNetworkIPResolution = "DbConnectionString_TransparentNetworkIPResolution";
+public const string TCE_NullCspPathSysErr = "TCE_NullCspPathSysErr";
+public const string TCE_NullCspPath = "TCE_NullCspPath";
+public const string TCE_NullCngPathSysErr = "TCE_NullCngPathSysErr";
+public const string TCE_NullCngPath = "TCE_NullCngPath";
+public const string TCE_InvalidCspPathSysErr = "TCE_InvalidCspPathSysErr";
+public const string TCE_InvalidCspPath = "TCE_InvalidCspPath";
+public const string TCE_InvalidCngPathSysErr = "TCE_InvalidCngPathSysErr";
+public const string TCE_InvalidCngPath = "TCE_InvalidCngPath";
+public const string TCE_EmptyCspNameSysErr = "TCE_EmptyCspNameSysErr";
+public const string TCE_EmptyCspName = "TCE_EmptyCspName";
+public const string TCE_EmptyCngNameSysErr = "TCE_EmptyCngNameSysErr";
+public const string TCE_EmptyCngName = "TCE_EmptyCngName";
+public const string TCE_EmptyCspKeyIdSysErr = "TCE_EmptyCspKeyIdSysErr";
+public const string TCE_EmptyCspKeyId = "TCE_EmptyCspKeyId";
+public const string TCE_EmptyCngKeyIdSysErr = "TCE_EmptyCngKeyIdSysErr";
+public const string TCE_EmptyCngKeyId = "TCE_EmptyCngKeyId";
+public const string TCE_InvalidCspNameSysErr = "TCE_InvalidCspNameSysErr";
+public const string TCE_InvalidCspName = "TCE_InvalidCspName";
+public const string TCE_InvalidCspKeyIdSysErr = "TCE_InvalidCspKeyIdSysErr";
+public const string TCE_InvalidCspKeyId = "TCE_InvalidCspKeyId";
+public const string TCE_InvalidCngKeySysErr = "TCE_InvalidCngKeySysErr";
+public const string TCE_InvalidCngKey = "TCE_InvalidCngKey";
+public const string TCE_InvalidCiphertextLengthInEncryptedCEKCsp = "TCE_InvalidCiphertextLengthInEncryptedCEKCsp";
+public const string TCE_InvalidCiphertextLengthInEncryptedCEKCng = "TCE_InvalidCiphertextLengthInEncryptedCEKCng";
+public const string TCE_InvalidSignatureInEncryptedCEKCsp = "TCE_InvalidSignatureInEncryptedCEKCsp";
+public const string TCE_InvalidSignatureInEncryptedCEKCng = "TCE_InvalidSignatureInEncryptedCEKCng";
+public const string TCE_InvalidSignature = "TCE_InvalidSignature";
+public const string GT_Disabled = "GT_Disabled";
+public const string GT_UnsupportedSysTxVersion = "GT_UnsupportedSysTxVersion";
 
        public static string GetString (string name)
        {

diff --git a/mcs/class/System.Data/System.Data-net_4_5.csproj b/mcs/class/System.Data/System.Data-net_4_5.csproj
deleted file mode 100644 (file)
index 24eb6c3..0000000
--- a/mcs/class/System.Data/System.Data-net_4_5.csproj
+++ /dev/null
@@ -1,555 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,169,219,414,649</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,169,219,414,649</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,169,219,414,649</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\bid\inc\cs\bidPrivateBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\Microsoft\SqlServer\Server\SqlTriggerContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\Misc\ExternDll.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\Misc\HResults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\Misc\PrivilegedConfigurationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\AcceptRejectRule.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\AggregateType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\BaseCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\CatalogLocation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\CodeGen\datacache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\CodeGen\StrongTypingException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ColumnTypeConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\CommandBehavior.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\CommandType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\ActivityCorrelator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\AdapterSwitches.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\AdapterUtil.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\BigIntegerStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\BooleanStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\ByteStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\CharStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DataAdapter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DataColumnMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DataColumnMappingCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DataRecordInternal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DataStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DataTableMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DataTableMappingCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DateTimeOffsetStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DateTimeStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBCommand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBCommandBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBConnection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbConnectionOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbConnectionPoolKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBConnectionString.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbConnectionStringBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbConnectionStringCommon.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbDataAdapter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBDataPermission.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBDataPermissionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbDataReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\dbdatarecord.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbDataSourceEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\dbenumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbParameterCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbProviderConfigurationHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbProviderFactories.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbProviderFactoriesConfigurationHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbProviderFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbProviderSpecificTypePropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBSchemaRow.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DBSchemaTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DbTransaction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DecimalStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\DoubleStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\FieldNameLookup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\GreenMethods.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\Groupbybehavior.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\HandlerBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\identifiercase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\Int16Storage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\Int32Storage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\Int64Storage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\MultipartIdentifier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\NameValuePair.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\NameValuePermission.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\NativeMethods.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\ObjectStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\RowUpdatedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\RowUpdatingEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SafeNativeMethods.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SByteStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SchemaTableColumn.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SchemaTableOptionalColumn.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SingleStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLConvert.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLBinaryStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQlBooleanStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLBytesStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLByteStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLCharsStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLDateTimeStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLDecimalStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLDoubleStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLGuidStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLInt16Storage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLInt32Storage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLInt64Storage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLMoneyStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLSingleStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SQLStringStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SqlUDTStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SQLTypes\SqlXmlStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\StringStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\SupportedJoinOperators.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\System.Data_BID.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\TimeSpanStorage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\UInt16Storage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\UInt32Storage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\UInt64Storage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Common\UnsafeNativeMethods.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ConflictOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ConnectionState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Constraint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ConstraintCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ConstraintConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ConstraintEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataColumn.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataColumnChangeEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataColumnChangeEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataColumnCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataColumnPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataError.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRelation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRelationCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRelationPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRow.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowChangeEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowChangeEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowCreatedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowVersion.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataRowView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataSerializationFormat.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataSetDateTime.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataSysAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableClearEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableClearEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableNewRowEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableNewRowEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTablePropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableReaderListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataTableTypeConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataViewListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataViewManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataViewManagerListItemTypeDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataViewRowState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataViewSetting.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DataViewSettingCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DBConcurrencyException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\dbtype.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\DefaultValueTypeConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\FillErrorEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\FillErrorEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\AggregateNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\BinaryNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\ConstNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\DataExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\ExpressionNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\ExpressionParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\FilterException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\FunctionNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\IFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\LookupNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\NameNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\Operators.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\UnaryNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Filter\ZeroOpNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ForeignKeyConstraint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IColumnMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IColumnMappingCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDataAdapter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDataParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDataParameterCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDataReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDataRecord.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDbCommand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDbConnection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDbDataAdapter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDbDataParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IDbTransaction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\IsolationLevel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ITableMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ITableMappingCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\LoadOption.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\MappingType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\MergeFailedEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\MergeFailedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Merger.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\MissingMappingAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\MissingSchemaAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\DbDataRecord.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\Odbc32.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcCommand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcCommandBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcConnection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcConnectionFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcConnectionHandle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcConnectionOpen.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcConnectionPoolProviderInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcConnectionString.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcConnectionStringbuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcDataAdapter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcDataReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcEnvironment.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcEnvironmentHandle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcError.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcErrorCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcHandle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcInfoMessageEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\odbcmetadatacollectionnames.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\odbcmetadatacolumnnames.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\odbcmetadatafactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcParameterCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcPermission.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcReferenceCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcRowUpdatingEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcStatementHandle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcTransaction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Odbc\OdbcUtils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\ColumnBinding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\DBBindings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\DBPropSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OLEDB_Enum.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OLEDB_Util.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbCommand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbCommandBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbConnection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbConnectionFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbConnectionInternal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbConnectionPoolGroupProviderInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\oledbconnectionstring.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OledbConnectionStringbuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbDataAdapter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbDataReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbError.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbErrorCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbHResult.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbInfoMessageEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbInfoMessageEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbLiteral.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\oledbmetadatacollectionnames.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\oledbmetadatacolumnnames.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbMetaDataFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbParameterCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbPermission.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbPropertySetGuid.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbPropertyStatus.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbReferenceCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbRowUpdatedEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbRowUpdatedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbRowUpdatingEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbRowUpdatingEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbSchemaGuid.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbStruct.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbTransaction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\OleDbWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\PropertyAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\PropertyIDSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\PropertyInfoSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\RowBinding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OleDb\SafeHandles.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\OperationAbortedException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ParameterDirection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\PrimaryKeyTypeConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\PropertyCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DataReaderContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbBuffer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionClosed.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionInternal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPool.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolCounters.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolIdentity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolProviderInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbMetaDataCollectionNames.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbMetaDataColumnNames.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbMetaDataFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbReferenceCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\SchemaMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\TimeoutTimer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\WrappedIUnknown.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Range.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\RbTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\RecordManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\RecordsAffectedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\RecordsAffectedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\RelatedView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\RelationshipConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Rule.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SchemaSerializationMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SchemaType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Select.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Selection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SimpleType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\IBinarySerialize.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\invalidudtexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlDataSourceEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlFacetAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlFunctionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlGenericUtil.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlMethodAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlNotificationRequest.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlProcedureAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlTriggerAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlUserDefinedAggregateAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\SqlUserDefinedTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\TriggerAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\ApplicationIntent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\LocalDBAPI.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlClientPermission.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlConnectionString.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlConnectionStringBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlError.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlErrorCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlInfoMessageEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlUtil.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\TdsEnums.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\TdsParserStaticMethods.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlDbType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\INullable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLBinary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLBoolean.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLByte.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLBytes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLChars.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SqlCharStream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLDateTime.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLDecimal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLDouble.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLGuid.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLInt16.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLInt32.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLInt64.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLMoney.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLResource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLSingle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLString.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SqlTypesSchemaImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SQLUtility.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SQLTypes\SqlXml.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\StateChangeEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\StateChangeEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\StatementType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\UniqueConstraint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\UpdateRowSource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\updatestatus.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XDRSchema.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XmlContent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XmlDataLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XMLDiffLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XmlKeywords.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XmlReadMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\xmlsaver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XMLSchema.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XmlToDatasetMap.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\XmlWriteMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\BaseTreeIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\DataDocumentXPathNavigator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\DataPointer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\DataSetMappper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\IXmlDataVirtualNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\RegionIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\TreeIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\XmlBoundElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\XmlDataDocument.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\XmlDataImplementation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data\System\NewXml\XPathNodePointer.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs.in" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\build\common\SR.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.SqlServer.Server\SqlMetaData.cs" />\r
-    <Compile Include="ReferenceSources\NativeOledbWrapper.cs" />\r
-    <Compile Include="ReferenceSources\Res.cs" />\r
-    <Compile Include="ReferenceSources\ResCategoryAttribute.cs" />\r
-    <Compile Include="ReferenceSources\ResDescriptionAttribute.cs" />\r
-    <Compile Include="ReferenceSources\SqlInternalConnectionTds.cs" />\r
-    <Compile Include="ReferenceSources\ThisAssembly.cs" />\r
-    <Compile Include="ReferenceSources\Win32NativeMethods.cs" />\r
-    <Compile Include="System.Data.Common\DbConnectionStringBuilderHelper.cs" />\r
-    <Compile Include="System.Data.Common\DbTypes.cs" />\r
-    <Compile Include="System.Data.Common\ExceptionHelper.cs" />\r
-    <Compile Include="System.Data.SqlClient\NetworkLibraryConverter.cs" />\r
-    <Compile Include="System.Data.SqlClient\OnChangeEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SortOrder.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlAsyncResult.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlAsyncState.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlBulkCopy.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlBulkCopyColumnMapping.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlBulkCopyColumnMappingCollection.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlBulkCopyOptions.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlClientFactory.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlClientMetaDataCollectionNames.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlCommand.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlCommandBuilder.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlConnection.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlCredential.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlDataAdapter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlDataReader.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlDataSourceConverter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SQLDebugging.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlDecimalExtensions.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlDependency.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlException.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlInfoMessageEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlInitialCatalogConverter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlNotificationEventArgs.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlNotificationInfo.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlNotificationSource.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlNotificationType.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlParameter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlParameterCollection.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlParameterConverter.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowsCopiedEventArgs.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowsCopiedEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowUpdatingEventArgs.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlRowUpdatingEventHandler.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlTransaction.cs" />\r
-    <Compile Include="System.Data.SqlClient\SqlXmlTextReader.cs" />\r
-    <Compile Include="gen_OdbcConnection.cs" />\r
-    <Compile Include="gen_OdbcParameter.cs" />\r
-    <Compile Include="gen_OdbcParameterCollection.cs" />\r
-    <Compile Include="gen_OleDbConnection.cs" />\r
-    <Compile Include="gen_OleDbParameter.cs" />\r
-    <Compile Include="gen_OleDbParameterCollection.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Numerics/System.Numerics-net_4_5.csproj">\r
-      <Project>{14631AC9-FDC6-4561-A04C-6913947C939E}</Project>\r
-      <Name>System.Numerics-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj">\r
-      <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Data.Tds/Mono.Data.Tds-net_4_5.csproj">\r
-      <Project>{CB7949AC-5FA7-4FAB-893A-8FAF436BF514}</Project>\r
-      <Name>Mono.Data.Tds-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Transactions/System.Transactions-net_4_5.csproj">\r
-      <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Data/System.Data-net_4_x.csproj b/mcs/class/System.Data/System.Data-net_4_x.csproj
index a0f8a936bb86858bc93a305b531500a182fbbf86..23229be5f1c1fa726cf74a075c07bc37bb9efe79 100644 (file)
--- a/mcs/class/System.Data/System.Data-net_4_x.csproj
+++ b/mcs/class/System.Data/System.Data-net_4_x.csproj
@@ -328,6 +328,8 @@
     <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionFactory.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionInternal.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPool.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolAuthenticationContext.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolAuthenticationContextKey.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolCounters.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolGroup.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs" />\r
@@ -369,6 +371,7 @@
     <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\Sql\TriggerAction.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\ApplicationIntent.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\LocalDBAPI.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlClientEncryptionType.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlClientPermission.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlConnectionString.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Data\System\Data\SqlClient\SqlConnectionStringBuilder.cs" />\r

diff --git a/mcs/class/System.Data/System.Data-tests-net_4_5.csproj b/mcs/class/System.Data/System.Data-tests-net_4_5.csproj
deleted file mode 100644 (file)
index f830530..0000000
--- a/mcs/class/System.Data/System.Data-tests-net_4_5.csproj
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F7AED8DB-C8C6-4F47-AC6C-F93B26F90899}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,649,618,169,612,219,168</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Data_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,649,618,169,612,219,168</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,649,618,169,612,219,168</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Mono.Data.SqlExpressions\DataColumnExpressionTest.cs" />\r
-    <Compile Include="Test\Mono.Data.SqlExpressions\DateComparisonTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\ConnectionStringsSectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DataColumnMappingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DataTableMappingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbCommandBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbConnectionStringBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DBDataPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DBDataPermissionTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbDataReaderMock.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbDataReaderTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbProviderFactoriesConfigurationHandlerTest.cs" />\r
-    <Compile Include="Test\System.Data.Common\DbTransactionTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcCommandBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcCommandTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcConnectionStringBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcConnectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcMetaDataCollectionNamesTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcParameterCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcParameterTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.Odbc\OdbcPermissionTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbCommandTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbConnectionTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbMetaDataCollectionNamesTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbParameterCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.OleDb\OleDbPermissionTest.cs" />\r
-    <Compile Include="Test\System.Data.Sql\SqlNotificationRequestTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlBulkCopyTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlClientMetaDataCollectionNamesTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlClientPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlClientPermissionTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlCommandBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlCommandTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlConnectionStringBuilderTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlConnectionTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlDataAdapterTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlClient\SqlParameterTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlBinaryTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlBooleanTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlBytesTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlByteTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlCharsTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlDateTimeTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlDecimalTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlDoubleTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlGuidTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlInt16Test.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlInt32Test.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlInt64Test.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlMoneyTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlSingleTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlStringTest.cs" />\r
-    <Compile Include="Test\System.Data.SqlTypes\SqlXmlTest.cs" />\r
-    <Compile Include="Test\System.Data.Test.Utils\DataProvider.cs" />\r
-    <Compile Include="Test\System.Data\BinarySerializationTest.cs" />\r
-    <Compile Include="Test\System.Data\ConstraintCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\ConstraintCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\ConstraintExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\ConstraintTest.cs" />\r
-    <Compile Include="Test\System.Data\DataColumnCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\DataColumnCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataColumnTest.cs" />\r
-    <Compile Include="Test\System.Data\DataColumnTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRelationCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRelationCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRelationTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRelationTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRowCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRowCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRowTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRowTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataRowViewTest.cs" />\r
-    <Compile Include="Test\System.Data\DataRowViewTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataSet1.Designer.cs" />\r
-    <Compile Include="Test\System.Data\DataSetAssertion.cs" />\r
-    <Compile Include="Test\System.Data\DataSetInferXmlSchemaTest.cs" />\r
-    <Compile Include="Test\System.Data\DataSetReadXmlSchemaTest.cs" />\r
-    <Compile Include="Test\System.Data\DataSetReadXmlTest.cs" />\r
-    <Compile Include="Test\System.Data\DataSetTest.cs" />\r
-    <Compile Include="Test\System.Data\DataSetTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataSetTypedDataSetTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableCollectionTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataTableLoadRowTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableReaderTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableReadWriteXmlTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableReadXmlSchemaTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest2.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest3.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest4.cs" />\r
-    <Compile Include="Test\System.Data\DataTableTest5.cs" />\r
-    <Compile Include="Test\System.Data\DataViewManagerTest.cs" />\r
-    <Compile Include="Test\System.Data\DataViewTest.cs" />\r
-    <Compile Include="Test\System.Data\DataViewTest_IBindingList.cs" />\r
-    <Compile Include="Test\System.Data\DataViewTest_IBindingListView.cs" />\r
-    <Compile Include="Test\System.Data\DataViewTest2.cs" />\r
-    <Compile Include="Test\System.Data\DBConcurrencyExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\DeletedRowInaccessibleExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\DuplicateNameExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\EvaluateExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\ForeignKeyConstraintTest.cs" />\r
-    <Compile Include="Test\System.Data\ForeignKeyConstraintTest2.cs" />\r
-    <Compile Include="Test\System.Data\InRowChangingEventExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\InvalidConstraintExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\MissingPrimaryKeyExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\MonkeyDataSet.cs" />\r
-    <Compile Include="Test\System.Data\NoNullAllowedExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\ReadOnlyExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\RowNotInTableExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\SyntaxErrorExceptionTest.cs" />\r
-    <Compile Include="Test\System.Data\TrailingSpaceTest.cs" />\r
-    <Compile Include="Test\System.Data\TypedDataSetGeneratorTest.cs" />\r
-    <Compile Include="Test\System.Data\UniqueConstraintTest.cs" />\r
-    <Compile Include="Test\System.Data\UniqueConstraintTest2.cs" />\r
-    <Compile Include="Test\System.Data\VersionNotFoundException.cs" />\r
-    <Compile Include="Test\System.Data\XmlDataLoaderTest.cs" />\r
-    <Compile Include="Test\System.Data\XmlDataReaderTest.cs" />\r
-    <Compile Include="Test\System.Data\XmlExportOfTypedDataSetTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDataDocumentTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDataDocumentTest2.cs" />\r
-    <Compile Include="Mono.Data.SqlExpressions\Parser.cs" />\r
-  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_5.csproj">\r
-      <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Tds\Mono.Data.Tds-net_4_5.csproj">\r
-      <Project>{CB7949AC-5FA7-4FAB-893A-8FAF436BF514}</Project>\r
-      <Name>Mono.Data.Tds\Mono.Data.Tds-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_4_5.csproj">\r
-      <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_0.csproj">\r
-      <Project>{74084B98-6858-4133-998C-E594D367D8F1}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r

diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
index 7410c36c2a1c1829f16c27403512cf8b23c5758f..4877d434a20c62afb5eb11c4277b62ee74d70ea5 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
@@ -1263,20 +1263,29 @@ namespace System.Data.SqlClient
                                throw new ArgumentNullException ("values");
 
                        int len = values.Length;
-                       int bigDecimalIndex = command.Tds.ColumnValues.BigDecimalIndex;
+                       var tds = command.Tds;
+                       int columns = Math.Min (len, tds.Columns.Count);
 
-                       // If a four-byte decimal is stored, then we can't convert to
-                       // a native type.  Throw an OverflowException.
-                       if (bigDecimalIndex >= 0 && bigDecimalIndex < len)
-                               throw new OverflowException ();
-                       try {
-                               command.Tds.ColumnValues.CopyTo (0, values, 0,
-                                                                len > command.Tds.ColumnValues.Count ? command.Tds.ColumnValues.Count : len);
-                       } catch (TdsInternalException ex) {
-                               command.Connection.Close ();
-                               throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
+                       if ((command.CommandBehavior & CommandBehavior.SequentialAccess) != 0) {
+                               for (int i = 0; i < columns; ++i) {
+                                       values [i] = tds.GetSequentialColumnValue (i);
+                               }
+                       } else {
+                               int bigDecimalIndex = tds.ColumnValues.BigDecimalIndex;
+
+                               // If a four-byte decimal is stored, then we can't convert to
+                               // a native type.  Throw an OverflowException.
+                               if (bigDecimalIndex >= 0 && bigDecimalIndex < len)
+                                       throw new OverflowException ();
+                               try {
+                                       tds.ColumnValues.CopyTo (0, values, 0, columns);
+                               } catch (TdsInternalException ex) {
+                                       command.Connection.Close ();
+                                       throw SqlException.FromTdsInternalException ((TdsInternalException)ex);
+                               }
                        }
-                       return (len < FieldCount ? len : FieldCount);
+
+                       return columns;
                }
 
 

diff --git a/mcs/class/System.Data/Test/System.Data/DataViewTest.cs b/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
index 123c878050b2034e394c84ef7eafdfd7bfe6469e..4be1824f6674c064bd460a4a3f0cab070727b250 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
@@ -983,6 +983,7 @@ table was set.
                        eventWriter.WriteLine (" add a column with an empty name.");
 
                        AssertEquals (result.Replace ("\r\n", "\n"), eventWriter.ToString ().Replace ("\r\n", "\n"));
+                       GC.KeepAlive (dv);
                }
 
                public class ComplexEventSequence1View : DataView

diff --git a/mcs/class/System.Data/mobile_referencesource.sources b/mcs/class/System.Data/mobile_referencesource.sources
index 7dcb976cd391fd405eac966586b8c188adbd63fc..45ae17e4d6c8aff9d79b1cda59ca4c05f480f611 100644 (file)
--- a/mcs/class/System.Data/mobile_referencesource.sources
+++ b/mcs/class/System.Data/mobile_referencesource.sources
@@ -66,7 +66,6 @@ MobileStubs.cs
 ../../../external/referencesource/System.Data/System/Data/Common/ObjectStorage.cs
 ../../../external/referencesource/System.Data/System/Data/Common/RowUpdatedEventArgs.cs
 ../../../external/referencesource/System.Data/System/Data/Common/RowUpdatingEventArgs.cs
-../../../external/referencesource/System.Data/System/Data/Common/SafeNativeMethods.cs
 ../../../external/referencesource/System.Data/System/Data/Common/SByteStorage.cs
 ../../../external/referencesource/System.Data/System/Data/Common/SchemaTableColumn.cs
 ../../../external/referencesource/System.Data/System/Data/Common/SchemaTableOptionalColumn.cs
@@ -191,24 +190,13 @@ MobileStubs.cs
 ../../../external/referencesource/System.Data/System/Data/PrimaryKeyTypeConverter.cs
 ../../../external/referencesource/System.Data/System/Data/PropertyCollection.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/DataReaderContainer.cs
-../../../external/referencesource/System.Data/System/Data/ProviderBase/DbBuffer.cs
-../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionClosed.cs
-../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionFactory.cs
-# ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionHelper.cs
-../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionInternal.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolAuthenticationContext.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolAuthenticationContextKey.cs
-../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPool.cs
-../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolGroup.cs
-../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolGroupProviderInfo.cs
-../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolIdentity.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolOptions.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbConnectionPoolProviderInfo.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbMetaDataCollectionNames.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbMetaDataColumnNames.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbMetaDataFactory.cs
-# ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbParameterCollectionHelper.cs
-# ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbParameterHelper.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/DbReferenceCollection.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/SchemaMapping.cs
 ../../../external/referencesource/System.Data/System/Data/ProviderBase/TimeoutTimer.cs

diff --git a/mcs/class/System.Design/System.Design-net_4_5.csproj b/mcs/class/System.Design/System.Design-net_4_5.csproj
deleted file mode 100644 (file)
index c27e158..0000000
--- a/mcs/class/System.Design/System.Design-net_4_5.csproj
+++ /dev/null
@@ -1,438 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D4E6A482-761B-4B41-8B63-C930CA84D268}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Design</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceDescriptorCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceGroup.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceGroupCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DataSourceProviderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataColumn.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataConnection.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataParameter.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataRelationship.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataSchemaClass.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataStoredProcedure.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataTable.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataTableBase.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\DesignerDataView.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\IDataEnvironment.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\IDesignerDataSchema.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Data\QueryBuilderMode.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\BasicDesignerLoader.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomComponentSerializationService.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomDesignerLoader.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomLocalizationModel.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomLocalizationProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializationProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializerBase.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CodeDomSerializerException.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\CollectionCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ComponentCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\DesignerSerializationManager.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\EnumCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\EventCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ExpressionContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ICodeDomDesignerReload.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\MemberCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\ObjectStatementCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\PrimitiveCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\PropertyCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\RootCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\RootContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\SerializeAbsoluteContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\StatementContext.cs" />\r
-    <Compile Include="System.ComponentModel.Design.Serialization\TypeCodeDomSerializer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignSurfaceChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ActiveDesignSurfaceChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ArrayEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\BinaryEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ByteViewer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\CollectionEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentActionsType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ComponentDesigner.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DateTimeEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionHeaderItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionItemCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionList.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionListCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionListsChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionListsChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionListsChangedType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionMethodItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionPropertyItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionTextItem.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionUIService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionUIStateChangeEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionUIStateChangeEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerActionUIStateChangeType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerCommandSet.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerEventService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignerHost.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignModeNestedContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignModeSite.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurface.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceManager.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceServiceContainer.cs" />\r
-    <Compile Include="System.ComponentModel.Design\DisplayMode.cs" />\r
-    <Compile Include="System.ComponentModel.Design\EventBindingService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ExceptionCollection.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ExtenderService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentDesignerDebugService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\IComponentDesignerStateService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\InheritanceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\LoadedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\LoadedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\LocalizationExtenderProvider.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommandsChangedEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommandsChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommandsChangedType.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MenuCommandService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\MultilineStringEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ObjectSelectorEditor.cs" />\r
-    <Compile Include="System.ComponentModel.Design\ReferenceService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\SelectionService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\TypeDescriptorFilterService.cs" />\r
-    <Compile Include="System.ComponentModel.Design\UndoEngine.cs" />\r
-    <Compile Include="System.Data.Design\MethodSignatureGenerator.cs" />\r
-    <Compile Include="System.Data.Design\ParameterGenerationOption.cs" />\r
-    <Compile Include="System.Data.Design\TypedDataSetGenerator.cs" />\r
-    <Compile Include="System.Data.Design\TypedDataSetGeneratorException.cs" />\r
-    <Compile Include="System.Data.Design\TypedDataSetSchemaImporterExtension.cs" />\r
-    <Compile Include="System.Design\DummyClass.cs" />\r
-    <Compile Include="System.Diagnostics.Design\LogConverter.cs" />\r
-    <Compile Include="System.Diagnostics.Design\ProcessDesigner.cs" />\r
-    <Compile Include="System.Diagnostics.Design\ProcessModuleDesigner.cs" />\r
-    <Compile Include="System.Diagnostics.Design\ProcessThreadDesigner.cs" />\r
-    <Compile Include="System.Diagnostics.Design\StringValueConverter.cs" />\r
-    <Compile Include="System.Messaging.Design\MessageDesigner.cs" />\r
-    <Compile Include="System.Resources.Tools\StronglyTypedResourceBuilder.cs" />\r
-    <Compile Include="System.ServiceProcess.Design\ServiceControllerDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.Util\DummyClass.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\AdRotatorDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\BaseDataBoundControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\BaseDataListComponentEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\BaseDataListDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\BaseValidatorDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\ButtonDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\CalendarAutoFormatDialog.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\CalendarDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\CheckBoxDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\CompositeControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\DataBoundControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\DataListComponentEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\DataProviderNameConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\DataSourceIDConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\HierarchicalDataBoundControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\HyperLinkDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\LabelDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\LinkButtonDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\ListControlDataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\ListControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\PanelDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\RegexEditorDialog.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\RegexTypeEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\RepeaterDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\TableCellsCollectionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\TableDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\TableRowsCollectionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design.WebControls\XmlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\AppSettingsExpressionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\CalendarDataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\ClientScriptItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\ClientScriptItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.Design\ColorBuilder.cs" />\r
-    <Compile Include="System.Web.UI.Design\ConnectionStringEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ConnectionStringsExpressionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ContainerControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\ContentDefinition.cs" />\r
-    <Compile Include="System.Web.UI.Design\ContentDesignerState.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlDesignerState.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlLocation.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlParser.cs" />\r
-    <Compile Include="System.Web.UI.Design\ControlPersister.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataBindingCollectionConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataBindingCollectionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataBindingValueUIHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataColumnSelectionConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataFieldConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataMemberConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSetFieldSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSetSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSetViewSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSourceBooleanViewSchemaConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSourceConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSourceDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\DataSourceViewSchemaConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerAutoFormat.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerAutoFormatCollection.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerAutoFormatStyle.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerObject.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerRegion.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerRegionCollection.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignerRegionMouseEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignTimeData.cs" />\r
-    <Compile Include="System.Web.UI.Design\DesignTimeResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.UI.Design\EditableDesignerRegion.cs" />\r
-    <Compile Include="System.Web.UI.Design\ExpressionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ExpressionEditorSheet.cs" />\r
-    <Compile Include="System.Web.UI.Design\ExpressionsCollectionConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\ExpressionsCollectionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\HierarchicalDataSourceConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\HierarchicalDataSourceDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\HtmlControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\HtmlIntrinsicControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\HyperLinkDataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\IContentResolutionService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IControlDesignerBehaviour.cs" />\r
-    <Compile Include="System.Web.UI.Design\IControlDesignerTag.cs" />\r
-    <Compile Include="System.Web.UI.Design\IControlDesignerView.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataBindingSchemaProvider.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceFieldSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceProvider.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDataSourceViewSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDesignTimeResourceProviderFactoryService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDesignTimeResourceWriter.cs" />\r
-    <Compile Include="System.Web.UI.Design\IDocumentProjectItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\IFolderProjectItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\IHierarchicalDataSourceDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\IHtmlControlDesignerBehavior.cs" />\r
-    <Compile Include="System.Web.UI.Design\ImageUrlEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\IProjectItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\ITemplateEditingFrame.cs" />\r
-    <Compile Include="System.Web.UI.Design\ITemplateEditingService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebAdministrationService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebApplication.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebFormReferenceManager.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebFormsBuilderUIService.cs" />\r
-    <Compile Include="System.Web.UI.Design\IWebFormsDocumentService.cs" />\r
-    <Compile Include="System.Web.UI.Design\MailFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\MdbDataFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ReadWriteControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\ResourceExpressionEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ResourceExpressionEditorSheet.cs" />\r
-    <Compile Include="System.Web.UI.Design\SkinIDTypeConverter.cs" />\r
-    <Compile Include="System.Web.UI.Design\SupportsPreviewControlAttribute.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplatedControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplatedEditableDesignerRegion.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateDefinition.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateEditingService.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateEditingVerb.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateGroup.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateGroupCollection.cs" />\r
-    <Compile Include="System.Web.UI.Design\TemplateModeChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.Design\TextControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\TextDataBindingHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\TransactedChangeCallback.cs" />\r
-    <Compile Include="System.Web.UI.Design\TypeSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\UrlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.Design\UrlBuilderOptions.cs" />\r
-    <Compile Include="System.Web.UI.Design\UrlEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\UserControlDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\UserControlFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewEvent.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewFlags.cs" />\r
-    <Compile Include="System.Web.UI.Design\ViewRendering.cs" />\r
-    <Compile Include="System.Web.UI.Design\WebControlToolboxItem.cs" />\r
-    <Compile Include="System.Web.UI.Design\WebFormsDesignerActionService.cs" />\r
-    <Compile Include="System.Web.UI.Design\WebFormsReferenceManager.cs" />\r
-    <Compile Include="System.Web.UI.Design\WebFormsRootDesigner.cs" />\r
-    <Compile Include="System.Web.UI.Design\XmlDataFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XmlDocumentSchema.cs" />\r
-    <Compile Include="System.Web.UI.Design\XmlFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XmlUrlEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XsdSchemaFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XslTransformFileEditor.cs" />\r
-    <Compile Include="System.Web.UI.Design\XslUrlEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\Adorner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\Behavior.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorDragDropEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorDragDropEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorServiceAdornerCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\BehaviorServiceAdornerCollectionEnumerator.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\ComponentGlyph.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\ControlBodyGlyph.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\Glyph.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\GlyphCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\GlyphSelectionType.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\SnapLine.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\SnapLinePriority.cs" />\r
-    <Compile Include="System.Windows.Forms.Design.Behavior\SnapLineType.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\AnchorEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\AxImporter.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\AxParameterData.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\AxWrapperGen.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\BorderSidesEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ComponentDocumentDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ComponentTray.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlBindingsConverter.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlCodeDomSerializer.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlCollectionCodeDomSerializer.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlDataObject.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ControlDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DataMemberFieldConverter.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DataMemberFieldEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DataMemberListEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DataSourceConverter.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DefaultMenuCommands.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DesignerOptions.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DockEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\DocumentDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\EventHandlerService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\FileNameEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\FolderNameEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\FormatStringEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\FormDocumentDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ImageCollectionEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ImageIndexEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ImageListCodeDomSerializer.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ImageListImageEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IMenuEditorService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IMessageReceiver.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IOleDragClient.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ISelectionUIHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IUISelectionService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ListControlStringCollectionEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\MaskDescriptor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\MenuCommands.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\Native.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\PanelDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ParentControlDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ScrollableControlDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\SelectionFrame.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\SelectionRules.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ShortcutKeysEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\SplitContainerDesigner.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\StringArrayEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\StringCollectionEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\TabPageCollectionEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\UISelectionService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\WindowsFormsDesignerOptionService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\WndProcRouter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-plainweb-net_4_5.csproj">\r
-      <Project>{21892B00-1C9F-44F3-AE4C-A6A9A210CEC7}</Project>\r
-      <Name>System.Web-plainweb-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Accessibility/Accessibility-net_4_5.csproj">\r
-      <Project>{FACE8136-C95A-4788-90B2-DB0ECF7A020A}</Project>\r
-      <Name>Accessibility-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Design/System.Design-tests-net_4_5.csproj b/mcs/class/System.Design/System.Design-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 76ad3f2..0000000
--- a/mcs/class/System.Design/System.Design-tests-net_4_5.csproj
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{AB2530F9-0740-41BF-9276-865F11BCAC7A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Design-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Design_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.ComponentModel.Design\DesignerActionListsChangedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design\DesignerActionMethodItemTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design\DesignerActionPropertyItemTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Design\StringValueConverterTest.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderBaseNameTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderCodeDomTest.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderNamespaceTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderOtherTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderResourceNameTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderResxFileTests.cs" />\r
-    <Compile Include="Test\System.Resources.Tools\StronglyTypedResourceBuilderVerifyResourceNameTests.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.Design\MenuCommandsTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Design\System.Design-net_4_5-1.csproj">\r
-      <Project>{9A747C88-5D5B-41EA-8435-48EAFCFF3C5B}</Project>\r
-      <Name>System.Design\System.Design-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Windows.Forms\System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms\System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols-net_4_5.csproj b/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols-net_4_5.csproj
deleted file mode 100644 (file)
index 0fd61b3..0000000
--- a/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols-net_4_5.csproj
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{34031168-8F0D-431D-A1DE-044B3D89C7A2}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.DirectoryServices.Protocols</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AddRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AddResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AsqRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AsqResponseControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\AuthType.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\BerConversionException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\BerConverter.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\CompareRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\CompareResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\CrossDomainMoveControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DeleteRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DeleteResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DereferenceAlias.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DereferenceConnectionCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttribute.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttributeCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttributeModification.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttributeModificationCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryAttributeOperation.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryControlCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryIdentifier.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryNotificationControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryOperation.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryOperationException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectoryResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirectorySynchronizationOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirSyncRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DirSyncResponseControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DomainScopeControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlAuthRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlAuthResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlDirectoryIdentifier.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlDocument.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlDocumentProcessing.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlErrorProcessing.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlErrorResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlInvalidDocumentException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlRequestDocument.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlResponseDocument.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlResponseOrder.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlSoapConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\DsmlSoapHttpConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ErrorResponseCategory.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ErrorResponseException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ExtendedDNControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ExtendedDNFlag.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ExtendedRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ExtendedResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LazyCommitControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LdapConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LdapDirectoryIdentifier.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LdapException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LdapSessionOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\LocatorFlags.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ModifyDNRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ModifyDNResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ModifyRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ModifyResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\NotifyOfNewConnectionCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PageResultRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PageResultResponseControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PartialResultProcessing.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PartialResultsCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\PermissiveModifyControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\QueryClientCertificateCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\QueryForConnectionCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\QuotaControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ReferralCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ReferralChasingOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ResultCode.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchOption.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchOptionsControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchRequest.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResponse.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultAttributeCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultEntry.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultEntryCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultReference.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchResultReferenceCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SearchScope.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SecurityDescriptorFlagControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SecurityMasks.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SecurityPackageContextConnectionInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SecurityProtocol.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\ShowDeletedControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SortKey.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SortRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\SortResponseControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\TlsOperationException.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\TreeDeleteControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\VerifyNameControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\VerifyServerCertificateCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\VlvRequestControl.cs" />\r
-    <Compile Include="System.DirectoryServices.Protocols\VlvResponseControl.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.DirectoryServices/System.DirectoryServices-net_4_5.csproj">\r
-      <Project>{EC4E43E7-63C0-4D64-8B7A-E00C097872A5}</Project>\r
-      <Name>System.DirectoryServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_5.csproj b/mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_5.csproj
deleted file mode 100644 (file)
index 9d9d162..0000000
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_5.csproj
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{EC4E43E7-63C0-4D64-8B7A-E00C097872A5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.DirectoryServices</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs.in" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryObjectNotFoundException.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryOperationException.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryPartition.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryReplicationMetadata.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryRole.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryRoleCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchedule.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchema.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchemaClass.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchemaClassCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchemaProperty.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySchemaPropertyCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySecurity.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryServerDownException.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySite.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteLink.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteLinkBridge.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteLinkCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySiteOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySubnet.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySubnetCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectorySyntax.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryTransportType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ApplicationPartition.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ApplicationPartitionCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\AttributeMetadata.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\AttributeMetadataCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryContext.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryContextType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryEntryConfiguration.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryServer.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DirectoryServerCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\Domain.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainCollisionOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainController.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainControllerCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\DomainMode.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\Forest.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestMode.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustCollisionException.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustCollisionType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustDomainInfoCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustDomainInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustDomainStatus.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustRelationshipCollision.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustRelationshipCollisionCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ForestTrustRelationshipInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\GlobalCatalog.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\GlobalCatalogCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\HourOfDay.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\LocatorOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\MinuteOfHour.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\NotificationStatus.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\PropertyTypes.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlyActiveDirectorySchemaClassCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlyActiveDirectorySchemaPropertyCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlyDirectoryServerCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlySiteCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlySiteLinkBridgeCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlySiteLinkCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReadOnlyStringCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationConnection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationConnectionCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationCursor.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationCursorCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationFailure.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationFailureCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationNeighbor.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationNeighborCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationOperation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationOperationCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationOperationInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationOperationType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationSecurityLevel.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ReplicationSpan.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SchemaClassType.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SecurityMasks.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersErrorCategory.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersErrorInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersEvent.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersOperationException.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncFromAllServersOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\SyncUpdateCallback.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TopLevelName.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TopLevelNameCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TopLevelNameCollisionOptions.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TopLevelNameStatus.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TrustDirection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TrustRelationshipInformation.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TrustRelationshipInformationCollection.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\TrustType.cs" />\r
-    <Compile Include="System.DirectoryServices.Design\DirectoryEntryConverter.cs" />\r
-    <Compile Include="System.DirectoryServices\ActiveDirectoryAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\ActiveDirectoryAuditRule.cs" />\r
-    <Compile Include="System.DirectoryServices\ActiveDirectoryRights.cs" />\r
-    <Compile Include="System.DirectoryServices\ActiveDirectorySecurityInheritance.cs" />\r
-    <Compile Include="System.DirectoryServices\AuthenticationTypes.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryEntries.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryEntry.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectorySearcher.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesCOMException.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermission.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermissionAccess.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermissionAttribute.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermissionEntry.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryServicesPermissionEntryCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectorySynchronization.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectorySynchronizationOptions.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryVirtualListView.cs" />\r
-    <Compile Include="System.DirectoryServices\DirectoryVirtualListViewContext.cs" />\r
-    <Compile Include="System.DirectoryServices\DSDescriptionAttribute.cs" />\r
-    <Compile Include="System.DirectoryServices\ExtendedDN.cs" />\r
-    <Compile Include="System.DirectoryServices\ExtendedRightAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\ListChildrenAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\PasswordEncodingMethod.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertyAccess.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertyAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertyCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertySetAccessRule.cs" />\r
-    <Compile Include="System.DirectoryServices\PropertyValueCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\ReferralChasingOption.cs" />\r
-    <Compile Include="System.DirectoryServices\ResultPropertyCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\ResultPropertyValueCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\SchemaNameCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\SearchResult.cs" />\r
-    <Compile Include="System.DirectoryServices\SearchResultCollection.cs" />\r
-    <Compile Include="System.DirectoryServices\SearchScope.cs" />\r
-    <Compile Include="System.DirectoryServices\SortDirection.cs" />\r
-    <Compile Include="System.DirectoryServices\SortOption.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_5.csproj">\r
-      <Project>{E6070FFA-2CBA-4C24-99C1-63A4F5052821}</Project>\r
-      <Name>Novell.Directory.Ldap-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_x.csproj b/mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_x.csproj
index 924e26d9036ee105dbde9ea63e75cf81a4adaa08..c31a24cab6fe8798cbef93f2ee4970d37a0aed82 100644 (file)
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_x.csproj
+++ b/mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_x.csproj
@@ -49,7 +49,7 @@
     <Compile Include="..\..\build\common\Locale.cs" />\r
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
     <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryObjectNotFoundException.cs" />
+    <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryObjectNotFoundException.cs" />\r
     <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryOperationException.cs" />\r
     <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryPartition.cs" />\r
     <Compile Include="System.DirectoryServices.ActiveDirectory\ActiveDirectoryReplicationMetadata.cs" />\r

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices-tests-net_4_5.csproj b/mcs/class/System.DirectoryServices/System.DirectoryServices-tests-net_4_5.csproj
deleted file mode 100644 (file)
index eac8025..0000000
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices-tests-net_4_5.csproj
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9154855D-9656-4742-9CF0-B70B583EE88F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.DirectoryServices-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.DirectoryServices_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesDirectoryEntryTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesDirectorySearcherTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesPermissionTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\DirectoryServicesSearchResultTest.cs" />\r
-    <Compile Include="Test\System.DirectoryServices\TestConfiguration.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.DirectoryServices\System.DirectoryServices-net_4_5.csproj">\r
-      <Project>{EC4E43E7-63C0-4D64-8B7A-E00C097872A5}</Project>\r
-      <Name>System.DirectoryServices\System.DirectoryServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Novell.Directory.Ldap\Novell.Directory.Ldap-net_4_5.csproj">\r
-      <Project>{E6070FFA-2CBA-4C24-99C1-63A4F5052821}</Project>\r
-      <Name>Novell.Directory.Ldap\Novell.Directory.Ldap-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_5.csproj b/mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_5.csproj
deleted file mode 100644 (file)
index 67a17af..0000000
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_5.csproj
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DAEBD561-068A-4730-9F8C-98EC20DDEE78}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Drawing.Design</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Drawing.Design\BitmapEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\ColorEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\ContentAlignmentEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\CursorEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\FontEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\FontNameEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\IconEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\ImageEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\MetafileEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItemContainer.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItemCreator.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxService.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Drawing/System.Drawing-net_4_5.csproj b/mcs/class/System.Drawing/System.Drawing-net_4_5.csproj
deleted file mode 100644 (file)
index 4de6938..0000000
--- a/mcs/class/System.Drawing/System.Drawing-net_4_5.csproj
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Drawing</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Drawing.Design\CategoryNameCollection.cs" />\r
-    <Compile Include="System.Drawing.Design\IPropertyValueUIService.cs" />\r
-    <Compile Include="System.Drawing.Design\IToolboxItemProvider.cs" />\r
-    <Compile Include="System.Drawing.Design\IToolboxService.cs" />\r
-    <Compile Include="System.Drawing.Design\IToolboxUser.cs" />\r
-    <Compile Include="System.Drawing.Design\PaintValueEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Design\PropertyValueItem.cs" />\r
-    <Compile Include="System.Drawing.Design\PropertyValueUIHandler.cs" />\r
-    <Compile Include="System.Drawing.Design\PropertyValueUIItemInvokeHandler.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatedEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatedEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatingEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatingEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItem.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItemCollection.cs" />\r
-    <Compile Include="System.Drawing.Design\ToolboxItemCreatorCallback.cs" />\r
-    <Compile Include="System.Drawing.Design\UITypeEditor.cs" />\r
-    <Compile Include="System.Drawing.Design\UITypeEditorEditStyle.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\AdjustableArrowCap.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\Blend.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\ColorBlend.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CombineMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CompostingMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CompostingQuality.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CoordinateSpace.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\CustomLineCap.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\DashCap.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\DashStyle.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\FillMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\FlushIntention.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\GraphicsContainer.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\GraphicsPath.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\GraphicsPathIterator.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\GraphicsState.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\HatchBrush.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\HatchStyle.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\InterpolationMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\LinearGradientBrush.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\LinearGradientMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\LineCap.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\LineJoin.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\Matrix.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\MatrixOrder.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PathData.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PathGradientBrush.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PathPointType.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PenAlignment.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PenType.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\PixelOffsetMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\QualityMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\RegionData.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\SmoothingMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\WarpMode.cs" />\r
-    <Compile Include="System.Drawing.Drawing2D\WrapMode.cs" />\r
-    <Compile Include="System.Drawing.Imaging\BitmapData.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorAdjustType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorChannelFlag.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMap.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMapType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMatrix.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMatrixFlag.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorMode.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ColorPalette.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EmfPlusRecordType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EmfType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\Encoder.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EncoderParameter.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EncoderParameters.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EncoderParameterValueType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\EncoderValue.cs" />\r
-    <Compile Include="System.Drawing.Imaging\FrameDimension.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageAttributes.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageCodecFlags.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageCodecInfo.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageFlags.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageFormat.cs" />\r
-    <Compile Include="System.Drawing.Imaging\ImageLockMode.cs" />\r
-    <Compile Include="System.Drawing.Imaging\Metafile.cs" />\r
-    <Compile Include="System.Drawing.Imaging\MetafileFrameUnit.cs" />\r
-    <Compile Include="System.Drawing.Imaging\MetafileHeader.cs" />\r
-    <Compile Include="System.Drawing.Imaging\MetafileType.cs" />\r
-    <Compile Include="System.Drawing.Imaging\MetaHeader.cs" />\r
-    <Compile Include="System.Drawing.Imaging\PaletteFlags.cs" />\r
-    <Compile Include="System.Drawing.Imaging\PixelFormat.cs" />\r
-    <Compile Include="System.Drawing.Imaging\PlayRecordCallback.cs" />\r
-    <Compile Include="System.Drawing.Imaging\PropertyItem.cs" />\r
-    <Compile Include="System.Drawing.Imaging\WmfPlaceableFileHeader.cs" />\r
-    <Compile Include="System.Drawing.Printing\Duplex.cs" />\r
-    <Compile Include="System.Drawing.Printing\InvalidPrinterException.cs" />\r
-    <Compile Include="System.Drawing.Printing\Margins.cs" />\r
-    <Compile Include="System.Drawing.Printing\MarginsConverter.cs" />\r
-    <Compile Include="System.Drawing.Printing\PageSettings.cs" />\r
-    <Compile Include="System.Drawing.Printing\PaperKind.cs" />\r
-    <Compile Include="System.Drawing.Printing\PaperSize.cs" />\r
-    <Compile Include="System.Drawing.Printing\PaperSource.cs" />\r
-    <Compile Include="System.Drawing.Printing\PaperSourceKind.cs" />\r
-    <Compile Include="System.Drawing.Printing\PreviewPageInfo.cs" />\r
-    <Compile Include="System.Drawing.Printing\PreviewPrintController.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintAction.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintController.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintDocument.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterResolution.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterResolutionKind.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterUnit.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrinterUnitConvert.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingPermission.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingPermissionAttribute.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingPermissionLevel.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingServices.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingServicesUnix.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintingServicesWin32.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintPageEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Printing\PrintRange.cs" />\r
-    <Compile Include="System.Drawing.Printing\QueryPageSettingsEventArgs.cs" />\r
-    <Compile Include="System.Drawing.Printing\QueryPageSettingsEventHandler.cs" />\r
-    <Compile Include="System.Drawing.Printing\StandardPrintController.cs" />\r
-    <Compile Include="System.Drawing.Text\FontCollection.cs" />\r
-    <Compile Include="System.Drawing.Text\GenericFontFamilies.cs" />\r
-    <Compile Include="System.Drawing.Text\HotkeyPrefix.cs" />\r
-    <Compile Include="System.Drawing.Text\InstalledFontCollection.cs" />\r
-    <Compile Include="System.Drawing.Text\PrivateFontCollection.cs" />\r
-    <Compile Include="System.Drawing.Text\TextRenderingHint.cs" />\r
-    <Compile Include="System.Drawing\Bitmap.cs" />\r
-    <Compile Include="System.Drawing\Brush.cs" />\r
-    <Compile Include="System.Drawing\Brushes.cs" />\r
-    <Compile Include="System.Drawing\BufferedGraphics.cs" />\r
-    <Compile Include="System.Drawing\BufferedGraphicsContext.cs" />\r
-    <Compile Include="System.Drawing\BufferedGraphicsManager.cs" />\r
-    <Compile Include="System.Drawing\CharacterRange.cs" />\r
-    <Compile Include="System.Drawing\Color.cs" />\r
-    <Compile Include="System.Drawing\ColorConverter.cs" />\r
-    <Compile Include="System.Drawing\ColorTranslator.cs" />\r
-    <Compile Include="System.Drawing\ComIStreamMarshaler.cs" />\r
-    <Compile Include="System.Drawing\ComIStreamWrapper.cs" />\r
-    <Compile Include="System.Drawing\ContentAlignment.cs" />\r
-    <Compile Include="System.Drawing\CopyPixelOperation.cs" />\r
-    <Compile Include="System.Drawing\Font.cs" />\r
-    <Compile Include="System.Drawing\FontConverter.cs" />\r
-    <Compile Include="System.Drawing\FontFamily.cs" />\r
-    <Compile Include="System.Drawing\FontStyle.cs" />\r
-    <Compile Include="System.Drawing\gdipEnums.cs" />\r
-    <Compile Include="System.Drawing\gdipFunctions.cs" />\r
-    <Compile Include="System.Drawing\gdipStructs.cs" />\r
-    <Compile Include="System.Drawing\Graphics.cs" />\r
-    <Compile Include="System.Drawing\GraphicsUnit.cs" />\r
-    <Compile Include="System.Drawing\Icon.cs" />\r
-    <Compile Include="System.Drawing\IconConverter.cs" />\r
-    <Compile Include="System.Drawing\IDeviceContext.cs" />\r
-    <Compile Include="System.Drawing\Image.cs" />\r
-    <Compile Include="System.Drawing\ImageAnimator.cs" />\r
-    <Compile Include="System.Drawing\ImageConverter.cs" />\r
-    <Compile Include="System.Drawing\ImageFormatConverter.cs" />\r
-    <Compile Include="System.Drawing\KnownColor.cs" />\r
-    <Compile Include="System.Drawing\KnownColors.cs" />\r
-    <Compile Include="System.Drawing\macFunctions.cs" />\r
-    <Compile Include="System.Drawing\Pen.cs" />\r
-    <Compile Include="System.Drawing\Pens.cs" />\r
-    <Compile Include="System.Drawing\Point.cs" />\r
-    <Compile Include="System.Drawing\PointConverter.cs" />\r
-    <Compile Include="System.Drawing\PointF.cs" />\r
-    <Compile Include="System.Drawing\Rectangle.cs" />\r
-    <Compile Include="System.Drawing\RectangleConverter.cs" />\r
-    <Compile Include="System.Drawing\RectangleF.cs" />\r
-    <Compile Include="System.Drawing\Region.cs" />\r
-    <Compile Include="System.Drawing\RotateFlipType.cs" />\r
-    <Compile Include="System.Drawing\Size.cs" />\r
-    <Compile Include="System.Drawing\SizeConverter.cs" />\r
-    <Compile Include="System.Drawing\SizeF.cs" />\r
-    <Compile Include="System.Drawing\SizeFConverter.cs" />\r
-    <Compile Include="System.Drawing\SolidBrush.cs" />\r
-    <Compile Include="System.Drawing\SRDescriptionAttribute.cs" />\r
-    <Compile Include="System.Drawing\StringAligment.cs" />\r
-    <Compile Include="System.Drawing\StringDigitSubstitute.cs" />\r
-    <Compile Include="System.Drawing\StringFormat.cs" />\r
-    <Compile Include="System.Drawing\StringFormatFlags.cs" />\r
-    <Compile Include="System.Drawing\StringTrimming.cs" />\r
-    <Compile Include="System.Drawing\StringUnit.cs" />\r
-    <Compile Include="System.Drawing\SystemBrushes.cs" />\r
-    <Compile Include="System.Drawing\SystemColors.cs" />\r
-    <Compile Include="System.Drawing\SystemFonts.cs" />\r
-    <Compile Include="System.Drawing\SystemIcons.cs" />\r
-    <Compile Include="System.Drawing\SystemPens.cs" />\r
-    <Compile Include="System.Drawing\TextureBrush.cs" />\r
-    <Compile Include="System.Drawing\ToolboxBitmapAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Assembly/Mono.ico">\r
-      <LogicalName>Mono.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Information.ico">\r
-      <LogicalName>Information.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Error.ico">\r
-      <LogicalName>Error.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Warning.ico">\r
-      <LogicalName>Warning.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Question.ico">\r
-      <LogicalName>Question.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Shield.ico">\r
-      <LogicalName>Shield.ico</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Drawing/System.Drawing-tests-net_4_5.csproj b/mcs/class/System.Drawing/System.Drawing-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 6b5bd8e..0000000
--- a/mcs/class/System.Drawing/System.Drawing-tests-net_4_5.csproj
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6E248AA8-76CF-4FFE-859D-F979E3DE810B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169,1595</NoWarn>\r
-    <OutputPath>bin\Debug\System.Drawing-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Drawing_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169,1595</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;TEST</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169,1595</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;TEST</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="System.Drawing\gdipEnums.cs" />\r
-    <Compile Include="System.Drawing\gdipFunctions.cs" />\r
-    <Compile Include="System.Drawing\gdipStructs.cs" />\r
-    <Compile Include="Test\HostIgnoreList.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\CategoryNameCollectionCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\PaintValueEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\PropertyValueUIItemCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\TestToolboxItem.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\ToolboxComponentsCreatedEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\ToolboxComponentsCreatingEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\ToolboxItemCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\ToolboxItemCollectionCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\UITypeEditorCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Design\UITypeEditorTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\GraphicsPathTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\LinearGradientBrushTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\PathDataTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\PathGradientBrushTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\TestBlend.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\TestColorBlend.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\TestHatchBrush.cs" />\r
-    <Compile Include="Test\System.Drawing.Drawing2D\TestMatrix.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\EmfPlusRecordTypeTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\FrameDimensionTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\GifCodecTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\IconCodecTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\MetafileTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\MetaHeaderTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\PngCodecTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestBmpCodec.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestColorMatrix.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestImageAttributes.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestImageCodecInfo.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestImageFormat.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TestJpegCodec.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\TiffCodecTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Imaging\WmfPlaceableFileHeaderTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\MarginsTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PageSettingsTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PageSourceTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PaperSizeTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PrinterUnitConvertTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PrintingPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PrintingPermissionTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Printing\PrintingServicesUnixTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Text\InstalledFontCollectionTest.cs" />\r
-    <Compile Include="Test\System.Drawing.Text\PrivateFontCollectionCas.cs" />\r
-    <Compile Include="Test\System.Drawing.Text\PrivateFontCollectionTest.cs" />\r
-    <Compile Include="Test\System.Drawing\BitmapCas.cs" />\r
-    <Compile Include="Test\System.Drawing\ColorConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\ColorTranslator.cs" />\r
-    <Compile Include="Test\System.Drawing\FontFamilyTest.cs" />\r
-    <Compile Include="Test\System.Drawing\GDIPlusTest.cs" />\r
-    <Compile Include="Test\System.Drawing\GraphicsCas.cs" />\r
-    <Compile Include="Test\System.Drawing\PenTest.cs" />\r
-    <Compile Include="Test\System.Drawing\RegionCas.cs" />\r
-    <Compile Include="Test\System.Drawing\RegionDataTest.cs" />\r
-    <Compile Include="Test\System.Drawing\RegionNonRectTest.cs" />\r
-    <Compile Include="Test\System.Drawing\SolidBrushTest.cs" />\r
-    <Compile Include="Test\System.Drawing\SystemFontsTest.cs" />\r
-    <Compile Include="Test\System.Drawing\SystemIconsTest.cs" />\r
-    <Compile Include="Test\System.Drawing\TestBitmap.cs" />\r
-    <Compile Include="Test\System.Drawing\TestBrushes.cs" />\r
-    <Compile Include="Test\System.Drawing\TestColor.cs" />\r
-    <Compile Include="Test\System.Drawing\TestFont.cs" />\r
-    <Compile Include="Test\System.Drawing\TestFontConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestGraphics.cs" />\r
-    <Compile Include="Test\System.Drawing\TestIcon.cs" />\r
-    <Compile Include="Test\System.Drawing\TestIconConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestImage.cs" />\r
-    <Compile Include="Test\System.Drawing\TestImageConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestImageFormatConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestPens.cs" />\r
-    <Compile Include="Test\System.Drawing\TestPoint.cs" />\r
-    <Compile Include="Test\System.Drawing\TestPointConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestPointF.cs" />\r
-    <Compile Include="Test\System.Drawing\TestRectangle.cs" />\r
-    <Compile Include="Test\System.Drawing\TestRectangleConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestRectangleF.cs" />\r
-    <Compile Include="Test\System.Drawing\TestRegion.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSize.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSizeConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSizeF.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSizeFConverter.cs" />\r
-    <Compile Include="Test\System.Drawing\TestStringFormat.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSystemBrushes.cs" />\r
-    <Compile Include="Test\System.Drawing\TestSystemPens.cs" />\r
-    <Compile Include="Test\System.Drawing\TextureBrushTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0.csproj">\r
-      <Project>{2FDBA71E-A6EC-4247-B0BD-BF7A618C0747}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Assembly/Mono.ico">\r
-      <LogicalName>Mono.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Information.ico">\r
-      <LogicalName>Information.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Error.ico">\r
-      <LogicalName>Error.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Warning.ico">\r
-      <LogicalName>Warning.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Question.ico">\r
-      <LogicalName>Question.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Assembly/Shield.ico">\r
-      <LogicalName>Shield.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/indexed.png">\r
-      <LogicalName>indexed.png</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Dynamic/System.Dynamic-net_4_5.csproj b/mcs/class/System.Dynamic/System.Dynamic-net_4_5.csproj
deleted file mode 100644 (file)
index 45682c2..0000000
--- a/mcs/class/System.Dynamic/System.Dynamic-net_4_5.csproj
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5F5C22E0-4AD5-4F78-94A7-038F823E1E3D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414,169</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Dynamic</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;CODEPLEX_40</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;CODEPLEX_40</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\Assert.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\BoolArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\BoundDispEvent.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\CollectionExtensions.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComBinderHelpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComDispIds.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComEventDesc.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComEventSink.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComEventSinkProxy.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComEventSinksContainer.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComFallbackMetaObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComHresults.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComInterop.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComInvokeAction.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComInvokeBinder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComMetaObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComMethodDesc.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComRuntimeHelpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComTypeClassDesc.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComTypeDesc.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComTypeEnumDesc.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ComTypeLibDesc.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ContractUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ConversionArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ConvertArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ConvertibleArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\CurrencyArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\DateTimeArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\DispatchArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\DispCallable.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\DispCallableMetaObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ErrorArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\Errors.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ExcepInfo.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\Helpers.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\IDispatchComObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\IDispatchMetaObject.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\NullArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\SimpleArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\SplatCallSite.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\StringArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\TypeUtils.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\UnknownArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\VarEnumSelector.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\Variant.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\VariantArgBuilder.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\VariantArray.cs" />\r
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\VariantBuilder.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj b/mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj
deleted file mode 100644 (file)
index df9e33d..0000000
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{773D8BA7-9A88-49AC-81C9-740436270588}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,168,162</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.EnterpriseServices</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,168,162</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,168,162</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\ApplicationCrmEnabledAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\Clerk.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\ClerkInfo.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\ClerkMonitor.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\Compensator.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\CompensatorOptions.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\LogRecord.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\LogRecordFlags.cs" />\r
-    <Compile Include="System.EnterpriseServices.CompensatingResourceManager\TransactionState.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\AppDomainHelper.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\AssemblyLocator.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ClientRemotingConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ClrObjectFactory.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ComManagedImportUtil.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ComSoapPublishError.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\GenerateMetadata.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IClrObjectFactory.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IComManagedImportUtil.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IComSoapIISVRoot.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IComSoapMetadata.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IComSoapPublisher.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IISVirtualRoot.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\IServerWebConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ISoapClientImport.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ISoapServerTlb.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ISoapServerVRoot.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ISoapUtility.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\Publish.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\ServerWebConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\SoapClientImport.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\SoapServerTlb.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\SoapServerVRoot.cs" />\r
-    <Compile Include="System.EnterpriseServices.Internal\SoapUtility.cs" />\r
-    <Compile Include="System.EnterpriseServices\AccessChecksLevelOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\ActivationOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\Activity.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationAccessControlAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationActivationAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationIDAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationNameAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ApplicationQueuingAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\AuthenticationOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\AutoCompleteAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\BindingOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\BOID.cs" />\r
-    <Compile Include="System.EnterpriseServices\BYOT.cs" />\r
-    <Compile Include="System.EnterpriseServices\ComponentAccessControlAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\COMTIIntrinsicsAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ConstructionEnabledAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ContextUtil.cs" />\r
-    <Compile Include="System.EnterpriseServices\DescriptionAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\EventClassAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\EventTrackingEnabledAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ExceptionClassAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\IAsyncErrorNotify.cs" />\r
-    <Compile Include="System.EnterpriseServices\IConfigurationAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\IISIntrinsicsAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ImpersonationLevelOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\InheritanceOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\InstallationFlags.cs" />\r
-    <Compile Include="System.EnterpriseServices\InterfaceQueuingAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\IPlaybackControl.cs" />\r
-    <Compile Include="System.EnterpriseServices\IProcessInitControl.cs" />\r
-    <Compile Include="System.EnterpriseServices\IProcessInitializer.cs" />\r
-    <Compile Include="System.EnterpriseServices\IRegistrationHelper.cs" />\r
-    <Compile Include="System.EnterpriseServices\IRemoteDispatch.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISecurityCallContext.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISecurityCallersColl.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISecurityIdentityColl.cs" />\r
-    <Compile Include="System.EnterpriseServices\IServiceCall.cs" />\r
-    <Compile Include="System.EnterpriseServices\IServicedComponentInfo.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISharedProperty.cs" />\r
-    <Compile Include="System.EnterpriseServices\ISharedPropertyGroup.cs" />\r
-    <Compile Include="System.EnterpriseServices\ITransaction.cs" />\r
-    <Compile Include="System.EnterpriseServices\JustInTimeActivationAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\LoadBalancingSupportedAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\MustRunInClientContextAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ObjectPoolingAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\PartitionOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\PrivateComponentAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\PropertyLockMode.cs" />\r
-    <Compile Include="System.EnterpriseServices\PropertyReleaseMode.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationErrorInfo.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationException.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationHelper.cs" />\r
-    <Compile Include="System.EnterpriseServices\RegistrationHelperTx.cs" />\r
-    <Compile Include="System.EnterpriseServices\ResourcePool.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecureMethodAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecurityCallContext.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecurityCallers.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecurityIdentity.cs" />\r
-    <Compile Include="System.EnterpriseServices\SecurityRoleAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\ServiceConfig.cs" />\r
-    <Compile Include="System.EnterpriseServices\ServicedComponent.cs" />\r
-    <Compile Include="System.EnterpriseServices\ServicedComponentException.cs" />\r
-    <Compile Include="System.EnterpriseServices\ServiceDomain.cs" />\r
-    <Compile Include="System.EnterpriseServices\SharedProperty.cs" />\r
-    <Compile Include="System.EnterpriseServices\SharedPropertyGroup.cs" />\r
-    <Compile Include="System.EnterpriseServices\SharedPropertyGroupManager.cs" />\r
-    <Compile Include="System.EnterpriseServices\SxsOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\SynchronizationAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\SynchronizationOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\ThreadPoolOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionAttribute.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionIsolationLevel.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionOption.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionStatus.cs" />\r
-    <Compile Include="System.EnterpriseServices\TransactionVote.cs" />\r
-    <Compile Include="System.EnterpriseServices\XACTTRANSINFO.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Transactions/System.Transactions-net_4_5.csproj">\r
-      <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_5.csproj b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_5.csproj
deleted file mode 100644 (file)
index 6498849..0000000
--- a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_5.csproj
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4124933B-9DE6-4D76-8ABB-AEAE814CFB26}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.IO.Compression.FileSystem</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="ZipFile.cs" />\r
-    <Compile Include="ZipFileExtensions.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.IO.Compression/System.IO.Compression-net_4_5.csproj">\r
-      <Project>{BDF04E30-60D9-4279-A1DF-3291328A5AFD}</Project>\r
-      <Name>System.IO.Compression-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.IO.Compression/System.IO.Compression-net_4_5.csproj b/mcs/class/System.IO.Compression/System.IO.Compression-net_4_5.csproj
deleted file mode 100644 (file)
index 20e993a..0000000
--- a/mcs/class/System.IO.Compression/System.IO.Compression-net_4_5.csproj
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{BDF04E30-60D9-4279-A1DF-3291328A5AFD}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.IO.Compression</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="SharpCompress\Archive\AbstractArchive.cs" />\r
-    <Compile Include="SharpCompress\Archive\AbstractWritableArchive.cs" />\r
-    <Compile Include="SharpCompress\Archive\AbstractWritableArchive.Extensions.cs" />\r
-    <Compile Include="SharpCompress\Archive\ArchiveFactory.cs" />\r
-    <Compile Include="SharpCompress\Archive\IArchive.cs" />\r
-    <Compile Include="SharpCompress\Archive\IArchive.Extensions.cs" />\r
-    <Compile Include="SharpCompress\Archive\IArchiveEntry.cs" />\r
-    <Compile Include="SharpCompress\Archive\IArchiveEntry.Extensions.cs" />\r
-    <Compile Include="SharpCompress\Archive\IArchiveExtractionListener.cs" />\r
-    <Compile Include="SharpCompress\Archive\IWritableArchiveEntry.cs" />\r
-    <Compile Include="SharpCompress\Archive\Zip\ZipArchive.cs" />\r
-    <Compile Include="SharpCompress\Archive\Zip\ZipArchiveEntry.cs" />\r
-    <Compile Include="SharpCompress\Archive\Zip\ZipWritableArchiveEntry.cs" />\r
-    <Compile Include="SharpCompress\Common\ArchiveEncoding.cs" />\r
-    <Compile Include="SharpCompress\Common\ArchiveException.cs" />\r
-    <Compile Include="SharpCompress\Common\ArchiveExtractionEventArgs.cs" />\r
-    <Compile Include="SharpCompress\Common\ArchiveType.cs" />\r
-    <Compile Include="SharpCompress\Common\CompressedBytesReadEventArgs.cs" />\r
-    <Compile Include="SharpCompress\Common\CompressionInfo.cs" />\r
-    <Compile Include="SharpCompress\Common\CompressionType.cs" />\r
-    <Compile Include="SharpCompress\Common\CryptographicException.cs" />\r
-    <Compile Include="SharpCompress\Common\Entry.cs" />\r
-    <Compile Include="SharpCompress\Common\EntryStream.cs" />\r
-    <Compile Include="SharpCompress\Common\ExtractionException.cs" />\r
-    <Compile Include="SharpCompress\Common\ExtractOptions.cs" />\r
-    <Compile Include="SharpCompress\Common\FilePart.cs" />\r
-    <Compile Include="SharpCompress\Common\FilePartExtractionBeginEventArgs.cs" />\r
-    <Compile Include="SharpCompress\Common\FlagUtility.cs" />\r
-    <Compile Include="SharpCompress\Common\IEntry.cs" />\r
-    <Compile Include="SharpCompress\Common\IExtractionListener.cs" />\r
-    <Compile Include="SharpCompress\Common\IncompleteArchiveException.cs" />\r
-    <Compile Include="SharpCompress\Common\InvalidFormatException.cs" />\r
-    <Compile Include="SharpCompress\Common\IVolume.cs" />\r
-    <Compile Include="SharpCompress\Common\MultipartStreamRequiredException.cs" />\r
-    <Compile Include="SharpCompress\Common\MultiVolumeExtractionException.cs" />\r
-    <Compile Include="SharpCompress\Common\Options.cs" />\r
-    <Compile Include="SharpCompress\Common\PasswordProtectedException.cs" />\r
-    <Compile Include="SharpCompress\Common\Volume.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\Headers\DirectoryEndHeader.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\Headers\DirectoryEntryHeader.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\Headers\HeaderFlags.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\Headers\IgnoreHeader.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\Headers\LocalEntryHeader.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\Headers\SplitHeader.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\Headers\ZipFileEntry..cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\Headers\ZipHeader.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\Headers\ZipHeaderType.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\PkwareTraditionalCryptoStream.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\PkwareTraditionalEncryptionData.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\SeekableZipFilePart.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\SeekableZipHeaderFactory.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\StreamingZipFilePart.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\StreamingZipHeaderFactory.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\WinzipAesCryptoStream.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\WinzipAesEncryptionData.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\WinzipAesKeySize.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\ZipCompressionMethod.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\ZipEntry.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\ZipFilePart.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\ZipHeaderFactory.cs" />\r
-    <Compile Include="SharpCompress\Common\Zip\ZipVolume.cs" />\r
-    <Compile Include="SharpCompress\Compressor\CompressionMode.cs" />\r
-    <Compile Include="SharpCompress\Compressor\Deflate\CRC32.cs" />\r
-    <Compile Include="SharpCompress\Compressor\Deflate\ZlibBase.cs" />\r
-    <Compile Include="SharpCompress\EnumExtensions.cs" />\r
-    <Compile Include="SharpCompress\IO\AppendingStream.cs" />\r
-    <Compile Include="SharpCompress\IO\CountingWritableSubStream.cs" />\r
-    <Compile Include="SharpCompress\IO\ListeningStream.cs" />\r
-    <Compile Include="SharpCompress\IO\MarkingBinaryReader.cs" />\r
-    <Compile Include="SharpCompress\IO\NonDisposingStream.cs" />\r
-    <Compile Include="SharpCompress\IO\ReadOnlySubStream.cs" />\r
-    <Compile Include="SharpCompress\IO\RewindableStream.cs" />\r
-    <Compile Include="SharpCompress\IO\StreamingMode.cs" />\r
-    <Compile Include="SharpCompress\LazyReadOnlyCollection.cs" />\r
-    <Compile Include="SharpCompress\Reader\AbstractReader.cs" />\r
-    <Compile Include="SharpCompress\Reader\IReader.cs" />\r
-    <Compile Include="SharpCompress\Reader\IReader.Extensions.cs" />\r
-    <Compile Include="SharpCompress\Reader\ReaderFactory.cs" />\r
-    <Compile Include="SharpCompress\Reader\Zip\ZipReader.cs" />\r
-    <Compile Include="SharpCompress\ReadOnlyCollection.cs" />\r
-    <Compile Include="SharpCompress\Utility.cs" />\r
-    <Compile Include="SharpCompress\Writer\AbstractWriter.cs" />\r
-    <Compile Include="SharpCompress\Writer\IWriter.cs" />\r
-    <Compile Include="SharpCompress\Writer\IWriter.Extensions.cs" />\r
-    <Compile Include="SharpCompress\Writer\WriterFactory.cs" />\r
-    <Compile Include="SharpCompress\Writer\Zip\ZipCentralDirectoryEntry.cs" />\r
-    <Compile Include="SharpCompress\Writer\Zip\ZipWriter.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r
-    <Compile Include="ZipArchive.cs" />\r
-    <Compile Include="ZipArchiveEntry.cs" />\r
-    <Compile Include="ZipArchiveMode.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_5.csproj b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_5.csproj
deleted file mode 100644 (file)
index d106a85..0000000
--- a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_5.csproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{AB4F77BB-4340-4A79-9B66-EF5B4221E1F2}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.IdentityModel.Selectors</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\CardSpaceException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\CardSpacePolicyElement.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\CardSpaceSelector.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\IdentityValidationException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\PolicyValidationException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\ServiceBusyException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\ServiceNotStartedException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\StsCommunicationException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UnsupportedPolicyOptionsException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UntrustedRecipientException.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UserCancellationException.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Security/System.Security-net_4_5.csproj">\r
-      <Project>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</Project>\r
-      <Name>System.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.IdentityModel/System.IdentityModel-net_4_5.csproj">\r
-      <Project>{F056C062-E467-4989-9366-440E8CD23C0C}</Project>\r
-      <Name>System.IdentityModel-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.IdentityModel/System.IdentityModel-net_4_5.csproj b/mcs/class/System.IdentityModel/System.IdentityModel-net_4_5.csproj
deleted file mode 100644 (file)
index 5a14255..0000000
--- a/mcs/class/System.IdentityModel/System.IdentityModel-net_4_5.csproj
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F056C062-E467-4989-9366-440E8CD23C0C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.IdentityModel</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\Claim.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\ClaimSet.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\ClaimTypes.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\DefaultClaimSet.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\Rights.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\WindowsClaimSet.cs" />\r
-    <Compile Include="System.IdentityModel.Claims\X509CertificateClaimSet.cs" />\r
-    <Compile Include="System.IdentityModel.Configuration\ICustomIdentityConfiguration.cs" />\r
-    <Compile Include="System.IdentityModel.Configuration\IdentityModelCaches.cs" />\r
-    <Compile Include="System.IdentityModel.Policy\AuthorizationContext.cs" />\r
-    <Compile Include="System.IdentityModel.Policy\EvaluationContext.cs" />\r
-    <Compile Include="System.IdentityModel.Policy\IAuthorizationComponent.cs" />\r
-    <Compile Include="System.IdentityModel.Policy\IAuthorizationPolicy.cs" />\r
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\BinaryExchange.cs" />\r
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\EndpointReference.cs" />\r
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\Entropy.cs" />\r
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\Lifetime.cs" />\r
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\ProtectedKey.cs" />\r
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\RequestedProofToken.cs" />\r
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\RequestedSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\RequestSecurityTokenResponse.cs" />\r
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\Status.cs" />\r
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\UseKey.cs" />\r
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\WSTrustMessage.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\AudienceUriMode.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\CustomUserNameSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\KerberosSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\KerberosSecurityTokenProvider.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\RsaSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SamlSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenManager.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenProvider.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenRequirement.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenResolver.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenSerializer.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenVersion.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\SystemIdentityAuthorizationPolicy.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UserNamePasswordValidator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UserNameSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\UserNameSecurityTokenProvider.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\WindowsSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\WindowsUserNameSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\X509CertificateValidator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\X509SecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.IdentityModel.Selectors\X509SecurityTokenProvider.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\AsymmetricSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\AudienceRestriction.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\AuthenticationContext.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\AuthenticationInformation.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\BinaryKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\BootstrapContext.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\EncryptedKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\EncryptingCredentials.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\GenericXmlSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\InMemorySymmetricSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\IssuerNameRegistry.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\KerberosReceiverSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\KerberosRequestorSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\LocalIdKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\ProofDescriptor.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\RsaKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\RsaSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\RsaSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAccessDecision.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAction.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAdvice.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAssertion.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAssertionKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAttribute.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAttributeStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAudienceRestrictionCondition.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthenticationClaimResource.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthenticationStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthorityBinding.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthorizationDecisionClaimResource.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthorizationDecisionStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlCondition.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlConditions.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlConstants.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlDoNotCacheCondition.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlEvidence.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlNameIdentifierClaimResource.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlSerializer.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlSubject.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SamlSubjectStatement.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityAlgorithms.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyIdentifier.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyType.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyUsage.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenDescriptor.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenException.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenExpiredException.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenHandler.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenHandlerCollection.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenHandlerConfiguration.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenNotYetValidException.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenReplayDetectedException.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenTypes.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenValidationException.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SessionSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SessionSecurityTokenCache.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SessionSecurityTokenCacheKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SessionSecurityTokenHandler.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SigningCredentials.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\SymmetricSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\TlsHMAC.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\TokenReplayCache.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\UserNameSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\WindowsSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509AsymmetricSecurityKey.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509IssuerSerialKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509RawDataKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509SecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509SigningCredentials.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509SubjectKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509ThumbprintKeyIdentifierClause.cs" />\r
-    <Compile Include="System.IdentityModel.Tokens\X509WindowsSecurityToken.cs" />\r
-    <Compile Include="System.IdentityModel\CookieTransform.cs" />\r
-    <Compile Include="System.IdentityModel\OpenObject.cs" />\r
-    <Compile Include="System.IdentityModel\SignatureVerificationFailedException.cs" />\r
-    <Compile Include="System.Security.Claims\AuthenticationTypes.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateValidationMode.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj">\r
-      <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Security/System.Security-net_4_5.csproj">\r
-      <Project>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</Project>\r
-      <Name>System.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.IdentityModel/System.IdentityModel-tests-net_4_5.csproj b/mcs/class/System.IdentityModel/System.IdentityModel-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 3099e1b..0000000
--- a/mcs/class/System.IdentityModel/System.IdentityModel-tests-net_4_5.csproj
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A9AD4247-006F-4885-88E7-AFF48405D1A1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.IdentityModel-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.IdentityModel_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.IdentityModel.Claims\ClaimSetTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Claims\ClaimTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Claims\ClaimTypesTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Claims\X509CertificateClaimSetTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Common\MySecurityTokenSerializer.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Policy\AuthorizationContextTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\CustomUserNameSecurityTokenAuthenticatorTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\RsaSecurityTokenAuthenticatorTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\SamlSecurityTokenAuthenticatorTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\SecurityTokenRequirementTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\SecurityTokenResolverTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\TestEvaluationContext.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\X509SecurityTokenAuthenticatorTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Selectors\X509SecurityTokenProviderTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\EncryptedKeyIdentifierClauseTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\InMemorySymmetricSecurityKeyTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\LocalIdKeyIdentifierClauseTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlActionTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAssertionTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAttributeStatementTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAudienceRestrictionConditionTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAuthenticationStatementTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAuthorityBindingTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlAuthorizationDecisionStatementTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlConditionsTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlConstantsTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlEvidenceTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SamlSubjectTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SecurityAlgorithmsTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SecurityKeyIdentifierTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\SecurityTokenTypesTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\UserNameSecurityTokenTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\X509AsymmetricSecurityKeyTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\X509IssuerSerialKeyIdentifierClauseTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\X509SecurityTokenTest.cs" />\r
-    <Compile Include="Test\System.IdentityModel.Tokens\X509ThumbprintKeyIdentifierClauseTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel\System.IdentityModel-net_4_5.csproj">\r
-      <Project>{F056C062-E467-4989-9366-440E8CD23C0C}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_4_5.csproj">\r
-      <Project>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</Project>\r
-      <Name>System.Security\System.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_5-2.csproj">\r
-      <Project>{725FB152-838A-4C6E-8A12-AC47E2DD4CEA}</Project>\r
-      <Name>System.Web\System.Web-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5.csproj">\r
-      <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_5.csproj b/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_5.csproj
deleted file mode 100644 (file)
index 8e0e4c9..0000000
--- a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_5.csproj
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3694FAEB-90F5-46E8-AD30-E91FF97B401A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Json.Microsoft</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETMVC;FEATURE_DYNAMIC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETMVC;FEATURE_DYNAMIC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\RS.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Json\Extensions\JsonValueExtensions.cs" />\r
-    <Compile Include="System.Json\GlobalSuppressions.cs" />\r
-    <Compile Include="System.Json\JsonArray.cs" />\r
-    <Compile Include="System.Json\JsonObject.cs" />\r
-    <Compile Include="System.Json\JsonPrimitive.cs" />\r
-    <Compile Include="System.Json\JsonType.cs" />\r
-    <Compile Include="System.Json\JsonValue.cs" />\r
-    <Compile Include="System.Json\JsonValueChange.cs" />\r
-    <Compile Include="System.Json\JsonValueChangeEventArgs.cs" />\r
-    <Compile Include="System.Json\JsonValueDynamicMetaObject.cs" />\r
-    <Compile Include="System.Json\JsonValueLinqExtensions.cs" />\r
-    <Compile Include="System.Json\JXmlToJsonValueConverter.cs" />\r
-    <Compile Include="System.Json\NGenWrapper.cs" />\r
-    <Compile Include="System.Json\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="System.Json\Properties\Resources.Designer.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.CSharp/Microsoft.CSharp-net_4_5.csproj">\r
-      <Project>{D554618C-5D38-413A-82BA-7A70B6FC61A3}</Project>\r
-      <Name>Microsoft.CSharp-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Json.Properties.Resources.resources">\r
-      <LogicalName>System.Json.Properties.Resources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-tests-net_4_5.csproj b/mcs/class/System.Json.Microsoft/System.Json.Microsoft-tests-net_4_5.csproj
deleted file mode 100644 (file)
index ffcc4bd..0000000
--- a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-tests-net_4_5.csproj
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{BF6DC977-2D12-4FE0-A44C-759FBD4FE7E9}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Json.Microsoft-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Json.Microsoft_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;ASPNETMVC;FEATURE_DYNAMIC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;ASPNETMVC;FEATURE_DYNAMIC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Json\JsonValueTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Json.Microsoft\System.Json.Microsoft-net_4_5.csproj">\r
-      <Project>{3694FAEB-90F5-46E8-AD30-E91FF97B401A}</Project>\r
-      <Name>System.Json.Microsoft\System.Json.Microsoft-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.CSharp\Microsoft.CSharp-net_4_5.csproj">\r
-      <Project>{D554618C-5D38-413A-82BA-7A70B6FC61A3}</Project>\r
-      <Name>Microsoft.CSharp\Microsoft.CSharp-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Json.Properties.Resources.resources">\r
-      <LogicalName>System.Json.Properties.Resources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Json/System.Json-net_4_5.csproj b/mcs/class/System.Json/System.Json-net_4_5.csproj
deleted file mode 100644 (file)
index 7636191..0000000
--- a/mcs/class/System.Json/System.Json-net_4_5.csproj
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A062944C-09A6-4C2C-A2DC-60BB1EB19766}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Json</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.Runtime.Serialization.Json\JavaScriptReader.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Json\JsonArray.cs" />\r
-    <Compile Include="System.Json\JsonObject.cs" />\r
-    <Compile Include="System.Json\JsonPrimitive.cs" />\r
-    <Compile Include="System.Json\JsonType.cs" />\r
-    <Compile Include="System.Json\JsonValue.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Json/System.Json-tests-net_4_5.csproj b/mcs/class/System.Json/System.Json-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 6993367..0000000
--- a/mcs/class/System.Json/System.Json-tests-net_4_5.csproj
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C9E9ACC2-4917-4C0C-8734-AD4864EEB7C2}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Json-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Json_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Json\JsonValueTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Json\System.Json-net_4_5.csproj">\r
-      <Project>{A062944C-09A6-4C2C-A2DC-60BB1EB19766}</Project>\r
-      <Name>System.Json\System.Json-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Management/System.Management-net_4_5.csproj b/mcs/class/System.Management/System.Management-net_4_5.csproj
deleted file mode 100644 (file)
index 25ebfed..0000000
--- a/mcs/class/System.Management/System.Management-net_4_5.csproj
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6F650EE0-43D3-4875-92E8-E3FA07E18575}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Management</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Management.Instrumentation\BaseEvent.cs" />\r
-    <Compile Include="System.Management.Instrumentation\DefaultManagementProjectInstaller.cs" />\r
-    <Compile Include="System.Management.Instrumentation\IEvent.cs" />\r
-    <Compile Include="System.Management.Instrumentation\IgnoreMemberAttribute.cs" />\r
-    <Compile Include="System.Management.Instrumentation\IInstance.cs" />\r
-    <Compile Include="System.Management.Instrumentation\Instance.cs" />\r
-    <Compile Include="System.Management.Instrumentation\Instrumentation.cs" />\r
-    <Compile Include="System.Management.Instrumentation\InstrumentationClassAttribute.cs" />\r
-    <Compile Include="System.Management.Instrumentation\InstrumentationType.cs" />\r
-    <Compile Include="System.Management.Instrumentation\InstrumentedAttribute.cs" />\r
-    <Compile Include="System.Management.Instrumentation\ManagedNameAttribute.cs" />\r
-    <Compile Include="System.Management.Instrumentation\ManagementInstaller.cs" />\r
-    <Compile Include="System.Management\AuthenticationLevel.cs" />\r
-    <Compile Include="System.Management\CimType.cs" />\r
-    <Compile Include="System.Management\CodeLanguage.cs" />\r
-    <Compile Include="System.Management\ComparisonSettings.cs" />\r
-    <Compile Include="System.Management\CompletedEventArgs.cs" />\r
-    <Compile Include="System.Management\CompletedEventHandler.cs" />\r
-    <Compile Include="System.Management\ConnectionOptions.cs" />\r
-    <Compile Include="System.Management\DeleteOptions.cs" />\r
-    <Compile Include="System.Management\EnumerationOptions.cs" />\r
-    <Compile Include="System.Management\EventArrivedEventArgs.cs" />\r
-    <Compile Include="System.Management\EventArrivedEventHandler.cs" />\r
-    <Compile Include="System.Management\EventQuery.cs" />\r
-    <Compile Include="System.Management\EventWatcherOptions.cs" />\r
-    <Compile Include="System.Management\ImpersonationLevel.cs" />\r
-    <Compile Include="System.Management\InvokeMethodOptions.cs" />\r
-    <Compile Include="System.Management\ManagementBaseObject.cs" />\r
-    <Compile Include="System.Management\ManagementClass.cs" />\r
-    <Compile Include="System.Management\ManagementDateTimeConverter.cs" />\r
-    <Compile Include="System.Management\ManagementEventArgs.cs" />\r
-    <Compile Include="System.Management\ManagementEventWatcher.cs" />\r
-    <Compile Include="System.Management\ManagementException.cs" />\r
-    <Compile Include="System.Management\ManagementNamedValueCollection.cs" />\r
-    <Compile Include="System.Management\ManagementObject.cs" />\r
-    <Compile Include="System.Management\ManagementObjectCollection.cs" />\r
-    <Compile Include="System.Management\ManagementObjectSearcher.cs" />\r
-    <Compile Include="System.Management\ManagementOperationObserver.cs" />\r
-    <Compile Include="System.Management\ManagementOptions.cs" />\r
-    <Compile Include="System.Management\ManagementPath.cs" />\r
-    <Compile Include="System.Management\ManagementQuery.cs" />\r
-    <Compile Include="System.Management\ManagementScope.cs" />\r
-    <Compile Include="System.Management\ManagementStatus.cs" />\r
-    <Compile Include="System.Management\MethodData.cs" />\r
-    <Compile Include="System.Management\MethodDataCollection.cs" />\r
-    <Compile Include="System.Management\ObjectGetOptions.cs" />\r
-    <Compile Include="System.Management\ObjectPutEventArgs.cs" />\r
-    <Compile Include="System.Management\ObjectPutEventHandler.cs" />\r
-    <Compile Include="System.Management\ObjectQuery.cs" />\r
-    <Compile Include="System.Management\ObjectReadyEventArgs.cs" />\r
-    <Compile Include="System.Management\ObjectReadyEventHandler.cs" />\r
-    <Compile Include="System.Management\ProgressEventArgs.cs" />\r
-    <Compile Include="System.Management\ProgressEventHandler.cs" />\r
-    <Compile Include="System.Management\PropertyData.cs" />\r
-    <Compile Include="System.Management\PropertyDataCollection.cs" />\r
-    <Compile Include="System.Management\PutOptions.cs" />\r
-    <Compile Include="System.Management\PutType.cs" />\r
-    <Compile Include="System.Management\QualifierData.cs" />\r
-    <Compile Include="System.Management\QualifierDataCollection.cs" />\r
-    <Compile Include="System.Management\RelatedObjectQuery.cs" />\r
-    <Compile Include="System.Management\RelationshipQuery.cs" />\r
-    <Compile Include="System.Management\SelectQuery.cs" />\r
-    <Compile Include="System.Management\StoppedEventArgs.cs" />\r
-    <Compile Include="System.Management\StoppedEventHandler.cs" />\r
-    <Compile Include="System.Management\TextFormat.cs" />\r
-    <Compile Include="System.Management\WqlEventQuery.cs" />\r
-    <Compile Include="System.Management\WqlObjectQuery.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration.Install/System.Configuration.Install-net_4_5.csproj">\r
-      <Project>{E6E1740E-37DD-487C-8947-F1C0612D4738}</Project>\r
-      <Name>System.Configuration.Install-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Messaging/System.Messaging-net_4_5.csproj b/mcs/class/System.Messaging/System.Messaging-net_4_5.csproj
deleted file mode 100644 (file)
index 88fcd52..0000000
--- a/mcs/class/System.Messaging/System.Messaging-net_4_5.csproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1CBEC0FC-5926-42FA-A0CF-A19617FABB78}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Messaging</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Messaging.Design\MessageFormatterConverter.cs" />\r
-    <Compile Include="System.Messaging.Design\MessageQueueConverter.cs" />\r
-    <Compile Include="System.Messaging.Design\QueuePathDialog.cs" />\r
-    <Compile Include="System.Messaging.Design\QueuePathEditor.cs" />\r
-    <Compile Include="System.Messaging.Design\TimeoutConverter.cs" />\r
-    <Compile Include="System.Messaging\AccessControlEntry.cs" />\r
-    <Compile Include="System.Messaging\AccessControlEntryType.cs" />\r
-    <Compile Include="System.Messaging\AccessControlList.cs" />\r
-    <Compile Include="System.Messaging\AcknowledgeTypes.cs" />\r
-    <Compile Include="System.Messaging\Acknowledgment.cs" />\r
-    <Compile Include="System.Messaging\ActiveXMessageFormatter.cs" />\r
-    <Compile Include="System.Messaging\BinaryMessageFormatter.cs" />\r
-    <Compile Include="System.Messaging\CryptographicProviderType.cs" />\r
-    <Compile Include="System.Messaging\DefaultPropertiesToSend.cs" />\r
-    <Compile Include="System.Messaging\EncryptionAlgorithm.cs" />\r
-    <Compile Include="System.Messaging\EncryptionRequired.cs" />\r
-    <Compile Include="System.Messaging\GenericAccessRights.cs" />\r
-    <Compile Include="System.Messaging\HashAlgorithm.cs" />\r
-    <Compile Include="System.Messaging\IMessageFormatter.cs" />\r
-    <Compile Include="System.Messaging\Message.cs" />\r
-    <Compile Include="System.Messaging\MessageEnumerator.cs" />\r
-    <Compile Include="System.Messaging\MessagePriority.cs" />\r
-    <Compile Include="System.Messaging\MessagePropertyFilter.cs" />\r
-    <Compile Include="System.Messaging\MessageQueue.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueAccessControlEntry.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueAccessRights.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueCriteria.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueEnumerator.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueErrorCode.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueException.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueInstaller.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermission.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermissionAccess.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermissionAttribute.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermissionEntry.cs" />\r
-    <Compile Include="System.Messaging\MessageQueuePermissionEntryCollection.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueTransaction.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueTransactionStatus.cs" />\r
-    <Compile Include="System.Messaging\MessageQueueTransactionType.cs" />\r
-    <Compile Include="System.Messaging\MessageType.cs" />\r
-    <Compile Include="System.Messaging\MessagingDescriptionAttribute.cs" />\r
-    <Compile Include="System.Messaging\PeekCompletedEventArgs.cs" />\r
-    <Compile Include="System.Messaging\PeekCompletedEventHandler.cs" />\r
-    <Compile Include="System.Messaging\QueueAccessMode.cs" />\r
-    <Compile Include="System.Messaging\ReceiveCompletedEventArgs.cs" />\r
-    <Compile Include="System.Messaging\ReceiveCompletedEventHandler.cs" />\r
-    <Compile Include="System.Messaging\StandardAccessRights.cs" />\r
-    <Compile Include="System.Messaging\Trustee.cs" />\r
-    <Compile Include="System.Messaging\TrusteeType.cs" />\r
-    <Compile Include="System.Messaging\XmlMessageFormatter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration.Install/System.Configuration.Install-net_4_5.csproj">\r
-      <Project>{E6E1740E-37DD-487C-8947-F1C0612D4738}</Project>\r
-      <Name>System.Configuration.Install-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Messaging/Mono.Messaging-net_4_5.csproj">\r
-      <Project>{DDCC93B5-9425-4E9A-95DC-3400D0028508}</Project>\r
-      <Name>Mono.Messaging-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Messaging/MessageQueue.resx">\r
-      <LogicalName>MessageQueue.resx</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Messaging/System.Messaging-tests-net_4_5.csproj b/mcs/class/System.Messaging/System.Messaging-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 89863b1..0000000
--- a/mcs/class/System.Messaging/System.Messaging-tests-net_4_5.csproj
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E8980B98-13D0-40AF-A452-F26D3482BCA4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.Messaging-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Messaging_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Messaging\AdminTest.cs" />\r
-    <Compile Include="Test\System.Messaging\AsyncPeekTest.cs" />\r
-    <Compile Include="Test\System.Messaging\AsyncReceiveTest.cs" />\r
-    <Compile Include="Test\System.Messaging\BasicMessagingTest.cs" />\r
-    <Compile Include="Test\System.Messaging\MessageEnumeratorTest.cs" />\r
-    <Compile Include="Test\System.Messaging\MessageQueuePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Messaging\MQUtil.cs" />\r
-    <Compile Include="Test\System.Messaging\PeekTest.cs" />\r
-    <Compile Include="Test\System.Messaging\SelectorTest.cs" />\r
-    <Compile Include="Test\System.Messaging\TransactionMessagingTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_4_5.csproj">\r
-      <Project>{1CBEC0FC-5926-42FA-A0CF-A19617FABB78}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration.Install\System.Configuration.Install-net_4_5.csproj">\r
-      <Project>{E6E1740E-37DD-487C-8947-F1C0612D4738}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Windows.Forms\System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms\System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Messaging\Mono.Messaging-net_4_5.csproj">\r
-      <Project>{DDCC93B5-9425-4E9A-95DC-3400D0028508}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_4_5</Name>\r
-    </ProjectReference>\r
-    <Reference Include="nunit.mocks.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>nunit.mocks.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Messaging/MessageQueue.resx">\r
-      <LogicalName>MessageQueue.resx</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_5.csproj b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_5.csproj
deleted file mode 100644 (file)
index d009b7a..0000000
--- a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_5.csproj
+++ /dev/null
@@ -1,362 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{BFBE5444-4F21-45CF-929E-C8FBEF302F5E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Net.Http.Formatting</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETMVC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETMVC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\CommonWebApiResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\DictionaryExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\Error.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpers.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpersExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\RS.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\CloneableExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\BufferedMediaTypeFormatter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\ContentNegotiationResult.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\DefaultContentNegotiator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\DelegatingEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\FormDataCollection.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\FormUrlEncodedJson.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\FormUrlEncodedMediaTypeFormatter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\IContentNegotiator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\IFormatterLogger.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\IRequiredMemberSelector.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\JsonContractResolver.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\JsonMediaTypeFormatter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\JsonReaderQuotaException.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaRangeMapping.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeConstants.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeFormatter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeFormatterCollection.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeFormatterExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeHeaderValueExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeMapping.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeMatch.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeWithQualityHeaderValueComparer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\ParsedMediaTypeHeaderValue.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\FormUrlEncodedParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\HttpRequestHeaderParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\HttpRequestLineParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\HttpResponseHeaderParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\HttpStatusLineParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\InternetMessageFormatHeaderParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\MimeMultipartBodyPartParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\MimeMultipartParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\ParserState.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\QueryStringMapping.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\RequestHeaderMapping.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\ResponseFormatterSelectionResult.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\ResponseMediaTypeMatch.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\SecureJsonTextReader.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\StringComparisonHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\StringWithQualityHeaderValueComparer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\XHRRequestHeaderMapping.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\XmlMediaTypeFormatter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\FormattingUtilities.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Headers\CookieHeaderValue.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Headers\CookieState.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpClientExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpContentCollectionExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpContentExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpContentMessageExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpContentMultipartExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpHeaderExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpMessageContent.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpRequestHeadersExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpRequestMessageExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpResponseHeadersExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpUnsortedHeaders.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpUnsortedRequest.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpUnsortedResponse.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\IMultipartStreamProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\AsyncResultWithExtraData.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\DelegatingStream.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\HttpValueCollection.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\NonClosingDelegatingStream.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\UriQueryUtility.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\MimeBodyPart.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\MultipartFileStreamProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\MultipartFormDataStreamProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\MultipartMemoryStreamProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\ObjectContent.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Properties\Resources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\UriExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Bson\BsonBinaryType.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Bson\BsonBinaryWriter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Bson\BsonObjectId.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Bson\BsonReader.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Bson\BsonToken.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Bson\BsonType.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Bson\BsonWriter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\ConstructorHandling.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\BinaryConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\BsonObjectIdConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\CustomCreationConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\DataSetConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\DataTableConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\DateTimeConverterBase.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\EntityKeyMemberConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\ExpandoObjectConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\IsoDateTimeConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\JavaScriptDateTimeConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\KeyValuePairConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\RegexConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\StringEnumConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\VersionConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Converters\XmlNodeConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\DateFormatHandling.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\DateTimeZoneHandling.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\DefaultValueHandling.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Formatting.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\IJsonLineInfo.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonArrayAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonConstructorAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonContainerAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonConvert.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonConverterAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonConverterCollection.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonIgnoreAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonObjectAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonPosition.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonReader.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonReaderException.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonSerializationException.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonSerializer.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonSerializerSettings.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonTextReader.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonToken.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonValidatingReader.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonWriter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\JsonWriterException.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\Extensions.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\IJEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JArray.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JConstructor.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JContainer.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JObject.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JPath.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JProperty.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JPropertyKeyedCollection.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JRaw.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JToken.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JTokenEqualityComparer.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JTokenReader.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JTokenType.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JTokenWriter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Linq\JValue.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\MemberSerialization.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\MissingMemberHandling.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\NullValueHandling.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\ObjectCreationHandling.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\PreserveReferencesHandling.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\ReferenceLoopHandling.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Required.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\Extensions.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\JsonSchema.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\JsonSchemaBuilder.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\JsonSchemaConstants.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\JsonSchemaException.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\JsonSchemaGenerator.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\JsonSchemaModel.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\JsonSchemaModelBuilder.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\JsonSchemaNode.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\JsonSchemaNodeCollection.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\JsonSchemaResolver.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\JsonSchemaType.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\JsonSchemaWriter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\UndefinedSchemaIdHandling.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\ValidationEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Schema\ValidationEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\CachedAttributeGetter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\CamelCasePropertyNamesContractResolver.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\DefaultContractResolver.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\DefaultReferenceResolver.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\DefaultSerializationBinder.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\DynamicValueProvider.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\ErrorContext.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\ErrorEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\IContractResolver.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\IReferenceResolver.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\IValueProvider.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonArrayContract.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonContract.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonDictionaryContract.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonDynamicContract.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonFormatterConverter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonISerializableContract.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonLinqContract.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonObjectContract.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonPrimitiveContract.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonProperty.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonPropertyCollection.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonSerializerInternalBase.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonSerializerInternalReader.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonSerializerInternalWriter.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonSerializerProxy.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonStringContract.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\JsonTypeReflector.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\LateBoundMetadataTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\ObjectConstructor.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\OnErrorAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Serialization\ReflectionValueProvider.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\TypeNameHandling.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\Base64Encoder.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\BidirectionalDictionary.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\CollectionUtils.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\CollectionWrapper.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\ConvertUtils.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\DateTimeUtils.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\DictionaryWrapper.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\DynamicProxy.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\DynamicProxyMetaObject.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\DynamicReflectionDelegateFactory.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\DynamicUtils.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\DynamicWrapper.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\EnumUtils.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\EnumValue.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\EnumValues.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\ILGeneratorExtensions.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\JavaScriptUtils.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\LateBoundReflectionDelegateFactory.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\ListWrapper.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\MathUtils.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\MethodCall.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\MiscellaneousUtils.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\ReflectionDelegateFactory.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\ReflectionUtils.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\StringBuffer.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\StringReference.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\StringUtils.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\ThreadSafeStore.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\TypeExtensions.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\ValidationUtils.cs" />\r
-    <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\WriteState.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Net.Http/System.Net.Http-net_4_5.csproj">\r
-      <Project>{E36C154B-A0AC-4721-B06A-AFE31D357CE5}</Project>\r
-      <Name>System.Net.Http-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
-      <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Net.Http.Properties.CommonWebApiResources.resources">\r
-      <LogicalName>System.Net.Http.Properties.CommonWebApiResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Net.Http.Properties.Resources.resources">\r
-      <LogicalName>System.Net.Http.Properties.Resources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest-net_4_5.csproj b/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest-net_4_5.csproj
deleted file mode 100644 (file)
index 30594b9..0000000
--- a/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{28DE6988-8E54-4D16-B9B6-4A5BB796FB15}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Net.Http.WebRequest</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Net.Http.WebRequest\WebRequestHandler.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Net.Http/System.Net.Http-net_4_5.csproj">\r
-      <Project>{E36C154B-A0AC-4721-B06A-AFE31D357CE5}</Project>\r
-      <Name>System.Net.Http-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Net.Http/System.Net.Http-net_4_5.csproj b/mcs/class/System.Net.Http/System.Net.Http-net_4_5.csproj
deleted file mode 100644 (file)
index 6571e8f..0000000
--- a/mcs/class/System.Net.Http/System.Net.Http-net_4_5.csproj
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E36C154B-A0AC-4721-B06A-AFE31D357CE5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Net.Http</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Net.Http.Headers\AuthenticationHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\CacheControlHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\CollectionExtensions.cs" />\r
-    <Compile Include="System.Net.Http.Headers\CollectionParser.cs" />\r
-    <Compile Include="System.Net.Http.Headers\ContentDispositionHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\ContentRangeHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\EntityTagHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\HashCodeCalculator.cs" />\r
-    <Compile Include="System.Net.Http.Headers\HeaderInfo.cs" />\r
-    <Compile Include="System.Net.Http.Headers\HttpContentHeaders.cs" />\r
-    <Compile Include="System.Net.Http.Headers\HttpHeaderKind.cs" />\r
-    <Compile Include="System.Net.Http.Headers\HttpHeaders.cs" />\r
-    <Compile Include="System.Net.Http.Headers\HttpHeaderValueCollection.cs" />\r
-    <Compile Include="System.Net.Http.Headers\HttpRequestHeaders.cs" />\r
-    <Compile Include="System.Net.Http.Headers\HttpResponseHeaders.cs" />\r
-    <Compile Include="System.Net.Http.Headers\Lexer.cs" />\r
-    <Compile Include="System.Net.Http.Headers\MediaTypeHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\MediaTypeWithQualityHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\NameValueHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\NameValueWithParametersHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\Parser.cs" />\r
-    <Compile Include="System.Net.Http.Headers\ProductHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\ProductInfoHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\QualityValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\RangeConditionHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\RangeHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\RangeItemHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\RetryConditionHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\StringWithQualityHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\TransferCodingHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\TransferCodingWithQualityHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\ViaHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http.Headers\WarningHeaderValue.cs" />\r
-    <Compile Include="System.Net.Http\ByteArrayContent.cs" />\r
-    <Compile Include="System.Net.Http\ClientCertificateOption.cs" />\r
-    <Compile Include="System.Net.Http\DelegatingHandler.cs" />\r
-    <Compile Include="System.Net.Http\FormUrlEncodedContent.cs" />\r
-    <Compile Include="System.Net.Http\HttpClient.cs" />\r
-    <Compile Include="System.Net.Http\HttpClientHandler.cs" />\r
-    <Compile Include="System.Net.Http\HttpCompletionOption.cs" />\r
-    <Compile Include="System.Net.Http\HttpContent.cs" />\r
-    <Compile Include="System.Net.Http\HttpMessageHandler.cs" />\r
-    <Compile Include="System.Net.Http\HttpMessageInvoker.cs" />\r
-    <Compile Include="System.Net.Http\HttpMethod.cs" />\r
-    <Compile Include="System.Net.Http\HttpRequestException.cs" />\r
-    <Compile Include="System.Net.Http\HttpRequestMessage.cs" />\r
-    <Compile Include="System.Net.Http\HttpResponseMessage.cs" />\r
-    <Compile Include="System.Net.Http\MessageProcessingHandler.cs" />\r
-    <Compile Include="System.Net.Http\MultipartContent.cs" />\r
-    <Compile Include="System.Net.Http\MultipartFormDataContent.cs" />\r
-    <Compile Include="System.Net.Http\StreamContent.cs" />\r
-    <Compile Include="System.Net.Http\StringContent.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Net.Http/System.Net.Http-tests-net_4_5.csproj b/mcs/class/System.Net.Http/System.Net.Http-tests-net_4_5.csproj
deleted file mode 100644 (file)
index d18d387..0000000
--- a/mcs/class/System.Net.Http/System.Net.Http-tests-net_4_5.csproj
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{98DA1392-DAD8-4F11-9B88-1E1578FF7670}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Net.Http-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Net.Http_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Net.Http.Headers\AuthenticationHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\CacheControlHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\ContentDispositionHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\ContentRangeHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\EntityTagHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\HttpHeadersTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\HttpHeaderValueCollection.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\HttpRequestHeadersTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\MediaTypeHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\MediaTypeWithQualityHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\NameValueHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\NameValueWithParametersHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\ProductHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\ProductInfoHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\RangeConditionHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\RangeHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\RangeItemHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\RetryConditionHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\StringWithQualityHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\TransferCodingHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\TransferCodingWithQualityHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\ViaHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http.Headers\WarningHeaderValueTest.cs" />\r
-    <Compile Include="Test\System.Net.Http\ByteArrayContentTest.cs" />\r
-    <Compile Include="Test\System.Net.Http\FormUrlEncodedContentTest.cs" />\r
-    <Compile Include="Test\System.Net.Http\HttpClientHandlerTest.cs" />\r
-    <Compile Include="Test\System.Net.Http\HttpClientTest.cs" />\r
-    <Compile Include="Test\System.Net.Http\HttpMethodTest.cs" />\r
-    <Compile Include="Test\System.Net.Http\HttpRequestMessageTest.cs" />\r
-    <Compile Include="Test\System.Net.Http\HttpResponseMessageTest.cs" />\r
-    <Compile Include="Test\System.Net.Http\MultipartContentTest.cs" />\r
-    <Compile Include="Test\System.Net.Http\MultipartFormDataContentTest.cs" />\r
-    <Compile Include="Test\System.Net.Http\StreamContentTest.cs" />\r
-    <Compile Include="Test\System.Net.Http\StringContentTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Net.Http\System.Net.Http-net_4_5.csproj">\r
-      <Project>{E36C154B-A0AC-4721-B06A-AFE31D357CE5}</Project>\r
-      <Name>System.Net.Http\System.Net.Http-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Net.Http/System.Net.Http/HttpClient.cs b/mcs/class/System.Net.Http/System.Net.Http/HttpClient.cs
index 114e78e83c2a53037594ccfbdbc1e458879ea10e..baa6dd9f0d26cc6a219c5187164013043009be9d 100644 (file)
--- a/mcs/class/System.Net.Http/System.Net.Http/HttpClient.cs
+++ b/mcs/class/System.Net.Http/System.Net.Http/HttpClient.cs
@@ -33,7 +33,7 @@ using System.IO;
 
 namespace System.Net.Http
 {
-       public class HttpClient : HttpMessageInvoker
+       public partial class HttpClient : HttpMessageInvoker
        {
                static readonly TimeSpan TimeoutDefault = TimeSpan.FromSeconds (100);
 
@@ -44,10 +44,12 @@ namespace System.Net.Http
                long buffer_size;
                TimeSpan timeout;
 
+#if !XAMARIN_MODERN
                public HttpClient ()
                        : this (new HttpClientHandler (), true)
                {
                }
+#endif
                
                public HttpClient (HttpMessageHandler handler)
                        : this (handler, true)

diff --git a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
index 510a2d63d45122db80bf3d145cbcc953051b807f..7992ecafb20807263f94efc60b129375821c16d0 100644 (file)
--- a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
+++ b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
@@ -997,8 +997,8 @@ namespace MonoTests.System.Net.Http
                public void GetString_Many ()
                {
                        var client = new HttpClient ();
-                       var t1 = client.GetStringAsync ("http://www.google.com");
-                       var t2 = client.GetStringAsync ("http://www.google.com");
+                       var t1 = client.GetStringAsync ("http://example.org");
+                       var t2 = client.GetStringAsync ("http://example.org");
                        Assert.IsTrue (Task.WaitAll (new [] { t1, t2 }, WaitTimeout));          
                }
 

diff --git a/mcs/class/System.Net/System.Net-net_4_5.csproj b/mcs/class/System.Net/System.Net-net_4_5.csproj
deleted file mode 100644 (file)
index 967cf8b..0000000
--- a/mcs/class/System.Net/System.Net-net_4_5.csproj
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E41631CD-605D-46BE-9D4B-46AAD7EE5599}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Net</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Assembly\TypeForwarders.cs" />\r
-    <Compile Include="System.Net\IPEndPointCollection.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Numerics/System.Numerics-net_4_5.csproj b/mcs/class/System.Numerics/System.Numerics-net_4_5.csproj
deleted file mode 100644 (file)
index 182af90..0000000
--- a/mcs/class/System.Numerics/System.Numerics-net_4_5.csproj
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{14631AC9-FDC6-4561-A04C-6913947C939E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Numerics</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MONO</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MONO</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System.Numerics\System\Numerics\BigInteger.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Numerics\System\Numerics\BigIntegerBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Numerics\System\Numerics\BigNumber.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Numerics\System\Numerics\Complex.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Numerics\System\Numerics\NumericsHelpers.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\SR.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="ReferenceSources\Environment.cs" />\r
-    <Compile Include="ReferenceSources\SR.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Numerics/System.Numerics-tests-net_4_5.csproj b/mcs/class/System.Numerics/System.Numerics-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 1ccaed1..0000000
--- a/mcs/class/System.Numerics/System.Numerics-tests-net_4_5.csproj
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A2E74122-C2B6-4A40-A255-AF54948DA464}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Numerics-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Numerics_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Numerics\BigIntegerTest.cs" />\r
-    <Compile Include="Test\System.Numerics\ComplexTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Numerics\System.Numerics-net_4_5.csproj">\r
-      <Project>{14631AC9-FDC6-4561-A04C-6913947C939E}</Project>\r
-      <Name>System.Numerics\System.Numerics-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_5.csproj b/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_5.csproj
deleted file mode 100644 (file)
index 35c87f3..0000000
--- a/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_5.csproj
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Core</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\InternalsVisibleTo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\NamespaceDocs.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Observable.Extensions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Observer.Extensions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\AnonymousObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\AnonymousObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\AnonymousSafeObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\AsyncLock.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\CatchScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ConcurrencyAbstractionLayer.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ConcurrencyAbstractionLayer.Default.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\CurrentThreadScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\DefaultScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\DisableOptimizationsScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ImmediateScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\LocalScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\LocalScheduler.TimerQueue.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ScheduledItem.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Async.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Recursive.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Services.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Services.Emulation.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Simple.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Wrappers.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerDefaults.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerOperation.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerQueue.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerWrapper.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Stopwatch.Default.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Synchronization.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Synchronization.ObserveOn.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Synchronization.Synchronize.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SynchronizationContextScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\AnonymousDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\BooleanDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\CancellationDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\CompositeDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\ContextDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\DefaultDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\Disposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\MultipleAssignmentDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\RefCountDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\ScheduledDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\SerialDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\SingleAssignmentDisposable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\AsyncLockObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\AutoDetachObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\CheckedObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ConcurrentDictionary.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ConcurrentQueue.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Constants.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ExceptionServices.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ExceptionServices.Default.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\HostLifecycleService.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ImmutableList.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Lazy.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Observers.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\PlatformEnlightenmentProvider.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\PriorityQueue.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Producer.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SafeObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ScheduledObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Semaphore.Silverlight.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Semaphore.Xna.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Sink.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Stubs.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SynchronizationContextExtensions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SynchronizedObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SystemClock.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SystemClock.Default.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Notification.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\ObservableBase.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\ObserverBase.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Unit.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Strings_Core.Generated.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
-      <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
-      <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings_Core.resources">\r
-      <LogicalName>System.Reactive.Strings_Core.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger-net_4_5.csproj b/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger-net_4_5.csproj
deleted file mode 100644 (file)
index fff560b..0000000
--- a/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger-net_4_5.csproj
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6A059733-FAF1-4125-8BE6-C58A4E3714CE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Debugger</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Debugger\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Debugger\Reactive\Linq\QueryDebugger.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
-      <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
-      <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
-      <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental-net_4_5.csproj b/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental-net_4_5.csproj
deleted file mode 100644 (file)
index e756150..0000000
--- a/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental-net_4_5.csproj
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1A49E00D-F0FB-430A-A540-1545DD999B36}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Experimental</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\ExperimentalAttribute.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\InternalsVisibleTo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Internal\BinaryObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\IQueryLanguageEx.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\ObservableEx.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\QbservableEx.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\QbservableEx.Generated.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\QueryLanguageEx.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\ListObservable.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
-      <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
-      <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
-      <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj b/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj
deleted file mode 100644 (file)
index 3c8fddc..0000000
--- a/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Interfaces</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\AssemblyFileVersionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\DateTimeOffset.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\IObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\IObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\NamespaceDocs.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\IScheduledItem.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\IScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\ISchedulerLongRunning.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\ISchedulerPeriodic.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\IStopwatch.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\IStopwatchProvider.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Disposables\ICancelable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\IEventPattern.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\IEventPatternSource.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\IEventSource.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\IObserver.Result.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Linq\IGroupedObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Linq\IQbservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Linq\IQbservableProvider.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\IConnectableObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\ISubject.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\ISubject.Multi.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj b/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj
deleted file mode 100644 (file)
index 08d46c1..0000000
--- a/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Linq</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\InternalsVisibleTo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\NamespaceDocs.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Concurrency\HistoricalScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Concurrency\VirtualTimeScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Concurrency\VirtualTimeScheduler.Extensions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventPattern.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventPatternSource.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventPatternSourceBase.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventSource.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\AnonymousEnumerable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\BinaryObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\ConcatSink.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\Constants.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\Either.Generic.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\HashSet.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\Helpers.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\IConcatenatable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\IEvaluatableObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\Lookup.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\PushPullAdapter.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\QueryServices.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\ReflectionUtils.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\TailRecursiveSink.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Joins\ActivePlan.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Joins\JoinObserver.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Joins\Pattern.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Joins\Plan.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\GroupedObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\IQueryLanguage.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\LocalQueryMethodImplementationTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Aggregates.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Async.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Awaiter.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Binding.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Blocking.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Concurrency.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Conversions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Creation.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Events.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Imperative.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Joins.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Multiple.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Single.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.StandardSequenceOperators.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Time.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\_.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\AddRef.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Aggregate.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\All.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Amb.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Any.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\AsObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Average.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Buffer.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Case.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Cast.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Catch.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Collect.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\CombineLatest.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Concat.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Contains.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Count.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\DefaultIfEmpty.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Defer.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Delay.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\DelaySubscription.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Dematerialize.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Distinct.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\DistinctUntilChanged.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Do.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\DoWhile.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ElementAt.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Empty.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Finally.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\FirstAsync.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\For.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ForEach.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\FromEvent.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\FromEventPattern.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Generate.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\GetEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\GroupBy.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\GroupByUntil.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\GroupJoin.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\If.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\IgnoreElements.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\IsEmpty.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Join.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\LastAsync.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Latest.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\LongCount.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Materialize.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Max.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\MaxBy.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Merge.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Min.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\MinBy.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\MostRecent.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Multicast.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Never.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Next.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\OfType.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\OnErrorResumeNext.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\PushToPullAdapter.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Range.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\RefCount.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Repeat.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Return.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Sample.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Scan.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Select.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SelectMany.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SequenceEqual.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SingleAsync.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Skip.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SkipLast.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SkipUntil.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SkipWhile.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Sum.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Switch.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Take.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TakeLast.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TakeLastBuffer.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TakeUntil.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TakeWhile.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Throttle.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Throw.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TimeInterval.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Timeout.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Timer.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Timestamp.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToArray.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToDictionary.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToList.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToLookup.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Using.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Where.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\While.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Window.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Zip.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable_.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Aggregates.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Async.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Awaiter.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Binding.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Blocking.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Concurrency.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Conversions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Creation.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Events.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Imperative.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Joins.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Multiple.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Single.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.StandardSequenceOperators.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Time.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage_.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\AsyncSubject.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\BehaviorSubject.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\ConnectableObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\ReplaySubject.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\Subject.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\Subject.Extensions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Threading\Tasks\NamespaceDoc.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Threading\Tasks\TaskObservableExtensions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\TimeInterval.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Timestamped.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Strings_Linq.Generated.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
-      <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
-      <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
-      <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings_Linq.resources">\r
-      <LogicalName>System.Reactive.Strings_Linq.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases-net_4_5.csproj b/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases-net_4_5.csproj
deleted file mode 100644 (file)
index a77aa5c..0000000
--- a/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases-net_4_5.csproj
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{91A70A1D-36C5-49BC-92CC-A04D7C2C6EE1}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Observable.Aliases</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Observable.Aliases\Observable.Aliases.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Observable.Aliases\Qbservable.Aliases.Generated.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Providers/System.Reactive.Providers-net_4_5.csproj">\r
-      <Project>{8D27108A-3DD4-46D7-917E-7833A3C4D479}</Project>\r
-      <Name>System.Reactive.Providers-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
-      <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
-      <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
-      <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Providers/System.Reactive.Providers-net_4_5.csproj">\r
-      <Project>{8D27108A-3DD4-46D7-917E-7833A3C4D479}</Project>\r
-      <Name>System.Reactive.Providers-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_5.csproj b/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_5.csproj
deleted file mode 100644 (file)
index e26e9a1..0000000
--- a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_5.csproj
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4C2D4246-D4F5-420B-B1B5-031853AC47F4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.PlatformServices</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ConcurrencyAbstractionLayerImpl.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ConcurrencyAbstractionLayerImpl.Windows.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\EventLoopScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\NewThreadScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\TaskPoolScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\Thread.Stub.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ThreadPoolScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ThreadPoolScheduler.Windows.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\EnlightenmentProvider.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\ExceptionServicesImpl.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\HostLifecycleNotifications.Windows.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\HostLifecycleNotifications.WindowsPhone.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\PhoneShellThunks.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\PlatformEnlightenmentProvider.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\StopwatchImpl.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\Stubs.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Strings_PlatformServices.Generated.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
-      <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
-      <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
-      <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
-      <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings_PlatformServices.resources">\r
-      <LogicalName>System.Reactive.Strings_PlatformServices.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_5.csproj b/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_5.csproj
deleted file mode 100644 (file)
index f0d3e04..0000000
--- a/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_5.csproj
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8D27108A-3DD4-46D7-917E-7833A3C4D479}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Providers</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Internal\Constants.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Joins\QueryablePattern.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Joins\QueryablePlan.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\ExpressionVisitor.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Observable.Queryable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.Generated.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.Joins.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\ObservableQuery.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Strings_Providers.Generated.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
-      <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
-      <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
-      <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
-      <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings_Providers.resources">\r
-      <LogicalName>System.Reactive.Strings_Providers.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting-net_4_5.csproj b/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting-net_4_5.csproj
deleted file mode 100644 (file)
index c94dcf3..0000000
--- a/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting-net_4_5.csproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{895BA5F6-E27F-46C4-B045-58DD0F14BF90}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Runtime.Remoting</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\Reactive\Linq\Observable.Remoting.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\Reactive\Linq\QueryLanguage.Remoting.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
-      <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
-      <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
-      <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
-      <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms-net_4_5.csproj b/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms-net_4_5.csproj
deleted file mode 100644 (file)
index d7365ef..0000000
--- a/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms-net_4_5.csproj
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E85DF38F-D4F6-4B04-9962-32B0CCC8AC5E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Windows.Forms</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Forms\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Forms\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Forms\Reactive\Concurrency\ControlScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Forms\Reactive\Linq\ControlObservable.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
-      <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
-      <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
-      <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_5.csproj b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_5.csproj
deleted file mode 100644 (file)
index fadb4bb..0000000
--- a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_5.csproj
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FC7ACFC5-81E9-4798-9D7F-067AEAD8A4D4}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Reactive.Windows.Threading</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Reactive\Concurrency\CoreDispatcherScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Reactive\Concurrency\DispatcherScheduler.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Reactive\Internal\Constants.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Reactive\Linq\CoreDispatcherObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Reactive\Linq\DispatcherObservable.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Strings_WindowsThreading.Generated.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../WindowsBase/WindowsBase-net_4_5.csproj">\r
-      <Project>{8E6ED7D5-3B08-4A83-905E-8FB4CF0C160D}</Project>\r
-      <Name>WindowsBase-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
-      <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
-      <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
-      <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../WindowsBase/WindowsBase-net_4_5.csproj">\r
-      <Project>{8E6ED7D5-3B08-4A83-905E-8FB4CF0C160D}</Project>\r
-      <Name>WindowsBase-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Strings_WindowsThreading.resources">\r
-      <LogicalName>System.Reactive.Strings_WindowsThreading.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_5.csproj b/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_5.csproj
deleted file mode 100644 (file)
index 8746abf..0000000
--- a/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_5.csproj
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{CB3E9225-3DFF-4930-BFED-1E8AE5319C32}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Caching</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\Resources\RH.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheEntryChangeMonitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheEntryRemovedArguments.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheEntryRemovedCallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheEntryRemovedReason.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheEntryUpdateArguments.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheEntryUpdateCallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheItem.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheItemPolicy.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheItemPriority.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\CacheMemoryMonitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\ChangeMonitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Configuration\CachingSectionGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Configuration\ConfigUtil.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Configuration\MemoryCacheElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Configuration\MemoryCacheSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Configuration\MemoryCacheSettingsCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Dbg.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\DefaultCacheCapabilities.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\EntryState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\FileChangeMonitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\FileChangeNotificationSystem.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\HostFileChangeMonitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Hosting\IApplicationIdentifier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Hosting\IFileChangeNotificationSystem.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\Hosting\IMemoryCacheManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheEntry.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheEntryChangeMonitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheKeyEqualityComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheStatistics.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryCacheStore.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\MemoryMonitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\ObjectCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\OnChangedCallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\PerfCounterName.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\PerfCounters.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\PhysicalMemoryMonitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\SafeBitVector32.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\SafeRegistryHandle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Caching\System\Caching\SqlChangeMonitor.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Configuration_2.0\NullableStringValidator.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="ReferenceSources\CacheEntryCollection.cs" />\r
-    <Compile Include="ReferenceSources\CacheExpires.cs" />\r
-    <Compile Include="ReferenceSources\CacheUsage.cs" />\r
-    <Compile Include="ReferenceSources\R.Designer.cs" />\r
-    <Compile Include="ReferenceSources\SRef.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Runtime.Caching/System.Runtime.Caching-tests-net_4_5.csproj b/mcs/class/System.Runtime.Caching/System.Runtime.Caching-tests-net_4_5.csproj
deleted file mode 100644 (file)
index a66c3cb..0000000
--- a/mcs/class/System.Runtime.Caching/System.Runtime.Caching-tests-net_4_5.csproj
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{98DDD6B7-792F-4E36-9ED0-141D0727D41F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Runtime.Caching-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Caching_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Common\AppDomainTools.cs" />\r
-    <Compile Include="Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\Common\PokerChangeMonitor.cs" />\r
-    <Compile Include="Test\Common\PokerMemoryCache.cs" />\r
-    <Compile Include="Test\Common\PokerObjectCache.cs" />\r
-    <Compile Include="Test\Common\TestNotificationSystem.cs" />\r
-    <Compile Include="Test\System.Runtime.Caching\HostFileChangeMonitorTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Caching\MemoryCacheTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Caching\ObjectCacheTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Caching\System.Runtime.Caching-net_4_5.csproj">\r
-      <Project>{CB3E9225-3DFF-4930-BFED-1E8AE5319C32}</Project>\r
-      <Name>System.Runtime.Caching\System.Runtime.Caching-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-net_4_5.csproj b/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-net_4_5.csproj
deleted file mode 100644 (file)
index cbb7b1c..0000000
--- a/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-net_4_5.csproj
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{04DAD425-06C0-481B-9787-D2D4BFF196F5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.DurableInstancing</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\DisassociateInstanceKeysExtension.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\IDurableInstancingOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceCollisionException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceCompleteException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceHandle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceHandleConflictException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceHandleReference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyCollisionException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyCompleteException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyNotReadyException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceLockedException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceLockLostException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceLockQueryResult.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceNormalEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceNotReadyException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceOwner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceOwnerException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceOwnerQueryResult.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistence.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceCommand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceCommandException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstancePersistenceException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceStore.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceStoreQueryResult.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceValue.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceValueConsistency.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceValueOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\ICancelable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\IPersistencePipelineModule.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\PersistenceMetadataNamespace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\PersistencePipeline.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\TransactedAsyncResult.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\TransactionHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\Workflow45Namespace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\WorkflowNamespace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.DurableInstancing\System\Runtime\WorkflowServiceNamespace.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\..\build\common\SR.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="SRCore.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
-      <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Transactions/System.Transactions-net_4_5.csproj">\r
-      <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel.Internals/System.ServiceModel.Internals-net_4_5.csproj">\r
-      <Project>{9C41A885-1D86-4508-B6F7-155D4B7BF441}</Project>\r
-      <Name>System.ServiceModel.Internals-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-tests-net_4_5.csproj b/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 5b08902..0000000
--- a/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-tests-net_4_5.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1EF37C09-E9CB-404B-BAF0-1877456C0799}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Runtime.DurableInstancing-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.DurableInstancing_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Runtime.DurableInstancing\InstancePersistenceEventTest.cs" />\r
-    <Compile Include="Test\System.Runtime.DurableInstancing\InstanceValueTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.DurableInstancing\System.Runtime.DurableInstancing-net_4_5.csproj">\r
-      <Project>{04DAD425-06C0-481B-9787-D2D4BFF196F5}</Project>\r
-      <Name>System.Runtime.DurableInstancing\System.Runtime.DurableInstancing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xml.Linq\System.Xml.Linq-net_4_5.csproj">\r
-      <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_5.csproj b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_5.csproj
deleted file mode 100644 (file)
index ad5cb5c..0000000
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_5.csproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{AD033C6B-F765-4B4D-B8D0-7C81C4194DAB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Remoting</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\AggregateDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpClientTransportSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpClientTransportSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpRemotingHandler.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpRemotingHandlerFactory.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\HttpServerTransportSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Http\RemotingHttpListener.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Unix\IpcChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Unix\IpcClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Unix\IpcServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Unix\UnixChannelLoader.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcChannelHelper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\IpcTransport.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeClient.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeException.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeHelper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeListener.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeSocket.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc.Win32\NamedPipeStream.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc\IpcChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc\IpcClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Ipc\IpcServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpClientChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpClientTransportSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpClientTransportSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpConnectionPool.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpMessageIO.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpServerChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels.Tcp\TcpServerTransportSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryClientFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryClientFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryCore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryServerFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BinaryServerFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelCore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\CommonTransportKeys.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IAuthorizeRemotingConnection.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\RemotingThreadPool.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapClientFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapClientFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapCore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapMessageFormatter.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapServerFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SoapServerFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SocketCachePolicy.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\MetaData.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\MetaDataCodeGenerator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\MetaDataExporter.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SdlChannelSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SdlChannelSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SdlType.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\ServiceType.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SUDSGeneratorException.cs" />\r
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SUDSParserException.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\RemotingClientProxy.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\RemotingService.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj">\r
-      <Project>{B12AABBC-30D1-4885-BF3F-A53B970F68FB}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-tests-net_4_5.csproj b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 6f7d205..0000000
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-tests-net_4_5.csproj
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{024A9C29-BE48-4A14-8E88-D2B5E2F14ECF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.Runtime.Remoting-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Remoting_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\ActivationTests.cs" />\r
-    <Compile Include="Test\AsyncCalls.cs" />\r
-    <Compile Include="Test\BaseCalls.cs" />\r
-    <Compile Include="Test\CallSeq.cs" />\r
-    <Compile Include="Test\ContextHookAttribute.cs" />\r
-    <Compile Include="Test\ContextsTest.cs" />\r
-    <Compile Include="Test\CrossDomainCalls.cs" />\r
-    <Compile Include="Test\DelegateCalls.cs" />\r
-    <Compile Include="Test\GenericTest.cs" />\r
-    <Compile Include="Test\HttpBugTests.cs" />\r
-    <Compile Include="Test\HttpCalls.cs" />\r
-    <Compile Include="Test\HttpServerChannelTests.cs" />\r
-    <Compile Include="Test\IpcCalls.cs" />\r
-    <Compile Include="Test\IpcChannelTest.cs" />\r
-    <Compile Include="Test\ReflectionCalls.cs" />\r
-    <Compile Include="Test\RemotingServicesTest.cs" />\r
-    <Compile Include="Test\ServerObject.cs" />\r
-    <Compile Include="Test\SyncCalls.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Channels.Tcp\TcpChannelTest.cs" />\r
-    <Compile Include="Test\TcpCalls.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Remoting\System.Runtime.Remoting-net_4_5.csproj">\r
-      <Project>{AD033C6B-F765-4B4D-B8D0-7C81C4194DAB}</Project>\r
-      <Name>System.Runtime.Remoting\System.Runtime.Remoting-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_5-1.csproj">\r
-      <Project>{85F119B8-8463-4D6F-9852-DAB8C4070BD5}</Project>\r
-      <Name>System.Web\System.Web-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj">\r
-      <Project>{B12AABBC-30D1-4885-BF3F-A53B970F68FB}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Remoting\System.Runtime.Remoting-net_4_5.csproj">\r
-      <Project>{AD033C6B-F765-4B4D-B8D0-7C81C4194DAB}</Project>\r
-      <Name>System.Runtime.Remoting\System.Runtime.Remoting-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Runtime.Remoting/Test/IpcChannelTest.cs b/mcs/class/System.Runtime.Remoting/Test/IpcChannelTest.cs
index 54a4146701fc947d8f95945a858fdb64db76e37b..831c69e72b54f79b0b9b454ec152261ea9864cc1 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/Test/IpcChannelTest.cs
+++ b/mcs/class/System.Runtime.Remoting/Test/IpcChannelTest.cs
@@ -28,6 +28,7 @@ namespace MonoTests.Remoting
                }
 
                [Test]
+               [Ignore ("https://bugzilla.xamarin.com/show_bug.cgi?id=36634")]
                public void Bug609381 ()
                {
                        string portName = "ipc" + Guid.NewGuid ().ToString ("N");

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj
deleted file mode 100644 (file)
index eff5096..0000000
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B12AABBC-30D1-4885-BF3F-A53B970F68FB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization.Formatters.Soap</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapFormatter.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapReader.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapTypeMapper.cs" />\r
-    <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapWriter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-tests-net_4_5.csproj b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 3efe252..0000000
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-tests-net_4_5.csproj
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1013C4B5-DE6B-4861-A579-6EED7452E135}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.Runtime.Serialization.Formatters.Soap-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization.Formatters.Soap_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\AssemblyInfo.cs" />\r
-    <Compile Include="Test\InternalSoapValuesTest.cs" />\r
-    <Compile Include="Test\SerializationCallbackTest.cs" />\r
-    <Compile Include="Test\SerializationTest.cs" />\r
-    <Compile Include="Test\SoapFormatterTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj">\r
-      <Project>{B12AABBC-30D1-4885-BF3F-A53B970F68FB}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Runtime.Serialization/ReferenceSources/XmlFormatWriterGenerator_static.cs b/mcs/class/System.Runtime.Serialization/ReferenceSources/XmlFormatWriterGenerator_static.cs
index 00e39ab6b65f92465496c8792df416735a1cbe6f..fdbcc77c5ba9a9dd2165481724d0e3d2285a8745 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/ReferenceSources/XmlFormatWriterGenerator_static.cs
+++ b/mcs/class/System.Runtime.Serialization/ReferenceSources/XmlFormatWriterGenerator_static.cs
@@ -469,8 +469,13 @@ namespace System.Runtime.Serialization
                                PrimitiveDataContract primitiveContract = PrimitiveDataContract.GetPrimitiveDataContract(memberType);
                                if (primitiveContract != null && !writeXsiType)
                                        primitiveContract.XmlFormatContentWriterMethod.Invoke (writer, new object [] {memberValue});
-                               else
-                                       InternalSerialize(XmlFormatGeneratorStatics.InternalSerializeMethod, () => memberValue, memberType, writeXsiType);
+                               else {
+                                       // InternalSerialize(XmlFormatGeneratorStatics.InternalSerializeMethod, () => memberValue, memberType, writeXsiType);
+                                       var typeHandleValue = Type.GetTypeHandle (memberValue);
+                                       var isDeclaredType = typeHandleValue.Equals (CodeInterpreter.ConvertValue (memberValue, memberType, Globals.TypeOfObject));
+                                       
+                                       ctx.InternalSerialize (writer, memberValue, isDeclaredType, writeXsiType, DataContract.GetId (memberType.TypeHandle), memberType.TypeHandle);
+                               }
                        }
                        else
                        {
@@ -500,22 +505,19 @@ namespace System.Runtime.Serialization
                                                if (isNull2) {
                                                        XmlFormatGeneratorStatics.WriteNullMethod.Invoke (ctx, new object [] {writer, memberType, DataContract.IsTypeSerializable(memberType)});
                                                } else {
-                                                       InternalSerialize((isNullableOfT ? XmlFormatGeneratorStatics.InternalSerializeMethod : XmlFormatGeneratorStatics.InternalSerializeReferenceMethod),
-                                                               () => memberValue, memberType, writeXsiType);
+                                                       var typeHandleValue = Type.GetTypeHandle (memberValue);
+                                                       var isDeclaredType = typeHandleValue.Equals (CodeInterpreter.ConvertValue (memberValue, memberType, Globals.TypeOfObject));
+                                                       if (isNullableOfT)
+                                                               ctx.InternalSerialize (writer, memberValue, isDeclaredType, writeXsiType, DataContract.GetId (memberType.TypeHandle), memberType.TypeHandle);
+                                                       else
+                                                               ctx.InternalSerializeReference (writer, memberValue, isDeclaredType, writeXsiType, DataContract.GetId (memberType.TypeHandle), memberType.TypeHandle);                                                          
+                                                       //InternalSerialize((isNullableOfT ? XmlFormatGeneratorStatics.InternalSerializeMethod : XmlFormatGeneratorStatics.InternalSerializeReferenceMethod), () => memberValue, memberType, writeXsiType);
                                                }
                                        }
                                }
                        }
                }
 
-               void InternalSerialize (MethodInfo methodInfo, Func<object> memberValue, Type memberType, bool writeXsiType)
-               {
-                       var v = memberValue ();
-                       var typeHandleValue = Type.GetTypeHandle (v);
-                       var isDeclaredType = typeHandleValue.Equals (CodeInterpreter.ConvertValue (v, memberType, Globals.TypeOfObject));
-                       methodInfo.Invoke (ctx, new object [] {writer, memberValue != null ? v : null, isDeclaredType, writeXsiType, DataContract.GetId (memberType.TypeHandle), memberType.TypeHandle});
-               }
-
                object UnwrapNullableObject(Func<object> memberValue, ref Type memberType, out bool isNull)// Leaves !HasValue on stack
                {
                        object v = memberValue ();

diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj
deleted file mode 100644 (file)
index d1251b4..0000000
--- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{08FF4C26-9C12-433D-AE90-43370046387A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NO_DYNAMIC_CODEGEN;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NO_DYNAMIC_CODEGEN;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\AppSettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Attributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ClassDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\CodeExporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\CollectionDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\CollectionDataContractAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\ConfigurationStrings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DataContractSerializerSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeElementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeValidatorAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\NetDataContractSerializerSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\ParameterElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\ParameterElementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\Properties.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\SerializationSectionGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\TypeElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\TypeElementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ContractCodeDomInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ContractNamespaceAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractSerializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractSerializerSettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataContractSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataMember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DataMemberAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DateTimeFormat.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DateTimeOffsetAdapter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Diagnostics\TraceCode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Diagnostics\TraceUtility.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\DictionaryGlobals.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\EmitTypeInformation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\EnumDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\EnumMemberAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ExportOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ExtensionDataObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ExtensionDataReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\GenericParameterDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Globals.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\HybridObjectCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\IDataContractSurrogate.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\IExtensibleDataObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\IgnoreDataMemberAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ImportOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\InvalidDataContractException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\ByteArrayHelperWithString.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\DataContractJsonSerializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\DataContractJsonSerializerSettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\IXmlJsonReaderInitializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\IXmlJsonWriterInitializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonByteArrayDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonClassDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonCollectionDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonEncodingStreamWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonEnumDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonFormatGeneratorStatics.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonFormatReaderGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonFormatWriterGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonGlobals.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonNodeType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonObjectDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonQNameDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonReaderDelegator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonReaderWriterFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonStringDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonUriDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonWriterDelegator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\JsonXmlDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\XmlJsonReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\XmlJsonWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\XmlObjectSerializerReadContextComplexJson.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Json\XmlObjectSerializerWriteContextComplexJson.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\KnownTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\KnownTypeDataContractResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\NetDataContractSerializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ObjectReferenceStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ObjectToIdCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\PrimitiveDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SchemaExporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SchemaHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SchemaImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ScopedKnownTypes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SerializationMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SerializationPermissionNotRequiredAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SerializationTrace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SpecialTypeDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SurrogateDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\TypeInformation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlDataContract.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlFormatGeneratorStatics.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlFormatReaderGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlFormatWriterGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerReadContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerReadContextComplex.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerWriteContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlObjectSerializerWriteContextComplex.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlReaderDelegator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlSerializableReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlSerializableServices.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlSerializableWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlWriterDelegator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XPathQueryGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XsdDataContractExporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XsdDataContractImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Text\Base64Encoding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Text\BinHexEncoding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Text\SurrogateChar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\ArrayHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\EncodingStreamWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\IFragmentCapableXmlDictionaryWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\IStreamProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\IXmlDictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\PrefixHandle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\StringHandle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\UniqueID.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\ValueHandle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBaseReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBaseWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryNodeType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryReaderSession.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBinaryWriterSession.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlBufferReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlC14NWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlDelegatedReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlDelegatedWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionaryReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionaryReaderQuotas.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionaryString.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlDictionaryWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlMtomReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlMtomWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlNodeWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlNodeWriterWriteBase64TextArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlSigningNodeWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlStreamNodeWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlUTF8TextReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlUTF8TextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\System\Xml\XmlWriteBase64AsyncArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Runtime.Serialization\TD.Designer.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\SR.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="ReferenceSources\BitFlagsGenerator.cs" />\r
-    <Compile Include="ReferenceSources\CodeInterpreter.cs" />\r
-    <Compile Include="ReferenceSources\DiagnosticUtility.cs" />\r
-    <Compile Include="ReferenceSources\FxTrace.cs" />\r
-    <Compile Include="ReferenceSources\JsonFormatReaderGenerator_static.cs" />\r
-    <Compile Include="ReferenceSources\JsonFormatWriterGenerator_static.cs" />\r
-    <Compile Include="ReferenceSources\SR.cs" />\r
-    <Compile Include="ReferenceSources\SR_missing.cs" />\r
-    <Compile Include="ReferenceSources\XmlDataContract_static.cs" />\r
-    <Compile Include="ReferenceSources\XmlExceptionHelper.cs" />\r
-    <Compile Include="ReferenceSources\XmlFormatReaderGenerator_static.cs" />\r
-    <Compile Include="ReferenceSources\XmlFormatWriterGenerator_static.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel.Internals/System.ServiceModel.Internals-net_4_5.csproj">\r
-      <Project>{9C41A885-1D86-4508-B6F7-155D4B7BF441}</Project>\r
-      <Name>System.ServiceModel.Internals-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../SMDiagnostics/SMDiagnostics-net_4_5.csproj">\r
-      <Project>{643FEEB8-DDEB-4204-9C95-344BAA753C58}</Project>\r
-      <Name>SMDiagnostics-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-tests-net_4_5.csproj b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 44cfc10..0000000
--- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-tests-net_4_5.csproj
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4EC3A502-D982-45B0-80F5-AC9873D03434}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <OutputPath>bin\Debug\System.Runtime.Serialization-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Runtime.Serialization_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,168,169,219,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Runtime.Serialization\AttributesTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug242Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug2843Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug3258Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug666333Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug675144Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\Bug695203Test.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\CollectionSerialization.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractResolverTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractSerializerTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractSerializerTest_DuplicateQName.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractSerializerTest_InvalidCharacters.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\DataContractSerializerTest_NullableWithDictionary.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\KnownTypeAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\WsdlHelper.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XmlObjectSerializerTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XsdDataContractExporterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XsdDataContractExporterTest2.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XsdDataContractImporterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\XsdDataContractImporterTest2.cs" />\r
-    <Compile Include="Test\System.Xml\UniqueIdTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlBinaryDictionaryReaderTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlBinaryDictionaryWriterTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlBinaryWriterSessionTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryReaderAbstractTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryReaderQuotasTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryStringTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDictionaryWriterTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlMtomDictionaryWriterTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlSimpleDictionaryWriterTest.cs" />\r
-    <Compile Include="Test\XmlComparer.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_0-1.csproj">\r
-      <Project>{CB54BC7B-F3CD-43DC-B983-3FFFF41D01E1}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_0-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_4_5.csproj">\r
-      <Project>{251DB111-FEE1-4080-8411-0AD1CC9BA94B}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/mstypes.schema">\r
-      <LogicalName>mstypes.schema</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/Resources/WSDL/collections.wsdl">\r
-      <LogicalName>collections.wsdl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/Resources/WSDL/custom-collections.wsdl">\r
-      <LogicalName>custom-collections.wsdl</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization_test.dll.sources b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization_test.dll.sources
index 3e9d83e63d7f2d506c08d41f757fcd8c63a9b8fc..59c7774eb075762a0274e4cecd3312ce616374b8 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization_test.dll.sources
+++ b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization_test.dll.sources
@@ -8,6 +8,7 @@ System.Runtime.Serialization/Bug2843Test.cs
 System.Runtime.Serialization/Bug3258Test.cs
 System.Runtime.Serialization/Bug242Test.cs
 System.Runtime.Serialization/Bug695203Test.cs
+System.Runtime.Serialization/Bug36100.cs
 System.Runtime.Serialization/DataContractResolverTest.cs
 System.Runtime.Serialization/DataContractSerializerTest_DuplicateQName.cs
 System.Runtime.Serialization/DataContractSerializerTest_NullableWithDictionary.cs

diff --git a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/Bug36100.cs b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/Bug36100.cs
new file mode 100644 (file)
index 0000000..0eb5fd5
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/Bug36100.cs
@@ -0,0 +1,14381 @@
+using System;
+using global::System.Runtime.Serialization;
+using global::System.Diagnostics;
+using global::System.ServiceModel;
+using System.IO;
+using NUnit.Framework;
+
+namespace MonoTests.System.Runtime.Serialization
+{
+       [TestFixture]
+       public class Bug36100
+       {
+               // This test exposed an issue with our dynamic serializer support and
+               // would cause problems with static compilation on 64 bit devices in
+               // FullAOT mode.
+               [Test]
+               public void SerializerDynamicInvoke ()
+               {
+                       var a = new DingusSyncData ();
+                       a.Aircraft = new AircraftDTO[] { new AircraftDTO () { } };
+                       a.AircraftTypes = new AircraftTypeDTO[] { new AircraftTypeDTO () };
+                       a.Airlines= new AirlineDTO[] { new AirlineDTO () };
+                       a.Airports= new AirportDTO[] { new AirportDTO() };
+                       a.Approaches= new ApproachDTO[] { new ApproachDTO() };
+                       a.ApproachesLegs= new ApproachesLegDTO[] { new ApproachesLegDTO() };
+                       a.Binaries= new BinaryCatalogDTO[] { new BinaryCatalogDTO() };
+                       a.Crews= new CrewDTO[] { new CrewDTO() };
+                       a.Days= new DayDTO[] { new DayDTO() };
+                       a.EmploymentEvents= new EmploymentEventDTO[] { new EmploymentEventDTO() };
+                       a.Events= new EventDTO[] { new EventDTO() };
+                       a.FlightDataInspection = new DataInspection ();
+                       a.GlobalSettings= new GlobalSettingDTO[] { new GlobalSettingDTO() };
+                       a.Hotels= new HotelDTO[] { new HotelDTO() };
+                       a.Legs= new LegDTO[] { new LegDTO() };
+                       a.Notes= new NoteDTO[] { new NoteDTO() };
+                       a.PayperiodEvents= new PayperiodEventDTO[] { new PayperiodEventDTO() };
+                       a.PayrollCategories= new PayrollCategoryDTO[] { new PayrollCategoryDTO() };
+                       a.Payrolls= new PayrollDTO[] { new PayrollDTO() };
+                       a.Performances= new PerformanceDTO[] { new PerformanceDTO() };
+                       a.Positions= new PositionDTO[] { new PositionDTO() };
+                       a.ReglatoryOperationTypes= new ReglatoryOperationTypeDTO[] { new ReglatoryOperationTypeDTO() };
+                       a.Trips= new TripDTO[] { new TripDTO() };
+                       a.UserSettings= new UserSettingDTO[] { new UserSettingDTO() };
+
+                       Console.WriteLine ("Size is: {0}", global::System.Runtime.InteropServices.Marshal.SizeOf(typeof(IntPtr)));
+                       using (var ms = new MemoryStream ()) {
+                               DataContractSerializer serializer = new DataContractSerializer (typeof(DingusSyncData));
+                               serializer.WriteObject (ms, a);
+                               ms.Position = 0;
+                               var b = serializer.ReadObject (ms);
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="DingusSyncData", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class DingusSyncData : object
+       {
+
+               AircraftDTO[] AircraftField;
+
+               AircraftTypeDTO[] AircraftTypesField;
+
+               AirlineDTO[] AirlinesField;
+
+               AirportDTO[] AirportsField;
+
+               ApproachDTO[] ApproachesField;
+
+               ApproachesLegDTO[] ApproachesLegsField;
+
+               BinaryCatalogDTO[] BinariesField;
+
+               CrewDTO[] CrewsField;
+
+               DayDTO[] DaysField;
+
+               EmploymentEventDTO[] EmploymentEventsField;
+
+               EventDTO[] EventsField;
+
+               DataInspection FlightDataInspectionField;
+
+               GlobalSettingDTO[] GlobalSettingsField;
+
+               HotelDTO[] HotelsField;
+
+               LegDTO[] LegsField;
+
+               NoteDTO[] NotesField;
+
+               PayperiodEventDTO[] PayperiodEventsField;
+
+               PayrollCategoryDTO[] PayrollCategoriesField;
+
+               PayrollDTO[] PayrollsField;
+
+               PerformanceDTO[] PerformancesField;
+
+               PositionDTO[] PositionsField;
+
+               ReglatoryOperationTypeDTO[] ReglatoryOperationTypesField;
+
+               TripDTO[] TripsField;
+
+               UserSettingDTO[] UserSettingsField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public AircraftDTO[] Aircraft
+               {
+                       get
+                       {
+                               return this.AircraftField;
+                       }
+                       set
+                       {
+                               this.AircraftField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public AircraftTypeDTO[] AircraftTypes
+               {
+                       get
+                       {
+                               return this.AircraftTypesField;
+                       }
+                       set
+                       {
+                               this.AircraftTypesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public AirlineDTO[] Airlines
+               {
+                       get
+                       {
+                               return this.AirlinesField;
+                       }
+                       set
+                       {
+                               this.AirlinesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public AirportDTO[] Airports
+               {
+                       get
+                       {
+                               return this.AirportsField;
+                       }
+                       set
+                       {
+                               this.AirportsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public ApproachDTO[] Approaches
+               {
+                       get
+                       {
+                               return this.ApproachesField;
+                       }
+                       set
+                       {
+                               this.ApproachesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public ApproachesLegDTO[] ApproachesLegs
+               {
+                       get
+                       {
+                               return this.ApproachesLegsField;
+                       }
+                       set
+                       {
+                               this.ApproachesLegsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public BinaryCatalogDTO[] Binaries
+               {
+                       get
+                       {
+                               return this.BinariesField;
+                       }
+                       set
+                       {
+                               this.BinariesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public CrewDTO[] Crews
+               {
+                       get
+                       {
+                               return this.CrewsField;
+                       }
+                       set
+                       {
+                               this.CrewsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public DayDTO[] Days
+               {
+                       get
+                       {
+                               return this.DaysField;
+                       }
+                       set
+                       {
+                               this.DaysField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public EmploymentEventDTO[] EmploymentEvents
+               {
+                       get
+                       {
+                               return this.EmploymentEventsField;
+                       }
+                       set
+                       {
+                               this.EmploymentEventsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public EventDTO[] Events
+               {
+                       get
+                       {
+                               return this.EventsField;
+                       }
+                       set
+                       {
+                               this.EventsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public DataInspection FlightDataInspection
+               {
+                       get
+                       {
+                               return this.FlightDataInspectionField;
+                       }
+                       set
+                       {
+                               this.FlightDataInspectionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public GlobalSettingDTO[] GlobalSettings
+               {
+                       get
+                       {
+                               return this.GlobalSettingsField;
+                       }
+                       set
+                       {
+                               this.GlobalSettingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public HotelDTO[] Hotels
+               {
+                       get
+                       {
+                               return this.HotelsField;
+                       }
+                       set
+                       {
+                               this.HotelsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public LegDTO[] Legs
+               {
+                       get
+                       {
+                               return this.LegsField;
+                       }
+                       set
+                       {
+                               this.LegsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public NoteDTO[] Notes
+               {
+                       get
+                       {
+                               return this.NotesField;
+                       }
+                       set
+                       {
+                               this.NotesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public PayperiodEventDTO[] PayperiodEvents
+               {
+                       get
+                       {
+                               return this.PayperiodEventsField;
+                       }
+                       set
+                       {
+                               this.PayperiodEventsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public PayrollCategoryDTO[] PayrollCategories
+               {
+                       get
+                       {
+                               return this.PayrollCategoriesField;
+                       }
+                       set
+                       {
+                               this.PayrollCategoriesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public PayrollDTO[] Payrolls
+               {
+                       get
+                       {
+                               return this.PayrollsField;
+                       }
+                       set
+                       {
+                               this.PayrollsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public PerformanceDTO[] Performances
+               {
+                       get
+                       {
+                               return this.PerformancesField;
+                       }
+                       set
+                       {
+                               this.PerformancesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public PositionDTO[] Positions
+               {
+                       get
+                       {
+                               return this.PositionsField;
+                       }
+                       set
+                       {
+                               this.PositionsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public ReglatoryOperationTypeDTO[] ReglatoryOperationTypes
+               {
+                       get
+                       {
+                               return this.ReglatoryOperationTypesField;
+                       }
+                       set
+                       {
+                               this.ReglatoryOperationTypesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public TripDTO[] Trips
+               {
+                       get
+                       {
+                               return this.TripsField;
+                       }
+                       set
+                       {
+                               this.TripsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public UserSettingDTO[] UserSettings
+               {
+                       get
+                       {
+                               return this.UserSettingsField;
+                       }
+                       set
+                       {
+                               this.UserSettingsField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="DataInspection", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class DataInspection : object
+       {
+
+               private int DayCountField;
+
+               private int LegCountField;
+
+               private Nullable<global::System.DateTime> MaxTripSequenceEndField;
+
+               private Nullable<global::System.DateTime> MinTripSequenceStartField;
+
+               private int TripCountField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int DayCount
+               {
+                       get
+                       {
+                               return this.DayCountField;
+                       }
+                       set
+                       {
+                               this.DayCountField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int LegCount
+               {
+                       get
+                       {
+                               return this.LegCountField;
+                       }
+                       set
+                       {
+                               this.LegCountField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> MaxTripSequenceEnd
+               {
+                       get
+                       {
+                               return this.MaxTripSequenceEndField;
+                       }
+                       set
+                       {
+                               this.MaxTripSequenceEndField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> MinTripSequenceStart
+               {
+                       get
+                       {
+                               return this.MinTripSequenceStartField;
+                       }
+                       set
+                       {
+                               this.MinTripSequenceStartField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int TripCount
+               {
+                       get
+                       {
+                               return this.TripCountField;
+                       }
+                       set
+                       {
+                               this.TripCountField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="AircraftDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class AircraftDTO : object
+       {
+
+               private string aircraftIdField;
+
+               private string aircraftTypeIdField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private string currentAirlineIdField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notesField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<decimal> payrateField;
+
+               private Nullable<bool> previewField;
+
+               private string previousAirlineIdField;
+
+               private string registrationField;
+
+               private string shipNumberField;
+
+               private Nullable<bool> syncedField;
+
+               private string tailField;
+
+               private Nullable<bool> usePayrateField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string aircraftId
+               {
+                       get
+                       {
+                               return this.aircraftIdField;
+                       }
+                       set
+                       {
+                               this.aircraftIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string aircraftTypeId
+               {
+                       get
+                       {
+                               return this.aircraftTypeIdField;
+                       }
+                       set
+                       {
+                               this.aircraftTypeIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string currentAirlineId
+               {
+                       get
+                       {
+                               return this.currentAirlineIdField;
+                       }
+                       set
+                       {
+                               this.currentAirlineIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notes
+               {
+                       get
+                       {
+                               return this.notesField;
+                       }
+                       set
+                       {
+                               this.notesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> payrate
+               {
+                       get
+                       {
+                               return this.payrateField;
+                       }
+                       set
+                       {
+                               this.payrateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string previousAirlineId
+               {
+                       get
+                       {
+                               return this.previousAirlineIdField;
+                       }
+                       set
+                       {
+                               this.previousAirlineIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string registration
+               {
+                       get
+                       {
+                               return this.registrationField;
+                       }
+                       set
+                       {
+                               this.registrationField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string shipNumber
+               {
+                       get
+                       {
+                               return this.shipNumberField;
+                       }
+                       set
+                       {
+                               this.shipNumberField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string tail
+               {
+                       get
+                       {
+                               return this.tailField;
+                       }
+                       set
+                       {
+                               this.tailField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> usePayrate
+               {
+                       get
+                       {
+                               return this.usePayrateField;
+                       }
+                       set
+                       {
+                               this.usePayrateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="AircraftTypeDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class AircraftTypeDTO : object
+       {
+
+               private string aircraftTypeIdField;
+
+               private string aselField;
+
+               private string configField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private string iconUrlField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> selectableField;
+
+               private Nullable<bool> syncedField;
+
+               private string transportField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string aircraftTypeId
+               {
+                       get
+                       {
+                               return this.aircraftTypeIdField;
+                       }
+                       set
+                       {
+                               this.aircraftTypeIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string asel
+               {
+                       get
+                       {
+                               return this.aselField;
+                       }
+                       set
+                       {
+                               this.aselField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string config
+               {
+                       get
+                       {
+                               return this.configField;
+                       }
+                       set
+                       {
+                               this.configField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string iconUrl
+               {
+                       get
+                       {
+                               return this.iconUrlField;
+                       }
+                       set
+                       {
+                               this.iconUrlField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> selectable
+               {
+                       get
+                       {
+                               return this.selectableField;
+                       }
+                       set
+                       {
+                               this.selectableField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string transport
+               {
+                       get
+                       {
+                               return this.transportField;
+                       }
+                       set
+                       {
+                               this.transportField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="AirlineDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class AirlineDTO : object
+       {
+
+               private string airlineIdField;
+
+               private string airlineNameField;
+
+               private string callSignField;
+
+               private string countryField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private string icaoField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string nameField;
+
+               private string phoneField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string airlineId
+               {
+                       get
+                       {
+                               return this.airlineIdField;
+                       }
+                       set
+                       {
+                               this.airlineIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string airlineName
+               {
+                       get
+                       {
+                               return this.airlineNameField;
+                       }
+                       set
+                       {
+                               this.airlineNameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string callSign
+               {
+                       get
+                       {
+                               return this.callSignField;
+                       }
+                       set
+                       {
+                               this.callSignField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string country
+               {
+                       get
+                       {
+                               return this.countryField;
+                       }
+                       set
+                       {
+                               this.countryField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string icao
+               {
+                       get
+                       {
+                               return this.icaoField;
+                       }
+                       set
+                       {
+                               this.icaoField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string name
+               {
+                       get
+                       {
+                               return this.nameField;
+                       }
+                       set
+                       {
+                               this.nameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string phone
+               {
+                       get
+                       {
+                               return this.phoneField;
+                       }
+                       set
+                       {
+                               this.phoneField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="AirportDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class AirportDTO : object
+       {
+
+               private string airlineNameField;
+
+               private string airportIdField;
+
+               private string airportNameField;
+
+               private Nullable<int> communicationLevelField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<bool> dstField;
+
+               private string emailField;
+
+               private string faaField;
+
+               private string iataField;
+
+               private string icaoField;
+
+               private string idField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<decimal> latitudeField;
+
+               private string localityField;
+
+               private string locationField;
+
+               private Nullable<decimal> longitudeField;
+
+               private Nullable<int> modelVersionField;
+
+               private string nameField;
+
+               private string notesField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private string olsentimezonenameField;
+
+               private string phoneField;
+
+               private string pictureField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<int> privacyLevelField;
+
+               private string regionField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               private Nullable<decimal> utcoffsetField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string airlineName
+               {
+                       get
+                       {
+                               return this.airlineNameField;
+                       }
+                       set
+                       {
+                               this.airlineNameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string airportId
+               {
+                       get
+                       {
+                               return this.airportIdField;
+                       }
+                       set
+                       {
+                               this.airportIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string airportName
+               {
+                       get
+                       {
+                               return this.airportNameField;
+                       }
+                       set
+                       {
+                               this.airportNameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> communicationLevel
+               {
+                       get
+                       {
+                               return this.communicationLevelField;
+                       }
+                       set
+                       {
+                               this.communicationLevelField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> dst
+               {
+                       get
+                       {
+                               return this.dstField;
+                       }
+                       set
+                       {
+                               this.dstField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string email
+               {
+                       get
+                       {
+                               return this.emailField;
+                       }
+                       set
+                       {
+                               this.emailField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string faa
+               {
+                       get
+                       {
+                               return this.faaField;
+                       }
+                       set
+                       {
+                               this.faaField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string iata
+               {
+                       get
+                       {
+                               return this.iataField;
+                       }
+                       set
+                       {
+                               this.iataField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string icao
+               {
+                       get
+                       {
+                               return this.icaoField;
+                       }
+                       set
+                       {
+                               this.icaoField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string id
+               {
+                       get
+                       {
+                               return this.idField;
+                       }
+                       set
+                       {
+                               this.idField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> latitude
+               {
+                       get
+                       {
+                               return this.latitudeField;
+                       }
+                       set
+                       {
+                               this.latitudeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string locality
+               {
+                       get
+                       {
+                               return this.localityField;
+                       }
+                       set
+                       {
+                               this.localityField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string location
+               {
+                       get
+                       {
+                               return this.locationField;
+                       }
+                       set
+                       {
+                               this.locationField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> longitude
+               {
+                       get
+                       {
+                               return this.longitudeField;
+                       }
+                       set
+                       {
+                               this.longitudeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string name
+               {
+                       get
+                       {
+                               return this.nameField;
+                       }
+                       set
+                       {
+                               this.nameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notes
+               {
+                       get
+                       {
+                               return this.notesField;
+                       }
+                       set
+                       {
+                               this.notesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string olsentimezonename
+               {
+                       get
+                       {
+                               return this.olsentimezonenameField;
+                       }
+                       set
+                       {
+                               this.olsentimezonenameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string phone
+               {
+                       get
+                       {
+                               return this.phoneField;
+                       }
+                       set
+                       {
+                               this.phoneField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string picture
+               {
+                       get
+                       {
+                               return this.pictureField;
+                       }
+                       set
+                       {
+                               this.pictureField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> privacyLevel
+               {
+                       get
+                       {
+                               return this.privacyLevelField;
+                       }
+                       set
+                       {
+                               this.privacyLevelField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string region
+               {
+                       get
+                       {
+                               return this.regionField;
+                       }
+                       set
+                       {
+                               this.regionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> utcoffset
+               {
+                       get
+                       {
+                               return this.utcoffsetField;
+                       }
+                       set
+                       {
+                               this.utcoffsetField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="ApproachDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class ApproachDTO : object
+       {
+
+               private string approachIdField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> selectableField;
+
+               private Nullable<bool> syncedField;
+
+               private string typeField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string approachId
+               {
+                       get
+                       {
+                               return this.approachIdField;
+                       }
+                       set
+                       {
+                               this.approachIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> selectable
+               {
+                       get
+                       {
+                               return this.selectableField;
+                       }
+                       set
+                       {
+                               this.selectableField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string type
+               {
+                       get
+                       {
+                               return this.typeField;
+                       }
+                       set
+                       {
+                               this.typeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="ApproachesLegDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class ApproachesLegDTO : object
+       {
+
+               private string approachIdField;
+
+               private string approachesLegsIdField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private string legIdField;
+
+               private Nullable<int> modelVersionField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string approachId
+               {
+                       get
+                       {
+                               return this.approachIdField;
+                       }
+                       set
+                       {
+                               this.approachIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string approachesLegsId
+               {
+                       get
+                       {
+                               return this.approachesLegsIdField;
+                       }
+                       set
+                       {
+                               this.approachesLegsIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string legId
+               {
+                       get
+                       {
+                               return this.legIdField;
+                       }
+                       set
+                       {
+                               this.legIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="BinaryCatalogDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class BinaryCatalogDTO : object
+       {
+
+               private global::System.Guid RowGuidField;
+
+               private Nullable<int> areaIdField;
+
+               private string binaryCatalogIdField;
+
+               private Nullable<int> contentLengthField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private string filenameField;
+
+               private string folderIdField;
+
+               private Nullable<bool> isSecuredField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<global::System.DateTime> lastWriteTimeUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private string titleField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public global::System.Guid RowGuid
+               {
+                       get
+                       {
+                               return this.RowGuidField;
+                       }
+                       set
+                       {
+                               this.RowGuidField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> areaId
+               {
+                       get
+                       {
+                               return this.areaIdField;
+                       }
+                       set
+                       {
+                               this.areaIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string binaryCatalogId
+               {
+                       get
+                       {
+                               return this.binaryCatalogIdField;
+                       }
+                       set
+                       {
+                               this.binaryCatalogIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> contentLength
+               {
+                       get
+                       {
+                               return this.contentLengthField;
+                       }
+                       set
+                       {
+                               this.contentLengthField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string filename
+               {
+                       get
+                       {
+                               return this.filenameField;
+                       }
+                       set
+                       {
+                               this.filenameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string folderId
+               {
+                       get
+                       {
+                               return this.folderIdField;
+                       }
+                       set
+                       {
+                               this.folderIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> isSecured
+               {
+                       get
+                       {
+                               return this.isSecuredField;
+                       }
+                       set
+                       {
+                               this.isSecuredField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastWriteTimeUtc
+               {
+                       get
+                       {
+                               return this.lastWriteTimeUtcField;
+                       }
+                       set
+                       {
+                               this.lastWriteTimeUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string title
+               {
+                       get
+                       {
+                               return this.titleField;
+                       }
+                       set
+                       {
+                               this.titleField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="CrewDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class CrewDTO : object
+       {
+
+               private Nullable<int> communicationLevelField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private string crewIdField;
+
+               private string crewNameField;
+
+               private string currentAirlineIdField;
+
+               private Nullable<bool> deletedField;
+
+               private string emailField;
+
+               private string facebookField;
+
+               private string idField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private string locationField;
+
+               private Nullable<int> modelVersionField;
+
+               private string nameField;
+
+               private string notesField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private string phoneField;
+
+               private string pictureField;
+
+               private string positionField;
+
+               private Nullable<bool> previewField;
+
+               private string previousAirlineIdField;
+
+               private Nullable<int> privacyLevelField;
+
+               private Nullable<bool> syncedField;
+
+               private string twitterField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> communicationLevel
+               {
+                       get
+                       {
+                               return this.communicationLevelField;
+                       }
+                       set
+                       {
+                               this.communicationLevelField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string crewId
+               {
+                       get
+                       {
+                               return this.crewIdField;
+                       }
+                       set
+                       {
+                               this.crewIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string crewName
+               {
+                       get
+                       {
+                               return this.crewNameField;
+                       }
+                       set
+                       {
+                               this.crewNameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string currentAirlineId
+               {
+                       get
+                       {
+                               return this.currentAirlineIdField;
+                       }
+                       set
+                       {
+                               this.currentAirlineIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string email
+               {
+                       get
+                       {
+                               return this.emailField;
+                       }
+                       set
+                       {
+                               this.emailField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string facebook
+               {
+                       get
+                       {
+                               return this.facebookField;
+                       }
+                       set
+                       {
+                               this.facebookField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string id
+               {
+                       get
+                       {
+                               return this.idField;
+                       }
+                       set
+                       {
+                               this.idField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string location
+               {
+                       get
+                       {
+                               return this.locationField;
+                       }
+                       set
+                       {
+                               this.locationField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string name
+               {
+                       get
+                       {
+                               return this.nameField;
+                       }
+                       set
+                       {
+                               this.nameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notes
+               {
+                       get
+                       {
+                               return this.notesField;
+                       }
+                       set
+                       {
+                               this.notesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string phone
+               {
+                       get
+                       {
+                               return this.phoneField;
+                       }
+                       set
+                       {
+                               this.phoneField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string picture
+               {
+                       get
+                       {
+                               return this.pictureField;
+                       }
+                       set
+                       {
+                               this.pictureField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string position
+               {
+                       get
+                       {
+                               return this.positionField;
+                       }
+                       set
+                       {
+                               this.positionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string previousAirlineId
+               {
+                       get
+                       {
+                               return this.previousAirlineIdField;
+                       }
+                       set
+                       {
+                               this.previousAirlineIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> privacyLevel
+               {
+                       get
+                       {
+                               return this.privacyLevelField;
+                       }
+                       set
+                       {
+                               this.privacyLevelField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string twitter
+               {
+                       get
+                       {
+                               return this.twitterField;
+                       }
+                       set
+                       {
+                               this.twitterField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="DayDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class DayDTO : object
+       {
+
+               private Nullable<int> blockField;
+
+               private string calendarIdentifierField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<int> creditField;
+
+               private string dayIdField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<decimal> dutyField;
+
+               private Nullable<global::System.DateTime> dutyOffField;
+
+               private Nullable<global::System.DateTime> dutyOnField;
+
+               private Nullable<int> fDPField;
+
+               private Nullable<global::System.DateTime> fDPEndTimeField;
+
+               private Nullable<decimal> flightTimeField;
+
+               private Nullable<int> grossPayField;
+
+               private string hotelIdField;
+
+               private Nullable<decimal> instrumentField;
+
+               private Nullable<int> landingsField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private Nullable<decimal> nightField;
+
+               private Nullable<int> nightLandingsField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> overrideDutyOffField;
+
+               private Nullable<bool> overrideDutyOnField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<int> rdpField;
+
+               private Nullable<global::System.DateTime> rdpBeginField;
+
+               private Nullable<global::System.DateTime> rdpEndField;
+
+               private Nullable<int> scheduleBlockField;
+
+               private Nullable<int> splitDutyField;
+
+               private Nullable<global::System.DateTime> splitDutyBeginField;
+
+               private Nullable<global::System.DateTime> splitDutyEndField;
+
+               private Nullable<bool> syncedField;
+
+               private string tripIdField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> block
+               {
+                       get
+                       {
+                               return this.blockField;
+                       }
+                       set
+                       {
+                               this.blockField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string calendarIdentifier
+               {
+                       get
+                       {
+                               return this.calendarIdentifierField;
+                       }
+                       set
+                       {
+                               this.calendarIdentifierField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> credit
+               {
+                       get
+                       {
+                               return this.creditField;
+                       }
+                       set
+                       {
+                               this.creditField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string dayId
+               {
+                       get
+                       {
+                               return this.dayIdField;
+                       }
+                       set
+                       {
+                               this.dayIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> duty
+               {
+                       get
+                       {
+                               return this.dutyField;
+                       }
+                       set
+                       {
+                               this.dutyField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> dutyOff
+               {
+                       get
+                       {
+                               return this.dutyOffField;
+                       }
+                       set
+                       {
+                               this.dutyOffField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> dutyOn
+               {
+                       get
+                       {
+                               return this.dutyOnField;
+                       }
+                       set
+                       {
+                               this.dutyOnField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> fDP
+               {
+                       get
+                       {
+                               return this.fDPField;
+                       }
+                       set
+                       {
+                               this.fDPField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> fDPEndTime
+               {
+                       get
+                       {
+                               return this.fDPEndTimeField;
+                       }
+                       set
+                       {
+                               this.fDPEndTimeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> flightTime
+               {
+                       get
+                       {
+                               return this.flightTimeField;
+                       }
+                       set
+                       {
+                               this.flightTimeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> grossPay
+               {
+                       get
+                       {
+                               return this.grossPayField;
+                       }
+                       set
+                       {
+                               this.grossPayField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string hotelId
+               {
+                       get
+                       {
+                               return this.hotelIdField;
+                       }
+                       set
+                       {
+                               this.hotelIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> instrument
+               {
+                       get
+                       {
+                               return this.instrumentField;
+                       }
+                       set
+                       {
+                               this.instrumentField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> landings
+               {
+                       get
+                       {
+                               return this.landingsField;
+                       }
+                       set
+                       {
+                               this.landingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> night
+               {
+                       get
+                       {
+                               return this.nightField;
+                       }
+                       set
+                       {
+                               this.nightField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> nightLandings
+               {
+                       get
+                       {
+                               return this.nightLandingsField;
+                       }
+                       set
+                       {
+                               this.nightLandingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> overrideDutyOff
+               {
+                       get
+                       {
+                               return this.overrideDutyOffField;
+                       }
+                       set
+                       {
+                               this.overrideDutyOffField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> overrideDutyOn
+               {
+                       get
+                       {
+                               return this.overrideDutyOnField;
+                       }
+                       set
+                       {
+                               this.overrideDutyOnField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> rdp
+               {
+                       get
+                       {
+                               return this.rdpField;
+                       }
+                       set
+                       {
+                               this.rdpField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> rdpBegin
+               {
+                       get
+                       {
+                               return this.rdpBeginField;
+                       }
+                       set
+                       {
+                               this.rdpBeginField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> rdpEnd
+               {
+                       get
+                       {
+                               return this.rdpEndField;
+                       }
+                       set
+                       {
+                               this.rdpEndField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> scheduleBlock
+               {
+                       get
+                       {
+                               return this.scheduleBlockField;
+                       }
+                       set
+                       {
+                               this.scheduleBlockField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> splitDuty
+               {
+                       get
+                       {
+                               return this.splitDutyField;
+                       }
+                       set
+                       {
+                               this.splitDutyField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> splitDutyBegin
+               {
+                       get
+                       {
+                               return this.splitDutyBeginField;
+                       }
+                       set
+                       {
+                               this.splitDutyBeginField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> splitDutyEnd
+               {
+                       get
+                       {
+                               return this.splitDutyEndField;
+                       }
+                       set
+                       {
+                               this.splitDutyEndField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string tripId
+               {
+                       get
+                       {
+                               return this.tripIdField;
+                       }
+                       set
+                       {
+                               this.tripIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="EmploymentEventDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class EmploymentEventDTO : object
+       {
+
+               private string airlineIdField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private string employmentEventIdField;
+
+               private Nullable<global::System.DateTime> firstDateField;
+
+               private Nullable<global::System.DateTime> lastDateField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string airlineId
+               {
+                       get
+                       {
+                               return this.airlineIdField;
+                       }
+                       set
+                       {
+                               this.airlineIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string employmentEventId
+               {
+                       get
+                       {
+                               return this.employmentEventIdField;
+                       }
+                       set
+                       {
+                               this.employmentEventIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> firstDate
+               {
+                       get
+                       {
+                               return this.firstDateField;
+                       }
+                       set
+                       {
+                               this.firstDateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastDate
+               {
+                       get
+                       {
+                               return this.lastDateField;
+                       }
+                       set
+                       {
+                               this.lastDateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="EventDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class EventDTO : object
+       {
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<global::System.DateTime> dateRangeField;
+
+               private Nullable<bool> deletedField;
+
+               private string eventIdField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<int> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private string urlField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> dateRange
+               {
+                       get
+                       {
+                               return this.dateRangeField;
+                       }
+                       set
+                       {
+                               this.dateRangeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string eventId
+               {
+                       get
+                       {
+                               return this.eventIdField;
+                       }
+                       set
+                       {
+                               this.eventIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string url
+               {
+                       get
+                       {
+                               return this.urlField;
+                       }
+                       set
+                       {
+                               this.urlField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="GlobalSettingDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class GlobalSettingDTO : object
+       {
+
+               private string DescriptionField;
+
+               private global::System.Guid GlobalSettingIdField;
+
+               private global::System.DateTime LastUpdatedUtcField;
+
+               private string SettingKeyField;
+
+               private string SettingValueField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string Description
+               {
+                       get
+                       {
+                               return this.DescriptionField;
+                       }
+                       set
+                       {
+                               this.DescriptionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public global::System.Guid GlobalSettingId
+               {
+                       get
+                       {
+                               return this.GlobalSettingIdField;
+                       }
+                       set
+                       {
+                               this.GlobalSettingIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public global::System.DateTime LastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.LastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.LastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string SettingKey
+               {
+                       get
+                       {
+                               return this.SettingKeyField;
+                       }
+                       set
+                       {
+                               this.SettingKeyField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string SettingValue
+               {
+                       get
+                       {
+                               return this.SettingValueField;
+                       }
+                       set
+                       {
+                               this.SettingValueField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="HotelDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class HotelDTO : object
+       {
+
+               private Nullable<int> communicationLevelField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private string emailField;
+
+               private string hotelIdField;
+
+               private string hotelNameField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private string locationField;
+
+               private Nullable<int> modelVersionField;
+
+               private string nameField;
+
+               private string notesField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private string numberField;
+
+               private string phoneField;
+
+               private string pictureField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<int> privacyLevelField;
+
+               private Nullable<int> ratingsField;
+
+               private string sharedNotesField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> communicationLevel
+               {
+                       get
+                       {
+                               return this.communicationLevelField;
+                       }
+                       set
+                       {
+                               this.communicationLevelField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string email
+               {
+                       get
+                       {
+                               return this.emailField;
+                       }
+                       set
+                       {
+                               this.emailField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string hotelId
+               {
+                       get
+                       {
+                               return this.hotelIdField;
+                       }
+                       set
+                       {
+                               this.hotelIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string hotelName
+               {
+                       get
+                       {
+                               return this.hotelNameField;
+                       }
+                       set
+                       {
+                               this.hotelNameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string location
+               {
+                       get
+                       {
+                               return this.locationField;
+                       }
+                       set
+                       {
+                               this.locationField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string name
+               {
+                       get
+                       {
+                               return this.nameField;
+                       }
+                       set
+                       {
+                               this.nameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notes
+               {
+                       get
+                       {
+                               return this.notesField;
+                       }
+                       set
+                       {
+                               this.notesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string number
+               {
+                       get
+                       {
+                               return this.numberField;
+                       }
+                       set
+                       {
+                               this.numberField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string phone
+               {
+                       get
+                       {
+                               return this.phoneField;
+                       }
+                       set
+                       {
+                               this.phoneField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string picture
+               {
+                       get
+                       {
+                               return this.pictureField;
+                       }
+                       set
+                       {
+                               this.pictureField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> privacyLevel
+               {
+                       get
+                       {
+                               return this.privacyLevelField;
+                       }
+                       set
+                       {
+                               this.privacyLevelField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> ratings
+               {
+                       get
+                       {
+                               return this.ratingsField;
+                       }
+                       set
+                       {
+                               this.ratingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string sharedNotes
+               {
+                       get
+                       {
+                               return this.sharedNotesField;
+                       }
+                       set
+                       {
+                               this.sharedNotesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="LegDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class LegDTO : object
+       {
+
+               private Nullable<int> actualBlockField;
+
+               private string aircraftIdField;
+
+               private string approachIdField;
+
+               private string cabinCrewAIdField;
+
+               private string cabinCrewBIdField;
+
+               private string calendarIdentifierField;
+
+               private string captainIdField;
+
+               private Nullable<bool> completedField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private string dayIdField;
+
+               private Nullable<bool> deletedField;
+
+               private string departureAirportIdField;
+
+               private string deptField;
+
+               private string deptGateField;
+
+               private string destField;
+
+               private string destGateField;
+
+               private string destinationAirportIdField;
+
+               private Nullable<global::System.DateTime> etaField;
+
+               private string firstOfficerIdField;
+
+               private string flightNumberField;
+
+               private Nullable<int> flightTimeField;
+
+               private Nullable<global::System.DateTime> inOOOIField;
+
+               private Nullable<decimal> instrumentField;
+
+               private Nullable<int> landingsField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private string legIdField;
+
+               private Nullable<int> modelVersionField;
+
+               private Nullable<decimal> nightField;
+
+               private Nullable<int> nightLandingsField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<global::System.DateTime> offOOOIField;
+
+               private Nullable<global::System.DateTime> onOOOIField;
+
+               private string operationTypeIdField;
+
+               private string otherCrewAIdField;
+
+               private string otherCrewBIdField;
+
+               private Nullable<global::System.DateTime> outOOOIField;
+
+               private string payIdField;
+
+               private string positionIdField;
+
+               private Nullable<bool> previewField;
+
+               private string registrationField;
+
+               private string remarksField;
+
+               private Nullable<int> scheduledBlockField;
+
+               private Nullable<global::System.DateTime> scheduledInField;
+
+               private Nullable<global::System.DateTime> scheduledOutField;
+
+               private Nullable<int> sequenceField;
+
+               private Nullable<bool> syncedField;
+
+               private Nullable<int> taxiTimeInField;
+
+               private Nullable<int> taxiTimeOutField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> actualBlock
+               {
+                       get
+                       {
+                               return this.actualBlockField;
+                       }
+                       set
+                       {
+                               this.actualBlockField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string aircraftId
+               {
+                       get
+                       {
+                               return this.aircraftIdField;
+                       }
+                       set
+                       {
+                               this.aircraftIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string approachId
+               {
+                       get
+                       {
+                               return this.approachIdField;
+                       }
+                       set
+                       {
+                               this.approachIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string cabinCrewAId
+               {
+                       get
+                       {
+                               return this.cabinCrewAIdField;
+                       }
+                       set
+                       {
+                               this.cabinCrewAIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string cabinCrewBId
+               {
+                       get
+                       {
+                               return this.cabinCrewBIdField;
+                       }
+                       set
+                       {
+                               this.cabinCrewBIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string calendarIdentifier
+               {
+                       get
+                       {
+                               return this.calendarIdentifierField;
+                       }
+                       set
+                       {
+                               this.calendarIdentifierField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string captainId
+               {
+                       get
+                       {
+                               return this.captainIdField;
+                       }
+                       set
+                       {
+                               this.captainIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> completed
+               {
+                       get
+                       {
+                               return this.completedField;
+                       }
+                       set
+                       {
+                               this.completedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string dayId
+               {
+                       get
+                       {
+                               return this.dayIdField;
+                       }
+                       set
+                       {
+                               this.dayIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string departureAirportId
+               {
+                       get
+                       {
+                               return this.departureAirportIdField;
+                       }
+                       set
+                       {
+                               this.departureAirportIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string dept
+               {
+                       get
+                       {
+                               return this.deptField;
+                       }
+                       set
+                       {
+                               this.deptField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string deptGate
+               {
+                       get
+                       {
+                               return this.deptGateField;
+                       }
+                       set
+                       {
+                               this.deptGateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string dest
+               {
+                       get
+                       {
+                               return this.destField;
+                       }
+                       set
+                       {
+                               this.destField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string destGate
+               {
+                       get
+                       {
+                               return this.destGateField;
+                       }
+                       set
+                       {
+                               this.destGateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string destinationAirportId
+               {
+                       get
+                       {
+                               return this.destinationAirportIdField;
+                       }
+                       set
+                       {
+                               this.destinationAirportIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> eta
+               {
+                       get
+                       {
+                               return this.etaField;
+                       }
+                       set
+                       {
+                               this.etaField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string firstOfficerId
+               {
+                       get
+                       {
+                               return this.firstOfficerIdField;
+                       }
+                       set
+                       {
+                               this.firstOfficerIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string flightNumber
+               {
+                       get
+                       {
+                               return this.flightNumberField;
+                       }
+                       set
+                       {
+                               this.flightNumberField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> flightTime
+               {
+                       get
+                       {
+                               return this.flightTimeField;
+                       }
+                       set
+                       {
+                               this.flightTimeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> inOOOI
+               {
+                       get
+                       {
+                               return this.inOOOIField;
+                       }
+                       set
+                       {
+                               this.inOOOIField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> instrument
+               {
+                       get
+                       {
+                               return this.instrumentField;
+                       }
+                       set
+                       {
+                               this.instrumentField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> landings
+               {
+                       get
+                       {
+                               return this.landingsField;
+                       }
+                       set
+                       {
+                               this.landingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string legId
+               {
+                       get
+                       {
+                               return this.legIdField;
+                       }
+                       set
+                       {
+                               this.legIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> night
+               {
+                       get
+                       {
+                               return this.nightField;
+                       }
+                       set
+                       {
+                               this.nightField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> nightLandings
+               {
+                       get
+                       {
+                               return this.nightLandingsField;
+                       }
+                       set
+                       {
+                               this.nightLandingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> offOOOI
+               {
+                       get
+                       {
+                               return this.offOOOIField;
+                       }
+                       set
+                       {
+                               this.offOOOIField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> onOOOI
+               {
+                       get
+                       {
+                               return this.onOOOIField;
+                       }
+                       set
+                       {
+                               this.onOOOIField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string operationTypeId
+               {
+                       get
+                       {
+                               return this.operationTypeIdField;
+                       }
+                       set
+                       {
+                               this.operationTypeIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string otherCrewAId
+               {
+                       get
+                       {
+                               return this.otherCrewAIdField;
+                       }
+                       set
+                       {
+                               this.otherCrewAIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string otherCrewBId
+               {
+                       get
+                       {
+                               return this.otherCrewBIdField;
+                       }
+                       set
+                       {
+                               this.otherCrewBIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> outOOOI
+               {
+                       get
+                       {
+                               return this.outOOOIField;
+                       }
+                       set
+                       {
+                               this.outOOOIField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string payId
+               {
+                       get
+                       {
+                               return this.payIdField;
+                       }
+                       set
+                       {
+                               this.payIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string positionId
+               {
+                       get
+                       {
+                               return this.positionIdField;
+                       }
+                       set
+                       {
+                               this.positionIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string registration
+               {
+                       get
+                       {
+                               return this.registrationField;
+                       }
+                       set
+                       {
+                               this.registrationField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string remarks
+               {
+                       get
+                       {
+                               return this.remarksField;
+                       }
+                       set
+                       {
+                               this.remarksField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> scheduledBlock
+               {
+                       get
+                       {
+                               return this.scheduledBlockField;
+                       }
+                       set
+                       {
+                               this.scheduledBlockField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> scheduledIn
+               {
+                       get
+                       {
+                               return this.scheduledInField;
+                       }
+                       set
+                       {
+                               this.scheduledInField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> scheduledOut
+               {
+                       get
+                       {
+                               return this.scheduledOutField;
+                       }
+                       set
+                       {
+                               this.scheduledOutField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> sequence
+               {
+                       get
+                       {
+                               return this.sequenceField;
+                       }
+                       set
+                       {
+                               this.sequenceField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> taxiTimeIn
+               {
+                       get
+                       {
+                               return this.taxiTimeInField;
+                       }
+                       set
+                       {
+                               this.taxiTimeInField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> taxiTimeOut
+               {
+                       get
+                       {
+                               return this.taxiTimeOutField;
+                       }
+                       set
+                       {
+                               this.taxiTimeOutField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="NoteDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class NoteDTO : object
+       {
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string note1Field;
+
+               private string noteIdField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string note1
+               {
+                       get
+                       {
+                               return this.note1Field;
+                       }
+                       set
+                       {
+                               this.note1Field = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string noteId
+               {
+                       get
+                       {
+                               return this.noteIdField;
+                       }
+                       set
+                       {
+                               this.noteIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="PayperiodEventDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class PayperiodEventDTO : object
+       {
+
+               private string airlineIdField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> firstDateField;
+
+               private Nullable<global::System.DateTime> lastDateField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string payperiodEventIdField;
+
+               private string periodDescriptionField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string airlineId
+               {
+                       get
+                       {
+                               return this.airlineIdField;
+                       }
+                       set
+                       {
+                               this.airlineIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> firstDate
+               {
+                       get
+                       {
+                               return this.firstDateField;
+                       }
+                       set
+                       {
+                               this.firstDateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastDate
+               {
+                       get
+                       {
+                               return this.lastDateField;
+                       }
+                       set
+                       {
+                               this.lastDateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string payperiodEventId
+               {
+                       get
+                       {
+                               return this.payperiodEventIdField;
+                       }
+                       set
+                       {
+                               this.payperiodEventIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string periodDescription
+               {
+                       get
+                       {
+                               return this.periodDescriptionField;
+                       }
+                       set
+                       {
+                               this.periodDescriptionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="PayrollCategoryDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class PayrollCategoryDTO : object
+       {
+
+               private Nullable<bool> aboveGuaranteeField;
+
+               private Nullable<bool> applyRigField;
+
+               private Nullable<bool> applyToFlightTimeField;
+
+               private Nullable<bool> applyToLegalityField;
+
+               private Nullable<bool> applyToPayField;
+
+               private Nullable<bool> copyLegField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> minimumCreditField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> overridePayField;
+
+               private Nullable<decimal> payrateField;
+
+               private string payrollCategoriesIdField;
+
+               private string plainDescriptionField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<int> rigAField;
+
+               private Nullable<int> rigBField;
+
+               private Nullable<bool> selectableField;
+
+               private Nullable<bool> setAllLegsField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> aboveGuarantee
+               {
+                       get
+                       {
+                               return this.aboveGuaranteeField;
+                       }
+                       set
+                       {
+                               this.aboveGuaranteeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> applyRig
+               {
+                       get
+                       {
+                               return this.applyRigField;
+                       }
+                       set
+                       {
+                               this.applyRigField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> applyToFlightTime
+               {
+                       get
+                       {
+                               return this.applyToFlightTimeField;
+                       }
+                       set
+                       {
+                               this.applyToFlightTimeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> applyToLegality
+               {
+                       get
+                       {
+                               return this.applyToLegalityField;
+                       }
+                       set
+                       {
+                               this.applyToLegalityField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> applyToPay
+               {
+                       get
+                       {
+                               return this.applyToPayField;
+                       }
+                       set
+                       {
+                               this.applyToPayField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> copyLeg
+               {
+                       get
+                       {
+                               return this.copyLegField;
+                       }
+                       set
+                       {
+                               this.copyLegField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> minimumCredit
+               {
+                       get
+                       {
+                               return this.minimumCreditField;
+                       }
+                       set
+                       {
+                               this.minimumCreditField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> overridePay
+               {
+                       get
+                       {
+                               return this.overridePayField;
+                       }
+                       set
+                       {
+                               this.overridePayField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> payrate
+               {
+                       get
+                       {
+                               return this.payrateField;
+                       }
+                       set
+                       {
+                               this.payrateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string payrollCategoriesId
+               {
+                       get
+                       {
+                               return this.payrollCategoriesIdField;
+                       }
+                       set
+                       {
+                               this.payrollCategoriesIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string plainDescription
+               {
+                       get
+                       {
+                               return this.plainDescriptionField;
+                       }
+                       set
+                       {
+                               this.plainDescriptionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> rigA
+               {
+                       get
+                       {
+                               return this.rigAField;
+                       }
+                       set
+                       {
+                               this.rigAField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> rigB
+               {
+                       get
+                       {
+                               return this.rigBField;
+                       }
+                       set
+                       {
+                               this.rigBField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> selectable
+               {
+                       get
+                       {
+                               return this.selectableField;
+                       }
+                       set
+                       {
+                               this.selectableField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> setAllLegs
+               {
+                       get
+                       {
+                               return this.setAllLegsField;
+                       }
+                       set
+                       {
+                               this.setAllLegsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="PayrollDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class PayrollDTO : object
+       {
+
+               private Nullable<int> actualField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<int> creditField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private string payrollCategoriesIdField;
+
+               private string payrollIdField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> actual
+               {
+                       get
+                       {
+                               return this.actualField;
+                       }
+                       set
+                       {
+                               this.actualField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> credit
+               {
+                       get
+                       {
+                               return this.creditField;
+                       }
+                       set
+                       {
+                               this.creditField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string payrollCategoriesId
+               {
+                       get
+                       {
+                               return this.payrollCategoriesIdField;
+                       }
+                       set
+                       {
+                               this.payrollCategoriesIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string payrollId
+               {
+                       get
+                       {
+                               return this.payrollIdField;
+                       }
+                       set
+                       {
+                               this.payrollIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="PerformanceDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class PerformanceDTO : object
+       {
+
+               private Nullable<int> actualField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<int> deviatedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private string performanceIdField;
+
+               private Nullable<int> plannedFuelField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> actual
+               {
+                       get
+                       {
+                               return this.actualField;
+                       }
+                       set
+                       {
+                               this.actualField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> deviated
+               {
+                       get
+                       {
+                               return this.deviatedField;
+                       }
+                       set
+                       {
+                               this.deviatedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string performanceId
+               {
+                       get
+                       {
+                               return this.performanceIdField;
+                       }
+                       set
+                       {
+                               this.performanceIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> plannedFuel
+               {
+                       get
+                       {
+                               return this.plannedFuelField;
+                       }
+                       set
+                       {
+                               this.plannedFuelField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="PositionDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class PositionDTO : object
+       {
+
+               private Nullable<bool> autoNightLandingField;
+
+               private Nullable<bool> checkAirmanField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> creditLandingField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<bool> ioeField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> pilotFlyingField;
+
+               private Nullable<bool> pilotInCommandField;
+
+               private string position1Field;
+
+               private string positionIdField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> selectableField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> autoNightLanding
+               {
+                       get
+                       {
+                               return this.autoNightLandingField;
+                       }
+                       set
+                       {
+                               this.autoNightLandingField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> checkAirman
+               {
+                       get
+                       {
+                               return this.checkAirmanField;
+                       }
+                       set
+                       {
+                               this.checkAirmanField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> creditLanding
+               {
+                       get
+                       {
+                               return this.creditLandingField;
+                       }
+                       set
+                       {
+                               this.creditLandingField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> ioe
+               {
+                       get
+                       {
+                               return this.ioeField;
+                       }
+                       set
+                       {
+                               this.ioeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> pilotFlying
+               {
+                       get
+                       {
+                               return this.pilotFlyingField;
+                       }
+                       set
+                       {
+                               this.pilotFlyingField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> pilotInCommand
+               {
+                       get
+                       {
+                               return this.pilotInCommandField;
+                       }
+                       set
+                       {
+                               this.pilotInCommandField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string position1
+               {
+                       get
+                       {
+                               return this.position1Field;
+                       }
+                       set
+                       {
+                               this.position1Field = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string positionId
+               {
+                       get
+                       {
+                               return this.positionIdField;
+                       }
+                       set
+                       {
+                               this.positionIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> selectable
+               {
+                       get
+                       {
+                               return this.selectableField;
+                       }
+                       set
+                       {
+                               this.selectableField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="ReglatoryOperationTypeDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class ReglatoryOperationTypeDTO : object
+       {
+
+               private Nullable<bool> activeField;
+
+               private Nullable<bool> canMixOperationsField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string operationAbvreviationField;
+
+               private string operationDescriptionField;
+
+               private Nullable<bool> previewField;
+
+               private string reglatoryOperationTypesIdField;
+
+               private string schemaURLField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> active
+               {
+                       get
+                       {
+                               return this.activeField;
+                       }
+                       set
+                       {
+                               this.activeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> canMixOperations
+               {
+                       get
+                       {
+                               return this.canMixOperationsField;
+                       }
+                       set
+                       {
+                               this.canMixOperationsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string operationAbvreviation
+               {
+                       get
+                       {
+                               return this.operationAbvreviationField;
+                       }
+                       set
+                       {
+                               this.operationAbvreviationField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string operationDescription
+               {
+                       get
+                       {
+                               return this.operationDescriptionField;
+                       }
+                       set
+                       {
+                               this.operationDescriptionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string reglatoryOperationTypesId
+               {
+                       get
+                       {
+                               return this.reglatoryOperationTypesIdField;
+                       }
+                       set
+                       {
+                               this.reglatoryOperationTypesIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string schemaURL
+               {
+                       get
+                       {
+                               return this.schemaURLField;
+                       }
+                       set
+                       {
+                               this.schemaURLField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="TripDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class TripDTO : object
+       {
+
+               private bool activeField;
+
+               private string calendarIdentifierField;
+
+               private Nullable<bool> completedField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<global::System.DateTime> seqEndTimeField;
+
+               private Nullable<global::System.DateTime> seqStartTimeField;
+
+               private Nullable<bool> syncedField;
+
+               private Nullable<int> tafbField;
+
+               private Nullable<int> totalBlockField;
+
+               private Nullable<int> totalCreditField;
+
+               private Nullable<decimal> totalFlightTimeField;
+
+               private Nullable<decimal> totalInstrumentField;
+
+               private Nullable<int> totalLandingsField;
+
+               private Nullable<decimal> totalNightField;
+
+               private Nullable<int> totalNightLandingsField;
+
+               private Nullable<decimal> totalPayFField;
+
+               private string tripIdField;
+
+               private string tripNumberField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public bool active
+               {
+                       get
+                       {
+                               return this.activeField;
+                       }
+                       set
+                       {
+                               this.activeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string calendarIdentifier
+               {
+                       get
+                       {
+                               return this.calendarIdentifierField;
+                       }
+                       set
+                       {
+                               this.calendarIdentifierField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> completed
+               {
+                       get
+                       {
+                               return this.completedField;
+                       }
+                       set
+                       {
+                               this.completedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> seqEndTime
+               {
+                       get
+                       {
+                               return this.seqEndTimeField;
+                       }
+                       set
+                       {
+                               this.seqEndTimeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> seqStartTime
+               {
+                       get
+                       {
+                               return this.seqStartTimeField;
+                       }
+                       set
+                       {
+                               this.seqStartTimeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> tafb
+               {
+                       get
+                       {
+                               return this.tafbField;
+                       }
+                       set
+                       {
+                               this.tafbField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> totalBlock
+               {
+                       get
+                       {
+                               return this.totalBlockField;
+                       }
+                       set
+                       {
+                               this.totalBlockField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> totalCredit
+               {
+                       get
+                       {
+                               return this.totalCreditField;
+                       }
+                       set
+                       {
+                               this.totalCreditField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> totalFlightTime
+               {
+                       get
+                       {
+                               return this.totalFlightTimeField;
+                       }
+                       set
+                       {
+                               this.totalFlightTimeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> totalInstrument
+               {
+                       get
+                       {
+                               return this.totalInstrumentField;
+                       }
+                       set
+                       {
+                               this.totalInstrumentField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> totalLandings
+               {
+                       get
+                       {
+                               return this.totalLandingsField;
+                       }
+                       set
+                       {
+                               this.totalLandingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> totalNight
+               {
+                       get
+                       {
+                               return this.totalNightField;
+                       }
+                       set
+                       {
+                               this.totalNightField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> totalNightLandings
+               {
+                       get
+                       {
+                               return this.totalNightLandingsField;
+                       }
+                       set
+                       {
+                               this.totalNightLandingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> totalPayF
+               {
+                       get
+                       {
+                               return this.totalPayFField;
+                       }
+                       set
+                       {
+                               this.totalPayFField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string tripId
+               {
+                       get
+                       {
+                               return this.tripIdField;
+                       }
+                       set
+                       {
+                               this.tripIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string tripNumber
+               {
+                       get
+                       {
+                               return this.tripNumberField;
+                       }
+                       set
+                       {
+                               this.tripNumberField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="UserSettingDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class UserSettingDTO : object
+       {
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private string keyField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> previewField;
+
+               private string stringValueField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               private string userSettingIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string key
+               {
+                       get
+                       {
+                               return this.keyField;
+                       }
+                       set
+                       {
+                               this.keyField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string stringValue
+               {
+                       get
+                       {
+                               return this.stringValueField;
+                       }
+                       set
+                       {
+                               this.stringValueField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string userSettingId
+               {
+                       get
+                       {
+                               return this.userSettingIdField;
+                       }
+                       set
+                       {
+                               this.userSettingIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="DingusSyncResponse", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class DingusSyncResponse : object
+       {
+
+               DingusSyncData CloudDataField;
+
+               private string StatusField;
+
+               private bool SuccessField;
+
+               private global::System.DateTime SyncDateLineField;
+
+               private long SyncDurationField;
+
+               private global::System.DateTime SyncEndedField;
+
+               private global::System.DateTime SyncStartedField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public DingusSyncData CloudData
+               {
+                       get
+                       {
+                               return this.CloudDataField;
+                       }
+                       set
+                       {
+                               this.CloudDataField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string Status
+               {
+                       get
+                       {
+                               return this.StatusField;
+                       }
+                       set
+                       {
+                               this.StatusField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public bool Success
+               {
+                       get
+                       {
+                               return this.SuccessField;
+                       }
+                       set
+                       {
+                               this.SuccessField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public global::System.DateTime SyncDateLine
+               {
+                       get
+                       {
+                               return this.SyncDateLineField;
+                       }
+                       set
+                       {
+                               this.SyncDateLineField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public long SyncDuration
+               {
+                       get
+                       {
+                               return this.SyncDurationField;
+                       }
+                       set
+                       {
+                               this.SyncDurationField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public global::System.DateTime SyncEnded
+               {
+                       get
+                       {
+                               return this.SyncEndedField;
+                       }
+                       set
+                       {
+                               this.SyncEndedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public global::System.DateTime SyncStarted
+               {
+                       get
+                       {
+                               return this.SyncStartedField;
+                       }
+                       set
+                       {
+                               this.SyncStartedField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="BinaryTransferResponse", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class BinaryTransferResponse : object
+       {
+
+               private string ErrorMessageField;
+
+               private bool SuccessField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string ErrorMessage
+               {
+                       get
+                       {
+                               return this.ErrorMessageField;
+                       }
+                       set
+                       {
+                               this.ErrorMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public bool Success
+               {
+                       get
+                       {
+                               return this.SuccessField;
+                       }
+                       set
+                       {
+                               this.SuccessField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="SyncStatus", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class SyncStatus : object
+       {
+
+               EntitySyncState[] SyncStateField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public EntitySyncState[] SyncState
+               {
+                       get
+                       {
+                               return this.SyncStateField;
+                       }
+                       set
+                       {
+                               this.SyncStateField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="EntitySyncState", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class EntitySyncState : object
+       {
+
+               private string EntityNameField;
+
+               private Nullable<global::System.DateTime> LastUpdatedUtcField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string EntityName
+               {
+                       get
+                       {
+                               return this.EntityNameField;
+                       }
+                       set
+                       {
+                               this.EntityNameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> LastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.LastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.LastUpdatedUtcField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="TaxiTime", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class TaxiTime : object
+       {
+
+               private string AirportField;
+
+               private int TaxiInAvgField;
+
+               private int TaxiOutAvgField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string Airport
+               {
+                       get
+                       {
+                               return this.AirportField;
+                       }
+                       set
+                       {
+                               this.AirportField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int TaxiInAvg
+               {
+                       get
+                       {
+                               return this.TaxiInAvgField;
+                       }
+                       set
+                       {
+                               this.TaxiInAvgField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int TaxiOutAvg
+               {
+                       get
+                       {
+                               return this.TaxiOutAvgField;
+                       }
+                       set
+                       {
+                               this.TaxiOutAvgField = value;
+                       }
+               }
+       }
+}
+
+
+namespace host
+{
+       public class AppDelegate
+       {
+               static void Main ()
+               {
+                       var a = new DingusSyncData ();
+                       a.Aircraft = new AircraftDTO[] { new AircraftDTO () { } };
+                       a.AircraftTypes = new AircraftTypeDTO[] { new AircraftTypeDTO () };
+                       a.Airlines= new AirlineDTO[] { new AirlineDTO () };
+                       a.Airports= new AirportDTO[] { new AirportDTO() };
+                       a.Approaches= new ApproachDTO[] { new ApproachDTO() };
+                       a.ApproachesLegs= new ApproachesLegDTO[] { new ApproachesLegDTO() };
+                       a.Binaries= new BinaryCatalogDTO[] { new BinaryCatalogDTO() };
+                       a.Crews= new CrewDTO[] { new CrewDTO() };
+                       a.Days= new DayDTO[] { new DayDTO() };
+                       a.EmploymentEvents= new EmploymentEventDTO[] { new EmploymentEventDTO() };
+                       a.Events= new EventDTO[] { new EventDTO() };
+                       a.FlightDataInspection = new DataInspection ();
+                       a.GlobalSettings= new GlobalSettingDTO[] { new GlobalSettingDTO() };
+                       a.Hotels= new HotelDTO[] { new HotelDTO() };
+                       a.Legs= new LegDTO[] { new LegDTO() };
+                       a.Notes= new NoteDTO[] { new NoteDTO() };
+                       a.PayperiodEvents= new PayperiodEventDTO[] { new PayperiodEventDTO() };
+                       a.PayrollCategories= new PayrollCategoryDTO[] { new PayrollCategoryDTO() };
+                       a.Payrolls= new PayrollDTO[] { new PayrollDTO() };
+                       a.Performances= new PerformanceDTO[] { new PerformanceDTO() };
+                       a.Positions= new PositionDTO[] { new PositionDTO() };
+                       a.ReglatoryOperationTypes= new ReglatoryOperationTypeDTO[] { new ReglatoryOperationTypeDTO() };
+                       a.Trips= new TripDTO[] { new TripDTO() };
+                       a.UserSettings= new UserSettingDTO[] { new UserSettingDTO() };
+
+                       Console.WriteLine ("Size is: {0}", global::System.Runtime.InteropServices.Marshal.SizeOf(typeof(IntPtr)));
+                       using (var ms = new MemoryStream ()) {
+                               DataContractSerializer serializer = new DataContractSerializer (typeof(DingusSyncData));
+                               serializer.WriteObject (ms, a);
+                               ms.Position = 0;
+                               var b = serializer.ReadObject (ms);
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="DingusSyncData", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class DingusSyncData : object
+       {
+
+               AircraftDTO[] AircraftField;
+
+               AircraftTypeDTO[] AircraftTypesField;
+
+               AirlineDTO[] AirlinesField;
+
+               AirportDTO[] AirportsField;
+
+               ApproachDTO[] ApproachesField;
+
+               ApproachesLegDTO[] ApproachesLegsField;
+
+               BinaryCatalogDTO[] BinariesField;
+
+               CrewDTO[] CrewsField;
+
+               DayDTO[] DaysField;
+
+               EmploymentEventDTO[] EmploymentEventsField;
+
+               EventDTO[] EventsField;
+
+               DataInspection FlightDataInspectionField;
+
+               GlobalSettingDTO[] GlobalSettingsField;
+
+               HotelDTO[] HotelsField;
+
+               LegDTO[] LegsField;
+
+               NoteDTO[] NotesField;
+
+               PayperiodEventDTO[] PayperiodEventsField;
+
+               PayrollCategoryDTO[] PayrollCategoriesField;
+
+               PayrollDTO[] PayrollsField;
+
+               PerformanceDTO[] PerformancesField;
+
+               PositionDTO[] PositionsField;
+
+               ReglatoryOperationTypeDTO[] ReglatoryOperationTypesField;
+
+               TripDTO[] TripsField;
+
+               UserSettingDTO[] UserSettingsField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public AircraftDTO[] Aircraft
+               {
+                       get
+                       {
+                               return this.AircraftField;
+                       }
+                       set
+                       {
+                               this.AircraftField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public AircraftTypeDTO[] AircraftTypes
+               {
+                       get
+                       {
+                               return this.AircraftTypesField;
+                       }
+                       set
+                       {
+                               this.AircraftTypesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public AirlineDTO[] Airlines
+               {
+                       get
+                       {
+                               return this.AirlinesField;
+                       }
+                       set
+                       {
+                               this.AirlinesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public AirportDTO[] Airports
+               {
+                       get
+                       {
+                               return this.AirportsField;
+                       }
+                       set
+                       {
+                               this.AirportsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public ApproachDTO[] Approaches
+               {
+                       get
+                       {
+                               return this.ApproachesField;
+                       }
+                       set
+                       {
+                               this.ApproachesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public ApproachesLegDTO[] ApproachesLegs
+               {
+                       get
+                       {
+                               return this.ApproachesLegsField;
+                       }
+                       set
+                       {
+                               this.ApproachesLegsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public BinaryCatalogDTO[] Binaries
+               {
+                       get
+                       {
+                               return this.BinariesField;
+                       }
+                       set
+                       {
+                               this.BinariesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public CrewDTO[] Crews
+               {
+                       get
+                       {
+                               return this.CrewsField;
+                       }
+                       set
+                       {
+                               this.CrewsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public DayDTO[] Days
+               {
+                       get
+                       {
+                               return this.DaysField;
+                       }
+                       set
+                       {
+                               this.DaysField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public EmploymentEventDTO[] EmploymentEvents
+               {
+                       get
+                       {
+                               return this.EmploymentEventsField;
+                       }
+                       set
+                       {
+                               this.EmploymentEventsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public EventDTO[] Events
+               {
+                       get
+                       {
+                               return this.EventsField;
+                       }
+                       set
+                       {
+                               this.EventsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public DataInspection FlightDataInspection
+               {
+                       get
+                       {
+                               return this.FlightDataInspectionField;
+                       }
+                       set
+                       {
+                               this.FlightDataInspectionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public GlobalSettingDTO[] GlobalSettings
+               {
+                       get
+                       {
+                               return this.GlobalSettingsField;
+                       }
+                       set
+                       {
+                               this.GlobalSettingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public HotelDTO[] Hotels
+               {
+                       get
+                       {
+                               return this.HotelsField;
+                       }
+                       set
+                       {
+                               this.HotelsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public LegDTO[] Legs
+               {
+                       get
+                       {
+                               return this.LegsField;
+                       }
+                       set
+                       {
+                               this.LegsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public NoteDTO[] Notes
+               {
+                       get
+                       {
+                               return this.NotesField;
+                       }
+                       set
+                       {
+                               this.NotesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public PayperiodEventDTO[] PayperiodEvents
+               {
+                       get
+                       {
+                               return this.PayperiodEventsField;
+                       }
+                       set
+                       {
+                               this.PayperiodEventsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public PayrollCategoryDTO[] PayrollCategories
+               {
+                       get
+                       {
+                               return this.PayrollCategoriesField;
+                       }
+                       set
+                       {
+                               this.PayrollCategoriesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public PayrollDTO[] Payrolls
+               {
+                       get
+                       {
+                               return this.PayrollsField;
+                       }
+                       set
+                       {
+                               this.PayrollsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public PerformanceDTO[] Performances
+               {
+                       get
+                       {
+                               return this.PerformancesField;
+                       }
+                       set
+                       {
+                               this.PerformancesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public PositionDTO[] Positions
+               {
+                       get
+                       {
+                               return this.PositionsField;
+                       }
+                       set
+                       {
+                               this.PositionsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public ReglatoryOperationTypeDTO[] ReglatoryOperationTypes
+               {
+                       get
+                       {
+                               return this.ReglatoryOperationTypesField;
+                       }
+                       set
+                       {
+                               this.ReglatoryOperationTypesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public TripDTO[] Trips
+               {
+                       get
+                       {
+                               return this.TripsField;
+                       }
+                       set
+                       {
+                               this.TripsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public UserSettingDTO[] UserSettings
+               {
+                       get
+                       {
+                               return this.UserSettingsField;
+                       }
+                       set
+                       {
+                               this.UserSettingsField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="DataInspection", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class DataInspection : object
+       {
+
+               private int DayCountField;
+
+               private int LegCountField;
+
+               private Nullable<global::System.DateTime> MaxTripSequenceEndField;
+
+               private Nullable<global::System.DateTime> MinTripSequenceStartField;
+
+               private int TripCountField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int DayCount
+               {
+                       get
+                       {
+                               return this.DayCountField;
+                       }
+                       set
+                       {
+                               this.DayCountField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int LegCount
+               {
+                       get
+                       {
+                               return this.LegCountField;
+                       }
+                       set
+                       {
+                               this.LegCountField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> MaxTripSequenceEnd
+               {
+                       get
+                       {
+                               return this.MaxTripSequenceEndField;
+                       }
+                       set
+                       {
+                               this.MaxTripSequenceEndField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> MinTripSequenceStart
+               {
+                       get
+                       {
+                               return this.MinTripSequenceStartField;
+                       }
+                       set
+                       {
+                               this.MinTripSequenceStartField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int TripCount
+               {
+                       get
+                       {
+                               return this.TripCountField;
+                       }
+                       set
+                       {
+                               this.TripCountField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="AircraftDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class AircraftDTO : object
+       {
+
+               private string aircraftIdField;
+
+               private string aircraftTypeIdField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private string currentAirlineIdField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notesField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<decimal> payrateField;
+
+               private Nullable<bool> previewField;
+
+               private string previousAirlineIdField;
+
+               private string registrationField;
+
+               private string shipNumberField;
+
+               private Nullable<bool> syncedField;
+
+               private string tailField;
+
+               private Nullable<bool> usePayrateField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string aircraftId
+               {
+                       get
+                       {
+                               return this.aircraftIdField;
+                       }
+                       set
+                       {
+                               this.aircraftIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string aircraftTypeId
+               {
+                       get
+                       {
+                               return this.aircraftTypeIdField;
+                       }
+                       set
+                       {
+                               this.aircraftTypeIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string currentAirlineId
+               {
+                       get
+                       {
+                               return this.currentAirlineIdField;
+                       }
+                       set
+                       {
+                               this.currentAirlineIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notes
+               {
+                       get
+                       {
+                               return this.notesField;
+                       }
+                       set
+                       {
+                               this.notesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> payrate
+               {
+                       get
+                       {
+                               return this.payrateField;
+                       }
+                       set
+                       {
+                               this.payrateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string previousAirlineId
+               {
+                       get
+                       {
+                               return this.previousAirlineIdField;
+                       }
+                       set
+                       {
+                               this.previousAirlineIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string registration
+               {
+                       get
+                       {
+                               return this.registrationField;
+                       }
+                       set
+                       {
+                               this.registrationField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string shipNumber
+               {
+                       get
+                       {
+                               return this.shipNumberField;
+                       }
+                       set
+                       {
+                               this.shipNumberField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string tail
+               {
+                       get
+                       {
+                               return this.tailField;
+                       }
+                       set
+                       {
+                               this.tailField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> usePayrate
+               {
+                       get
+                       {
+                               return this.usePayrateField;
+                       }
+                       set
+                       {
+                               this.usePayrateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="AircraftTypeDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class AircraftTypeDTO : object
+       {
+
+               private string aircraftTypeIdField;
+
+               private string aselField;
+
+               private string configField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private string iconUrlField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> selectableField;
+
+               private Nullable<bool> syncedField;
+
+               private string transportField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string aircraftTypeId
+               {
+                       get
+                       {
+                               return this.aircraftTypeIdField;
+                       }
+                       set
+                       {
+                               this.aircraftTypeIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string asel
+               {
+                       get
+                       {
+                               return this.aselField;
+                       }
+                       set
+                       {
+                               this.aselField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string config
+               {
+                       get
+                       {
+                               return this.configField;
+                       }
+                       set
+                       {
+                               this.configField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string iconUrl
+               {
+                       get
+                       {
+                               return this.iconUrlField;
+                       }
+                       set
+                       {
+                               this.iconUrlField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> selectable
+               {
+                       get
+                       {
+                               return this.selectableField;
+                       }
+                       set
+                       {
+                               this.selectableField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string transport
+               {
+                       get
+                       {
+                               return this.transportField;
+                       }
+                       set
+                       {
+                               this.transportField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="AirlineDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class AirlineDTO : object
+       {
+
+               private string airlineIdField;
+
+               private string airlineNameField;
+
+               private string callSignField;
+
+               private string countryField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private string icaoField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string nameField;
+
+               private string phoneField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string airlineId
+               {
+                       get
+                       {
+                               return this.airlineIdField;
+                       }
+                       set
+                       {
+                               this.airlineIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string airlineName
+               {
+                       get
+                       {
+                               return this.airlineNameField;
+                       }
+                       set
+                       {
+                               this.airlineNameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string callSign
+               {
+                       get
+                       {
+                               return this.callSignField;
+                       }
+                       set
+                       {
+                               this.callSignField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string country
+               {
+                       get
+                       {
+                               return this.countryField;
+                       }
+                       set
+                       {
+                               this.countryField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string icao
+               {
+                       get
+                       {
+                               return this.icaoField;
+                       }
+                       set
+                       {
+                               this.icaoField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string name
+               {
+                       get
+                       {
+                               return this.nameField;
+                       }
+                       set
+                       {
+                               this.nameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string phone
+               {
+                       get
+                       {
+                               return this.phoneField;
+                       }
+                       set
+                       {
+                               this.phoneField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="AirportDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class AirportDTO : object
+       {
+
+               private string airlineNameField;
+
+               private string airportIdField;
+
+               private string airportNameField;
+
+               private Nullable<int> communicationLevelField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<bool> dstField;
+
+               private string emailField;
+
+               private string faaField;
+
+               private string iataField;
+
+               private string icaoField;
+
+               private string idField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<decimal> latitudeField;
+
+               private string localityField;
+
+               private string locationField;
+
+               private Nullable<decimal> longitudeField;
+
+               private Nullable<int> modelVersionField;
+
+               private string nameField;
+
+               private string notesField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private string olsentimezonenameField;
+
+               private string phoneField;
+
+               private string pictureField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<int> privacyLevelField;
+
+               private string regionField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               private Nullable<decimal> utcoffsetField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string airlineName
+               {
+                       get
+                       {
+                               return this.airlineNameField;
+                       }
+                       set
+                       {
+                               this.airlineNameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string airportId
+               {
+                       get
+                       {
+                               return this.airportIdField;
+                       }
+                       set
+                       {
+                               this.airportIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string airportName
+               {
+                       get
+                       {
+                               return this.airportNameField;
+                       }
+                       set
+                       {
+                               this.airportNameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> communicationLevel
+               {
+                       get
+                       {
+                               return this.communicationLevelField;
+                       }
+                       set
+                       {
+                               this.communicationLevelField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> dst
+               {
+                       get
+                       {
+                               return this.dstField;
+                       }
+                       set
+                       {
+                               this.dstField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string email
+               {
+                       get
+                       {
+                               return this.emailField;
+                       }
+                       set
+                       {
+                               this.emailField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string faa
+               {
+                       get
+                       {
+                               return this.faaField;
+                       }
+                       set
+                       {
+                               this.faaField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string iata
+               {
+                       get
+                       {
+                               return this.iataField;
+                       }
+                       set
+                       {
+                               this.iataField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string icao
+               {
+                       get
+                       {
+                               return this.icaoField;
+                       }
+                       set
+                       {
+                               this.icaoField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string id
+               {
+                       get
+                       {
+                               return this.idField;
+                       }
+                       set
+                       {
+                               this.idField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> latitude
+               {
+                       get
+                       {
+                               return this.latitudeField;
+                       }
+                       set
+                       {
+                               this.latitudeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string locality
+               {
+                       get
+                       {
+                               return this.localityField;
+                       }
+                       set
+                       {
+                               this.localityField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string location
+               {
+                       get
+                       {
+                               return this.locationField;
+                       }
+                       set
+                       {
+                               this.locationField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> longitude
+               {
+                       get
+                       {
+                               return this.longitudeField;
+                       }
+                       set
+                       {
+                               this.longitudeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string name
+               {
+                       get
+                       {
+                               return this.nameField;
+                       }
+                       set
+                       {
+                               this.nameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notes
+               {
+                       get
+                       {
+                               return this.notesField;
+                       }
+                       set
+                       {
+                               this.notesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string olsentimezonename
+               {
+                       get
+                       {
+                               return this.olsentimezonenameField;
+                       }
+                       set
+                       {
+                               this.olsentimezonenameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string phone
+               {
+                       get
+                       {
+                               return this.phoneField;
+                       }
+                       set
+                       {
+                               this.phoneField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string picture
+               {
+                       get
+                       {
+                               return this.pictureField;
+                       }
+                       set
+                       {
+                               this.pictureField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> privacyLevel
+               {
+                       get
+                       {
+                               return this.privacyLevelField;
+                       }
+                       set
+                       {
+                               this.privacyLevelField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string region
+               {
+                       get
+                       {
+                               return this.regionField;
+                       }
+                       set
+                       {
+                               this.regionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> utcoffset
+               {
+                       get
+                       {
+                               return this.utcoffsetField;
+                       }
+                       set
+                       {
+                               this.utcoffsetField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="ApproachDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class ApproachDTO : object
+       {
+
+               private string approachIdField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> selectableField;
+
+               private Nullable<bool> syncedField;
+
+               private string typeField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string approachId
+               {
+                       get
+                       {
+                               return this.approachIdField;
+                       }
+                       set
+                       {
+                               this.approachIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> selectable
+               {
+                       get
+                       {
+                               return this.selectableField;
+                       }
+                       set
+                       {
+                               this.selectableField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string type
+               {
+                       get
+                       {
+                               return this.typeField;
+                       }
+                       set
+                       {
+                               this.typeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="ApproachesLegDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class ApproachesLegDTO : object
+       {
+
+               private string approachIdField;
+
+               private string approachesLegsIdField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private string legIdField;
+
+               private Nullable<int> modelVersionField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string approachId
+               {
+                       get
+                       {
+                               return this.approachIdField;
+                       }
+                       set
+                       {
+                               this.approachIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string approachesLegsId
+               {
+                       get
+                       {
+                               return this.approachesLegsIdField;
+                       }
+                       set
+                       {
+                               this.approachesLegsIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string legId
+               {
+                       get
+                       {
+                               return this.legIdField;
+                       }
+                       set
+                       {
+                               this.legIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="BinaryCatalogDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class BinaryCatalogDTO : object
+       {
+
+               private global::System.Guid RowGuidField;
+
+               private Nullable<int> areaIdField;
+
+               private string binaryCatalogIdField;
+
+               private Nullable<int> contentLengthField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private string filenameField;
+
+               private string folderIdField;
+
+               private Nullable<bool> isSecuredField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<global::System.DateTime> lastWriteTimeUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private string titleField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public global::System.Guid RowGuid
+               {
+                       get
+                       {
+                               return this.RowGuidField;
+                       }
+                       set
+                       {
+                               this.RowGuidField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> areaId
+               {
+                       get
+                       {
+                               return this.areaIdField;
+                       }
+                       set
+                       {
+                               this.areaIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string binaryCatalogId
+               {
+                       get
+                       {
+                               return this.binaryCatalogIdField;
+                       }
+                       set
+                       {
+                               this.binaryCatalogIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> contentLength
+               {
+                       get
+                       {
+                               return this.contentLengthField;
+                       }
+                       set
+                       {
+                               this.contentLengthField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string filename
+               {
+                       get
+                       {
+                               return this.filenameField;
+                       }
+                       set
+                       {
+                               this.filenameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string folderId
+               {
+                       get
+                       {
+                               return this.folderIdField;
+                       }
+                       set
+                       {
+                               this.folderIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> isSecured
+               {
+                       get
+                       {
+                               return this.isSecuredField;
+                       }
+                       set
+                       {
+                               this.isSecuredField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastWriteTimeUtc
+               {
+                       get
+                       {
+                               return this.lastWriteTimeUtcField;
+                       }
+                       set
+                       {
+                               this.lastWriteTimeUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string title
+               {
+                       get
+                       {
+                               return this.titleField;
+                       }
+                       set
+                       {
+                               this.titleField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="CrewDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class CrewDTO : object
+       {
+
+               private Nullable<int> communicationLevelField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private string crewIdField;
+
+               private string crewNameField;
+
+               private string currentAirlineIdField;
+
+               private Nullable<bool> deletedField;
+
+               private string emailField;
+
+               private string facebookField;
+
+               private string idField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private string locationField;
+
+               private Nullable<int> modelVersionField;
+
+               private string nameField;
+
+               private string notesField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private string phoneField;
+
+               private string pictureField;
+
+               private string positionField;
+
+               private Nullable<bool> previewField;
+
+               private string previousAirlineIdField;
+
+               private Nullable<int> privacyLevelField;
+
+               private Nullable<bool> syncedField;
+
+               private string twitterField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> communicationLevel
+               {
+                       get
+                       {
+                               return this.communicationLevelField;
+                       }
+                       set
+                       {
+                               this.communicationLevelField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string crewId
+               {
+                       get
+                       {
+                               return this.crewIdField;
+                       }
+                       set
+                       {
+                               this.crewIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string crewName
+               {
+                       get
+                       {
+                               return this.crewNameField;
+                       }
+                       set
+                       {
+                               this.crewNameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string currentAirlineId
+               {
+                       get
+                       {
+                               return this.currentAirlineIdField;
+                       }
+                       set
+                       {
+                               this.currentAirlineIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string email
+               {
+                       get
+                       {
+                               return this.emailField;
+                       }
+                       set
+                       {
+                               this.emailField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string facebook
+               {
+                       get
+                       {
+                               return this.facebookField;
+                       }
+                       set
+                       {
+                               this.facebookField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string id
+               {
+                       get
+                       {
+                               return this.idField;
+                       }
+                       set
+                       {
+                               this.idField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string location
+               {
+                       get
+                       {
+                               return this.locationField;
+                       }
+                       set
+                       {
+                               this.locationField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string name
+               {
+                       get
+                       {
+                               return this.nameField;
+                       }
+                       set
+                       {
+                               this.nameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notes
+               {
+                       get
+                       {
+                               return this.notesField;
+                       }
+                       set
+                       {
+                               this.notesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string phone
+               {
+                       get
+                       {
+                               return this.phoneField;
+                       }
+                       set
+                       {
+                               this.phoneField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string picture
+               {
+                       get
+                       {
+                               return this.pictureField;
+                       }
+                       set
+                       {
+                               this.pictureField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string position
+               {
+                       get
+                       {
+                               return this.positionField;
+                       }
+                       set
+                       {
+                               this.positionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string previousAirlineId
+               {
+                       get
+                       {
+                               return this.previousAirlineIdField;
+                       }
+                       set
+                       {
+                               this.previousAirlineIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> privacyLevel
+               {
+                       get
+                       {
+                               return this.privacyLevelField;
+                       }
+                       set
+                       {
+                               this.privacyLevelField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string twitter
+               {
+                       get
+                       {
+                               return this.twitterField;
+                       }
+                       set
+                       {
+                               this.twitterField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="DayDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class DayDTO : object
+       {
+
+               private Nullable<int> blockField;
+
+               private string calendarIdentifierField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<int> creditField;
+
+               private string dayIdField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<decimal> dutyField;
+
+               private Nullable<global::System.DateTime> dutyOffField;
+
+               private Nullable<global::System.DateTime> dutyOnField;
+
+               private Nullable<int> fDPField;
+
+               private Nullable<global::System.DateTime> fDPEndTimeField;
+
+               private Nullable<decimal> flightTimeField;
+
+               private Nullable<int> grossPayField;
+
+               private string hotelIdField;
+
+               private Nullable<decimal> instrumentField;
+
+               private Nullable<int> landingsField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private Nullable<decimal> nightField;
+
+               private Nullable<int> nightLandingsField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> overrideDutyOffField;
+
+               private Nullable<bool> overrideDutyOnField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<int> rdpField;
+
+               private Nullable<global::System.DateTime> rdpBeginField;
+
+               private Nullable<global::System.DateTime> rdpEndField;
+
+               private Nullable<int> scheduleBlockField;
+
+               private Nullable<int> splitDutyField;
+
+               private Nullable<global::System.DateTime> splitDutyBeginField;
+
+               private Nullable<global::System.DateTime> splitDutyEndField;
+
+               private Nullable<bool> syncedField;
+
+               private string tripIdField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> block
+               {
+                       get
+                       {
+                               return this.blockField;
+                       }
+                       set
+                       {
+                               this.blockField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string calendarIdentifier
+               {
+                       get
+                       {
+                               return this.calendarIdentifierField;
+                       }
+                       set
+                       {
+                               this.calendarIdentifierField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> credit
+               {
+                       get
+                       {
+                               return this.creditField;
+                       }
+                       set
+                       {
+                               this.creditField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string dayId
+               {
+                       get
+                       {
+                               return this.dayIdField;
+                       }
+                       set
+                       {
+                               this.dayIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> duty
+               {
+                       get
+                       {
+                               return this.dutyField;
+                       }
+                       set
+                       {
+                               this.dutyField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> dutyOff
+               {
+                       get
+                       {
+                               return this.dutyOffField;
+                       }
+                       set
+                       {
+                               this.dutyOffField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> dutyOn
+               {
+                       get
+                       {
+                               return this.dutyOnField;
+                       }
+                       set
+                       {
+                               this.dutyOnField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> fDP
+               {
+                       get
+                       {
+                               return this.fDPField;
+                       }
+                       set
+                       {
+                               this.fDPField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> fDPEndTime
+               {
+                       get
+                       {
+                               return this.fDPEndTimeField;
+                       }
+                       set
+                       {
+                               this.fDPEndTimeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> flightTime
+               {
+                       get
+                       {
+                               return this.flightTimeField;
+                       }
+                       set
+                       {
+                               this.flightTimeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> grossPay
+               {
+                       get
+                       {
+                               return this.grossPayField;
+                       }
+                       set
+                       {
+                               this.grossPayField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string hotelId
+               {
+                       get
+                       {
+                               return this.hotelIdField;
+                       }
+                       set
+                       {
+                               this.hotelIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> instrument
+               {
+                       get
+                       {
+                               return this.instrumentField;
+                       }
+                       set
+                       {
+                               this.instrumentField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> landings
+               {
+                       get
+                       {
+                               return this.landingsField;
+                       }
+                       set
+                       {
+                               this.landingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> night
+               {
+                       get
+                       {
+                               return this.nightField;
+                       }
+                       set
+                       {
+                               this.nightField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> nightLandings
+               {
+                       get
+                       {
+                               return this.nightLandingsField;
+                       }
+                       set
+                       {
+                               this.nightLandingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> overrideDutyOff
+               {
+                       get
+                       {
+                               return this.overrideDutyOffField;
+                       }
+                       set
+                       {
+                               this.overrideDutyOffField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> overrideDutyOn
+               {
+                       get
+                       {
+                               return this.overrideDutyOnField;
+                       }
+                       set
+                       {
+                               this.overrideDutyOnField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> rdp
+               {
+                       get
+                       {
+                               return this.rdpField;
+                       }
+                       set
+                       {
+                               this.rdpField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> rdpBegin
+               {
+                       get
+                       {
+                               return this.rdpBeginField;
+                       }
+                       set
+                       {
+                               this.rdpBeginField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> rdpEnd
+               {
+                       get
+                       {
+                               return this.rdpEndField;
+                       }
+                       set
+                       {
+                               this.rdpEndField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> scheduleBlock
+               {
+                       get
+                       {
+                               return this.scheduleBlockField;
+                       }
+                       set
+                       {
+                               this.scheduleBlockField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> splitDuty
+               {
+                       get
+                       {
+                               return this.splitDutyField;
+                       }
+                       set
+                       {
+                               this.splitDutyField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> splitDutyBegin
+               {
+                       get
+                       {
+                               return this.splitDutyBeginField;
+                       }
+                       set
+                       {
+                               this.splitDutyBeginField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> splitDutyEnd
+               {
+                       get
+                       {
+                               return this.splitDutyEndField;
+                       }
+                       set
+                       {
+                               this.splitDutyEndField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string tripId
+               {
+                       get
+                       {
+                               return this.tripIdField;
+                       }
+                       set
+                       {
+                               this.tripIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="EmploymentEventDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class EmploymentEventDTO : object
+       {
+
+               private string airlineIdField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private string employmentEventIdField;
+
+               private Nullable<global::System.DateTime> firstDateField;
+
+               private Nullable<global::System.DateTime> lastDateField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string airlineId
+               {
+                       get
+                       {
+                               return this.airlineIdField;
+                       }
+                       set
+                       {
+                               this.airlineIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string employmentEventId
+               {
+                       get
+                       {
+                               return this.employmentEventIdField;
+                       }
+                       set
+                       {
+                               this.employmentEventIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> firstDate
+               {
+                       get
+                       {
+                               return this.firstDateField;
+                       }
+                       set
+                       {
+                               this.firstDateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastDate
+               {
+                       get
+                       {
+                               return this.lastDateField;
+                       }
+                       set
+                       {
+                               this.lastDateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="EventDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class EventDTO : object
+       {
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<global::System.DateTime> dateRangeField;
+
+               private Nullable<bool> deletedField;
+
+               private string eventIdField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<int> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private string urlField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> dateRange
+               {
+                       get
+                       {
+                               return this.dateRangeField;
+                       }
+                       set
+                       {
+                               this.dateRangeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string eventId
+               {
+                       get
+                       {
+                               return this.eventIdField;
+                       }
+                       set
+                       {
+                               this.eventIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string url
+               {
+                       get
+                       {
+                               return this.urlField;
+                       }
+                       set
+                       {
+                               this.urlField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="GlobalSettingDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class GlobalSettingDTO : object
+       {
+
+               private string DescriptionField;
+
+               private global::System.Guid GlobalSettingIdField;
+
+               private global::System.DateTime LastUpdatedUtcField;
+
+               private string SettingKeyField;
+
+               private string SettingValueField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string Description
+               {
+                       get
+                       {
+                               return this.DescriptionField;
+                       }
+                       set
+                       {
+                               this.DescriptionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public global::System.Guid GlobalSettingId
+               {
+                       get
+                       {
+                               return this.GlobalSettingIdField;
+                       }
+                       set
+                       {
+                               this.GlobalSettingIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public global::System.DateTime LastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.LastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.LastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string SettingKey
+               {
+                       get
+                       {
+                               return this.SettingKeyField;
+                       }
+                       set
+                       {
+                               this.SettingKeyField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string SettingValue
+               {
+                       get
+                       {
+                               return this.SettingValueField;
+                       }
+                       set
+                       {
+                               this.SettingValueField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="HotelDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class HotelDTO : object
+       {
+
+               private Nullable<int> communicationLevelField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private string emailField;
+
+               private string hotelIdField;
+
+               private string hotelNameField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private string locationField;
+
+               private Nullable<int> modelVersionField;
+
+               private string nameField;
+
+               private string notesField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private string numberField;
+
+               private string phoneField;
+
+               private string pictureField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<int> privacyLevelField;
+
+               private Nullable<int> ratingsField;
+
+               private string sharedNotesField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> communicationLevel
+               {
+                       get
+                       {
+                               return this.communicationLevelField;
+                       }
+                       set
+                       {
+                               this.communicationLevelField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string email
+               {
+                       get
+                       {
+                               return this.emailField;
+                       }
+                       set
+                       {
+                               this.emailField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string hotelId
+               {
+                       get
+                       {
+                               return this.hotelIdField;
+                       }
+                       set
+                       {
+                               this.hotelIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string hotelName
+               {
+                       get
+                       {
+                               return this.hotelNameField;
+                       }
+                       set
+                       {
+                               this.hotelNameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string location
+               {
+                       get
+                       {
+                               return this.locationField;
+                       }
+                       set
+                       {
+                               this.locationField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string name
+               {
+                       get
+                       {
+                               return this.nameField;
+                       }
+                       set
+                       {
+                               this.nameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notes
+               {
+                       get
+                       {
+                               return this.notesField;
+                       }
+                       set
+                       {
+                               this.notesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string number
+               {
+                       get
+                       {
+                               return this.numberField;
+                       }
+                       set
+                       {
+                               this.numberField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string phone
+               {
+                       get
+                       {
+                               return this.phoneField;
+                       }
+                       set
+                       {
+                               this.phoneField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string picture
+               {
+                       get
+                       {
+                               return this.pictureField;
+                       }
+                       set
+                       {
+                               this.pictureField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> privacyLevel
+               {
+                       get
+                       {
+                               return this.privacyLevelField;
+                       }
+                       set
+                       {
+                               this.privacyLevelField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> ratings
+               {
+                       get
+                       {
+                               return this.ratingsField;
+                       }
+                       set
+                       {
+                               this.ratingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string sharedNotes
+               {
+                       get
+                       {
+                               return this.sharedNotesField;
+                       }
+                       set
+                       {
+                               this.sharedNotesField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="LegDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class LegDTO : object
+       {
+
+               private Nullable<int> actualBlockField;
+
+               private string aircraftIdField;
+
+               private string approachIdField;
+
+               private string cabinCrewAIdField;
+
+               private string cabinCrewBIdField;
+
+               private string calendarIdentifierField;
+
+               private string captainIdField;
+
+               private Nullable<bool> completedField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private string dayIdField;
+
+               private Nullable<bool> deletedField;
+
+               private string departureAirportIdField;
+
+               private string deptField;
+
+               private string deptGateField;
+
+               private string destField;
+
+               private string destGateField;
+
+               private string destinationAirportIdField;
+
+               private Nullable<global::System.DateTime> etaField;
+
+               private string firstOfficerIdField;
+
+               private string flightNumberField;
+
+               private Nullable<int> flightTimeField;
+
+               private Nullable<global::System.DateTime> inOOOIField;
+
+               private Nullable<decimal> instrumentField;
+
+               private Nullable<int> landingsField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private string legIdField;
+
+               private Nullable<int> modelVersionField;
+
+               private Nullable<decimal> nightField;
+
+               private Nullable<int> nightLandingsField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<global::System.DateTime> offOOOIField;
+
+               private Nullable<global::System.DateTime> onOOOIField;
+
+               private string operationTypeIdField;
+
+               private string otherCrewAIdField;
+
+               private string otherCrewBIdField;
+
+               private Nullable<global::System.DateTime> outOOOIField;
+
+               private string payIdField;
+
+               private string positionIdField;
+
+               private Nullable<bool> previewField;
+
+               private string registrationField;
+
+               private string remarksField;
+
+               private Nullable<int> scheduledBlockField;
+
+               private Nullable<global::System.DateTime> scheduledInField;
+
+               private Nullable<global::System.DateTime> scheduledOutField;
+
+               private Nullable<int> sequenceField;
+
+               private Nullable<bool> syncedField;
+
+               private Nullable<int> taxiTimeInField;
+
+               private Nullable<int> taxiTimeOutField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> actualBlock
+               {
+                       get
+                       {
+                               return this.actualBlockField;
+                       }
+                       set
+                       {
+                               this.actualBlockField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string aircraftId
+               {
+                       get
+                       {
+                               return this.aircraftIdField;
+                       }
+                       set
+                       {
+                               this.aircraftIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string approachId
+               {
+                       get
+                       {
+                               return this.approachIdField;
+                       }
+                       set
+                       {
+                               this.approachIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string cabinCrewAId
+               {
+                       get
+                       {
+                               return this.cabinCrewAIdField;
+                       }
+                       set
+                       {
+                               this.cabinCrewAIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string cabinCrewBId
+               {
+                       get
+                       {
+                               return this.cabinCrewBIdField;
+                       }
+                       set
+                       {
+                               this.cabinCrewBIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string calendarIdentifier
+               {
+                       get
+                       {
+                               return this.calendarIdentifierField;
+                       }
+                       set
+                       {
+                               this.calendarIdentifierField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string captainId
+               {
+                       get
+                       {
+                               return this.captainIdField;
+                       }
+                       set
+                       {
+                               this.captainIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> completed
+               {
+                       get
+                       {
+                               return this.completedField;
+                       }
+                       set
+                       {
+                               this.completedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string dayId
+               {
+                       get
+                       {
+                               return this.dayIdField;
+                       }
+                       set
+                       {
+                               this.dayIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string departureAirportId
+               {
+                       get
+                       {
+                               return this.departureAirportIdField;
+                       }
+                       set
+                       {
+                               this.departureAirportIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string dept
+               {
+                       get
+                       {
+                               return this.deptField;
+                       }
+                       set
+                       {
+                               this.deptField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string deptGate
+               {
+                       get
+                       {
+                               return this.deptGateField;
+                       }
+                       set
+                       {
+                               this.deptGateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string dest
+               {
+                       get
+                       {
+                               return this.destField;
+                       }
+                       set
+                       {
+                               this.destField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string destGate
+               {
+                       get
+                       {
+                               return this.destGateField;
+                       }
+                       set
+                       {
+                               this.destGateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string destinationAirportId
+               {
+                       get
+                       {
+                               return this.destinationAirportIdField;
+                       }
+                       set
+                       {
+                               this.destinationAirportIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> eta
+               {
+                       get
+                       {
+                               return this.etaField;
+                       }
+                       set
+                       {
+                               this.etaField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string firstOfficerId
+               {
+                       get
+                       {
+                               return this.firstOfficerIdField;
+                       }
+                       set
+                       {
+                               this.firstOfficerIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string flightNumber
+               {
+                       get
+                       {
+                               return this.flightNumberField;
+                       }
+                       set
+                       {
+                               this.flightNumberField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> flightTime
+               {
+                       get
+                       {
+                               return this.flightTimeField;
+                       }
+                       set
+                       {
+                               this.flightTimeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> inOOOI
+               {
+                       get
+                       {
+                               return this.inOOOIField;
+                       }
+                       set
+                       {
+                               this.inOOOIField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> instrument
+               {
+                       get
+                       {
+                               return this.instrumentField;
+                       }
+                       set
+                       {
+                               this.instrumentField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> landings
+               {
+                       get
+                       {
+                               return this.landingsField;
+                       }
+                       set
+                       {
+                               this.landingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string legId
+               {
+                       get
+                       {
+                               return this.legIdField;
+                       }
+                       set
+                       {
+                               this.legIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> night
+               {
+                       get
+                       {
+                               return this.nightField;
+                       }
+                       set
+                       {
+                               this.nightField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> nightLandings
+               {
+                       get
+                       {
+                               return this.nightLandingsField;
+                       }
+                       set
+                       {
+                               this.nightLandingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> offOOOI
+               {
+                       get
+                       {
+                               return this.offOOOIField;
+                       }
+                       set
+                       {
+                               this.offOOOIField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> onOOOI
+               {
+                       get
+                       {
+                               return this.onOOOIField;
+                       }
+                       set
+                       {
+                               this.onOOOIField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string operationTypeId
+               {
+                       get
+                       {
+                               return this.operationTypeIdField;
+                       }
+                       set
+                       {
+                               this.operationTypeIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string otherCrewAId
+               {
+                       get
+                       {
+                               return this.otherCrewAIdField;
+                       }
+                       set
+                       {
+                               this.otherCrewAIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string otherCrewBId
+               {
+                       get
+                       {
+                               return this.otherCrewBIdField;
+                       }
+                       set
+                       {
+                               this.otherCrewBIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> outOOOI
+               {
+                       get
+                       {
+                               return this.outOOOIField;
+                       }
+                       set
+                       {
+                               this.outOOOIField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string payId
+               {
+                       get
+                       {
+                               return this.payIdField;
+                       }
+                       set
+                       {
+                               this.payIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string positionId
+               {
+                       get
+                       {
+                               return this.positionIdField;
+                       }
+                       set
+                       {
+                               this.positionIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string registration
+               {
+                       get
+                       {
+                               return this.registrationField;
+                       }
+                       set
+                       {
+                               this.registrationField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string remarks
+               {
+                       get
+                       {
+                               return this.remarksField;
+                       }
+                       set
+                       {
+                               this.remarksField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> scheduledBlock
+               {
+                       get
+                       {
+                               return this.scheduledBlockField;
+                       }
+                       set
+                       {
+                               this.scheduledBlockField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> scheduledIn
+               {
+                       get
+                       {
+                               return this.scheduledInField;
+                       }
+                       set
+                       {
+                               this.scheduledInField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> scheduledOut
+               {
+                       get
+                       {
+                               return this.scheduledOutField;
+                       }
+                       set
+                       {
+                               this.scheduledOutField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> sequence
+               {
+                       get
+                       {
+                               return this.sequenceField;
+                       }
+                       set
+                       {
+                               this.sequenceField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> taxiTimeIn
+               {
+                       get
+                       {
+                               return this.taxiTimeInField;
+                       }
+                       set
+                       {
+                               this.taxiTimeInField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> taxiTimeOut
+               {
+                       get
+                       {
+                               return this.taxiTimeOutField;
+                       }
+                       set
+                       {
+                               this.taxiTimeOutField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="NoteDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class NoteDTO : object
+       {
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string note1Field;
+
+               private string noteIdField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string note1
+               {
+                       get
+                       {
+                               return this.note1Field;
+                       }
+                       set
+                       {
+                               this.note1Field = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string noteId
+               {
+                       get
+                       {
+                               return this.noteIdField;
+                       }
+                       set
+                       {
+                               this.noteIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="PayperiodEventDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class PayperiodEventDTO : object
+       {
+
+               private string airlineIdField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> firstDateField;
+
+               private Nullable<global::System.DateTime> lastDateField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string payperiodEventIdField;
+
+               private string periodDescriptionField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string airlineId
+               {
+                       get
+                       {
+                               return this.airlineIdField;
+                       }
+                       set
+                       {
+                               this.airlineIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> firstDate
+               {
+                       get
+                       {
+                               return this.firstDateField;
+                       }
+                       set
+                       {
+                               this.firstDateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastDate
+               {
+                       get
+                       {
+                               return this.lastDateField;
+                       }
+                       set
+                       {
+                               this.lastDateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string payperiodEventId
+               {
+                       get
+                       {
+                               return this.payperiodEventIdField;
+                       }
+                       set
+                       {
+                               this.payperiodEventIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string periodDescription
+               {
+                       get
+                       {
+                               return this.periodDescriptionField;
+                       }
+                       set
+                       {
+                               this.periodDescriptionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="PayrollCategoryDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class PayrollCategoryDTO : object
+       {
+
+               private Nullable<bool> aboveGuaranteeField;
+
+               private Nullable<bool> applyRigField;
+
+               private Nullable<bool> applyToFlightTimeField;
+
+               private Nullable<bool> applyToLegalityField;
+
+               private Nullable<bool> applyToPayField;
+
+               private Nullable<bool> copyLegField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> minimumCreditField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> overridePayField;
+
+               private Nullable<decimal> payrateField;
+
+               private string payrollCategoriesIdField;
+
+               private string plainDescriptionField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<int> rigAField;
+
+               private Nullable<int> rigBField;
+
+               private Nullable<bool> selectableField;
+
+               private Nullable<bool> setAllLegsField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> aboveGuarantee
+               {
+                       get
+                       {
+                               return this.aboveGuaranteeField;
+                       }
+                       set
+                       {
+                               this.aboveGuaranteeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> applyRig
+               {
+                       get
+                       {
+                               return this.applyRigField;
+                       }
+                       set
+                       {
+                               this.applyRigField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> applyToFlightTime
+               {
+                       get
+                       {
+                               return this.applyToFlightTimeField;
+                       }
+                       set
+                       {
+                               this.applyToFlightTimeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> applyToLegality
+               {
+                       get
+                       {
+                               return this.applyToLegalityField;
+                       }
+                       set
+                       {
+                               this.applyToLegalityField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> applyToPay
+               {
+                       get
+                       {
+                               return this.applyToPayField;
+                       }
+                       set
+                       {
+                               this.applyToPayField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> copyLeg
+               {
+                       get
+                       {
+                               return this.copyLegField;
+                       }
+                       set
+                       {
+                               this.copyLegField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> minimumCredit
+               {
+                       get
+                       {
+                               return this.minimumCreditField;
+                       }
+                       set
+                       {
+                               this.minimumCreditField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> overridePay
+               {
+                       get
+                       {
+                               return this.overridePayField;
+                       }
+                       set
+                       {
+                               this.overridePayField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> payrate
+               {
+                       get
+                       {
+                               return this.payrateField;
+                       }
+                       set
+                       {
+                               this.payrateField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string payrollCategoriesId
+               {
+                       get
+                       {
+                               return this.payrollCategoriesIdField;
+                       }
+                       set
+                       {
+                               this.payrollCategoriesIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string plainDescription
+               {
+                       get
+                       {
+                               return this.plainDescriptionField;
+                       }
+                       set
+                       {
+                               this.plainDescriptionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> rigA
+               {
+                       get
+                       {
+                               return this.rigAField;
+                       }
+                       set
+                       {
+                               this.rigAField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> rigB
+               {
+                       get
+                       {
+                               return this.rigBField;
+                       }
+                       set
+                       {
+                               this.rigBField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> selectable
+               {
+                       get
+                       {
+                               return this.selectableField;
+                       }
+                       set
+                       {
+                               this.selectableField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> setAllLegs
+               {
+                       get
+                       {
+                               return this.setAllLegsField;
+                       }
+                       set
+                       {
+                               this.setAllLegsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="PayrollDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class PayrollDTO : object
+       {
+
+               private Nullable<int> actualField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<int> creditField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private string payrollCategoriesIdField;
+
+               private string payrollIdField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> actual
+               {
+                       get
+                       {
+                               return this.actualField;
+                       }
+                       set
+                       {
+                               this.actualField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> credit
+               {
+                       get
+                       {
+                               return this.creditField;
+                       }
+                       set
+                       {
+                               this.creditField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string payrollCategoriesId
+               {
+                       get
+                       {
+                               return this.payrollCategoriesIdField;
+                       }
+                       set
+                       {
+                               this.payrollCategoriesIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string payrollId
+               {
+                       get
+                       {
+                               return this.payrollIdField;
+                       }
+                       set
+                       {
+                               this.payrollIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="PerformanceDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class PerformanceDTO : object
+       {
+
+               private Nullable<int> actualField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<int> deviatedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private string performanceIdField;
+
+               private Nullable<int> plannedFuelField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> actual
+               {
+                       get
+                       {
+                               return this.actualField;
+                       }
+                       set
+                       {
+                               this.actualField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> deviated
+               {
+                       get
+                       {
+                               return this.deviatedField;
+                       }
+                       set
+                       {
+                               this.deviatedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string performanceId
+               {
+                       get
+                       {
+                               return this.performanceIdField;
+                       }
+                       set
+                       {
+                               this.performanceIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> plannedFuel
+               {
+                       get
+                       {
+                               return this.plannedFuelField;
+                       }
+                       set
+                       {
+                               this.plannedFuelField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="PositionDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class PositionDTO : object
+       {
+
+               private Nullable<bool> autoNightLandingField;
+
+               private Nullable<bool> checkAirmanField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> creditLandingField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<bool> ioeField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> pilotFlyingField;
+
+               private Nullable<bool> pilotInCommandField;
+
+               private string position1Field;
+
+               private string positionIdField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<bool> selectableField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> autoNightLanding
+               {
+                       get
+                       {
+                               return this.autoNightLandingField;
+                       }
+                       set
+                       {
+                               this.autoNightLandingField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> checkAirman
+               {
+                       get
+                       {
+                               return this.checkAirmanField;
+                       }
+                       set
+                       {
+                               this.checkAirmanField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> creditLanding
+               {
+                       get
+                       {
+                               return this.creditLandingField;
+                       }
+                       set
+                       {
+                               this.creditLandingField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> ioe
+               {
+                       get
+                       {
+                               return this.ioeField;
+                       }
+                       set
+                       {
+                               this.ioeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> pilotFlying
+               {
+                       get
+                       {
+                               return this.pilotFlyingField;
+                       }
+                       set
+                       {
+                               this.pilotFlyingField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> pilotInCommand
+               {
+                       get
+                       {
+                               return this.pilotInCommandField;
+                       }
+                       set
+                       {
+                               this.pilotInCommandField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string position1
+               {
+                       get
+                       {
+                               return this.position1Field;
+                       }
+                       set
+                       {
+                               this.position1Field = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string positionId
+               {
+                       get
+                       {
+                               return this.positionIdField;
+                       }
+                       set
+                       {
+                               this.positionIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> selectable
+               {
+                       get
+                       {
+                               return this.selectableField;
+                       }
+                       set
+                       {
+                               this.selectableField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="ReglatoryOperationTypeDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class ReglatoryOperationTypeDTO : object
+       {
+
+               private Nullable<bool> activeField;
+
+               private Nullable<bool> canMixOperationsField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string operationAbvreviationField;
+
+               private string operationDescriptionField;
+
+               private Nullable<bool> previewField;
+
+               private string reglatoryOperationTypesIdField;
+
+               private string schemaURLField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> active
+               {
+                       get
+                       {
+                               return this.activeField;
+                       }
+                       set
+                       {
+                               this.activeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> canMixOperations
+               {
+                       get
+                       {
+                               return this.canMixOperationsField;
+                       }
+                       set
+                       {
+                               this.canMixOperationsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string operationAbvreviation
+               {
+                       get
+                       {
+                               return this.operationAbvreviationField;
+                       }
+                       set
+                       {
+                               this.operationAbvreviationField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string operationDescription
+               {
+                       get
+                       {
+                               return this.operationDescriptionField;
+                       }
+                       set
+                       {
+                               this.operationDescriptionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string reglatoryOperationTypesId
+               {
+                       get
+                       {
+                               return this.reglatoryOperationTypesIdField;
+                       }
+                       set
+                       {
+                               this.reglatoryOperationTypesIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string schemaURL
+               {
+                       get
+                       {
+                               return this.schemaURLField;
+                       }
+                       set
+                       {
+                               this.schemaURLField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="TripDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class TripDTO : object
+       {
+
+               private bool activeField;
+
+               private string calendarIdentifierField;
+
+               private Nullable<bool> completedField;
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> previewField;
+
+               private Nullable<global::System.DateTime> seqEndTimeField;
+
+               private Nullable<global::System.DateTime> seqStartTimeField;
+
+               private Nullable<bool> syncedField;
+
+               private Nullable<int> tafbField;
+
+               private Nullable<int> totalBlockField;
+
+               private Nullable<int> totalCreditField;
+
+               private Nullable<decimal> totalFlightTimeField;
+
+               private Nullable<decimal> totalInstrumentField;
+
+               private Nullable<int> totalLandingsField;
+
+               private Nullable<decimal> totalNightField;
+
+               private Nullable<int> totalNightLandingsField;
+
+               private Nullable<decimal> totalPayFField;
+
+               private string tripIdField;
+
+               private string tripNumberField;
+
+               private int userIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public bool active
+               {
+                       get
+                       {
+                               return this.activeField;
+                       }
+                       set
+                       {
+                               this.activeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string calendarIdentifier
+               {
+                       get
+                       {
+                               return this.calendarIdentifierField;
+                       }
+                       set
+                       {
+                               this.calendarIdentifierField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> completed
+               {
+                       get
+                       {
+                               return this.completedField;
+                       }
+                       set
+                       {
+                               this.completedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> seqEndTime
+               {
+                       get
+                       {
+                               return this.seqEndTimeField;
+                       }
+                       set
+                       {
+                               this.seqEndTimeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> seqStartTime
+               {
+                       get
+                       {
+                               return this.seqStartTimeField;
+                       }
+                       set
+                       {
+                               this.seqStartTimeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> tafb
+               {
+                       get
+                       {
+                               return this.tafbField;
+                       }
+                       set
+                       {
+                               this.tafbField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> totalBlock
+               {
+                       get
+                       {
+                               return this.totalBlockField;
+                       }
+                       set
+                       {
+                               this.totalBlockField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> totalCredit
+               {
+                       get
+                       {
+                               return this.totalCreditField;
+                       }
+                       set
+                       {
+                               this.totalCreditField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> totalFlightTime
+               {
+                       get
+                       {
+                               return this.totalFlightTimeField;
+                       }
+                       set
+                       {
+                               this.totalFlightTimeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> totalInstrument
+               {
+                       get
+                       {
+                               return this.totalInstrumentField;
+                       }
+                       set
+                       {
+                               this.totalInstrumentField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> totalLandings
+               {
+                       get
+                       {
+                               return this.totalLandingsField;
+                       }
+                       set
+                       {
+                               this.totalLandingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> totalNight
+               {
+                       get
+                       {
+                               return this.totalNightField;
+                       }
+                       set
+                       {
+                               this.totalNightField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> totalNightLandings
+               {
+                       get
+                       {
+                               return this.totalNightLandingsField;
+                       }
+                       set
+                       {
+                               this.totalNightLandingsField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<decimal> totalPayF
+               {
+                       get
+                       {
+                               return this.totalPayFField;
+                       }
+                       set
+                       {
+                               this.totalPayFField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string tripId
+               {
+                       get
+                       {
+                               return this.tripIdField;
+                       }
+                       set
+                       {
+                               this.tripIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string tripNumber
+               {
+                       get
+                       {
+                               return this.tripNumberField;
+                       }
+                       set
+                       {
+                               this.tripNumberField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="UserSettingDTO", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class UserSettingDTO : object
+       {
+
+               private Nullable<global::System.DateTime> createdUtcField;
+
+               private Nullable<bool> deletedField;
+
+               private string keyField;
+
+               private Nullable<global::System.DateTime> lastUpdatedUtcField;
+
+               private Nullable<int> modelVersionField;
+
+               private string notificationMessageField;
+
+               private Nullable<int> notificationTypeField;
+
+               private Nullable<bool> previewField;
+
+               private string stringValueField;
+
+               private Nullable<bool> syncedField;
+
+               private int userIdField;
+
+               private string userSettingIdField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> createdUtc
+               {
+                       get
+                       {
+                               return this.createdUtcField;
+                       }
+                       set
+                       {
+                               this.createdUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> deleted
+               {
+                       get
+                       {
+                               return this.deletedField;
+                       }
+                       set
+                       {
+                               this.deletedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string key
+               {
+                       get
+                       {
+                               return this.keyField;
+                       }
+                       set
+                       {
+                               this.keyField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> lastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.lastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.lastUpdatedUtcField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> modelVersion
+               {
+                       get
+                       {
+                               return this.modelVersionField;
+                       }
+                       set
+                       {
+                               this.modelVersionField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string notificationMessage
+               {
+                       get
+                       {
+                               return this.notificationMessageField;
+                       }
+                       set
+                       {
+                               this.notificationMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<int> notificationType
+               {
+                       get
+                       {
+                               return this.notificationTypeField;
+                       }
+                       set
+                       {
+                               this.notificationTypeField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> preview
+               {
+                       get
+                       {
+                               return this.previewField;
+                       }
+                       set
+                       {
+                               this.previewField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string stringValue
+               {
+                       get
+                       {
+                               return this.stringValueField;
+                       }
+                       set
+                       {
+                               this.stringValueField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<bool> synced
+               {
+                       get
+                       {
+                               return this.syncedField;
+                       }
+                       set
+                       {
+                               this.syncedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int userId
+               {
+                       get
+                       {
+                               return this.userIdField;
+                       }
+                       set
+                       {
+                               this.userIdField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string userSettingId
+               {
+                       get
+                       {
+                               return this.userSettingIdField;
+                       }
+                       set
+                       {
+                               this.userSettingIdField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="DingusSyncResponse", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class DingusSyncResponse : object
+       {
+
+               DingusSyncData CloudDataField;
+
+               private string StatusField;
+
+               private bool SuccessField;
+
+               private global::System.DateTime SyncDateLineField;
+
+               private long SyncDurationField;
+
+               private global::System.DateTime SyncEndedField;
+
+               private global::System.DateTime SyncStartedField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public DingusSyncData CloudData
+               {
+                       get
+                       {
+                               return this.CloudDataField;
+                       }
+                       set
+                       {
+                               this.CloudDataField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string Status
+               {
+                       get
+                       {
+                               return this.StatusField;
+                       }
+                       set
+                       {
+                               this.StatusField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public bool Success
+               {
+                       get
+                       {
+                               return this.SuccessField;
+                       }
+                       set
+                       {
+                               this.SuccessField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public global::System.DateTime SyncDateLine
+               {
+                       get
+                       {
+                               return this.SyncDateLineField;
+                       }
+                       set
+                       {
+                               this.SyncDateLineField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public long SyncDuration
+               {
+                       get
+                       {
+                               return this.SyncDurationField;
+                       }
+                       set
+                       {
+                               this.SyncDurationField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public global::System.DateTime SyncEnded
+               {
+                       get
+                       {
+                               return this.SyncEndedField;
+                       }
+                       set
+                       {
+                               this.SyncEndedField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public global::System.DateTime SyncStarted
+               {
+                       get
+                       {
+                               return this.SyncStartedField;
+                       }
+                       set
+                       {
+                               this.SyncStartedField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="BinaryTransferResponse", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class BinaryTransferResponse : object
+       {
+
+               private string ErrorMessageField;
+
+               private bool SuccessField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string ErrorMessage
+               {
+                       get
+                       {
+                               return this.ErrorMessageField;
+                       }
+                       set
+                       {
+                               this.ErrorMessageField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public bool Success
+               {
+                       get
+                       {
+                               return this.SuccessField;
+                       }
+                       set
+                       {
+                               this.SuccessField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="SyncStatus", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class SyncStatus : object
+       {
+
+               EntitySyncState[] SyncStateField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public EntitySyncState[] SyncState
+               {
+                       get
+                       {
+                               return this.SyncStateField;
+                       }
+                       set
+                       {
+                               this.SyncStateField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="EntitySyncState", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class EntitySyncState : object
+       {
+
+               private string EntityNameField;
+
+               private Nullable<global::System.DateTime> LastUpdatedUtcField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string EntityName
+               {
+                       get
+                       {
+                               return this.EntityNameField;
+                       }
+                       set
+                       {
+                               this.EntityNameField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public Nullable<global::System.DateTime> LastUpdatedUtc
+               {
+                       get
+                       {
+                               return this.LastUpdatedUtcField;
+                       }
+                       set
+                       {
+                               this.LastUpdatedUtcField = value;
+                       }
+               }
+       }
+
+       [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("global::System.Runtime.Serialization", "4.0.0.0")]
+       [global::System.Runtime.Serialization.DataContractAttribute(Name="TaxiTime", Namespace="http://schemas.datacontract.org/2004/07/Dingus.Data.DataContracts")]
+       public partial class TaxiTime : object
+       {
+
+               private string AirportField;
+
+               private int TaxiInAvgField;
+
+               private int TaxiOutAvgField;
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public string Airport
+               {
+                       get
+                       {
+                               return this.AirportField;
+                       }
+                       set
+                       {
+                               this.AirportField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int TaxiInAvg
+               {
+                       get
+                       {
+                               return this.TaxiInAvgField;
+                       }
+                       set
+                       {
+                               this.TaxiInAvgField = value;
+                       }
+               }
+
+               [global::System.Runtime.Serialization.DataMemberAttribute()]
+               public int TaxiOutAvg
+               {
+                       get
+                       {
+                               return this.TaxiOutAvgField;
+                       }
+                       set
+                       {
+                               this.TaxiOutAvgField = value;
+                       }
+               }
+       }
+}
+
+
+

diff --git a/mcs/class/System.Security/System.Security-net_4_5.csproj b/mcs/class/System.Security/System.Security-net_4_5.csproj
deleted file mode 100644 (file)
index 74704c2..0000000
--- a/mcs/class/System.Security/System.Security-net_4_5.csproj
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,414</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Security</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;SECURITY_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;SECURITY_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\ManagedProtection.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\NativeDapiProtection.cs" />\r
-    <Compile Include="Mono.Xml\XmlCanonicalizer.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\AlgorithmIdentifier.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\CmsRecipient.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\CmsRecipientCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\CmsRecipientEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\CmsSigner.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\ContentInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\EnvelopedCms.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\KeyAgreeKeyChoice.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\KeyAgreeRecipientInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\KeyTransRecipientInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9Attribute.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9ContentType.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9DocumentDescription.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9DocumentName.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9MessageDigest.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9SigningTime.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\PublicKeyInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\RecipientInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\RecipientInfoCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\RecipientInfoEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\RecipientInfoType.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SignedCms.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SignerInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SignerInfoCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SignerInfoEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SubjectIdentifier.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SubjectIdentifierOrKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SubjectIdentifierOrKeyType.cs" />\r
-    <Compile Include="System.Security.Cryptography.Pkcs\SubjectIdentifierType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2UI.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SelectionFlag.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\CipherData.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\CipherReference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\DataObject.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\DataReference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\DSAKeyValue.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedData.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedReference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedType.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptedXml.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptionMethod.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptionProperties.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\EncryptionProperty.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\IRelDecryptor.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoClause.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoEncryptedKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoName.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoNode.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoRetrievalMethod.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyInfoX509Data.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\KeyReference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\Manifest.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\Reference.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\ReferenceList.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\RSAKeyValue.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\Signature.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\SignedInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\SignedXml.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\SymmetricKeyWrap.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\Transform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\TransformChain.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\X509IssuerSerial.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDecryptionTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigBase64Transform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigC14NTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigC14NWithCommentsTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigEnvelopedSignatureTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigExcC14NTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigExcC14NWithCommentsTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigNodeList.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigXPathTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlDsigXsltTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlEncryption.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlLicenseTransform.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlSignature.cs" />\r
-    <Compile Include="System.Security.Cryptography.Xml\XmlSignatureStreamReader.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptographicAttribute.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptographicAttributeCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptographicAttributeEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography\DataProtectionScope.cs" />\r
-    <Compile Include="System.Security.Cryptography\MemoryProtectionScope.cs" />\r
-    <Compile Include="System.Security.Cryptography\ProtectedData.cs" />\r
-    <Compile Include="System.Security.Cryptography\ProtectedMemory.cs" />\r
-    <Compile Include="System.Security.Permissions\DataProtectionPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\DataProtectionPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\DataProtectionPermissionFlags.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-secxml-net_4_5.csproj">\r
-      <Project>{46F151F2-A422-4A1B-9D29-2E148CE73629}</Project>\r
-      <Name>System-secxml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-bare-net_4_5.csproj">\r
-      <Project>{21FB091E-0F84-479E-AB16-6503D36852F9}</Project>\r
-      <Name>System.Xml-bare-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Security/System.Security-tests-net_4_5.csproj b/mcs/class/System.Security/System.Security-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 9beb057..0000000
--- a/mcs/class/System.Security/System.Security-tests-net_4_5.csproj
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D49E3075-7A78-4CF1-8300-DF847C9B6796}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,414,169,219,1595,168,183,414</NoWarn>\r
-    <OutputPath>bin\Debug\System.Security-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Security_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,414,169,219,1595,168,183,414</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;SECURITY_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,414,169,219,1595,168,183,414</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;SECURITY_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\AlgorithmIdentifierTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\CmsRecipientCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\CmsRecipientTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\CmsSignerTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\ContentInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\EnvelopedCmsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\KeyTransRecipientInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9AttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9ContentTypeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9DocumentDescriptionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9DocumentNameTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9MessageDigestTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkcs9SigningTimeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\Pkits_4_01_SignatureVerification.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\PkitsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\SignedCmsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\SignerInfoCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\SignerInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Pkcs\SubjectIdentifierTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Certificate2UICas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Certificate2UITest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\AssertCrypto.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\DataObjectTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\DataReferenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\DSAKeyValueTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\EncryptedXmlTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoNameTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoNodeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoRetrievalMethodTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\KeyInfoX509DataTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\ReferenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\RSAKeyValueTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\SignatureTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\SignedInfoTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\SignedXmlTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\TransformChainTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\TransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDecryptionTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigBase64TransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigC14NTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigC14NWithCommentsTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigEnvelopedSignatureTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigExcC14NTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigExcC14NWithCommentsTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigXPathTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlDsigXsltTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.Xml\XmlLicenseTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectCollectionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectEnumeratorCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeObjectEnumeratorTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptographicAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ProtectedDataCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ProtectedDataTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ProtectedMemoryCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ProtectedMemoryTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\DataProtectionPermissionAttributeTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_4_5.csproj">\r
-      <Project>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</Project>\r
-      <Name>System.Security\System.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-1.csproj">\r
-      <Project>{6822DF7D-F859-4F02-9946-F138AA756A0E}</Project>\r
-      <Name>System\System-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_5.csproj b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_5.csproj
deleted file mode 100644 (file)
index 6bd2f56..0000000
--- a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_5.csproj
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{E537F31B-BCB7-4935-ABF3-DF2FAC48DCB3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Activation</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.ServiceModel\System.ServiceModel.Activation\ServiceHostFactory.cs" />\r
-    <Compile Include="..\System.ServiceModel\System.ServiceModel\ServiceHostingEnvironment.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel/System.ServiceModel-plainservice-net_4_5.csproj">\r
-      <Project>{0E3CFD7E-2F93-4B5B-B7FA-2AEBE0F850C0}</Project>\r
-      <Name>System.ServiceModel-plainservice-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_5.csproj b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_5.csproj
deleted file mode 100644 (file)
index ad82899..0000000
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_5.csproj
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DAF033A4-D1CF-464F-B581-578259BF3F8F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Discovery</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DiscoveryChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RequestChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementChannelEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\ContractTypeNameElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\ContractTypeNameElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryClientSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\DynamicEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\DynamicEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\EndpointDiscoveryElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\FindCriteriaElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\ScopeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\ScopeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\ServiceDiscoveryElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpAnnouncementEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpAnnouncementEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpDiscoveryEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpDiscoveryEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpTransportSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Udp\UdpChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Udp\UdpChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Udp\UdpDuplexChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Udp\UdpTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\AnnouncementClient11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryMessageSequence11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryProxyClient11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryTargetClient11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\EndpointDiscoveryMetadata11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\FindCriteria11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\IAnnouncementContract11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\IDiscoveryProxyContract11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\IDiscoveryTargetContract11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\MessageContracts11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.Version11\ResolveCriteria11.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\AnnouncementClientApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryMessageSequenceApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryProxyClientApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryTargetClientApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\EndpointDiscoveryMetadataApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\FindCriteriaApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IAnnouncementContractApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IDiscoveryProxyContractApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IDiscoveryTargetContractApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\MessageContractsApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\ResolveCriteriaApril2005.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\AnnouncementClientCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryMessageSequenceCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryProxyClientCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryTargetClientCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\EndpointDiscoveryMetadataCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\FindCriteriaCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\IAnnouncementContractCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\IDiscoveryProxyContractCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\IDiscoveryTargetContractCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\MessageContractsCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery.VersionCD1\ResolveCriteriaCD1.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\AnnouncementClient.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\AnnouncementEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\AnnouncementEventArgs.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\AnnouncementService.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryChannelDispatcher.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryClient.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryClientBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpointProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpointPublisherBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryMessageSequence.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryMessageSequenceGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryOperationContextExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryProxy.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryService.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryServiceExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DiscoveryViaUriBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\DynamicEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\EndpointDiscoveryBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\EndpointDiscoveryMetadata.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\FindCompletedEventArgs.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\FindCriteria.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\FindProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\FindRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\FindResponse.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\ResolveCompletedEventArgs.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\ResolveCriteria.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\ResolveResponse.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\ServiceDiscoveryBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\ServiceDiscoveryMode.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\UdpAnnouncementEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\UdpDiscoveryEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Discovery\UdpTransportSettings.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
-      <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
-      <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-tests-net_4_5.csproj b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 71a64cd..0000000
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-tests-net_4_5.csproj
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{83854968-EA94-4D22-8BFE-AA81557AACFB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.ServiceModel.Discovery-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Discovery_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementBoundDiscoveryService.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementClientTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementServiceTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\ContractTypes.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryClientBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryClientTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryProxyTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryServiceTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryVersionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\DynamicEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\EndpointDiscoveryBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\EndpointDiscoveryMetadataTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\FindCriteriaTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\InspectionBehaviors.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\IntegratedDiscoveryTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\MyDiscoveryServiceTypes.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\ServiceDiscoveryBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\UdpAnnouncementEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\UdpDiscoveryEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Discovery\UdpTransportTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel.Discovery\System.ServiceModel.Discovery-net_4_5.csproj">\r
-      <Project>{DAF033A4-D1CF-464F-B581-578259BF3F8F}</Project>\r
-      <Name>System.ServiceModel.Discovery\System.ServiceModel.Discovery-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_5-1.csproj">\r
-      <Project>{F1316A49-176B-4E68-8A5F-1BA718289D46}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xml.Linq\System.Xml.Linq-net_4_5.csproj">\r
-      <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_5.csproj b/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_5.csproj
deleted file mode 100644 (file)
index 189f315..0000000
--- a/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_5.csproj
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{6546230C-B2F4-4F79-8E57-6B4867997D77}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Routing</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointNameMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\StrictAndMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\BackupEndpointCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\BackupEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\BackupListCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\FilterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\FilterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\FilterTableCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\FilterTableEntryCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\FilterTableEntryElement.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\FilterType.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\NamespaceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\NamespaceElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\RoutingExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\RoutingSection.cs" />\r
-    <Compile Include="System.ServiceModel.Routing.Configuration\SoapProcessingExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\IDuplexSessionRouter.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\IRequestReplyRouter.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\ISimplexDatagramRouter.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\ISimplexSessionRouter.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\RoutingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\RoutingConfiguration.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\RoutingExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\RoutingService.cs" />\r
-    <Compile Include="System.ServiceModel.Routing\SoapProcessingBehavior.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
-      <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_5.csproj b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_5.csproj
deleted file mode 100644 (file)
index 45b5792..0000000
--- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_5.csproj
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{BD4DF654-42EE-40E8-A3F4-8A80959E7879}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Web</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Assembly\TypeForwarders.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\WebScriptServiceHostFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\WebServiceHostFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebBodyFormatMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebContentFormat.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebContentTypeMapper.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebScriptEnablingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebScriptEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WebScriptEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebHttpBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebHttpEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebScriptEnablingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebScriptEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WebServiceEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\JsonQueryStringConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\QueryStringConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\WebHttpDispatchOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\WebMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Web\IncomingWebRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\IncomingWebResponseContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\OutgoingWebRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\OutgoingWebResponseContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebAttributeInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebGetAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebInvokeAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebMessageBodyStyle.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebMessageFormat.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebOperationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Web\WebServiceHost.cs" />\r
-    <Compile Include="System.ServiceModel\WebHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WebHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WebHttpSecurityMode.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
-      <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Extensions/System.Web.Extensions-net_4_5.csproj">\r
-      <Project>{74D281D8-F725-4D79-B218-2DFCCFD44FA2}</Project>\r
-      <Name>System.Web.Extensions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_5.csproj">\r
-      <Project>{E537F31B-BCB7-4935-ABF3-DF2FAC48DCB3}</Project>\r
-      <Name>System.ServiceModel.Activation-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-tests-net_4_5.csproj b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-tests-net_4_5.csproj
deleted file mode 100644 (file)
index d8e3c21..0000000
--- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-tests-net_4_5.csproj
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{15DA3E31-1142-4ABB-AC5E-B2FB2B7C50D9}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.ServiceModel.Web-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel.Web_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_3_5;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Runtime.Serialization.Json\DataContractJsonSerializerTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization.Json\JsonReaderTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization.Json\JsonWriterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Activation\WebScriptServiceHostFactoryTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\WebBodyFormatMessagePropertyTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\WebMessageEncodingBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\WebHttpBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WebHttpBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WebHttpEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WebScriptEnablingBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\JsonQueryStringConverterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\QueryStringConverterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\WebHttpDispatchOperationSelectorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\Atom10FeedFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\Atom10ItemFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\AtomPub10CategoriesDocumentFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\Rss20FeedFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\Rss20ItemFormatterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\ServiceDocumentTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\SyndicationElementExtensionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\SyndicationFeedTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\SyndicationItemTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\SyndicationLinkTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\TextSyndicationContentTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\UrlSyndicationContentTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Syndication\XmlSyndicationContentTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Web\WebGetAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Web\WebInvokeAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Web\WebOperationContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Web\WebServiceHostTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\WebHttpBindingTest.cs" />\r
-    <Compile Include="Test\System\UriTemplateEquivalenceComparerTest.cs" />\r
-    <Compile Include="Test\System\UriTemplateTableTest.cs" />\r
-    <Compile Include="Test\System\UriTemplateTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel.Web\System.ServiceModel.Web-net_4_5.csproj">\r
-      <Project>{BD4DF654-42EE-40E8-A3F4-8A80959E7879}</Project>\r
-      <Name>System.ServiceModel.Web\System.ServiceModel.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_5-1.csproj">\r
-      <Project>{F1316A49-176B-4E68-8A5F-1BA718289D46}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions\System.Web.Extensions-net_4_5.csproj">\r
-      <Project>{74D281D8-F725-4D79-B218-2DFCCFD44FA2}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_5.csproj">\r
-      <Project>{E537F31B-BCB7-4935-ABF3-DF2FAC48DCB3}</Project>\r
-      <Name>System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel-net_4_5.csproj b/mcs/class/System.ServiceModel/System.ServiceModel-net_4_5.csproj
deleted file mode 100644 (file)
index 66064a5..0000000
--- a/mcs/class/System.ServiceModel/System.ServiceModel-net_4_5.csproj
+++ /dev/null
@@ -1,1164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F2156C09-C377-4945-A690-39CFBF3319B3}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;TRACE;NET_3_0;HAS_ACTIVATION</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;TRACE;NET_3_0;HAS_ACTIVATION</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10FeedFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10FeedFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10ItemFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10ItemFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10CategoriesDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\CategoriesDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\CategoriesDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\InlineCategoriesDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ISyndicationElement.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ReferencedCategoriesDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ResourceCollectionInfo.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20FeedFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20FeedFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20ItemFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20ItemFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ServiceDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ServiceDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationCategory.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationElementExtension.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationElementExtensionCollection.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationExtensions.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationFeed.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationFeedFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationItem.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationItemFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationLink.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationPerson.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationVersions.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\TextSyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\TextSyndicationContentKind.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\UrlSyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Workspace.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\XmlSyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplate.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateEquivalenceComparer.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateMatch.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateMatchException.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateTable.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAdd.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAnd.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArgument.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArgumentReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArithmeticOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArrayItem.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArrayLength.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAssignment.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBinaryComparison.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBinaryOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBlock.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBuilder.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeCast.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeClass.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeCustomAttribute.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeDecrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeEquals.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeExpression.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeFieldReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeFor.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeForeach.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeGenerationHelper.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIf.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIncrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIs.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeItem.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeLiteral.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeMethod.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeMethodCall.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeModule.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNew.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNewArray.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNotEquals.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeOr.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeProperty.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodePropertyReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeReturn.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeSelect.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeSelfIncrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeTryBlock.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeUnaryOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeValueReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeVariableDeclaration.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeVariableReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWhen.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWhile.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWriter.cs" />\r
-    <Compile Include="Mono.CodeGeneration\Exp.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD5SHA1.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\TlsHMAC.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\BitConverterLE.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\ChallengeResponse.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\MessageBase.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmFlags.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmTargetInformation.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmVersion.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type1Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type2Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type3Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificateVerify.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificateRequest.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHelloDone.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificateVerify.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificateRequest.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHelloDone.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\ClientCertificateType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\HandshakeMessage.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\HandshakeType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\Alert.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuiteCollection.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuiteFactory.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientContext.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientRecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientSessionCache.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ContentType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\Context.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\DebugHelper.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HandshakeState.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HashAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HttpsClientStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureDeformatter.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureFormatter.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityCompressionType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityParameters.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ServerContext.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ServerRecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslCipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslClientStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslHandshakeHash.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslServerStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslStreamBase.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsCipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsClientSettings.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsException.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsServerSettings.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsStream.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode2.cs" />\r
-    <Compile Include="System.Collections.Generic\KeyedByTypeCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedKeyedCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedReadOnlyCollection.cs" />\r
-    <Compile Include="System.IO\PipeException.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\AspNetIntegrationRequirementsAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\ServiceHostFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\ServiceHostFactoryBase.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\VirtualPathExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpChannelListenerEntry.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpContextInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpListenerManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpListenerManagerTable.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\PeerDuplexChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpBinaryFrameManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\MessageSecurityBindingSupport.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecureMessageDecryptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecureMessageGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SupportingTokenInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSEncryptedXml.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSSecurityMessageHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSSignedXml.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressHeaderCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressingVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AsymmetricSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\Binding.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingParameterCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BufferManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CachingCompiler.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelFactoryBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelListenerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelListenerBase_1.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelManagerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelParameterCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompilationException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompositeDuplexBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompositeDuplexBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompressionFormat.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ConnectionOrientedTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ContentType.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CustomBinding.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DeliveryFailure.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DeliveryStatus.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DuplexChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DuplexSessionBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\FaultConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HostedTransportConfiguration.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HtmlizedException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpCookieContainerBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpRequestMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpResponseMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpsTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingDeliveryCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingMulticastCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingRuntimePreferences.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IHttpCookieContainer.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\InputChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\InvalidChannelBindingException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IReplySessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IRequestSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISecurityCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ITransactedBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ITransportTokenAssertionProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LocalClientSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\Message.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageBuffer.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageBufferImpl.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncodingBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageFault.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageFaultBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeaderInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeaders.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageImpl.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageProperties.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqBindingElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeConnectionPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipetransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OneWayBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OneWayBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OutputChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerCustomResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PnrpPeerResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PolicyImportHelper.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PrivacyNoticeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReliableSessionBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReliableSessionBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RemoteEndpointMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReplyChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RequestChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SecurityBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ServiceHostParser.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StandardBindingImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeInitiator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeInitiator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SvcHttpHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SvcHttpHandlerFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SymmetricSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TcpConnectionPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TcpTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionFlowBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionFlowBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\UnderstoodHeaders.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\UseManagedPresentationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebSocketTransportSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebSocketTransportUsage.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WindowsStreamSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\XmlObjectSerializerBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\XmlReaderBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.ComIntegration\Dummy.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AddressHeaderCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AllowedAudienceUriElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AllowedAudienceUriElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthenticationMode.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthorizationPolicyTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthorizationPolicyTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressPrefixFilterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressPrefixFilterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingElement_4_5.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpMessageSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpsBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpsBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpsSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BehaviorExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BehaviorsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BinaryMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingElementExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CallbackDebugElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CallbackTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CertificateReferenceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClaimTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClaimTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientViaElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComMethodElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComMethodElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonBehaviorsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonEndpointBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonServiceBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComPersistableTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComPersistableTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CompositeDuplexElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComUdtElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComUdtElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ConnectionOrientedTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DataContractSerializerElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DiagnosticSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DnsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EncodingConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointAddressElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointBehaviorElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndToEndTracingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\FederatedMessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HostElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HostTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpBindingBaseElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpDigestClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpsTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IBindingConfigurationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IdentityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IPAddressConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientBehaviorsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientBehaviorsElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenParametersElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenParametersEndpointAddressElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\LocalClientSecuritySettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\LocalServiceSecuritySettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageLoggingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverMsmqElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverTcpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MetadataElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MethodStubs.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexBindingBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpsBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpsBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexNamedPipeBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexNamedPipeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqBindingElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MtomMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeConnectionPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedServiceModelExtensionCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetPeerTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetPeerTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NonDualMessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\OneWayElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerCredentialElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerCustomResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PnrpPeerResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyImporterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyImporterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PrivacyNoticeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ReliableMessagingVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\RsaElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecureConversationServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityAlgorithmSuiteConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceAuthorizationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceBehaviorElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceDebugElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceHostingEnvironmentSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataPublishingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelConfigurationElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelEnhancedConfigurationElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelExtensionCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelSectionGroup.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServicePrincipalNameElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceSecurityAuditElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServicesSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceThrottlingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SslStreamSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingOptionalReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SynchronousReceiveElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpConnectionPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TextMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactedBatchingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactionFlowElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactionProtocolConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportConfigurationTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportConfigurationTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UseManagedPresentationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UserNameServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UserPrincipalNameElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsStreamSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007FederationHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007FederationHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007HttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007HttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingBaseElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509CertificateTrustedIssuerElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509CertificateTrustedIssuerElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ClientCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ClientCertificateCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509DefaultServiceCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509InitiatorCertificateClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509InitiatorCertificateServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509PeerCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509PeerCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509RecipientCertificateClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509RecipientCertificateServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ServiceCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlDictionaryReaderQuotasElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlElementElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlElementElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElementComparer.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CallbackDebugBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CallbackTimeoutsBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ClientCredentials.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ClientViaBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ContractDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ContractDescriptionGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CustomPolicyConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\DataContractSerializerMessageContractImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\DataContractSerializerOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\FaultDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\FaultDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IContractBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IContractBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IEndpointBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IMetadataExchange.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IOperationContractGenerationExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IpolicyExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IPolicyImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IServiceBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IServiceContractGenerationExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IWsdlExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IWsdlImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\LocalServiceSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageBodyDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageHeaderDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageHeaderDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePartDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePartDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePropertyDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePropertyDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataConversionError.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExchangeBindings.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExchangeClient.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataLocation.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataReference.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSectionSerializerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSet.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MustUnderstandBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationContractGenerationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyAssertionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceAuthorizationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceContractGenerationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceContractGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceCredentials.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceDebugBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceEndpointCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceSecurityAuditBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceThrottlingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceTimeoutsBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\SynchronousReceiveBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\TransactedBatchingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\TypedMessageConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlContractConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlEndpointConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WSTrustMessageConverters.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WSTrustSTSContract.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlName.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlSerializerMessageContractImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlSerializerOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\MessageLoggingSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\MessageLogTraceRecord.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\PerformanceCounterScope.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseMessagesFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseRequestProcessor.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseRequestProcessorHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\CallbackInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcher.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcherBase.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcherCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ClientOperation.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ClientRuntime.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DataContractSerializerServiceBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DefaultInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DefaultOperationInvoker.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DispatchOperation.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DispatchRuntime.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointAddressMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointAddressMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointDispatcher.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ErrorProcessingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ExceptionHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FaultContractInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FilterInvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FinalizeProcessingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ICallContextInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IChannelDispatcherBoundListener.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientMessageInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchMessageInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IErrorHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInputSessionShutdown.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceContextInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInteractiveChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InitializingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InputOrReplyRequestProcessor.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InstanceContextIdleCallback.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InstanceManager.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IOperationInvoker.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IParameterInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MatchAllMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MatchNoneMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilterNodeQuotaExceededException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageProcessingContext.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MexInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MultipleMessageFilterMatchesException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\NavigatorInvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\OperationInvokerHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\PostReceiveRequestHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\PrefixEndpointAddressMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ReplyHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SeekableXPathNavigator.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ServiceThrottle.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SessionInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SingletonInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XmlMessagesFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageContext.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathNavigatorException.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationBinding.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationSecurity.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqMessage.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\CustomPeerResolverService.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ICustomPeerResolverContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\IPeerConnectorContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\IPeerResolverContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\LocalPeerResolverService.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerCustomResolverSettings.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerReferralPolicy.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerResolverMode.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerResolverSettings.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshResult.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RegisterInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RegisterResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ResolveInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ResolveResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ServiceSettingsResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\UnregisterInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\UpdateInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\AuthenticatorCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\BinarySecretSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ClaimTypeRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\DerivedKeySecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IIssuanceSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\InitiatorServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\InternalEncryptedKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ISecurityContextSecurityTokenCache.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedTokenCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\KerberosSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ProviderCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RecipientServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RenewedSecurityTokenHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RsaSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityTokenReferenceStyle.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenTypes.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SpnegoSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SpnegoSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslnegoCookieResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiClientSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SupportingTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\TlsClientSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\TlsServerSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\UserNameSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\WrappedKeySecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\X509SecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security\BasicSecurityProfileVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\BinarySecretKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ChannelProtectionRequirements.cs" />\r
-    <Compile Include="System.ServiceModel.Security\DataProtectionSecurityStateEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ExpiredSecurityTokenException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\HttpDigestClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IdentityVerifier.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IEndpointIdentityProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security\InfocardInteractiveChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ISecureConversationSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ISecuritySession.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IssuedTokenClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IssuedTokenServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\KeyEntropyMode.cs" />\r
-    <Compile Include="System.ServiceModel.Security\KeyNameIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessagePartSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessageProtectionOrder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessageSecurityException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\PeerCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ScopedMessagePartSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecureConversationServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecureConversationVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityAccessDeniedException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityAlgorithmSuite.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityContextKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityCredentialsManager.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityNegotiationException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityPolicyVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityStateEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityTokenAttachmentMode.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityTokenSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ServiceCredentialsSecurityTokenManager.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SspiSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SupportingTokenSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\TrustVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UnionSecurityTokenResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UserNamePasswordClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UserNamePasswordServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WindowsClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WindowsServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WSSecurityTokenSerializer.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateInitiatorClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateInitiatorServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateRecipientClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateRecipientServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509ClientCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509PeerCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509ServiceCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel\ActionNotSupportedException.cs" />\r
-    <Compile Include="System.ServiceModel\AddressAccessDeniedException.cs" />\r
-    <Compile Include="System.ServiceModel\AddressAlreadyInUseException.cs" />\r
-    <Compile Include="System.ServiceModel\AllEnums.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpBinding_4_5.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpMessageSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpsBinding.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpsSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\CallbackBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelFactory_1.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelTerminatedException.cs" />\r
-    <Compile Include="System.ServiceModel\ClientBase.cs" />\r
-    <Compile Include="System.ServiceModel\ClientCredentialsSecurityTokenManager.cs" />\r
-    <Compile Include="System.ServiceModel\ClientProxyGenerator.cs" />\r
-    <Compile Include="System.ServiceModel\ClientRealProxy.cs" />\r
-    <Compile Include="System.ServiceModel\ClientRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationException.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationObjectAbortedException.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationObjectFaultedException.cs" />\r
-    <Compile Include="System.ServiceModel\Constants.cs" />\r
-    <Compile Include="System.ServiceModel\DataContractFormatAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\DefaultCommunicationTimeouts.cs" />\r
-    <Compile Include="System.ServiceModel\DeliveryRequirementsAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\DnsEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\Dummy.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexClientBase.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexClientRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddress.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddress10.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddressAugust2004.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddressBuilder.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointNotFoundException.cs" />\r
-    <Compile Include="System.ServiceModel\EnvelopeVersion.cs" />\r
-    <Compile Include="System.ServiceModel\ExceptionDetail.cs" />\r
-    <Compile Include="System.ServiceModel\ExtensionCollection.cs" />\r
-    <Compile Include="System.ServiceModel\FaultCode.cs" />\r
-    <Compile Include="System.ServiceModel\FaultContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\FaultException.cs" />\r
-    <Compile Include="System.ServiceModel\FaultException_1.cs" />\r
-    <Compile Include="System.ServiceModel\FaultReason.cs" />\r
-    <Compile Include="System.ServiceModel\FaultReasonText.cs" />\r
-    <Compile Include="System.ServiceModel\FederatedMessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\HttpBindingBase.cs" />\r
-    <Compile Include="System.ServiceModel\HttpTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\IClientChannel.cs" />\r
-    <Compile Include="System.ServiceModel\ICommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel\IContextChannel.cs" />\r
-    <Compile Include="System.ServiceModel\IDefaultCommunicationTimeouts.cs" />\r
-    <Compile Include="System.ServiceModel\IDuplexClientChannel.cs" />\r
-    <Compile Include="System.ServiceModel\IExtensibleObject.cs" />\r
-    <Compile Include="System.ServiceModel\IExtension.cs" />\r
-    <Compile Include="System.ServiceModel\IExtensionCollection.cs" />\r
-    <Compile Include="System.ServiceModel\InstanceContext.cs" />\r
-    <Compile Include="System.ServiceModel\InvalidMessageContractException.cs" />\r
-    <Compile Include="System.ServiceModel\IOnlineStatus.cs" />\r
-    <Compile Include="System.ServiceModel\IServiceChannel.cs" />\r
-    <Compile Include="System.ServiceModel\Logger.cs" />\r
-    <Compile Include="System.ServiceModel\MessageBodyAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageContractMemberAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeader_1.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderArrayAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderException.cs" />\r
-    <Compile Include="System.ServiceModel\MessageParameterAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessagePropertyAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverMsmq.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverTcp.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityVersion.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqBindingBase.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqException.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqPoisonMessageException.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NamedPipeTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetHttpMessageEncoding.cs" />\r
-    <Compile Include="System.ServiceModel\NetMsmqBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetMsmqSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetNamedPipeBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetNamedPipeSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetPeerTcpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetTcpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetTcpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NonDualMessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\OperationBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContext.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContextScope.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\OptionalReliableSession.cs" />\r
-    <Compile Include="System.ServiceModel\PeerMessagePropagationMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel\PeerNode.cs" />\r
-    <Compile Include="System.ServiceModel\PeerNodeAddress.cs" />\r
-    <Compile Include="System.ServiceModel\PeerResolver.cs" />\r
-    <Compile Include="System.ServiceModel\PeerResolverImpl.cs" />\r
-    <Compile Include="System.ServiceModel\PeerSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel\PeerTransportSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel\PoisonMessageException.cs" />\r
-    <Compile Include="System.ServiceModel\ProtocolException.cs" />\r
-    <Compile Include="System.ServiceModel\QuotaExceededException.cs" />\r
-    <Compile Include="System.ServiceModel\ReliableMessagingVersion.cs" />\r
-    <Compile Include="System.ServiceModel\ReliableSession.cs" />\r
-    <Compile Include="System.ServiceModel\RsaEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\ServerTooBusyException.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceActivationException.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceAuthorizationManager.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHost.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHostBase.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHostingEnvironment.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceKnownTypeAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceProxyGenerator.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceSecurityContext.cs" />\r
-    <Compile Include="System.ServiceModel\SilverlightClientConfigLoader.cs" />\r
-    <Compile Include="System.ServiceModel\SpnEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\TcpTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\TransactionFlowAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\TransactionProtocol.cs" />\r
-    <Compile Include="System.ServiceModel\TransferMode.cs" />\r
-    <Compile Include="System.ServiceModel\UnknownMessageReceivedEventArgs.cs" />\r
-    <Compile Include="System.ServiceModel\UpnEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\UriSchemeKeyedCollection.cs" />\r
-    <Compile Include="System.ServiceModel\WS2007FederationHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WS2007HttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSDualHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSDualHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WSFederationHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSFederationHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpBindingBase.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\X509CertificateEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\XmlSerializerFormatAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_5.csproj">\r
-      <Project>{E537F31B-BCB7-4935-ABF3-DF2FAC48DCB3}</Project>\r
-      <Name>System.ServiceModel.Activation-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Security/System.Security-net_4_5.csproj">\r
-      <Project>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</Project>\r
-      <Name>System.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.IdentityModel/System.IdentityModel-net_4_5.csproj">\r
-      <Project>{F056C062-E467-4989-9366-440E8CD23C0C}</Project>\r
-      <Name>System.IdentityModel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_5.csproj">\r
-      <Project>{AB4F77BB-4340-4A79-9B66-EF5B4221E1F2}</Project>\r
-      <Name>System.IdentityModel.Selectors-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Transactions/System.Transactions-net_4_5.csproj">\r
-      <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Messaging/System.Messaging-net_4_5.csproj">\r
-      <Project>{1CBEC0FC-5926-42FA-A0CF-A19617FABB78}</Project>\r
-      <Name>System.Messaging-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Services/System.Web.Services-net_4_5.csproj">\r
-      <Project>{251DB111-FEE1-4080-8411-0AD1CC9BA94B}</Project>\r
-      <Name>System.Web.Services-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj">\r
-      <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/WS-Addressing.schema">\r
-      <LogicalName>WS-Addressing.schema</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ws-addr.xsd">\r
-      <LogicalName>ws-addr.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_5.csproj b/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_5.csproj
deleted file mode 100644 (file)
index 5b75911..0000000
--- a/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_5.csproj
+++ /dev/null
@@ -1,1160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{0E3CFD7E-2F93-4B5B-B7FA-2AEBE0F850C0}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5/plainservice</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;TRACE;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;TRACE;NET_3_0</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10FeedFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10FeedFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10ItemFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10ItemFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10CategoriesDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\CategoriesDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\CategoriesDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\InlineCategoriesDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ISyndicationElement.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ReferencedCategoriesDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ResourceCollectionInfo.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20FeedFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20FeedFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20ItemFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20ItemFormatter_1.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ServiceDocument.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ServiceDocumentFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationCategory.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationElementExtension.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationElementExtensionCollection.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationExtensions.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationFeed.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationFeedFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationItem.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationItemFormatter.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationLink.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationPerson.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationVersions.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\TextSyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\TextSyndicationContentKind.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\UrlSyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Workspace.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\XmlSyndicationContent.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplate.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateEquivalenceComparer.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateMatch.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateMatchException.cs" />\r
-    <Compile Include="..\System.ServiceModel.Web\System\UriTemplateTable.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAdd.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAnd.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArgument.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArgumentReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArithmeticOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArrayItem.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeArrayLength.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeAssignment.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBinaryComparison.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBinaryOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBlock.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeBuilder.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeCast.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeClass.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeCustomAttribute.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeDecrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeEquals.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeExpression.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeFieldReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeFor.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeForeach.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeGenerationHelper.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIf.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIncrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeIs.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeItem.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeLiteral.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeMethod.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeMethodCall.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeModule.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNew.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNewArray.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeNotEquals.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeOr.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeProperty.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodePropertyReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeReturn.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeSelect.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeSelfIncrement.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeTryBlock.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeUnaryOperation.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeValueReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeVariableDeclaration.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeVariableReference.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWhen.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWhile.cs" />\r
-    <Compile Include="Mono.CodeGeneration\CodeWriter.cs" />\r
-    <Compile Include="Mono.CodeGeneration\Exp.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MD5SHA1.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\TlsHMAC.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\BitConverterLE.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\ChallengeResponse.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\MessageBase.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmFlags.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmTargetInformation.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmVersion.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type1Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type2Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Ntlm\Type3Message.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificateVerify.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificateRequest.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHelloDone.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificateVerify.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificate.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificateRequest.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerFinished.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHello.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHelloDone.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerKeyExchange.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\ClientCertificateType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\HandshakeMessage.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls.Handshake\HandshakeType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\Alert.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuiteCollection.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\CipherSuiteFactory.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientContext.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientRecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ClientSessionCache.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ContentType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\Context.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\DebugHelper.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HandshakeState.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HashAlgorithmType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\HttpsClientStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureDeformatter.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureFormatter.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityCompressionType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityParameters.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ServerContext.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\ServerRecordProtocol.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslCipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslClientStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslHandshakeHash.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslServerStream.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\SslStreamBase.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsCipherSuite.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsClientSettings.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsException.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsServerSettings.cs" />\r
-    <Compile Include="Mono.Security.Protocol.Tls\TlsStream.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocument2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentBuilder2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathDocumentWriter2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNavigator2.cs" />\r
-    <Compile Include="Mono.Xml.XPath\DTMXPathNode2.cs" />\r
-    <Compile Include="System.Collections.Generic\KeyedByTypeCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedKeyedCollection.cs" />\r
-    <Compile Include="System.Collections.Generic\SynchronizedReadOnlyCollection.cs" />\r
-    <Compile Include="System.IO\PipeException.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\AspNetIntegrationRequirementsAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\ServiceHostFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\ServiceHostFactoryBase.cs" />\r
-    <Compile Include="System.ServiceModel.Activation\VirtualPathExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpChannelListenerEntry.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpContextInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpListenerManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpListenerManagerTable.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Http\HttpRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\PeerDuplexChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpBinaryFrameManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.NetTcp\TcpRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\MessageSecurityBindingSupport.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecureMessageDecryptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecureMessageGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SecurityRequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\SupportingTokenInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSEncryptedXml.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSSecurityMessageHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels.Security\WSSignedXml.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressHeaderCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AddressingVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\AsymmetricSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BinaryMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\Binding.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BindingParameterCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\BufferManager.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CachingCompiler.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelFactoryBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelListenerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelListenerBase_1.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelManagerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelParameterCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ChannelPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompilationException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompositeDuplexBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompositeDuplexBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CompressionFormat.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ConnectionOrientedTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ContentType.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\CustomBinding.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DeliveryFailure.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DeliveryStatus.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DuplexChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\DuplexSessionBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\FaultConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HostedTransportConfiguration.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HtmlizedException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpCookieContainerBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpRequestMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpResponseMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpsTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\HttpTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingDeliveryCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingMulticastCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IBindingRuntimePreferences.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IDuplexSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IHttpCookieContainer.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IInputSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\InputChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\InvalidChannelBindingException.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputSession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IOutputSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IReplySessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\IRequestSessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISecurityCapabilities.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISession.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ISessionChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ITransactedBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ITransportTokenAssertionProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LayeredRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\LocalClientSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\Message.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageBuffer.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageBufferImpl.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageEncodingBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageFault.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageFaultBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeader.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeaderInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageHeaders.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageImpl.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageProperties.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MessageVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqBindingElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MsmqTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\MtomMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeConnectionPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeReplyChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipeRequestChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\NamedPipetransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OneWayBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OneWayBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\OutputChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerChannelListener.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerCustomResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerInputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerOutputChannel.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PeerTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PnrpPeerResolverBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PolicyImportHelper.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\PrivacyNoticeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReliableSessionBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReliableSessionBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RemoteEndpointMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ReplyChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RequestChannelBase.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\RequestContext.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SecurityBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\ServiceHostParser.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SslStreamSecurityUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StandardBindingImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeInitiator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamSecurityUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeAcceptor.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeInitiator.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\StreamUpgradeProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SvcHttpHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SvcHttpHandlerFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\SymmetricSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TcpConnectionPoolSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TcpTransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncoderFactory.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TextMessageEncodingBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionFlowBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionFlowBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransactionMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportBindingElementImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\TransportSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\UnderstoodHeaders.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\UseManagedPresentationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebSocketTransportSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WebSocketTransportUsage.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\WindowsStreamSecurityBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\XmlObjectSerializerBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.Channels\XmlReaderBodyWriter.cs" />\r
-    <Compile Include="System.ServiceModel.ComIntegration\Dummy.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AddressHeaderCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AllowedAudienceUriElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AllowedAudienceUriElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthenticationMode.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthorizationPolicyTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\AuthorizationPolicyTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressPrefixFilterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BaseAddressPrefixFilterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingElement_4_5.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpMessageSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpsBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpsBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpsSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BehaviorExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BehaviorsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BinaryMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingElementExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\BindingsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CallbackDebugElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CallbackTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CertificateReferenceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ChannelPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClaimTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClaimTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ClientViaElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComContractsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComMethodElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComMethodElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonBehaviorsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonEndpointBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CommonServiceBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComPersistableTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComPersistableTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CompositeDuplexElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComUdtElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ComUdtElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ConnectionOrientedTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\CustomBindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DataContractSerializerElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DiagnosticSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\DnsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EncodingConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointAddressElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointBehaviorElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\EndToEndTracingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ExtensionsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\FederatedMessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HostElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HostTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpBindingBaseElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpDigestClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpsTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\HttpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IBindingConfigurationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IdentityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IPAddressConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientBehaviorsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientBehaviorsElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenParametersElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenParametersEndpointAddressElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\IssuedTokenServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\LocalClientSecuritySettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\LocalServiceSecuritySettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageLoggingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverMsmqElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityOverTcpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageSecurityVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MessageVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MetadataElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MethodStubs.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexBindingBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpsBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexHttpsBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexNamedPipeBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexNamedPipeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MexTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqBindingElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqIntegrationSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MsmqTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\MtomMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeConnectionPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedPipeTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NamedServiceModelExtensionCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetMsmqSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetNamedPipeSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetPeerTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetPeerTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NetTcpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\NonDualMessageSecurityOverHttpElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\OneWayElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerCredentialElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerCustomResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PeerTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PnrpPeerResolverElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyImporterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyImporterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PolicyVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\PrivacyNoticeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ProtocolMappingSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ReliableMessagingVersionConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\RsaElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecureConversationServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityAlgorithmSuiteConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SecurityElementBase.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceAuthorizationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceBehaviorElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceBehaviorElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceDebugElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceHostingEnvironmentSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceMetadataPublishingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelConfigurationElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelEnhancedConfigurationElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelExtensionCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelExtensionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceModelSectionGroup.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServicePrincipalNameElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceSecurityAuditElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServicesSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceThrottlingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\ServiceTimeoutsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SslStreamSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingOptionalReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardBindingReliableSessionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\StandardEndpointsSection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\SynchronousReceiveElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpConnectionPoolSettingsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpTransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TcpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TextMessageEncodingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactedBatchingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactionFlowElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransactionProtocolConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportConfigurationTypeElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportConfigurationTypeElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\TransportElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UseManagedPresentationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UserNameServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\UserPrincipalNameElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WindowsStreamSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007FederationHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007FederationHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007HttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WS2007HttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSDualHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSFederationHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingBaseElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingCollectionElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\WSHttpTransportSecurityElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509CertificateTrustedIssuerElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509CertificateTrustedIssuerElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ClientCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ClientCertificateCredentialsElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509DefaultServiceCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509InitiatorCertificateClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509InitiatorCertificateServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509PeerCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509PeerCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509RecipientCertificateClientElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509RecipientCertificateServiceElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\X509ServiceCertificateAuthenticationElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlDictionaryReaderQuotasElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlElementElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XmlElementElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElement.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElementCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElementComparer.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CallbackDebugBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CallbackTimeoutsBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ClientCredentials.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ClientViaBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ContractDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ContractDescriptionGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Description\CustomPolicyConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\DataContractSerializerMessageContractImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\DataContractSerializerOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\FaultDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\FaultDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IContractBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IContractBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IEndpointBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IMetadataExchange.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IOperationContractGenerationExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IpolicyExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IPolicyImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IServiceBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IServiceContractGenerationExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IWsdlExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\IWsdlImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\LocalServiceSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageBodyDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageHeaderDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessageHeaderDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePartDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePartDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePropertyDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MessagePropertyDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataConversionError.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExchangeBindings.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExchangeClient.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataLocation.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataReference.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSectionSerializerBase.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MetadataSet.cs" />\r
-    <Compile Include="System.ServiceModel.Description\MustUnderstandBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationContractGenerationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\OperationDescriptionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyAssertionCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\PolicyVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceAuthorizationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceContractGenerationContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceContractGenerator.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceCredentials.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceDebugBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceDescription.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceEndpointCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataEndpoint.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceMetadataExtension.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceSecurityAuditBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceThrottlingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\ServiceTimeoutsBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\SynchronousReceiveBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\TransactedBatchingBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Description\TypedMessageConverter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlContractConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlEndpointConversionContext.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlExporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WsdlImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WSTrustMessageConverters.cs" />\r
-    <Compile Include="System.ServiceModel.Description\WSTrustSTSContract.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlName.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlSerializerMessageContractImporter.cs" />\r
-    <Compile Include="System.ServiceModel.Description\XmlSerializerOperationBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\MessageLoggingSettings.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\MessageLogTraceRecord.cs" />\r
-    <Compile Include="System.ServiceModel.Diagnostics\PerformanceCounterScope.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseMessagesFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseRequestProcessor.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\BaseRequestProcessorHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\CallbackInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcher.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcherBase.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ChannelDispatcherCollection.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ClientOperation.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ClientRuntime.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DataContractSerializerServiceBehavior.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DefaultInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DefaultOperationInvoker.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DispatchOperation.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\DispatchRuntime.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointAddressMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointAddressMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\EndpointDispatcher.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ErrorProcessingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ExceptionHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FaultContractInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FilterInvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\FinalizeProcessingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ICallContextInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IChannelDispatcherBoundListener.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientMessageInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IClientOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchMessageFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchMessageInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IDispatchOperationSelector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IErrorHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInputSessionShutdown.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceContextInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInstanceProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IInteractiveChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InitializingHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InputOrReplyRequestProcessor.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InstanceContextIdleCallback.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InstanceManager.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\InvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IOperationInvoker.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\IParameterInspector.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MatchAllMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MatchNoneMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilterNodeQuotaExceededException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MessageProcessingContext.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MexInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\MultipleMessageFilterMatchesException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\NavigatorInvalidBodyAccessException.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\OperationInvokerHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\PostReceiveRequestHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\PrefixEndpointAddressMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ReplyHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SeekableXPathNavigator.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\ServiceThrottle.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SessionInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\SingletonInstanceContextProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XmlMessagesFormatter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageContext.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageFilterTable.cs" />\r
-    <Compile Include="System.ServiceModel.Dispatcher\XPathNavigatorException.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationBinding.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationBindingElement.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqIntegrationSecurity.cs" />\r
-    <Compile Include="System.ServiceModel.MsmqIntegration\MsmqMessage.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\CustomPeerResolverService.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ICustomPeerResolverContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\IPeerConnectorContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\IPeerResolverContract.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\LocalPeerResolverService.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerCustomResolverSettings.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerReferralPolicy.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerResolverMode.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\PeerResolverSettings.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RefreshResult.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RegisterInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\RegisterResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ResolveInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ResolveResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\ServiceSettingsResponseInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\UnregisterInfo.cs" />\r
-    <Compile Include="System.ServiceModel.PeerResolvers\UpdateInfo.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\AuthenticatorCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\BinarySecretSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ClaimTypeRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\DerivedKeySecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IIssuanceSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\InitiatorServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\InternalEncryptedKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ISecurityContextSecurityTokenCache.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\IssuedTokenCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\KerberosSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ProviderCommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RecipientServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RenewedSecurityTokenHandler.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\RsaSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityTokenReferenceStyle.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenRequirement.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenTypes.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SpnegoSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SpnegoSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslnegoCookieResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiClientSecurityTokenAuthenticator.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SspiSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\SupportingTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\TlsClientSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\TlsServerSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\UserNameSecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\WrappedKeySecurityToken.cs" />\r
-    <Compile Include="System.ServiceModel.Security.Tokens\X509SecurityTokenParameters.cs" />\r
-    <Compile Include="System.ServiceModel.Security\BasicSecurityProfileVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\BinarySecretKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ChannelProtectionRequirements.cs" />\r
-    <Compile Include="System.ServiceModel.Security\DataProtectionSecurityStateEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ExpiredSecurityTokenException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\HttpDigestClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IdentityVerifier.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IEndpointIdentityProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security\InfocardInteractiveChannelInitializer.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ISecureConversationSession.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ISecuritySession.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IssuedTokenClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\IssuedTokenServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\KeyEntropyMode.cs" />\r
-    <Compile Include="System.ServiceModel.Security\KeyNameIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessagePartSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessageProtectionOrder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\MessageSecurityException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\PeerCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ScopedMessagePartSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecureConversationServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecureConversationVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityAccessDeniedException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityAlgorithmSuite.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityContextKeyIdentifierClause.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityCredentialsManager.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityMessageProperty.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityNegotiationException.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityPolicyVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityStateEncoder.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityTokenAttachmentMode.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityTokenSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SecurityVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\ServiceCredentialsSecurityTokenManager.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SspiSecurityTokenProvider.cs" />\r
-    <Compile Include="System.ServiceModel.Security\SupportingTokenSpecification.cs" />\r
-    <Compile Include="System.ServiceModel.Security\TrustVersion.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UnionSecurityTokenResolver.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UserNamePasswordClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\UserNamePasswordServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WindowsClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WindowsServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\WSSecurityTokenSerializer.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateInitiatorClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateInitiatorServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateRecipientClientCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509CertificateRecipientServiceCredential.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509ClientCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509PeerCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel.Security\X509ServiceCertificateAuthentication.cs" />\r
-    <Compile Include="System.ServiceModel\ActionNotSupportedException.cs" />\r
-    <Compile Include="System.ServiceModel\AddressAccessDeniedException.cs" />\r
-    <Compile Include="System.ServiceModel\AddressAlreadyInUseException.cs" />\r
-    <Compile Include="System.ServiceModel\AllEnums.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpBinding_4_5.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpMessageSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpsBinding.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\BasicHttpsSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\CallbackBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelFactory_1.cs" />\r
-    <Compile Include="System.ServiceModel\ChannelTerminatedException.cs" />\r
-    <Compile Include="System.ServiceModel\ClientBase.cs" />\r
-    <Compile Include="System.ServiceModel\ClientCredentialsSecurityTokenManager.cs" />\r
-    <Compile Include="System.ServiceModel\ClientProxyGenerator.cs" />\r
-    <Compile Include="System.ServiceModel\ClientRealProxy.cs" />\r
-    <Compile Include="System.ServiceModel\ClientRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationException.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationObjectAbortedException.cs" />\r
-    <Compile Include="System.ServiceModel\CommunicationObjectFaultedException.cs" />\r
-    <Compile Include="System.ServiceModel\Constants.cs" />\r
-    <Compile Include="System.ServiceModel\DataContractFormatAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\DefaultCommunicationTimeouts.cs" />\r
-    <Compile Include="System.ServiceModel\DeliveryRequirementsAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\DnsEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\Dummy.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexChannelFactory.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexClientBase.cs" />\r
-    <Compile Include="System.ServiceModel\DuplexClientRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddress.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddress10.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddressAugust2004.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointAddressBuilder.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\EndpointNotFoundException.cs" />\r
-    <Compile Include="System.ServiceModel\EnvelopeVersion.cs" />\r
-    <Compile Include="System.ServiceModel\ExceptionDetail.cs" />\r
-    <Compile Include="System.ServiceModel\ExtensionCollection.cs" />\r
-    <Compile Include="System.ServiceModel\FaultCode.cs" />\r
-    <Compile Include="System.ServiceModel\FaultContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\FaultException.cs" />\r
-    <Compile Include="System.ServiceModel\FaultException_1.cs" />\r
-    <Compile Include="System.ServiceModel\FaultReason.cs" />\r
-    <Compile Include="System.ServiceModel\FaultReasonText.cs" />\r
-    <Compile Include="System.ServiceModel\FederatedMessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\HttpBindingBase.cs" />\r
-    <Compile Include="System.ServiceModel\HttpTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\IClientChannel.cs" />\r
-    <Compile Include="System.ServiceModel\ICommunicationObject.cs" />\r
-    <Compile Include="System.ServiceModel\IContextChannel.cs" />\r
-    <Compile Include="System.ServiceModel\IDefaultCommunicationTimeouts.cs" />\r
-    <Compile Include="System.ServiceModel\IDuplexClientChannel.cs" />\r
-    <Compile Include="System.ServiceModel\IExtensibleObject.cs" />\r
-    <Compile Include="System.ServiceModel\IExtension.cs" />\r
-    <Compile Include="System.ServiceModel\IExtensionCollection.cs" />\r
-    <Compile Include="System.ServiceModel\InstanceContext.cs" />\r
-    <Compile Include="System.ServiceModel\InvalidMessageContractException.cs" />\r
-    <Compile Include="System.ServiceModel\IOnlineStatus.cs" />\r
-    <Compile Include="System.ServiceModel\IServiceChannel.cs" />\r
-    <Compile Include="System.ServiceModel\Logger.cs" />\r
-    <Compile Include="System.ServiceModel\MessageBodyAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageContractMemberAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeader_1.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderArrayAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageHeaderException.cs" />\r
-    <Compile Include="System.ServiceModel\MessageParameterAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessagePropertyAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverMsmq.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityOverTcp.cs" />\r
-    <Compile Include="System.ServiceModel\MessageSecurityVersion.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqBindingBase.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqException.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqPoisonMessageException.cs" />\r
-    <Compile Include="System.ServiceModel\MsmqTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NamedPipeTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetHttpMessageEncoding.cs" />\r
-    <Compile Include="System.ServiceModel\NetMsmqBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetMsmqSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetNamedPipeBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetNamedPipeSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NetPeerTcpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetTcpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\NetTcpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\NonDualMessageSecurityOverHttp.cs" />\r
-    <Compile Include="System.ServiceModel\OperationBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContext.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContextScope.cs" />\r
-    <Compile Include="System.ServiceModel\OperationContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\OptionalReliableSession.cs" />\r
-    <Compile Include="System.ServiceModel\PeerMessagePropagationMessageFilter.cs" />\r
-    <Compile Include="System.ServiceModel\PeerNode.cs" />\r
-    <Compile Include="System.ServiceModel\PeerNodeAddress.cs" />\r
-    <Compile Include="System.ServiceModel\PeerResolver.cs" />\r
-    <Compile Include="System.ServiceModel\PeerResolverImpl.cs" />\r
-    <Compile Include="System.ServiceModel\PeerSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel\PeerTransportSecuritySettings.cs" />\r
-    <Compile Include="System.ServiceModel\PoisonMessageException.cs" />\r
-    <Compile Include="System.ServiceModel\ProtocolException.cs" />\r
-    <Compile Include="System.ServiceModel\QuotaExceededException.cs" />\r
-    <Compile Include="System.ServiceModel\ReliableMessagingVersion.cs" />\r
-    <Compile Include="System.ServiceModel\ReliableSession.cs" />\r
-    <Compile Include="System.ServiceModel\RsaEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\ServerTooBusyException.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceActivationException.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceAuthorizationManager.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceBehaviorAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceContractAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHost.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHostBase.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceHostingEnvironment.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceKnownTypeAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceProxyGenerator.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceRuntimeChannel.cs" />\r
-    <Compile Include="System.ServiceModel\ServiceSecurityContext.cs" />\r
-    <Compile Include="System.ServiceModel\SilverlightClientConfigLoader.cs" />\r
-    <Compile Include="System.ServiceModel\SpnEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\TcpTransportSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\TransactionFlowAttribute.cs" />\r
-    <Compile Include="System.ServiceModel\TransactionProtocol.cs" />\r
-    <Compile Include="System.ServiceModel\TransferMode.cs" />\r
-    <Compile Include="System.ServiceModel\UnknownMessageReceivedEventArgs.cs" />\r
-    <Compile Include="System.ServiceModel\UpnEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\UriSchemeKeyedCollection.cs" />\r
-    <Compile Include="System.ServiceModel\WS2007FederationHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WS2007HttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSDualHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSDualHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WSFederationHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSFederationHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpBinding.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpBindingBase.cs" />\r
-    <Compile Include="System.ServiceModel\WSHttpSecurity.cs" />\r
-    <Compile Include="System.ServiceModel\X509CertificateEndpointIdentity.cs" />\r
-    <Compile Include="System.ServiceModel\XmlSerializerFormatAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Security/System.Security-net_4_5.csproj">\r
-      <Project>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</Project>\r
-      <Name>System.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.IdentityModel/System.IdentityModel-net_4_5.csproj">\r
-      <Project>{F056C062-E467-4989-9366-440E8CD23C0C}</Project>\r
-      <Name>System.IdentityModel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_5.csproj">\r
-      <Project>{AB4F77BB-4340-4A79-9B66-EF5B4221E1F2}</Project>\r
-      <Name>System.IdentityModel.Selectors-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Transactions/System.Transactions-net_4_5.csproj">\r
-      <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Messaging/System.Messaging-net_4_5.csproj">\r
-      <Project>{1CBEC0FC-5926-42FA-A0CF-A19617FABB78}</Project>\r
-      <Name>System.Messaging-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Services/System.Web.Services-net_4_5.csproj">\r
-      <Project>{251DB111-FEE1-4080-8411-0AD1CC9BA94B}</Project>\r
-      <Name>System.Web.Services-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj">\r
-      <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/WS-Addressing.schema">\r
-      <LogicalName>WS-Addressing.schema</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ws-addr.xsd">\r
-      <LogicalName>ws-addr.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel-tests-net_4_5.csproj b/mcs/class/System.ServiceModel/System.ServiceModel-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 725fa01..0000000
--- a/mcs/class/System.ServiceModel/System.ServiceModel-tests-net_4_5.csproj
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2642A2D0-D703-4A60-B60D-B64BD12CB01C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.ServiceModel-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceModel_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;TRACE;NET_3_0;HAS_ACTIVATION</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;TRACE;NET_3_0;HAS_ACTIVATION</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\FeatureBased\Features.Client\AsyncCallTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\AsyncPatternServer.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\DataContractTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\ExitProcessHelperServer.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\FaultsTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\KnownTypeTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\MessageContractTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\OperationContractServer.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\PrimitiveTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Client\UntypedMessageTesterProxy.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\AsyncCallTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\AsyncPatternContract.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\DataContractTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\DualContract.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\ExitpProcessHelper.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\FaultsTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\KnownTypeTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\MessageContractTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\OperationContract.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\PrimitiveTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Contracts\UntypedMessageTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\AsyncCallTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\AsyncPatternTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\DataContractSerializerTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\DualContractTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\ExitProcessHelper.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\FaultsTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\KnownTypeTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\MessageContractTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\OperationContractTester.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\PrimitiveTesterTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\UntypedMessageTest.cs" />\r
-    <Compile Include="Test\FeatureBased\Features.Serialization\XmlComparer.cs" />\r
-    <Compile Include="Test\FeatureBased\TestFixtureBase.cs" />\r
-    <Compile Include="Test\MetadataTests\BindingTestAssertions.cs" />\r
-    <Compile Include="Test\MetadataTests\ExportTests.cs" />\r
-    <Compile Include="Test\MetadataTests\ImportTests.cs" />\r
-    <Compile Include="Test\MetadataTests\ImportTests_CreateMetadata.cs" />\r
-    <Compile Include="Test\MetadataTests\ImportTests_LoadMetadata.cs" />\r
-    <Compile Include="Test\MetadataTests\ImportTests_RoundTrip.cs" />\r
-    <Compile Include="Test\MetadataTests\MetadataSamples.cs" />\r
-    <Compile Include="Test\MetadataTests\MiscImportTests.cs" />\r
-    <Compile Include="Test\MetadataTests\TestContext.cs" />\r
-    <Compile Include="Test\MetadataTests\TestLabel.cs" />\r
-    <Compile Include="Test\NUnitMoonHelper.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\AddressHeaderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\AddressingVersionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\AsymmetricSecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\BinaryMessageEncodingBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\BindingContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\BindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\BindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CalcSampleProxy.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CommunicationObjectSyncTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CommunicationObjectTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\ConnectionOrientedTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CustomBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\CustomPolicyConversionContext.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\DebugBindingElement.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\EmptyFaultExceptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\EnvelopeVersionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\FaultConverterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\FaultExceptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HandlerBodyWriter.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HandlerTransportBindingElement.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HttpRequestMessagePropertyTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HttpsTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\HttpTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\InterceptorBindingElement.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\InvalidBindingElement.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\LocalClientSecuritySettingsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageBufferTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageEncoderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageEncodingBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageFaultTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageHeadersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageHeaderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessagePropertiesTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MessageVersionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MsmqBindingElementBaseTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\MsmqTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\NamedPipeTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\OneWayBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\OutputChannelBase.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\PeerTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\ReplyChannelBase.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\RequestChannelBase.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\SecurityAssert.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\SecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\SslStreamSecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\SymmetricSecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\TcpTransportBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\TextMessageEncodingBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Channels\TransactionFlowBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\AddressHeaderCollectionElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\BasicHttpBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\BehaviorsSectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\BindingsSectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ChannelEndpointElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\CustomBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\EndpointBehaviorElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ExtensionsSectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\MetadataElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\MexBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\NetNamedPipeBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\NetPeerTcpBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\NetTcpBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ServiceBehaviorElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ServiceElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ServiceModelConfigurationElementCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\ServiceModelSectionGroupTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\StandardBindingCollectionElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\StandardBindingElementCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\StandardBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\StandardEndpointsSectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Configuration\UserBinding.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\BugX41.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ClientCredentialsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ContractDescriptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\FaultDescriptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\MetadataExchangeBindingsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\MetadataResolverTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\MetadataSetTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\OperationDescriptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceAuthorizationBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceContractGeneratorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceCredentialsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceDebugBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceMetadataBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceMetadataEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\ServiceThrottlingBehaviorTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\TypedMessageConverterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WsdlExporterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Description\WsdlImporterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\ActionFilterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\Bug652331_2Test.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\Bug652331Test.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\ChannelDispatcherTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\DispatchOperationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\DispatchRuntimeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\EndpointAddressMessageFilterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\EndpointDispatcherTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\ExceptionHandlerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\FilterTableTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\InvalidBodyAccessExceptionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\PrefixEndpointAddressMessageFilterTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Dispatcher\XPathMessageContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.PeerResolvers\CustomPeerResolverServiceTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.PeerResolvers\PeerResolverSerializationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\IssuedSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\IssuedSecurityTokenProviderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\RsaSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SecureConversationSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SecurityContextSecurityTokenTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenTypesTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SslSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\SspiSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\UserNameSecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\WrappedKeySecurityTokenTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\X509ListedCertificateValidator.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security.Tokens\X509SecurityTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\ChannelProtectionRequirementsTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\MessagePartSpecificationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\ScopedMessagePartSpecificationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\SecurityAlgorithmSuiteTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\SecurityMessagePropertyTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\SecurityTokenSpeficicationTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\ServiceCredentialsSecurityTokenManagerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\ServiceSecurityContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\SupportingTokenParametersTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\TransportSecurityBindingElementTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel.Security\WSSecurityTokenSerializerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\BasicHttpBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\CallbackBehaviorAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ChannelFactory_1Test.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ChannelFactoryTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ClientBase_InteractiveChannelInitializerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ClientBaseTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ClientCredentialsSecurityTokenManagerTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\CommonUseCases.cs" />\r
-    <Compile Include="Test\System.ServiceModel\Constants.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointAddress10Test.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointAddressBuilderTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointAddressTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointBehaviorCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\EndpointIdentityTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ExtensionCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\FaultCodeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\FaultContractAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\FaultReasonTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\IntegratedConnectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\MessageSecurityVersionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\MsmqTransportSecurityTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\NetMsmqBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\NetPeerTcpBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\NetTcpBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\OperationContextTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\PeerNodeAddressTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceAssert.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceEndpointCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceEndpointTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceHostBaseTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceHostTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\ServiceKnownTypeAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\SynchronizedReadOnlyCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\TransactionProtocolTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\UriSchemeKeyedCollectionTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\WSFederationHttpBindingTest.cs" />\r
-    <Compile Include="Test\System.ServiceModel\WSHttpBindingTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_5-1.csproj">\r
-      <Project>{F1316A49-176B-4E68-8A5F-1BA718289D46}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization\System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Security\System.Security-net_4_5.csproj">\r
-      <Project>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</Project>\r
-      <Name>System.Security\System.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel\System.IdentityModel-net_4_5.csproj">\r
-      <Project>{F056C062-E467-4989-9366-440E8CD23C0C}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.IdentityModel.Selectors\System.IdentityModel.Selectors-net_4_5.csproj">\r
-      <Project>{AB4F77BB-4340-4A79-9B66-EF5B4221E1F2}</Project>\r
-      <Name>System.IdentityModel.Selectors\System.IdentityModel.Selectors-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_4_5.csproj">\r
-      <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Messaging\System.Messaging-net_4_5.csproj">\r
-      <Project>{1CBEC0FC-5926-42FA-A0CF-A19617FABB78}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_5-2.csproj">\r
-      <Project>{725FB152-838A-4C6E-8A12-AC47E2DD4CEA}</Project>\r
-      <Name>System.Web\System.Web-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_4_5.csproj">\r
-      <Project>{251DB111-FEE1-4080-8411-0AD1CC9BA94B}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_5.csproj">\r
-      <Project>{E537F31B-BCB7-4935-ABF3-DF2FAC48DCB3}</Project>\r
-      <Name>System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5.csproj">\r
-      <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/WS-Addressing.schema">\r
-      <LogicalName>WS-Addressing.schema</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ws-addr.xsd">\r
-      <LogicalName>ws-addr.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug32886Test.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug32886Test.cs
index 1562ba1ba9b2afc5519e9fff11ad0158e83da8ae..71c1f554c3b43f4b8ea90438cbffd19afb646001 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug32886Test.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug32886Test.cs
@@ -23,6 +23,7 @@
 // THE SOFTWARE.
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Runtime.Serialization;
 using System.ServiceModel;
@@ -62,16 +63,24 @@ namespace MonoTests.System.ServiceModel.Dispatcher
                                var client = new TempConvertSoapClient (binding, remoteAddress);
 
                                var wait = new ManualResetEvent (false);
+
+                               Exception error = null;
+                               string result = null;
+
                                client.CelsiusToFahrenheitCompleted += delegate (object o, CelsiusToFahrenheitCompletedEventArgs e) {
-                                       if (e.Error != null)
-                                               throw e.Error;
-                                       Assert.AreEqual ("76.1", e.Result, "#1");
-                                       wait.Set ();
+                                       try {
+                                               error = e.Error;
+                                               result = e.Error == null ? e.Result : null;
+                                       } finally {
+                                               wait.Set ();
+                                       }
                                };
 
                                client.CelsiusToFahrenheitAsync ("24.5");
-                               if (!wait.WaitOne (TimeSpan.FromSeconds (20)))
-                                       Assert.Fail ("timeout");
+
+                               Assert.IsTrue (wait.WaitOne (TimeSpan.FromSeconds (20)), "timeout");
+                               Assert.IsNull (error, "#1, inner exception: {0}", error);
+                               Assert.AreEqual ("76.1", result, "#2");
                        } finally {
                                serviceHost.Close ();
                        }
@@ -81,16 +90,16 @@ namespace MonoTests.System.ServiceModel.Dispatcher
                {
                        public FahrenheitToCelsiusResponse FarenheitToCelsius (FahrenheitToCelsiusRequest request)
                        {
-                               var farenheit = double.Parse (request.Body.Fahrenheit);
+                               var farenheit = double.Parse (request.Body.Fahrenheit, CultureInfo.InvariantCulture);
                                var celsius = ((farenheit - 32) / 9) * 5;
-                               return new FahrenheitToCelsiusResponse (new FahrenheitToCelsiusResponseBody (celsius.ToString ()));
+                               return new FahrenheitToCelsiusResponse (new FahrenheitToCelsiusResponseBody (celsius.ToString (CultureInfo.InvariantCulture)));
                        }
 
                        public CelsiusToFahrenheitResponse CelsiusToFarenheit (CelsiusToFahrenheitRequest request)
                        {
-                               var celsius = double.Parse (request.Body.Celsius);
+                               var celsius = double.Parse (request.Body.Celsius, CultureInfo.InvariantCulture);
                                var farenheit = ((celsius * 9) / 5) + 32;
-                               return new CelsiusToFahrenheitResponse (new CelsiusToFahrenheitResponseBody (farenheit.ToString ()));
+                               return new CelsiusToFahrenheitResponse (new CelsiusToFahrenheitResponseBody (farenheit.ToString (CultureInfo.InvariantCulture)));
                        }
 
                        Func<FahrenheitToCelsiusRequest,FahrenheitToCelsiusResponse> farenheitToCelsius;

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331Test.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331Test.cs
index cdc68486779adc619e335eccabbb06dc4a72265c..141d8bf3f6bb728ebb46da545a8f85ea23d5a8fd 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331Test.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331Test.cs
@@ -66,16 +66,24 @@ namespace MonoTests.System.ServiceModel.Dispatcher
                                var client = new Service1Client (binding, remoteAddress);
 
                                var wait = new ManualResetEvent (false);
+
+                               Exception error = null;
+                               object result = null;
+
                                client.GetDataCompleted += delegate (object o, GetDataCompletedEventArgs e) {
-                                       if (e.Error != null)
-                                               throw e.Error;
-                                       Assert.AreEqual ("A", ((DataType1) e.Result).Id, "#1");
-                                       wait.Set ();
+                                       try {
+                                               error = e.Error;
+                                               result = e.Error == null ? e.Result : null;
+                                       } finally {
+                                               wait.Set ();
+                                       }
                                };
 
                                client.GetDataAsync ();
-                               if (!wait.WaitOne (TimeSpan.FromSeconds (20)))
-                                       Assert.Fail ("timeout");
+
+                               Assert.IsTrue (wait.WaitOne (TimeSpan.FromSeconds (20)), "timeout");
+                               Assert.IsNull (error, "#1, inner exception: {0}", error);
+                               Assert.AreEqual ("A", ((DataType1) result).Id, "#2");
                        } finally {
                                serviceHost.Close ();
                        }

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331_2Test.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331_2Test.cs
index 4d6fca943e6f88529a257468d0776026019f33f0..21559c528a2cd28a61189174d292da9c4e91b709 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331_2Test.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331_2Test.cs
@@ -76,58 +76,85 @@ namespace MonoTests.System.ServiceModel.Dispatcher
                        var nestedClient      = new Service1Client (binding, remoteAddress);
                        var dbClient          = new Service1Client (binding, remoteAddress);
 
-                       var waits = new ManualResetEvent [4];
-                       for (int i = 0; i < waits.Length; i++)
-                               waits [i] = new ManualResetEvent (false);
-
-                       int passed = 0;
-
-                       normalClient.GetDataCompleted += delegate (object o, GetDataCompletedEventArgs e) {
-                               if (e.Error != null) {
-                                       Assert.Fail ("Normal failed; error: {0}", e.Error);
-                                       throw e.Error;
-                               }
-                               Assert.AreEqual ("A", ((DataType1) e.Result).Id, "Normal");
-                               Interlocked.Increment (ref passed);
-                               waits [0].Set ();
-                       };
-                       normalClient.GetDataAsync ();
-
-                       collectionClient.GetCollectionDataCompleted += delegate (object sender, GetCollectionDataCompletedEventArgs e) {
-                               if (e.Error != null) {
-                                       Assert.Fail ("Collection failed; error: {0}", e.Error);
-                                       throw e.Error;
-                               }
-                               Assert.AreEqual ("B,C", ItemsToString (e.Result.Cast<DataType1> ()), "Collection");
-                               Interlocked.Increment (ref passed);
-                               waits [1].Set ();
-                       };
-                       collectionClient.GetCollectionDataAsync ();
-
-                       nestedClient.GetNestedDataCompleted += delegate (object sender, GetNestedDataCompletedEventArgs e) {
-                               if (e.Error != null) {
-                                       Assert.Fail ("Nested failed; error: {0}", e.Error);
-                                       throw e.Error;
-                               }
-                               Assert.AreEqual ("D,E", ItemsToString (e.Result.Items.Cast<DataType1> ()), "Nested");
-                               Interlocked.Increment (ref passed);
-                               waits [2].Set ();
-                       };
-                       nestedClient.GetNestedDataAsync ();
-
-                       dbClient.JSMGetDatabasesCompleted += delegate (object sender, JSMGetDatabasesCompletedEventArgs e) {
-                               waits [3].Set ();
-                               if (e.Error != null) {
-                                       throw e.Error;
-                               }
-                               Assert.AreEqual ("databases", e.Result, "Databases");
-                               Interlocked.Increment (ref passed);
-                       };
-                       dbClient.JSMGetDatabasesAsync();
-
-                       WaitHandle.WaitAll (waits, TimeSpan.FromMinutes (1));
-                       if (passed != waits.Length)
-                               Assert.Fail ("Not all tests passed!");
+                       {
+                               ManualResetEvent wait = new ManualResetEvent (false);
+                               Exception error = null;
+                               object result = null;
+
+                               normalClient.GetDataCompleted += delegate (object o, GetDataCompletedEventArgs e) {
+                                       try {
+                                               error = e.Error;
+                                               result = e.Error == null ? e.Result : null;
+                                       } finally {
+                                               wait.Set ();
+                                       }
+                               };
+                               normalClient.GetDataAsync ();
+
+                               Assert.IsTrue (wait.WaitOne (TimeSpan.FromSeconds (20)), "#1 timeout");
+                               Assert.IsNull (error, "#1.1, inner exception: {0}", error);
+                               Assert.AreEqual ("A", ((DataType1) result).Id, "#1.2");
+                       }
+
+                       {
+                               ManualResetEvent wait = new ManualResetEvent (false);
+                               Exception error = null;
+                               ObservableCollection<object> result = null;
+
+                               collectionClient.GetCollectionDataCompleted += delegate (object sender, GetCollectionDataCompletedEventArgs e) {
+                                       try {
+                                               error = e.Error;
+                                               result = e.Error == null ? e.Result : null;
+                                       } finally {
+                                               wait.Set ();
+                                       }
+                               };
+                               collectionClient.GetCollectionDataAsync ();
+
+                               Assert.IsTrue (wait.WaitOne (TimeSpan.FromSeconds (20)), "#2 timeout");
+                               Assert.IsNull (error, "#2.1, inner exception: {0}", error);
+                               Assert.AreEqual ("B,C", ItemsToString (result.Cast<DataType1> ()), "#2.2");
+                       }
+
+                       {
+                               ManualResetEvent wait = new ManualResetEvent (false);
+                               Exception error = null;
+                               WebServiceMoonlightTest.ServiceReference2.DataType2 result = null;
+
+                               nestedClient.GetNestedDataCompleted += delegate (object sender, GetNestedDataCompletedEventArgs e) {
+                                       try {
+                                               error = e.Error;
+                                               result = e.Error == null ? e.Result : null;
+                                       } finally {
+                                               wait.Set ();
+                                       }
+                               };
+                               nestedClient.GetNestedDataAsync ();
+
+                               Assert.IsTrue (wait.WaitOne (TimeSpan.FromSeconds (20)), "#3 timeout");
+                               Assert.IsNull (error, "#3.1, inner exception: {0}", error);
+                               Assert.AreEqual ("D,E", ItemsToString (result.Items.Cast<DataType1> ()), "#3.2");
+                       }
+
+                       {
+                               ManualResetEvent wait = new ManualResetEvent (false);
+                               Exception error = null;
+                               string result = null;
+
+                               dbClient.JSMGetDatabasesCompleted += delegate (object sender, JSMGetDatabasesCompletedEventArgs e) {
+                                       try {
+                                               error = e.Error;
+                                               result = e.Error == null ? e.Result : null;
+                                       } finally {
+                                               wait.Set ();
+                                       }
+                               };
+                               dbClient.JSMGetDatabasesAsync();
+
+                               Assert.IsTrue (wait.WaitOne (TimeSpan.FromSeconds (20)), "#4 timeout");
+                               Assert.IsNull (error, "#4.1, inner exception: {0}", error);
+                               Assert.AreEqual ("databases", result, "#4.2");
+                       }
                }
 
                string ItemsToString (IEnumerable<DataType1> items)

diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_5.csproj b/mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_5.csproj
deleted file mode 100644 (file)
index f4b5222..0000000
--- a/mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_5.csproj
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FE889BD6-43E6-435E-90CE-A39F65A4AA5A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceProcess</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.ServiceProcess.Design\ServiceInstallerDialog.cs" />\r
-    <Compile Include="System.ServiceProcess.Design\ServiceInstallerDialogResult.cs" />\r
-    <Compile Include="System.ServiceProcess.Design\ServiceNameConverter.cs" />\r
-    <Compile Include="System.ServiceProcess\PowerBroadcastStatus.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceAccount.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceBase.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceController.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerImpl.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermission.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermissionAccess.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermissionAttribute.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermissionEntry.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerPermissionEntryCollection.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceControllerStatus.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceInstaller.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceProcessDescriptionAttribute.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceProcessInstaller.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceStartMode.cs" />\r
-    <Compile Include="System.ServiceProcess\ServiceType.cs" />\r
-    <Compile Include="System.ServiceProcess\SessionChangeDescription.cs" />\r
-    <Compile Include="System.ServiceProcess\SessionChangeReason.cs" />\r
-    <Compile Include="System.ServiceProcess\TimeoutException.cs" />\r
-    <Compile Include="System.ServiceProcess\UnixServiceController.cs" />\r
-    <Compile Include="System.ServiceProcess\Win32ServiceController.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration.Install/System.Configuration.Install-net_4_5.csproj">\r
-      <Project>{E6E1740E-37DD-487C-8947-F1C0612D4738}</Project>\r
-      <Name>System.Configuration.Install-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess-tests-net_4_5.csproj b/mcs/class/System.ServiceProcess/System.ServiceProcess-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 0cb2d14..0000000
--- a/mcs/class/System.ServiceProcess/System.ServiceProcess-tests-net_4_5.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{EE7E6BEB-7814-4A33-AF9A-9B0BFE5BE3B5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.ServiceProcess-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.ServiceProcess_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.ServiceProcess\ServiceBaseTest.cs" />\r
-    <Compile Include="Test\System.ServiceProcess\ServiceControllerPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.ServiceProcess\ServiceControllerPermissionTest.cs" />\r
-    <Compile Include="Test\System.ServiceProcess\ServiceControllerTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceProcess\System.ServiceProcess-net_4_5.csproj">\r
-      <Project>{FE889BD6-43E6-435E-90CE-A39F65A4AA5A}</Project>\r
-      <Name>System.ServiceProcess\System.ServiceProcess-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration.Install\System.Configuration.Install-net_4_5.csproj">\r
-      <Project>{E6E1740E-37DD-487C-8947-F1C0612D4738}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Windows.Forms\System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms\System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_5.csproj b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_5.csproj
deleted file mode 100644 (file)
index 3ab5713..0000000
--- a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_5.csproj
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{19831BAF-44E6-4F3E-B46E-B1BD09398232}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Threading.Tasks.Dataflow</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\Mono.Parallel\Mono.Threading\AtomicBoolean.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ActionBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\AsyncExecutingMessageBox.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\BatchBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\BatchedJoinBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\BatchedJoinBlock`3.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\BroadcastBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\BroadcastOutgoingQueue.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\BufferBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ChooserBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\CompletionHelper.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\DataflowBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\DataflowBlockOptions.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\DataflowLinkOptions.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\DataflowMessageHeader.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\DataflowMessageStatus.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ExecutingMessageBox.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ExecutingMessageBoxBase.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ExecutionDataflowBlockOptions.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\GroupingDataflowBlockOptions.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\IDataflowBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\IPropagatorBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\IReceivableSourceBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ISourceBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ITargetBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\JoinBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\JoinBlock`3.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\JoinTarget.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\MessageBox.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\NameHelper.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\NullTargetBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ObservableDataflowBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ObserverDataflowBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\OutgoingQueue.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\OutgoingQueueBase.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\OutputAvailableBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\PassingMessageBox.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\PredicateBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\PropagatorWrapperBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ReceiveBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\SendBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\TargetCollection.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\TransformBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\TransformManyBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\WriteOnceBlock.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_x.csproj b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_x.csproj
index d32383802fdfe280315dd6fdcb8d074a02a0125a..8a3a31b9e5e45bb65bedab0cb05a1a1e98af92b3 100644 (file)
--- a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_x.csproj
+++ b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_x.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>\r
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONCURRENT_COLLECTIONS</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -33,7 +33,7 @@
     <DebugType>pdbonly</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>\r
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONCURRENT_COLLECTIONS</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -48,52 +48,42 @@
     <Compile Include="..\..\build\common\Consts.cs" />\r
     <Compile Include="..\..\build\common\Locale.cs" />\r
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\Mono.Parallel\Mono.Threading\AtomicBoolean.cs" />\r
+    <Compile Include="..\..\build\common\SR.cs" />\r
     <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ActionBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\AsyncExecutingMessageBox.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\BatchBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\BatchedJoinBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\BatchedJoinBlock`3.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\BroadcastBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\BroadcastOutgoingQueue.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\BufferBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ChooserBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\CompletionHelper.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\DataflowBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\DataflowBlockOptions.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\DataflowLinkOptions.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\DataflowMessageHeader.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\DataflowMessageStatus.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ExecutingMessageBox.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ExecutingMessageBoxBase.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ExecutionDataflowBlockOptions.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\GroupingDataflowBlockOptions.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\IDataflowBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\IPropagatorBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\IReceivableSourceBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ISourceBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ITargetBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\JoinBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\JoinBlock`3.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\JoinTarget.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\MessageBox.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\NameHelper.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\NullTargetBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ObservableDataflowBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ObserverDataflowBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\OutgoingQueue.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\OutgoingQueueBase.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\OutputAvailableBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\PassingMessageBox.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\PredicateBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\PropagatorWrapperBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\ReceiveBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\SendBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\TargetCollection.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\TransformBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\TransformManyBlock.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\WriteOnceBlock.cs" />\r  </ItemGroup>\r
+    <Compile Include="CoreFxSources\Base\DataflowBlock.cs" />\r
+    <Compile Include="CoreFxSources\Base\DataflowBlockOptions.cs" />\r
+    <Compile Include="CoreFxSources\Base\DataflowLinkOptions.cs" />\r
+    <Compile Include="CoreFxSources\Base\DataflowMessageHeader.cs" />\r
+    <Compile Include="CoreFxSources\Base\DataflowMessageStatus.cs" />\r
+    <Compile Include="CoreFxSources\Base\IDataflowBlock.cs" />\r
+    <Compile Include="CoreFxSources\Base\IPropagatorBlock.cs" />\r
+    <Compile Include="CoreFxSources\Base\IReceivableSourceBlock.cs" />\r
+    <Compile Include="CoreFxSources\Base\ISourceBlock.cs" />\r
+    <Compile Include="CoreFxSources\Base\ITargetBlock.cs" />\r
+    <Compile Include="CoreFxSources\Blocks\ActionBlock.cs" />\r
+    <Compile Include="CoreFxSources\Blocks\BatchBlock.cs" />\r
+    <Compile Include="CoreFxSources\Blocks\BatchedJoinBlock.cs" />\r
+    <Compile Include="CoreFxSources\Blocks\BroadcastBlock.cs" />\r
+    <Compile Include="CoreFxSources\Blocks\BufferBlock.cs" />\r
+    <Compile Include="CoreFxSources\Blocks\JoinBlock.cs" />\r
+    <Compile Include="CoreFxSources\Blocks\TransformBlock.cs" />\r
+    <Compile Include="CoreFxSources\Blocks\TransformManyBlock.cs" />\r
+    <Compile Include="CoreFxSources\Blocks\WriteOnceBlock.cs" />\r
+    <Compile Include="CoreFxSources\Internal\ActionOnDispose.cs" />\r
+    <Compile Include="CoreFxSources\Internal\Common.cs" />\r
+    <Compile Include="CoreFxSources\Internal\EnumerableDebugView.cs" />\r
+    <Compile Include="CoreFxSources\Internal\IDebuggerDisplay.cs" />\r
+    <Compile Include="CoreFxSources\Internal\ImmutableList.cs" />\r
+    <Compile Include="CoreFxSources\Internal\Padding.cs" />\r
+    <Compile Include="CoreFxSources\Internal\ProducerConsumerQueues.cs" />\r
+    <Compile Include="CoreFxSources\Internal\QueuedMap.cs" />\r
+    <Compile Include="CoreFxSources\Internal\ReorderingBuffer.cs" />\r
+    <Compile Include="CoreFxSources\Internal\SourceCore.cs" />\r
+    <Compile Include="CoreFxSources\Internal\SpscTargetCore.cs" />\r
+    <Compile Include="CoreFxSources\Internal\TargetCore.cs" />\r
+    <Compile Include="CoreFxSources\Internal\TargetRegistry.cs" />\r
+    <Compile Include="CoreFxSources\Internal\Threading.cs" />\r
+    <Compile Include="SR.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r

diff --git a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-tests-net_4_5.csproj b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 72129b6..0000000
--- a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-tests-net_4_5.csproj
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3EE40B63-F51F-45BE-A86B-76546F4ED3D7}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Threading.Tasks.Dataflow-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Threading.Tasks.Dataflow_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\corlib\System.Threading\AtomicBoolean.cs" />\r
-    <Compile Include="System.Threading.Tasks.Dataflow\CompletionHelper.cs" />\r
-    <Compile Include="Test\AssertEx.cs" />\r
-    <Compile Include="Test\Blocks.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\ActionBlockTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\BatchBlockTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\BatchedJoinBlock`3Test.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\BatchedJoinBlockTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\BoundedCapacityTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\BroadcastBlockTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\BufferBlockTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\ChooseTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\CompletionHelperTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\CompletionTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\DataflowBlockTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\DataflowMessageHeaderTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\EncapsulateTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\ExecutionBlocksTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\GreedyTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\InvalidArgumentsTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\JoinBlock`3Test.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\JoinBlockTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\OptionsTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\OutputAvailableTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\PropagateCompletionTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\ReceivingTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\TransformBlockTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\TransformManyBlockTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks.Dataflow\WriteOnceBlockTest.cs" />\r
-    <Compile Include="Test\TestScheduler.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Threading.Tasks.Dataflow\System.Threading.Tasks.Dataflow-net_4_5.csproj">\r
-      <Project>{19831BAF-44E6-4F3E-B46E-B1BD09398232}</Project>\r
-      <Name>System.Threading.Tasks.Dataflow\System.Threading.Tasks.Dataflow-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Transactions/System.Transactions-net_4_5.csproj b/mcs/class/System.Transactions/System.Transactions-net_4_5.csproj
deleted file mode 100644 (file)
index 40c327b..0000000
--- a/mcs/class/System.Transactions/System.Transactions-net_4_5.csproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Transactions</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Transactions\CommittableTransaction.cs" />\r
-    <Compile Include="System.Transactions\Configuration\DefaultSettingsSection.cs" />\r
-    <Compile Include="System.Transactions\Configuration\MachineSettingsSection.cs" />\r
-    <Compile Include="System.Transactions\Configuration\TransactionsSectionGroup.cs" />\r
-    <Compile Include="System.Transactions\Delegates.cs" />\r
-    <Compile Include="System.Transactions\DependentCloneOption.cs" />\r
-    <Compile Include="System.Transactions\DependentTransaction.cs" />\r
-    <Compile Include="System.Transactions\Enlistment.cs" />\r
-    <Compile Include="System.Transactions\EnlistmentOptions.cs" />\r
-    <Compile Include="System.Transactions\EnterpriseServicesInteropOption.cs" />\r
-    <Compile Include="System.Transactions\IDtcTransaction.cs" />\r
-    <Compile Include="System.Transactions\IEnlistmentNotification.cs" />\r
-    <Compile Include="System.Transactions\IPromotableSinglePhaseNotification.cs" />\r
-    <Compile Include="System.Transactions\ISimpleTransactionSuperior.cs" />\r
-    <Compile Include="System.Transactions\ISinglePhaseNotification.cs" />\r
-    <Compile Include="System.Transactions\IsolationLevel.cs" />\r
-    <Compile Include="System.Transactions\ITransactionPromoter.cs" />\r
-    <Compile Include="System.Transactions\PreparingEnlistment.cs" />\r
-    <Compile Include="System.Transactions\SinglePhaseEnlistment.cs" />\r
-    <Compile Include="System.Transactions\SubordinateTransaction.cs" />\r
-    <Compile Include="System.Transactions\Transaction.cs" />\r
-    <Compile Include="System.Transactions\TransactionAbortedException.cs" />\r
-    <Compile Include="System.Transactions\TransactionEventArgs.cs" />\r
-    <Compile Include="System.Transactions\TransactionException.cs" />\r
-    <Compile Include="System.Transactions\TransactionInDoubtException.cs" />\r
-    <Compile Include="System.Transactions\TransactionInformation.cs" />\r
-    <Compile Include="System.Transactions\TransactionInterop.cs" />\r
-    <Compile Include="System.Transactions\TransactionManager.cs" />\r
-    <Compile Include="System.Transactions\TransactionManagerCommunicationException.cs" />\r
-    <Compile Include="System.Transactions\TransactionOptions.cs" />\r
-    <Compile Include="System.Transactions\TransactionPromotionException.cs" />\r
-    <Compile Include="System.Transactions\TransactionScope.cs" />\r
-    <Compile Include="System.Transactions\TransactionScopeOption.cs" />\r
-    <Compile Include="System.Transactions\TransactionStatus.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Transactions/System.Transactions-tests-net_4_5.csproj b/mcs/class/System.Transactions/System.Transactions-tests-net_4_5.csproj
deleted file mode 100644 (file)
index ba5a47f..0000000
--- a/mcs/class/System.Transactions/System.Transactions-tests-net_4_5.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{869910C7-CB75-4021-8862-ACBBE236B5A5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1595</NoWarn>\r
-    <OutputPath>bin\Debug\System.Transactions-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Transactions_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1595</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1595</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\AsyncTest.cs" />\r
-    <Compile Include="Test\EnlistTest.cs" />\r
-    <Compile Include="Test\IntResourceManager.cs" />\r
-    <Compile Include="Test\TransactionScopeTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Transactions\System.Transactions-net_4_5.csproj">\r
-      <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_5.csproj b/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_5.csproj
deleted file mode 100644 (file)
index 786b2f9..0000000
--- a/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_5.csproj
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{94BD3939-6937-47AA-86CF-5C3E4C59E272}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Abstractions</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.Abstractions/System.Web.Abstractions-tests-net_4_5.csproj b/mcs/class/System.Web.Abstractions/System.Web.Abstractions-tests-net_4_5.csproj
deleted file mode 100644 (file)
index cf089f8..0000000
--- a/mcs/class/System.Web.Abstractions/System.Web.Abstractions-tests-net_4_5.csproj
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3801922A-8C65-4DC6-8B0C-35E154D9BCA0}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.Abstractions-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Abstractions_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web.DynamicData\Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\System.Web\HttpApplicationStateBaseTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpFileCollectionWrapperTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_4_5.csproj">\r
-      <Project>{94BD3939-6937-47AA-86CF-5C3E4C59E272}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_5-2.csproj">\r
-      <Project>{725FB152-838A-4C6E-8A12-AC47E2DD4CEA}</Project>\r
-      <Name>System.Web\System.Web-net_4_5-2</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj
deleted file mode 100644 (file)
index da3247a..0000000
--- a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.ApplicationServices</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;SYSTEM_WEB_APPLICATIONSERVICES</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;SYSTEM_WEB_APPLICATIONSERVICES</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Configuration\MembershipPasswordCompatibilityMode.cs" />\r
-    <Compile Include="System.Web.Security\IMembershipHelper.cs" />\r
-    <Compile Include="System.Web.Security\MembershipCreateStatus.cs" />\r
-    <Compile Include="System.Web.Security\MembershipCreateUserException.cs" />\r
-    <Compile Include="System.Web.Security\MembershipPasswordException.cs" />\r
-    <Compile Include="System.Web.Security\MembershipPasswordFormat.cs" />\r
-    <Compile Include="System.Web.Security\MembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\MembershipProviderCollection.cs" />\r
-    <Compile Include="System.Web.Security\MembershipUser.cs" />\r
-    <Compile Include="System.Web.Security\MembershipUserCollection.cs" />\r
-    <Compile Include="System.Web.Security\MembershipValidatePasswordEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\RoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\ValidatePasswordEventArgs.cs" />\r
-    <Compile Include="System.Web.UI\KeyedList.cs" />\r
-    <Compile Include="System.Web.UI\KeyedListEnumerator.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_5.csproj b/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_5.csproj
deleted file mode 100644 (file)
index 7d05cb4..0000000
--- a/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_5.csproj
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{EAE6491A-1C73-432A-A0C2-60940B6AA2B8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.DynamicData</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\AssociationDirection.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\AssociationProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\ColumnProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DataModelProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DLinqAssociationProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DLinqColumnProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DLinqDataModelProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\DLinqTableProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData.ModelProviders\TableProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData\ContextConfiguration.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicControl.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicControlParameter.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicDataExtensions.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicDataManager.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicDataRoute.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicDataRouteHandler.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicField.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicQueryStringParameter.cs" />\r
-    <Compile Include="System.Web.DynamicData\DynamicValidator.cs" />\r
-    <Compile Include="System.Web.DynamicData\FieldTemplateFactory.cs" />\r
-    <Compile Include="System.Web.DynamicData\FieldTemplateUserControl.cs" />\r
-    <Compile Include="System.Web.DynamicData\FilterRepeater.cs" />\r
-    <Compile Include="System.Web.DynamicData\FilterUserControlBase.cs" />\r
-    <Compile Include="System.Web.DynamicData\IControlParameterTarget.cs" />\r
-    <Compile Include="System.Web.DynamicData\IFieldFormattingOptions.cs" />\r
-    <Compile Include="System.Web.DynamicData\IFieldTemplate.cs" />\r
-    <Compile Include="System.Web.DynamicData\IFieldTemplateFactory.cs" />\r
-    <Compile Include="System.Web.DynamicData\IFieldTemplateHost.cs" />\r
-    <Compile Include="System.Web.DynamicData\IWhereParametersProvider.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaChildrenColumn.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaColumn.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaForeignKeyColumn.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaModel.cs" />\r
-    <Compile Include="System.Web.DynamicData\MetaTable.cs" />\r
-    <Compile Include="System.Web.DynamicData\PageAction.cs" />\r
-    <Compile Include="System.Web.DynamicData\TableNameAttribute.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
-      <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data.Linq/System.Data.Linq-net_4_5.csproj">\r
-      <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Extensions/System.Web.Extensions-net_4_5.csproj">\r
-      <Project>{74D281D8-F725-4D79-B218-2DFCCFD44FA2}</Project>\r
-      <Name>System.Web.Extensions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Abstractions/System.Web.Abstractions-net_4_5.csproj">\r
-      <Project>{94BD3939-6937-47AA-86CF-5C3E4C59E272}</Project>\r
-      <Name>System.Web.Abstractions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Routing/System.Web.Routing-net_4_5.csproj">\r
-      <Project>{A28F2A14-901C-452C-82B6-75ECE5C7E714}</Project>\r
-      <Name>System.Web.Routing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj">\r
-      <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.DynamicData/System.Web.DynamicData-tests-net_4_5.csproj b/mcs/class/System.Web.DynamicData/System.Web.DynamicData-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 6ed5528..0000000
--- a/mcs/class/System.Web.DynamicData/System.Web.DynamicData-tests-net_4_5.csproj
+++ /dev/null
@@ -1,701 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5CA19741-2C8A-4482-835B-E1E4345A7E14}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.DynamicData-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.DynamicData_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\crc32.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\Header.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlAttribute.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlDocument.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlEntity.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNode.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNodeNavigator.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlWeb.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\MixedCodeDocument.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\ParseReader.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\tools.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\NunitWebTest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\XmlComparer.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseControl.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseControlCollection.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseWorkerRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\CustomSection.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\FakeMembershipProvider.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\FormRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\HandlerInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\IForeignData.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyHandler.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyHost.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyPageHandlerFactory.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyTemplateControls.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PageDelegates.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PageInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PostableRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PostableWorkerRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\Response.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\StandardUrl.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\WebTest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\WebTestResourcesSetupAttribute.cs" />\r
-    <Compile Include="Test\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Test\Common\AFieldTemplate.cs" />\r
-    <Compile Include="Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\Common\AssociatedBar.cs" />\r
-    <Compile Include="Test\Common\AssociatedFoo.cs" />\r
-    <Compile Include="Test\Common\Baz.cs" />\r
-    <Compile Include="Test\Common\BazColumnAttributes.cs" />\r
-    <Compile Include="Test\Common\BazDataTypeDefaultTypes.cs" />\r
-    <Compile Include="Test\Common\BazNoStrings.cs" />\r
-    <Compile Include="Test\Common\BazNoStringsNoPrimary.cs" />\r
-    <Compile Include="Test\Common\BazValidationAttributes.cs" />\r
-    <Compile Include="Test\Common\BazWithDataTypeAttribute.cs" />\r
-    <Compile Include="Test\Common\EmployeesDataContext.cs" />\r
-    <Compile Include="Test\Common\FakeHttpWorkerRequest.cs" />\r
-    <Compile Include="Test\Common\FieldFormattingOptions.cs" />\r
-    <Compile Include="Test\Common\FieldTemplatePathTables.cs" />\r
-    <Compile Include="Test\Common\FieldTemplateTestDescription.cs" />\r
-    <Compile Include="Test\Common\FooBarNoScaffold.cs" />\r
-    <Compile Include="Test\Common\FooDisplayColumnAttribute.cs" />\r
-    <Compile Include="Test\Common\FooDisplayName.cs" />\r
-    <Compile Include="Test\Common\FooDisplayNameEmptyName.cs" />\r
-    <Compile Include="Test\Common\FooEmpty.cs" />\r
-    <Compile Include="Test\Common\FooEmptyDisplayColumnAttribute.cs" />\r
-    <Compile Include="Test\Common\FooEmptySortColumn.cs" />\r
-    <Compile Include="Test\Common\FooInvalidDisplayColumnAttribute.cs" />\r
-    <Compile Include="Test\Common\FooMisnamedSortColumn.cs" />\r
-    <Compile Include="Test\Common\FooNoDefaultsWithPrimaryKey.cs" />\r
-    <Compile Include="Test\Common\FooNoPrimaryColumns.cs" />\r
-    <Compile Include="Test\Common\FooNoScaffold.cs" />\r
-    <Compile Include="Test\Common\FooReadOnly.cs" />\r
-    <Compile Include="Test\Common\FooSettableDefaults.cs" />\r
-    <Compile Include="Test\Common\FooWithDefaults.cs" />\r
-    <Compile Include="Test\Common\FooWithMetadataType.cs" />\r
-    <Compile Include="Test\Common\FooWithToString.cs" />\r
-    <Compile Include="Test\Common\ITestDataContext.cs" />\r
-    <Compile Include="Test\Common\KnownResponseHeader.cs" />\r
-    <Compile Include="Test\Common\MiscExtensions.cs" />\r
-    <Compile Include="Test\Common\Mocks.cs" />\r
-    <Compile Include="Test\Common\MyDynamicDataRouteHandler.cs" />\r
-    <Compile Include="Test\Common\MyHttpContextWrapper.cs" />\r
-    <Compile Include="Test\Common\MyHttpRequestWrapper.cs" />\r
-    <Compile Include="Test\Common\PokerDynamicControl.cs" />\r
-    <Compile Include="Test\Common\PokerDynamicValidator.cs" />\r
-    <Compile Include="Test\Common\PokerFieldTemplateUserControl.cs" />\r
-    <Compile Include="Test\Common\TestDataColumn.cs" />\r
-    <Compile Include="Test\Common\TestDataContainer.cs" />\r
-    <Compile Include="Test\Common\TestDataContext.cs" />\r
-    <Compile Include="Test\Common\TestDataContext2.cs" />\r
-    <Compile Include="Test\Common\TestDataContext3.cs" />\r
-    <Compile Include="Test\Common\TestDataContext4.cs" />\r
-    <Compile Include="Test\Common\TestDataTable.cs" />\r
-    <Compile Include="Test\Common\TestsBasePage.cs" />\r
-    <Compile Include="Test\Common\TestsSetup.cs" />\r
-    <Compile Include="Test\Common\TestStubTypes.cs" />\r
-    <Compile Include="Test\Common\UnknownResponseHeader.cs" />\r
-    <Compile Include="Test\Common\Utils.cs" />\r
-    <Compile Include="Test\DataObjects\Employee.cs" />\r
-    <Compile Include="Test\DataObjects\EmployeeColumn.cs" />\r
-    <Compile Include="Test\DataObjects\EmployeeDynamicDataContainer.cs" />\r
-    <Compile Include="Test\DataObjects\EmployeeTable.cs" />\r
-    <Compile Include="Test\DataObjects\SeasonalEmployee.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataColumn.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataContainer.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataSource.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataSourceView.cs" />\r
-    <Compile Include="Test\DataSource\DynamicDataTable.cs" />\r
-    <Compile Include="Test\DataSource\IDynamicDataContainer.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataAssociationAttribute.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataAssociationProvider.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataContainerColumnProvider.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataContainerModelProvider.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataContainerTableProvider.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataSortableAttribute.cs" />\r
-    <Compile Include="Test\ModelProviders\DynamicDataStringLengthAttribute.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData.ModelProviders\TableProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\ContextConfigurationTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicControlTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicDataExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicDataManagerTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicDataRouteHandlerTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicDataRouteTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\DynamicValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\FieldTemplateFactoryTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\FieldTemplateUserControlTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\MetaColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\MetaModelTest.cs" />\r
-    <Compile Include="Test\System.Web.DynamicData\MetaTableTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.DynamicData\System.Web.DynamicData-net_4_5.csproj">\r
-      <Project>{EAE6491A-1C73-432A-A0C2-60940B6AA2B8}</Project>\r
-      <Name>System.Web.DynamicData\System.Web.DynamicData-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
-      <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_4_5.csproj">\r
-      <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_5-2.csproj">\r
-      <Project>{725FB152-838A-4C6E-8A12-AC47E2DD4CEA}</Project>\r
-      <Name>System.Web\System.Web-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions\System.Web.Extensions-net_4_5.csproj">\r
-      <Project>{74D281D8-F725-4D79-B218-2DFCCFD44FA2}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_4_5.csproj">\r
-      <Project>{94BD3939-6937-47AA-86CF-5C3E4C59E272}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Routing\System.Web.Routing-net_4_5.csproj">\r
-      <Project>{A28F2A14-901C-452C-82B6-75ECE5C7E714}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5.csproj">\r
-      <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\SystemWebTestShim\SystemWebTestShim-net_4_5.csproj">\r
-      <Project>{337A92C8-EB50-43A9-9435-CB268AC147DC}</Project>\r
-      <Name>SystemWebTestShim\SystemWebTestShim-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/FilterUserControl.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.FilterUserControl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/FilterUserControl.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.FilterUserControl.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/GridViewPager.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.GridViewPager.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/GridViewPager.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.GridViewPager.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/Back.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.Back.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/header_back.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.header_back.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/PgFirst.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.PgFirst.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/PgLast.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.PgLast.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/PgNext.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.PgNext.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/PgPrev.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.PgPrev.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/Content/Images/plus.gif">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.Content.Images.plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Boolean.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Boolean.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Boolean.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Boolean.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Boolean_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Boolean_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Boolean_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Boolean_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Children.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Children.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Children.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Children.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/CustomColor.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.CustomColor.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/CustomColor.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.CustomColor.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/CustomFieldTemplate.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.CustomFieldTemplate.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/CustomFieldTemplate.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.CustomFieldTemplate.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/DateTime.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.DateTime.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/DateTime.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.DateTime.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/DateTime_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.DateTime_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/DateTime_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.DateTime_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Decimal_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Decimal_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Decimal_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Decimal_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/ForeignKey.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.ForeignKey.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/ForeignKey.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.ForeignKey.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/ForeignKey_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.ForeignKey_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/ForeignKey_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.ForeignKey_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Integer_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Integer_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Integer_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Integer_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/MultilineText_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.MultilineText_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/MultilineText_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.MultilineText_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/MyCustomUIHintTemplate_Text.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.MyCustomUIHintTemplate_Text.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/MyCustomUIHintTemplate_Text.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.MyCustomUIHintTemplate_Text.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Boolean.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Boolean.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Boolean.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Boolean.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Byte.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Byte.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Byte[].ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Byte[].ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Byte.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Byte.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Byte[].ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Byte[].ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Char.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Char.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Char.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Char.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/FooEmpty.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.FooEmpty.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/FooEmpty.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.FooEmpty.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/ICollection.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.ICollection.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/ICollection.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.ICollection.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int16.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int16.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int16.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int16.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int32.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int32.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int32.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int32.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int64.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int64.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Int64.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Int64.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/MonoTests.Common.FooEmpty.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.MonoTests.Common.FooEmpty.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/MonoTests.Common.FooEmpty.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.MonoTests.Common.FooEmpty.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Object.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Object.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/Object.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.Object.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/SByte.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.SByte.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/SByte.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.SByte.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/String.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.String.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/String.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.String.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Boolean.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Boolean.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Boolean.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Boolean.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Byte.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Byte.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Byte[].ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Byte[].ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Byte.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Byte.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Byte[].ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Byte[].ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Char.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Char.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Char.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Char.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Collections.Generic.List`1[System.String].ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Collections.Generic.List`1[System.String].ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Collections.Generic.List`1[System.String].ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Collections.Generic.List`1[System.String].ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Collections.ICollection.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Collections.ICollection.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Collections.ICollection.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Collections.ICollection.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int16.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int16.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int16.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int16.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int32.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int32.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int32.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int32.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int64.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int64.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Int64.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Int64.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Object.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Object.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.Object.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.Object.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.SByte.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.SByte.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.SByte.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.SByte.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.String.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.String.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.String.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.String.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt16.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt16.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt16.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt16.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt32.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt32.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt32.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt32.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt64.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt64.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/System.UInt64.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.System.UInt64.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt16.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt16.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt16.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt16.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt32.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt32.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt32.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt32.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt64.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt64.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates_NonDefault/UInt64.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates_NonDefault.UInt64.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/PlainControlTemplate.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.PlainControlTemplate.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/PlainControlTemplate.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.PlainControlTemplate.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Text.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Text.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Text.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Text.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Text_Edit.ascx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Text_Edit.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/FieldTemplates/Text_Edit.ascx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.FieldTemplates.Text_Edit.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Details.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Details.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Details.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Details.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Edit.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Edit.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Edit.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Edit.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Insert.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Insert.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/Insert.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.Insert.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/List.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.List.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/List.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.List.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/ListDetails.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.ListDetails.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/PageTemplates/ListDetails.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.PageTemplates.ListDetails.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicData/web.config">\r
-      <LogicalName>MonoTests.WebPages.DynamicData.web.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/Global.asax">\r
-      <LogicalName>MonoTests.WebPages.Global.asax</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_01.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_01.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_01.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_01.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_02.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_02.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_02.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_02.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_03.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_03.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_03.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_03.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_04.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_04.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_04.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_04.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_05.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_05.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_05.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_05.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_06.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_06.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_06.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_06.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_07.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_07.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_07.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_07.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_08.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_08.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_08.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_08.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_09.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_09.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_09.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_09.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_10.aspx">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_10.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/ListView_DynamicControl_10.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.ListView_DynamicControl_10.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicValidator_01.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicValidator_01.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicValidator_01.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicValidator_01.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicValidator_02.aspx">\r
-      <LogicalName>MonoTests.WebPages.DynamicValidator_02.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/DynamicValidator_02.aspx.cs">\r
-      <LogicalName>MonoTests.WebPages.DynamicValidator_02.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/Site.css">\r
-      <LogicalName>MonoTests.WebPages.Site.css</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/Site.master">\r
-      <LogicalName>MonoTests.WebPages.Site.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/Site.master.cs">\r
-      <LogicalName>MonoTests.WebPages.Site.master.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/web.config.2.0">\r
-      <LogicalName>MonoTests.WebPages.web.config.2.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/web.config.4.0">\r
-      <LogicalName>MonoTests.WebPages.web.config.4.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/WebPages/web.config.4.5">\r
-      <LogicalName>MonoTests.WebPages.web.config.4.5</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_5.csproj b/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_5.csproj
deleted file mode 100644 (file)
index 2134252..0000000
--- a/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_5.csproj
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D1A53FE0-3EE3-43FD-8472-29B6E0FAA21D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Extensions.Design</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\AsyncPostBackTriggerControlIDConverter.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\AsyncPostBackTriggerEventNameConverter.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\CollectionEditorBase.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\ExtenderControlDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\PostBackTriggerControlIDConverter.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\ScriptManagerDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\ScriptManagerProxyDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\TimerDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\UpdatePanelDesigner.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\UpdatePanelTriggerCollectionEditor.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\UpdateProgressAssociatedUpdatePanelIDConverter.cs" />\r
-    <Compile Include="System.Web.Extensions.Design\UpdateProgressDesigner.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Design/System.Design-net_4_5.csproj">\r
-      <Project>{D4E6A482-761B-4B41-8B63-C930CA84D268}</Project>\r
-      <Name>System.Design-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_5.csproj b/mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_5.csproj
deleted file mode 100644 (file)
index cecbd56..0000000
--- a/mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_5.csproj
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{74D281D8-F725-4D79-B218-2DFCCFD44FA2}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Extensions</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;NET_3_5;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Configuration_2.0\MachineKeyRegistryStorage.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Handlers\AssemblyResourceLoader.cs" />\r
-    <Compile Include="..\System.Web\System.Web.Util\MachineKeySectionUtils.cs" />\r
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientFormsAuthenticationCredentials.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientFormsAuthenticationMembershipProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientRoleProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientSettingsProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientWindowsAuthenticationMembershipProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\IClientFormsAuthenticationCredentialsProvider.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\SettingsSavedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.ClientServices.Providers\UserValidatedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.ClientServices\ClientFormsIdentity.cs" />\r
-    <Compile Include=".\System.Web.ClientServices\ClientRolePrincipal.cs" />\r
-    <Compile Include=".\System.Web.ClientServices\ConnectivityStatus.cs" />\r
-    <Compile Include=".\System.Web.Configuration\Converter.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ConvertersCollection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingAuthenticationServiceSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingJsonSerializationSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingProfileServiceSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingRoleServiceSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingScriptResourceHandlerSection.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingSectionGroup.cs" />\r
-    <Compile Include=".\System.Web.Configuration\ScriptingWebServicesSectionGroup.cs" />\r
-    <Compile Include=".\System.Web.Configuration\SystemWebExtensionsSectionGroup.cs" />\r
-    <Compile Include=".\System.Web.DynamicData\DynamicDataSourceOperation.cs" />\r
-    <Compile Include=".\System.Web.DynamicData\DynamicValidatorEventArgs.cs" />\r
-    <Compile Include=".\System.Web.DynamicData\IDynamicDataSource.cs" />\r
-    <Compile Include=".\System.Web.DynamicData\IDynamicValidatorException.cs" />\r
-    <Compile Include=".\System.Web.Handlers\ScriptModule.cs" />\r
-    <Compile Include=".\System.Web.Handlers\ScriptResourceHandler.cs" />\r
-    <Compile Include=".\System.Web.Query.Dynamic\DynamicClass.cs" />\r
-    <Compile Include=".\System.Web.Query.Dynamic\ParseException.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JavaScriptConverter.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JavaScriptSerializer.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JavaScriptTypeResolver.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\Json.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JSON\JavaScriptUtils.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JSON\ReflectionUtils.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JsonDeserializer.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\JsonSerializer.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\ScriptIgnoreAttribute.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\SimpleTypeResolver.cs" />\r
-    <Compile Include=".\System.Web.Script.Serialization\StringBuilderExtensions.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\AuthenticationService.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ClientProxyHandler.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\GenerateScriptTypeAttribute.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\LogicalTypeInfo.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ProfileService.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ProxyGenerator.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ResponseFormat.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\RestHandler.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ScriptHandlerFactory.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ScriptMethodAttribute.cs" />\r
-    <Compile Include=".\System.Web.Script.Services\ScriptServiceAttribute.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPager.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerCommandEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerField.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerFieldCollection.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerFieldCommandEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerFieldItem.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\HelperExtensions.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\InsertItemPosition.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\IPageableItemContainer.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSource.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceContextEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceDeleteEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceDisposeEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceInsertEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceSelectEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceStatusEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceUpdateEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceValidationException.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceView.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListView.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewCancelEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewCancelMode.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewCommandEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewContainer.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewDataItem.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewDeletedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewDeleteEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewEditEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewInsertedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewInsertEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewItem.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewItemEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewItemType.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewPagedDataSource.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewSelectEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewSortEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewTableCell.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewTableRow.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewUpdatedEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\ListViewUpdateEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\NextPreviousPagerField.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\NumericPagerField.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\PageEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\PagePropertiesChangingEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI.WebControls\TemplatePagerField.cs" />\r
-    <Compile Include=".\System.Web.UI\AsyncPostBackErrorEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI\AsyncPostBackTrigger.cs" />\r
-    <Compile Include=".\System.Web.UI\AuthenticationServiceManager.cs" />\r
-    <Compile Include=".\System.Web.UI\CompositeEntry.cs" />\r
-    <Compile Include=".\System.Web.UI\CompositeScriptReference.cs" />\r
-    <Compile Include=".\System.Web.UI\CompositeScriptReferenceEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI\ExtenderControl.cs" />\r
-    <Compile Include=".\System.Web.UI\IExtenderControl.cs" />\r
-    <Compile Include=".\System.Web.UI\IScriptControl.cs" />\r
-    <Compile Include=".\System.Web.UI\PostBackTrigger.cs" />\r
-    <Compile Include=".\System.Web.UI\ProfileServiceManager.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredArrayDeclaration.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredDisposeScript.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredExpandoAttribute.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredHiddenField.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredScript.cs" />\r
-    <Compile Include=".\System.Web.UI\RegisteredScriptType.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptBehaviorDescriptor.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptComponentDescriptor.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptControl.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptControlDescriptor.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptDescriptor.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptManager.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptManagerProxy.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptMode.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptReference.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptReferenceBase.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptReferenceCollection.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptReferenceEventArgs.cs" />\r
-    <Compile Include=".\System.Web.UI\ScriptResourceAttribute.cs" />\r
-    <Compile Include=".\System.Web.UI\ServiceReference.cs" />\r
-    <Compile Include=".\System.Web.UI\ServiceReferenceCollection.cs" />\r
-    <Compile Include=".\System.Web.UI\TargetControlTypeAttribute.cs" />\r
-    <Compile Include=".\System.Web.UI\Timer.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanel.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelControlTrigger.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelRenderMode.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelTrigger.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelTriggerCollection.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdatePanelUpdateMode.cs" />\r
-    <Compile Include=".\System.Web.UI\UpdateProgress.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj">\r
-      <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data.Linq/System.Data.Linq-net_4_5.csproj">\r
-      <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Services/System.Web.Services-net_4_5.csproj">\r
-      <Project>{251DB111-FEE1-4080-8411-0AD1CC9BA94B}</Project>\r
-      <Name>System.Web.Services-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj">\r
-      <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
-      <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.debug.js">\r
-      <LogicalName>MicrosoftAjax.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.js">\r
-      <LogicalName>MicrosoftAjax.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.debug.js">\r
-      <LogicalName>MicrosoftAjaxTimer.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.js">\r
-      <LogicalName>MicrosoftAjaxTimer.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.debug.js">\r
-      <LogicalName>MicrosoftAjaxWebForms.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.js">\r
-      <LogicalName>MicrosoftAjaxWebForms.js</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.Extensions/System.Web.Extensions-tests-net_4_5.csproj b/mcs/class/System.Web.Extensions/System.Web.Extensions-tests-net_4_5.csproj
deleted file mode 100644 (file)
index fc69b59..0000000
--- a/mcs/class/System.Web.Extensions/System.Web.Extensions-tests-net_4_5.csproj
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F6ACFFDE-B4F0-4622-AA00-6ED634E1BF3E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,219,169,1591</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.Extensions-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Extensions_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,219,169,1591</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_3_5;SYSTEM_WEB_EXTENSIONS;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,219,169,1591</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_3_5;SYSTEM_WEB_EXTENSIONS;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\AssemblyInfo.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\crc32.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\Header.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlAttribute.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlDocument.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlEntity.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNode.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNodeNavigator.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlWeb.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\MixedCodeDocument.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\ParseReader.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\tools.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\NunitWebTest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\MainsoftWebTest\XmlComparer.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseControl.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseControlCollection.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\BaseWorkerRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\FakeMembershipProvider.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\FormRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\Global.asax.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\HandlerInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\IForeignData.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyHandler.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyHost.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyPageHandlerFactory.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\MyTemplateControls.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PageDelegates.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PageInvoker.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PostableRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\PostableWorkerRequest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\Response.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\StandardUrl.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\WebTest.cs" />\r
-    <Compile Include="..\System.Web\Test\mainsoft\NunitWeb\NunitWeb\WebTestResourcesSetupAttribute.cs" />\r
-    <Compile Include="Test\code\Bug604053_DataSource.cs" />\r
-    <Compile Include="Test\code\Country.cs" />\r
-    <Compile Include="Test\code\CountryCollection.cs" />\r
-    <Compile Include="Test\code\WebTestLocal.cs" />\r
-    <Compile Include="Test\System.Web.Script.Serialization\JavaScriptSerializerTest.cs" />\r
-    <Compile Include="Test\System.Web.Script.Services\ProxyGeneratorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataPagerFieldCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\EventRecorder.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListViewPagedDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ScriptBehaviorDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ScriptComponentDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ScriptControlDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ScriptReferenceBaseTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\UpdateProgressTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Extensions\System.Web.Extensions-net_4_5.csproj">\r
-      <Project>{74D281D8-F725-4D79-B218-2DFCCFD44FA2}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data.Linq\System.Data.Linq-net_4_5.csproj">\r
-      <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_5-2.csproj">\r
-      <Project>{725FB152-838A-4C6E-8A12-AC47E2DD4CEA}</Project>\r
-      <Name>System.Web\System.Web-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_4_5.csproj">\r
-      <Project>{251DB111-FEE1-4080-8411-0AD1CC9BA94B}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_5.csproj">\r
-      <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.ServiceModel\System.ServiceModel-net_4_5.csproj">\r
-      <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5.csproj">\r
-      <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\SystemWebTestShim\SystemWebTestShim-net_4_5.csproj">\r
-      <Project>{337A92C8-EB50-43A9-9435-CB268AC147DC}</Project>\r
-      <Name>SystemWebTestShim\SystemWebTestShim-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.debug.js">\r
-      <LogicalName>MicrosoftAjax.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.js">\r
-      <LogicalName>MicrosoftAjax.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.debug.js">\r
-      <LogicalName>MicrosoftAjaxTimer.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.js">\r
-      <LogicalName>MicrosoftAjaxTimer.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.debug.js">\r
-      <LogicalName>MicrosoftAjaxWebForms.debug.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.js">\r
-      <LogicalName>MicrosoftAjaxWebForms.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/Web.mono.config">\r
-      <LogicalName>Web.mono.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/profile.config.4.5">\r
-      <LogicalName>profile.config.4.5</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/profile.config.4.0">\r
-      <LogicalName>profile.config.4.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/profile.config.2.0">\r
-      <LogicalName>profile.config.2.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewSort.aspx">\r
-      <LogicalName>ListViewSort.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewTest.aspx">\r
-      <LogicalName>ListViewTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewTotalRowCount_Bug535701_1.aspx">\r
-      <LogicalName>ListViewTotalRowCount_Bug535701_1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewTotalRowCount_Bug535701_2.aspx">\r
-      <LogicalName>ListViewTotalRowCount_Bug535701_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/ListViewTotalRowCount_Bug604053.aspx">\r
-      <LogicalName>ListViewTotalRowCount_Bug604053.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs">\r
-      <LogicalName>MyPage.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax">\r
-      <LogicalName>Global.asax</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx">\r
-      <LogicalName>My.ashx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx">\r
-      <LogicalName>MyPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithDerivedMaster.aspx">\r
-      <LogicalName>MyPageWithDerivedMaster.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx">\r
-      <LogicalName>MyPageWithMaster.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMasterInvalidPlaceHolder.aspx">\r
-      <LogicalName>MyPageWithMasterInvalidPlaceHolder.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.master">\r
-      <LogicalName>My.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyDerived.master">\r
-      <LogicalName>MyDerived.master</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_5.csproj b/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_5.csproj
deleted file mode 100644 (file)
index aa1b8ea..0000000
--- a/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_5.csproj
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A7DC51E3-AB8D-4FE4-B25F-4C16F3CCCB5C}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Http.SelfHost</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETMVC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETMVC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\CommonWebApiResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\DictionaryExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\Error.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\HttpMethodHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpers.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpersExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Channels\HttpBinding.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Channels\HttpBindingSecurity.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Channels\HttpBindingSecurityMode.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Channels\HttpBindingSecurityModeHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Channels\HttpMessage.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Channels\HttpMessageEncoderFactory.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Channels\HttpMessageEncodingBindingElement.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Channels\HttpMessageEncodingChannelListener.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Channels\HttpMessageEncodingReplyChannel.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Channels\HttpMessageEncodingRequestContext.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Channels\HttpMessageExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\HttpRequestMessageExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\HttpSelfHostConfiguration.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\HttpSelfHostServer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Properties\SRResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\AsyncResult.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\BufferedOutputStream.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\BufferManagerOutputStream.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\ChannelAcceptor.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\ChannelBindingUtility.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\CompletedAsyncResult.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\HttpTransportDefaults.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\IChannelAcceptor.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\LayeredChannel.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\LayeredChannelAcceptor.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\LayeredChannelListener.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\TransportDefaults.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\HostNameComparisonModeHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\HttpClientCredentialTypeHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\HttpProxyCredentialTypeHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\HttpTransportSecurityExtensionMethods.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\TransferModeHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Net.Http/System.Net.Http-net_4_5.csproj">\r
-      <Project>{E36C154B-A0AC-4721-B06A-AFE31D357CE5}</Project>\r
-      <Name>System.Net.Http-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
-      <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.IdentityModel/System.IdentityModel-net_4_5.csproj">\r
-      <Project>{F056C062-E467-4989-9366-440E8CD23C0C}</Project>\r
-      <Name>System.IdentityModel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Http/System.Web.Http-net_4_5.csproj">\r
-      <Project>{2EFF8684-99DB-4DD6-B3BC-7E7AA42A15FC}</Project>\r
-      <Name>System.Web.Http-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_5.csproj">\r
-      <Project>{BFBE5444-4F21-45CF-929E-C8FBEF302F5E}</Project>\r
-      <Name>System.Net.Http.Formatting-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_5.csproj b/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_5.csproj
deleted file mode 100644 (file)
index 7b16627..0000000
--- a/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_5.csproj
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{73DBB6D8-132F-4E3B-B437-2F65CBDEF5DE}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Http.WebHost</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETMVC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETMVC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\CommonWebApiResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\DictionaryExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\Error.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\HttpMethodHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpers.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpersExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\GlobalConfiguration.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\HttpControllerHandler.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\HttpControllerRouteHandler.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\HttpControllerTypeCacheSerializer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\PreApplicationStartCode.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\Properties\SRResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\RouteCollectionExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\Routing\HostedHttpRoute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\Routing\HostedHttpRouteCollection.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\Routing\HostedHttpRouteData.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\Routing\HostedHttpVirtualPathData.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\Routing\HttpContextBaseExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\Routing\HttpRouteDataExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\Routing\HttpRouteExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\Routing\HttpWebRoute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\SuppressFormsAuthRedirectModule.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\TaskWrapperAsyncResult.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\WebHostAssembliesResolver.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\WebHostHttpControllerTypeResolver.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Net.Http/System.Net.Http-net_4_5.csproj">\r
-      <Project>{E36C154B-A0AC-4721-B06A-AFE31D357CE5}</Project>\r
-      <Name>System.Net.Http-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
-      <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.IdentityModel/System.IdentityModel-net_4_5.csproj">\r
-      <Project>{F056C062-E467-4989-9366-440E8CD23C0C}</Project>\r
-      <Name>System.IdentityModel-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Http/System.Web.Http-net_4_5.csproj">\r
-      <Project>{2EFF8684-99DB-4DD6-B3BC-7E7AA42A15FC}</Project>\r
-      <Name>System.Web.Http-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_5.csproj">\r
-      <Project>{BFBE5444-4F21-45CF-929E-C8FBEF302F5E}</Project>\r
-      <Name>System.Net.Http.Formatting-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Routing/System.Web.Routing-net_4_5.csproj">\r
-      <Project>{A28F2A14-901C-452C-82B6-75ECE5C7E714}</Project>\r
-      <Name>System.Web.Routing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_5.csproj">\r
-      <Project>{50DC9191-2D18-4EDB-A929-4ECAB7981A1C}</Project>\r
-      <Name>Microsoft.Web.Infrastructure-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.Http/System.Web.Http-net_4_5.csproj b/mcs/class/System.Web.Http/System.Web.Http-net_4_5.csproj
deleted file mode 100644 (file)
index f5d899c..0000000
--- a/mcs/class/System.Web.Http/System.Web.Http-net_4_5.csproj
+++ /dev/null
@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2EFF8684-99DB-4DD6-B3BC-7E7AA42A15FC}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Http</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETMVC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETMVC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\AptcaCommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\CommonWebApiResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\DictionaryExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\Error.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\HttpMethodHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\PrefixContainer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpers.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpersExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\RS.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\AcceptVerbsAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ActionNameAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\AllowAnonymousAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ApiController.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\AuthorizeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\ApiControllerActionInvoker.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\ApiControllerActionSelector.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\HttpActionBinding.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\HttpActionContext.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\HttpActionContextExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\HttpActionDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\HttpControllerConfigurationAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\HttpControllerContext.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\HttpControllerDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\HttpParameterBinding.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\HttpParameterDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\IActionHttpMethodProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\IActionMethodSelector.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\IActionResultConverter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\IActionValueBinder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\IHttpActionInvoker.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\IHttpActionSelector.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\IHttpController.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\ReflectedHttpActionDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\ReflectedHttpParameterDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\ResponseMessageResultConverter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\ValueResultConverter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Controllers\VoidResultConverter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Dependencies\EmptyResolver.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Dependencies\IDependencyResolver.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Dependencies\IDependencyScope.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Description\ApiDescription.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Description\ApiExplorer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Description\ApiExplorerSettingsAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Description\ApiParameterDescription.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Description\ApiParameterSource.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Description\IApiExplorer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Description\IDocumentationProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Dispatcher\DefaultAssembliesResolver.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Dispatcher\DefaultHttpControllerActivator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Dispatcher\DefaultHttpControllerSelector.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Dispatcher\DefaultHttpControllerTypeResolver.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Dispatcher\ExceptionSurrogate.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Dispatcher\HttpControllerDispatcher.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Dispatcher\HttpControllerTypeCache.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Dispatcher\IAssembliesResolver.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Dispatcher\IHttpControllerActivator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Dispatcher\IHttpControllerSelector.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Dispatcher\IHttpControllerTypeResolver.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\ActionDescriptorFilterProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\ActionFilterAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\AuthorizationFilterAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\ConfigurationFilterProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\ExceptionFilterAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\FilterAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\FilterInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\FilterInfoComparer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\FilterScope.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\HttpActionExecutedContext.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\HttpFilterCollection.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\IActionFilter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\IAuthorizationFilter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\IExceptionFilter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\IFilter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Filters\IFilterProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\FromBodyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\FromUriAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Hosting\HttpPipelineFactory.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Hosting\HttpPropertyKeys.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpBindNeverAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpBindRequiredAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpConfiguration.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpDeleteAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpGetAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpHeadAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpOptionsAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpPatchAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpPostAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpPutAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpRequestMessageExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpResponseException.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpResponseMessageExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpRouteCollection.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpRouteCollectionExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\HttpServer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\IncludeErrorDetailPolicy.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Internal\CollectionModelBinderUtil.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Internal\DataTypeUtil.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Internal\HttpActionContextExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Internal\HttpParameterBindingExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Internal\MemberInfoExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Internal\ParameterInfoExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Internal\TypeActivator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Internal\TypeDescriptorHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Internal\TypeHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Internal\UriQueryUtility.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Metadata\ModelMetadata.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Metadata\ModelMetadataProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Metadata\Providers\AssociatedMetadataProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Metadata\Providers\CachedDataAnnotationsMetadataAttributes.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Metadata\Providers\CachedDataAnnotationsModelMetadata.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Metadata\Providers\CachedModelMetadata.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Metadata\Providers\DataAnnotationsModelMetadataProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Metadata\Providers\EmptyMetadataProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\ArrayModelBinder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\ArrayModelBinderProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\BinaryDataModelBinderProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\CollectionModelBinder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\CollectionModelBinderProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\ComplexModelDto.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\ComplexModelDtoModelBinder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\ComplexModelDtoModelBinderProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\ComplexModelDtoResult.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\CompositeModelBinder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\CompositeModelBinderProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\DictionaryModelBinder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\DictionaryModelBinderProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\GenericModelBinderProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\KeyValuePairModelBinder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\KeyValuePairModelBinderProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\MutableObjectModelBinder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\MutableObjectModelBinderProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\SimpleModelBinderProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\TypeConverterModelBinder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\TypeConverterModelBinderProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\TypeMatchModelBinder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\Binders\TypeMatchModelBinderProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\CancellationTokenParameterBinding.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\CustomModelBinderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\DefaultActionValueBinder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\ErrorParameterBinding.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\FormatterParameterBinding.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\FormDataCollectionExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\HttpBindingBehavior.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\HttpBindingBehaviorAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\HttpRequestParameterBinding.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\IModelBinder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\JQueryMVCFormUrlEncodedFormatter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\ModelBinderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\ModelBinderConfig.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\ModelBinderErrorMessageProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\ModelBinderParameterBinding.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\ModelBinderProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\ModelBindingContext.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\ModelBindingHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\ModelError.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\ModelErrorCollection.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\ModelState.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\ModelStateDictionary.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\NonActionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Properties\SRResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Query\DynamicQueryable.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Query\ODataQueryDeserializer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Query\ParseException.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Query\QueryComposer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Query\QueryResolver.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Query\QueryValidator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Query\ServiceQuery.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Query\ServiceQueryPart.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\QueryableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\RouteParameter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\BoundRouteTemplate.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\HttpMethodConstraint.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\HttpParsedRoute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\HttpRoute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\HttpRouteData.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\HttpRouteDirection.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\HttpRouteParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\HttpRouteValueDictionary.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\HttpVirtualPathData.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\IHttpRoute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\IHttpRouteConstraint.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\IHttpRouteData.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\IHttpVirtualPathData.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\MediaTypeFormatterExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\PathContentSegment.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\PathLiteralSubsegment.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\PathParameterSubsegment.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\PathSegment.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\PathSeparatorSegment.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\PathSubsegment.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\UriPathExtensionMapping.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\UrlHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Services\DefaultServices.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ServicesExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\FormattingUtilities.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\IFormatterTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\ITraceManager.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\ITraceWriter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\ITraceWriterExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\TraceCategories.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\TraceKind.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\TraceLevel.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\TraceManager.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\TraceRecord.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\ActionFilterAttributeTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\ActionFilterTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\ActionValueBinderTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\AuthorizationFilterAttributeTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\AuthorizationFilterTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\BufferedMediaTypeFormatterTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\ContentNegotiatorTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\ExceptionFilterAttributeTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\ExceptionFilterTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\FilterTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\FormatterParameterBindingTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\FormUrlEncodedMediaTypeFormatterTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\HttpActionBindingTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\HttpActionDescriptorTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\HttpActionInvokerTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\HttpActionSelectorTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\HttpControllerActivatorTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\HttpControllerDescriptorTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\HttpControllerSelectorTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\HttpControllerTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\HttpParameterBindingTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\JsonMediaTypeFormatterTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\MediaTypeFormatterTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\MessageHandlerTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\RequestMessageHandlerTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\XmlMediaTypeFormatterTracer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\DefaultBodyModelValidator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\IBodyModelValidator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\ModelStateFormatterLogger.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\ModelValidatedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\ModelValidatingEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\ModelValidationNode.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\ModelValidationRequiredMemberSelector.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\ModelValidationResult.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\ModelValidator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\ModelValidatorProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\Providers\AssociatedValidatorProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\Providers\DataAnnotationsModelValidatorProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\Providers\DataMemberModelValidatorProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\Providers\RequiredMemberModelValidatorProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\Validators\DataAnnotationsModelValidator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\Validators\RequiredMemberModelValidator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Validation\Validators\ValidatableObjectAdapter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\IEnumerableValueProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\IUriValueProviderFactory.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\IValueProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\Providers\CompositeValueProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\Providers\CompositeValueProviderFactory.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\Providers\ElementalValueProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\Providers\NameValueCollectionValueProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\Providers\QueryStringValueProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\Providers\QueryStringValueProviderFactory.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\Providers\RouteDataValueProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\Providers\RouteDataValueProviderFactory.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\ValueProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\ValueProviderFactory.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\ValueProviderResult.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Net.Http/System.Net.Http-net_4_5.csproj">\r
-      <Project>{E36C154B-A0AC-4721-B06A-AFE31D357CE5}</Project>\r
-      <Name>System.Net.Http-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
-      <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_5.csproj">\r
-      <Project>{BFBE5444-4F21-45CF-929E-C8FBEF302F5E}</Project>\r
-      <Name>System.Net.Http.Formatting-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Caching/System.Runtime.Caching-net_4_5.csproj">\r
-      <Project>{CB3E9225-3DFF-4930-BFED-1E8AE5319C32}</Project>\r
-      <Name>System.Runtime.Caching-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data.Linq/System.Data.Linq-net_4_5.csproj">\r
-      <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.Http.Properties.CommonWebApiResources.resources">\r
-      <LogicalName>System.Web.Http.Properties.CommonWebApiResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Http.Properties.SRResources.resources">\r
-      <LogicalName>System.Web.Http.Properties.SRResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_5.csproj b/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_5.csproj
deleted file mode 100644 (file)
index 9aa71a3..0000000
--- a/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_5.csproj
+++ /dev/null
@@ -1,496 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{AED34264-9E46-4F38-8BBF-6ECB69DE8FD8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Mvc</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MONO</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MONO</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include=".\GlobalAssemblyInfo.cs" />\r
-    <Compile Include=".\GlobalSuppressions.cs" />\r
-    <Compile Include=".\Mvc\AcceptVerbsAttribute.cs" />\r
-    <Compile Include=".\Mvc\ActionDescriptor.cs" />\r
-    <Compile Include=".\Mvc\ActionExecutedContext.cs" />\r
-    <Compile Include=".\Mvc\ActionExecutingContext.cs" />\r
-    <Compile Include=".\Mvc\ActionFilterAttribute.cs" />\r
-    <Compile Include=".\Mvc\ActionMethodDispatcher.cs" />\r
-    <Compile Include=".\Mvc\ActionMethodDispatcherCache.cs" />\r
-    <Compile Include=".\Mvc\ActionMethodSelector.cs" />\r
-    <Compile Include=".\Mvc\ActionMethodSelectorAttribute.cs" />\r
-    <Compile Include=".\Mvc\ActionNameAttribute.cs" />\r
-    <Compile Include=".\Mvc\ActionNameSelectorAttribute.cs" />\r
-    <Compile Include=".\Mvc\ActionResult.cs" />\r
-    <Compile Include=".\Mvc\ActionSelector.cs" />\r
-    <Compile Include=".\Mvc\AdditionalMetaDataAttribute.cs" />\r
-    <Compile Include=".\Mvc\Ajax\AjaxExtensions.cs" />\r
-    <Compile Include=".\Mvc\Ajax\AjaxOptions.cs" />\r
-    <Compile Include=".\Mvc\Ajax\InsertionMode.cs" />\r
-    <Compile Include=".\Mvc\AjaxHelper.cs" />\r
-    <Compile Include=".\Mvc\AjaxHelper`1.cs" />\r
-    <Compile Include=".\Mvc\AjaxRequestExtensions.cs" />\r
-    <Compile Include=".\Mvc\AllowHtmlAttribute.cs" />\r
-    <Compile Include=".\Mvc\AreaHelpers.cs" />\r
-    <Compile Include=".\Mvc\AreaRegistration.cs" />\r
-    <Compile Include=".\Mvc\AreaRegistrationContext.cs" />\r
-    <Compile Include=".\Mvc\AssociatedMetadataProvider.cs" />\r
-    <Compile Include=".\Mvc\AssociatedValidatorProvider.cs" />\r
-    <Compile Include=".\Mvc\Async\ActionDescriptorCreator.cs" />\r
-    <Compile Include=".\Mvc\Async\AsyncActionDescriptor.cs" />\r
-    <Compile Include=".\Mvc\Async\AsyncActionMethodSelector.cs" />\r
-    <Compile Include=".\Mvc\Async\AsyncControllerActionInvoker.cs" />\r
-    <Compile Include=".\Mvc\Async\AsyncManager.cs" />\r
-    <Compile Include=".\Mvc\Async\AsyncResultWrapper.cs" />\r
-    <Compile Include=".\Mvc\Async\AsyncUtil.cs" />\r
-    <Compile Include=".\Mvc\Async\AsyncVoid.cs" />\r
-    <Compile Include=".\Mvc\Async\BeginInvokeDelegate.cs" />\r
-    <Compile Include=".\Mvc\Async\EndInvokeDelegate.cs" />\r
-    <Compile Include=".\Mvc\Async\EndInvokeDelegate`1.cs" />\r
-    <Compile Include=".\Mvc\Async\IAsyncActionInvoker.cs" />\r
-    <Compile Include=".\Mvc\Async\IAsyncController.cs" />\r
-    <Compile Include=".\Mvc\Async\IAsyncManagerContainer.cs" />\r
-    <Compile Include=".\Mvc\Async\OperationCounter.cs" />\r
-    <Compile Include=".\Mvc\Async\ReflectedAsyncActionDescriptor.cs" />\r
-    <Compile Include=".\Mvc\Async\ReflectedAsyncControllerDescriptor.cs" />\r
-    <Compile Include=".\Mvc\Async\SimpleAsyncResult.cs" />\r
-    <Compile Include=".\Mvc\Async\SingleEntryGate.cs" />\r
-    <Compile Include=".\Mvc\Async\SynchronizationContextUtil.cs" />\r
-    <Compile Include=".\Mvc\Async\SynchronousOperationException.cs" />\r
-    <Compile Include=".\Mvc\Async\Trigger.cs" />\r
-    <Compile Include=".\Mvc\Async\TriggerListener.cs" />\r
-    <Compile Include=".\Mvc\AsyncController.cs" />\r
-    <Compile Include=".\Mvc\AsyncTimeoutAttribute.cs" />\r
-    <Compile Include=".\Mvc\AuthorizationContext.cs" />\r
-    <Compile Include=".\Mvc\AuthorizeAttribute.cs" />\r
-    <Compile Include=".\Mvc\BindAttribute.cs" />\r
-    <Compile Include=".\Mvc\BuildManagerCompiledView.cs" />\r
-    <Compile Include=".\Mvc\BuildManagerViewEngine.cs" />\r
-    <Compile Include=".\Mvc\BuildManagerWrapper.cs" />\r
-    <Compile Include=".\Mvc\ByteArrayModelBinder.cs" />\r
-    <Compile Include=".\Mvc\ChildActionOnlyAttribute.cs" />\r
-    <Compile Include=".\Mvc\ChildActionValueProvider.cs" />\r
-    <Compile Include=".\Mvc\ChildActionValueProviderFactory.cs" />\r
-    <Compile Include=".\Mvc\ClientDataTypeModelValidatorProvider.cs" />\r
-    <Compile Include=".\Mvc\CompareAttribute.cs" />\r
-    <Compile Include=".\Mvc\ContentResult.cs" />\r
-    <Compile Include=".\Mvc\Controller.cs" />\r
-    <Compile Include=".\Mvc\ControllerActionInvoker.cs" />\r
-    <Compile Include=".\Mvc\ControllerBase.cs" />\r
-    <Compile Include=".\Mvc\ControllerBuilder.cs" />\r
-    <Compile Include=".\Mvc\ControllerContext.cs" />\r
-    <Compile Include=".\Mvc\ControllerDescriptor.cs" />\r
-    <Compile Include=".\Mvc\ControllerDescriptorCache.cs" />\r
-    <Compile Include=".\Mvc\ControllerInstanceFilterProvider.cs" />\r
-    <Compile Include=".\Mvc\ControllerTypeCache.cs" />\r
-    <Compile Include=".\Mvc\CustomModelBinderAttribute.cs" />\r
-    <Compile Include=".\Mvc\DataAnnotationsModelMetadata.cs" />\r
-    <Compile Include=".\Mvc\DataAnnotationsModelMetadataProvider.cs" />\r
-    <Compile Include=".\Mvc\DataAnnotationsModelValidator.cs" />\r
-    <Compile Include=".\Mvc\DataAnnotationsModelValidator`1.cs" />\r
-    <Compile Include=".\Mvc\DataAnnotationsModelValidatorProvider.cs" />\r
-    <Compile Include=".\Mvc\DataErrorInfoModelValidatorProvider.cs" />\r
-    <Compile Include=".\Mvc\DataTypeUtil.cs" />\r
-    <Compile Include=".\Mvc\DefaultControllerFactory.cs" />\r
-    <Compile Include=".\Mvc\DefaultModelBinder.cs" />\r
-    <Compile Include=".\Mvc\DefaultViewLocationCache.cs" />\r
-    <Compile Include=".\Mvc\DependencyResolver.cs" />\r
-    <Compile Include=".\Mvc\DependencyResolverExtensions.cs" />\r
-    <Compile Include=".\Mvc\DescriptorUtil.cs" />\r
-    <Compile Include=".\Mvc\DictionaryHelpers.cs" />\r
-    <Compile Include=".\Mvc\DictionaryValueProvider`1.cs" />\r
-    <Compile Include=".\Mvc\DynamicViewDataDictionary.cs" />\r
-    <Compile Include=".\Mvc\EmptyModelMetadataProvider.cs" />\r
-    <Compile Include=".\Mvc\EmptyModelValidatorProvider.cs" />\r
-    <Compile Include=".\Mvc\EmptyResult.cs" />\r
-    <Compile Include=".\Mvc\Error.cs" />\r
-    <Compile Include=".\Mvc\ExceptionContext.cs" />\r
-    <Compile Include=".\Mvc\ExpressionHelper.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\BinaryExpressionFingerprint.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\CachedExpressionCompiler.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\ConditionalExpressionFingerprint.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\ConstantExpressionFingerprint.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\DefaultExpressionFingerprint.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\ExpressionFingerprint.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\ExpressionFingerprintChain.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\FingerprintingExpressionVisitor.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\HashCodeCombiner.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\Hoisted`2.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\HoistingExpressionVisitor.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\IndexExpressionFingerprint.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\LambdaExpressionFingerprint.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\MemberExpressionFingerprint.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\MethodCallExpressionFingerprint.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\ParameterExpressionFingerprint.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\TypeBinaryExpressionFingerprint.cs" />\r
-    <Compile Include=".\Mvc\ExpressionUtil\UnaryExpressionFingerprint.cs" />\r
-    <Compile Include=".\Mvc\FieldValidationMetadata.cs" />\r
-    <Compile Include=".\Mvc\FileContentResult.cs" />\r
-    <Compile Include=".\Mvc\FilePathResult.cs" />\r
-    <Compile Include=".\Mvc\FileResult.cs" />\r
-    <Compile Include=".\Mvc\FileStreamResult.cs" />\r
-    <Compile Include=".\Mvc\Filter.cs" />\r
-    <Compile Include=".\Mvc\FilterAttribute.cs" />\r
-    <Compile Include=".\Mvc\FilterAttributeFilterProvider.cs" />\r
-    <Compile Include=".\Mvc\FilterInfo.cs" />\r
-    <Compile Include=".\Mvc\FilterProviderCollection.cs" />\r
-    <Compile Include=".\Mvc\FilterProviders.cs" />\r
-    <Compile Include=".\Mvc\FilterScope.cs" />\r
-    <Compile Include=".\Mvc\FormCollection.cs" />\r
-    <Compile Include=".\Mvc\FormContext.cs" />\r
-    <Compile Include=".\Mvc\FormMethod.cs" />\r
-    <Compile Include=".\Mvc\FormValueProvider.cs" />\r
-    <Compile Include=".\Mvc\FormValueProviderFactory.cs" />\r
-    <Compile Include=".\Mvc\GlobalFilterCollection.cs" />\r
-    <Compile Include=".\Mvc\GlobalFilters.cs" />\r
-    <Compile Include=".\Mvc\HandleErrorAttribute.cs" />\r
-    <Compile Include=".\Mvc\HandleErrorInfo.cs" />\r
-    <Compile Include=".\Mvc\HiddenInputAttribute.cs" />\r
-    <Compile Include=".\Mvc\Html\ChildActionExtensions.cs" />\r
-    <Compile Include=".\Mvc\Html\DefaultDisplayTemplates.cs" />\r
-    <Compile Include=".\Mvc\Html\DefaultEditorTemplates.cs" />\r
-    <Compile Include=".\Mvc\Html\DisplayExtensions.cs" />\r
-    <Compile Include=".\Mvc\Html\DisplayTextExtensions.cs" />\r
-    <Compile Include=".\Mvc\Html\EditorExtensions.cs" />\r
-    <Compile Include=".\Mvc\Html\FormExtensions.cs" />\r
-    <Compile Include=".\Mvc\Html\InputExtensions.cs" />\r
-    <Compile Include=".\Mvc\Html\LabelExtensions.cs" />\r
-    <Compile Include=".\Mvc\Html\LinkExtensions.cs" />\r
-    <Compile Include=".\Mvc\Html\MvcForm.cs" />\r
-    <Compile Include=".\Mvc\Html\PartialExtensions.cs" />\r
-    <Compile Include=".\Mvc\Html\RenderPartialExtensions.cs" />\r
-    <Compile Include=".\Mvc\Html\SelectExtensions.cs" />\r
-    <Compile Include=".\Mvc\Html\TemplateHelpers.cs" />\r
-    <Compile Include=".\Mvc\Html\TextAreaExtensions.cs" />\r
-    <Compile Include=".\Mvc\Html\ValidationExtensions.cs" />\r
-    <Compile Include=".\Mvc\HtmlHelper.cs" />\r
-    <Compile Include=".\Mvc\HtmlHelper`1.cs" />\r
-    <Compile Include=".\Mvc\HttpDeleteAttribute.cs" />\r
-    <Compile Include=".\Mvc\HttpFileCollectionValueProvider.cs" />\r
-    <Compile Include=".\Mvc\HttpFileCollectionValueProviderFactory.cs" />\r
-    <Compile Include=".\Mvc\HttpGetAttribute.cs" />\r
-    <Compile Include=".\Mvc\HttpHandlerUtil.cs" />\r
-    <Compile Include=".\Mvc\HttpNotFoundResult.cs" />\r
-    <Compile Include=".\Mvc\HttpPostAttribute.cs" />\r
-    <Compile Include=".\Mvc\HttpPostedFileBaseModelBinder.cs" />\r
-    <Compile Include=".\Mvc\HttpPutAttribute.cs" />\r
-    <Compile Include=".\Mvc\HttpRequestExtensions.cs" />\r
-    <Compile Include=".\Mvc\HttpStatusCodeResult.cs" />\r
-    <Compile Include=".\Mvc\HttpUnauthorizedResult.cs" />\r
-    <Compile Include=".\Mvc\HttpVerbs.cs" />\r
-    <Compile Include=".\Mvc\IActionFilter.cs" />\r
-    <Compile Include=".\Mvc\IActionInvoker.cs" />\r
-    <Compile Include=".\Mvc\IAuthorizationFilter.cs" />\r
-    <Compile Include=".\Mvc\IBuildManager.cs" />\r
-    <Compile Include=".\Mvc\IClientValidatable.cs" />\r
-    <Compile Include=".\Mvc\IController.cs" />\r
-    <Compile Include=".\Mvc\IControllerActivator.cs" />\r
-    <Compile Include=".\Mvc\IControllerFactory.cs" />\r
-    <Compile Include=".\Mvc\IDependencyResolver.cs" />\r
-    <Compile Include=".\Mvc\IExceptionFilter.cs" />\r
-    <Compile Include=".\Mvc\IFilterProvider.cs" />\r
-    <Compile Include=".\Mvc\IMetadataAware.cs" />\r
-    <Compile Include=".\Mvc\IModelBinder.cs" />\r
-    <Compile Include=".\Mvc\IModelBinderProvider.cs" />\r
-    <Compile Include=".\Mvc\IMvcControlBuilder.cs" />\r
-    <Compile Include=".\Mvc\IMvcFilter.cs" />\r
-    <Compile Include=".\Mvc\InputType.cs" />\r
-    <Compile Include=".\Mvc\IResolver.cs" />\r
-    <Compile Include=".\Mvc\IResultFilter.cs" />\r
-    <Compile Include=".\Mvc\IRouteWithArea.cs" />\r
-    <Compile Include=".\Mvc\ITempDataProvider.cs" />\r
-    <Compile Include=".\Mvc\IUniquelyIdentifiable.cs" />\r
-    <Compile Include=".\Mvc\IUnvalidatedRequestValues.cs" />\r
-    <Compile Include=".\Mvc\IUnvalidatedValueProvider.cs" />\r
-    <Compile Include=".\Mvc\IValueProvider.cs" />\r
-    <Compile Include=".\Mvc\IView.cs" />\r
-    <Compile Include=".\Mvc\IViewDataContainer.cs" />\r
-    <Compile Include=".\Mvc\IViewEngine.cs" />\r
-    <Compile Include=".\Mvc\IViewLocationCache.cs" />\r
-    <Compile Include=".\Mvc\IViewPageActivator.cs" />\r
-    <Compile Include=".\Mvc\IViewStartPageChild.cs" />\r
-    <Compile Include=".\Mvc\JavaScriptResult.cs" />\r
-    <Compile Include=".\Mvc\JsonRequestBehavior.cs" />\r
-    <Compile Include=".\Mvc\JsonResult.cs" />\r
-    <Compile Include=".\Mvc\JsonValueProviderFactory.cs" />\r
-    <Compile Include=".\Mvc\LinqBinaryModelBinder.cs" />\r
-    <Compile Include=".\Mvc\ModelBinderAttribute.cs" />\r
-    <Compile Include=".\Mvc\ModelBinderDictionary.cs" />\r
-    <Compile Include=".\Mvc\ModelBinderProviderCollection.cs" />\r
-    <Compile Include=".\Mvc\ModelBinderProviders.cs" />\r
-    <Compile Include=".\Mvc\ModelBinders.cs" />\r
-    <Compile Include=".\Mvc\ModelBindingContext.cs" />\r
-    <Compile Include=".\Mvc\ModelClientValidationEqualToRule.cs" />\r
-    <Compile Include=".\Mvc\ModelClientValidationRangeRule.cs" />\r
-    <Compile Include=".\Mvc\ModelClientValidationRegexRule.cs" />\r
-    <Compile Include=".\Mvc\ModelClientValidationRemoteRule.cs" />\r
-    <Compile Include=".\Mvc\ModelClientValidationRequiredRule.cs" />\r
-    <Compile Include=".\Mvc\ModelClientValidationRule.cs" />\r
-    <Compile Include=".\Mvc\ModelClientValidationStringLengthRule.cs" />\r
-    <Compile Include=".\Mvc\ModelError.cs" />\r
-    <Compile Include=".\Mvc\ModelErrorCollection.cs" />\r
-    <Compile Include=".\Mvc\ModelMetadata.cs" />\r
-    <Compile Include=".\Mvc\ModelMetadataProvider.cs" />\r
-    <Compile Include=".\Mvc\ModelMetadataProviders.cs" />\r
-    <Compile Include=".\Mvc\ModelState.cs" />\r
-    <Compile Include=".\Mvc\ModelStateDictionary.cs" />\r
-    <Compile Include=".\Mvc\ModelValidationResult.cs" />\r
-    <Compile Include=".\Mvc\ModelValidator.cs" />\r
-    <Compile Include=".\Mvc\ModelValidatorProvider.cs" />\r
-    <Compile Include=".\Mvc\ModelValidatorProviderCollection.cs" />\r
-    <Compile Include=".\Mvc\ModelValidatorProviders.cs" />\r
-    <Compile Include=".\Mvc\MultiSelectList.cs" />\r
-    <Compile Include=".\Mvc\MultiServiceResolver.cs" />\r
-    <Compile Include=".\Mvc\MvcFilter.cs" />\r
-    <Compile Include=".\Mvc\MvcHandler.cs" />\r
-    <Compile Include=".\Mvc\MvcHtmlString.cs" />\r
-    <Compile Include=".\Mvc\MvcHttpHandler.cs" />\r
-    <Compile Include=".\Mvc\MvcRouteHandler.cs" />\r
-    <Compile Include=".\Mvc\MvcWebRazorHostFactory.cs" />\r
-    <Compile Include=".\Mvc\NameValueCollectionExtensions.cs" />\r
-    <Compile Include=".\Mvc\NameValueCollectionValueProvider.cs" />\r
-    <Compile Include=".\Mvc\NoAsyncTimeoutAttribute.cs" />\r
-    <Compile Include=".\Mvc\NonActionAttribute.cs" />\r
-    <Compile Include=".\Mvc\NullViewLocationCache.cs" />\r
-    <Compile Include=".\Mvc\OutputCacheAttribute.cs" />\r
-    <Compile Include=".\Mvc\ParameterBindingInfo.cs" />\r
-    <Compile Include=".\Mvc\ParameterDescriptor.cs" />\r
-    <Compile Include=".\Mvc\ParameterInfoUtil.cs" />\r
-    <Compile Include=".\Mvc\PartialViewResult.cs" />\r
-    <Compile Include=".\Mvc\PathHelpers.cs" />\r
-    <Compile Include=".\Mvc\PreApplicationStartCode.cs" />\r
-    <Compile Include=".\Mvc\QueryStringValueProvider.cs" />\r
-    <Compile Include=".\Mvc\QueryStringValueProviderFactory.cs" />\r
-    <Compile Include=".\Mvc\RangeAttributeAdapter.cs" />\r
-    <Compile Include=".\Mvc\Razor\MvcCSharpRazorCodeGenerator.cs" />\r
-    <Compile Include=".\Mvc\Razor\MvcCSharpRazorCodeParser.cs" />\r
-    <Compile Include=".\Mvc\Razor\MvcVBRazorCodeParser.cs" />\r
-    <Compile Include=".\Mvc\Razor\MvcWebPageRazorHost.cs" />\r
-    <Compile Include=".\Mvc\Razor\SetModelTypeCodeGenerator.cs" />\r
-    <Compile Include=".\Mvc\Razor\StartPageLookupDelegate.cs" />\r
-    <Compile Include=".\Mvc\RazorView.cs" />\r
-    <Compile Include=".\Mvc\RazorViewEngine.cs" />\r
-    <Compile Include=".\Mvc\ReaderWriterCache`2.cs" />\r
-    <Compile Include=".\Mvc\RedirectResult.cs" />\r
-    <Compile Include=".\Mvc\RedirectToRouteResult.cs" />\r
-    <Compile Include=".\Mvc\ReflectedActionDescriptor.cs" />\r
-    <Compile Include=".\Mvc\ReflectedAttributeCache.cs" />\r
-    <Compile Include=".\Mvc\ReflectedControllerDescriptor.cs" />\r
-    <Compile Include=".\Mvc\ReflectedParameterBindingInfo.cs" />\r
-    <Compile Include=".\Mvc\ReflectedParameterDescriptor.cs" />\r
-    <Compile Include=".\Mvc\RegularExpressionAttributeAdapter.cs" />\r
-    <Compile Include=".\Mvc\RemoteAttribute.cs" />\r
-    <Compile Include=".\Mvc\RequiredAttributeAdapter.cs" />\r
-    <Compile Include=".\Mvc\RequireHttpsAttribute.cs" />\r
-    <Compile Include=".\Mvc\Resources\MvcResources.Designer.cs" />\r
-    <Compile Include=".\Mvc\ResultExecutedContext.cs" />\r
-    <Compile Include=".\Mvc\ResultExecutingContext.cs" />\r
-    <Compile Include=".\Mvc\RouteCollectionExtensions.cs" />\r
-    <Compile Include=".\Mvc\RouteDataValueProvider.cs" />\r
-    <Compile Include=".\Mvc\RouteDataValueProviderFactory.cs" />\r
-    <Compile Include=".\Mvc\RouteValuesHelpers.cs" />\r
-    <Compile Include=".\Mvc\SecurityUtil.cs" />\r
-    <Compile Include=".\Mvc\SelectList.cs" />\r
-    <Compile Include=".\Mvc\SelectListItem.cs" />\r
-    <Compile Include=".\Mvc\SessionStateAttribute.cs" />\r
-    <Compile Include=".\Mvc\SessionStateTempDataProvider.cs" />\r
-    <Compile Include=".\Mvc\SingleServiceResolver.cs" />\r
-    <Compile Include=".\Mvc\StringLengthAttributeAdapter.cs" />\r
-    <Compile Include=".\Mvc\TagBuilderExtensions.cs" />\r
-    <Compile Include=".\Mvc\TempDataDictionary.cs" />\r
-    <Compile Include=".\Mvc\TemplateInfo.cs" />\r
-    <Compile Include=".\Mvc\TryGetValueDelegate.cs" />\r
-    <Compile Include=".\Mvc\TypeCacheSerializer.cs" />\r
-    <Compile Include=".\Mvc\TypeCacheUtil.cs" />\r
-    <Compile Include=".\Mvc\TypeDescriptorHelper.cs" />\r
-    <Compile Include=".\Mvc\TypeHelpers.cs" />\r
-    <Compile Include=".\Mvc\UnvalidatedRequestValuesAccessor.cs" />\r
-    <Compile Include=".\Mvc\UnvalidatedRequestValuesWrapper.cs" />\r
-    <Compile Include=".\Mvc\UrlHelper.cs" />\r
-    <Compile Include=".\Mvc\UrlParameter.cs" />\r
-    <Compile Include=".\Mvc\UrlRewriterHelper.cs" />\r
-    <Compile Include=".\Mvc\ValidatableObjectAdapter.cs" />\r
-    <Compile Include=".\Mvc\ValidateAntiForgeryTokenAttribute.cs" />\r
-    <Compile Include=".\Mvc\ValidateInputAttribute.cs" />\r
-    <Compile Include=".\Mvc\ValueProviderCollection.cs" />\r
-    <Compile Include=".\Mvc\ValueProviderDictionary.cs" />\r
-    <Compile Include=".\Mvc\ValueProviderFactories.cs" />\r
-    <Compile Include=".\Mvc\ValueProviderFactory.cs" />\r
-    <Compile Include=".\Mvc\ValueProviderFactoryCollection.cs" />\r
-    <Compile Include=".\Mvc\ValueProviderResult.cs" />\r
-    <Compile Include=".\Mvc\ValueProviderUtil.cs" />\r
-    <Compile Include=".\Mvc\ViewContext.cs" />\r
-    <Compile Include=".\Mvc\ViewDataDictionary.cs" />\r
-    <Compile Include=".\Mvc\ViewDataDictionary`1.cs" />\r
-    <Compile Include=".\Mvc\ViewDataInfo.cs" />\r
-    <Compile Include=".\Mvc\ViewEngineCollection.cs" />\r
-    <Compile Include=".\Mvc\ViewEngineResult.cs" />\r
-    <Compile Include=".\Mvc\ViewEngines.cs" />\r
-    <Compile Include=".\Mvc\ViewMasterPage.cs" />\r
-    <Compile Include=".\Mvc\ViewMasterPage`1.cs" />\r
-    <Compile Include=".\Mvc\ViewMasterPageControlBuilder.cs" />\r
-    <Compile Include=".\Mvc\ViewPage.cs" />\r
-    <Compile Include=".\Mvc\ViewPage`1.cs" />\r
-    <Compile Include=".\Mvc\ViewPageControlBuilder.cs" />\r
-    <Compile Include=".\Mvc\ViewResult.cs" />\r
-    <Compile Include=".\Mvc\ViewResultBase.cs" />\r
-    <Compile Include=".\Mvc\ViewStartPage.cs" />\r
-    <Compile Include=".\Mvc\ViewTemplateUserControl.cs" />\r
-    <Compile Include=".\Mvc\ViewTemplateUserControl`1.cs" />\r
-    <Compile Include=".\Mvc\ViewType.cs" />\r
-    <Compile Include=".\Mvc\ViewTypeControlBuilder.cs" />\r
-    <Compile Include=".\Mvc\ViewTypeParserFilter.cs" />\r
-    <Compile Include=".\Mvc\ViewUserControl.cs" />\r
-    <Compile Include=".\Mvc\ViewUserControl`1.cs" />\r
-    <Compile Include=".\Mvc\ViewUserControlControlBuilder.cs" />\r
-    <Compile Include=".\Mvc\VirtualPathProviderViewEngine.cs" />\r
-    <Compile Include=".\Mvc\WebFormView.cs" />\r
-    <Compile Include=".\Mvc\WebFormViewEngine.cs" />\r
-    <Compile Include=".\Mvc\WebViewPage.cs" />\r
-    <Compile Include=".\Mvc\WebViewPage`1.cs" />\r
-    <Compile Include=".\Properties\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_5.csproj">\r
-      <Project>{50DC9191-2D18-4EDB-A929-4ECAB7981A1C}</Project>\r
-      <Name>Microsoft.Web.Infrastructure-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Abstractions/System.Web.Abstractions-net_4_5.csproj">\r
-      <Project>{94BD3939-6937-47AA-86CF-5C3E4C59E272}</Project>\r
-      <Name>System.Web.Abstractions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Routing/System.Web.Routing-net_4_5.csproj">\r
-      <Project>{A28F2A14-901C-452C-82B6-75ECE5C7E714}</Project>\r
-      <Name>System.Web.Routing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Extensions/System.Web.Extensions-net_4_5.csproj">\r
-      <Project>{74D281D8-F725-4D79-B218-2DFCCFD44FA2}</Project>\r
-      <Name>System.Web.Extensions-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
-      <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data.Linq/System.Data.Linq-net_4_5.csproj">\r
-      <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Caching/System.Runtime.Caching-net_4_5.csproj">\r
-      <Project>{CB3E9225-3DFF-4930-BFED-1E8AE5319C32}</Project>\r
-      <Name>System.Runtime.Caching-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Razor/System.Web.Razor-net_4_5.csproj">\r
-      <Project>{FF61AB24-4492-47FA-B4D3-8D961113DD08}</Project>\r
-      <Name>System.Web.Razor-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_5.csproj">\r
-      <Project>{4E601800-644F-49B2-B1C9-60D3489AAC38}</Project>\r
-      <Name>System.Web.WebPages.Razor-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.WebPages/System.Web.WebPages-net_4_5.csproj">\r
-      <Project>{FFDF7B0A-BD62-4E39-8A80-A42B560149C5}</Project>\r
-      <Name>System.Web.WebPages-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Mvc/Resources/MvcResources.resources">\r
-      <LogicalName>System.Web.Mvc.Resources.MvcResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.Razor/System.Web.Razor-net_4_5.csproj b/mcs/class/System.Web.Razor/System.Web.Razor-net_4_5.csproj
deleted file mode 100644 (file)
index 91c4de8..0000000
--- a/mcs/class/System.Web.Razor/System.Web.Razor-net_4_5.csproj
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FF61AB24-4492-47FA-B4D3-8D961113DD08}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Razor</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\ExceptionHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\HashCodeCombiner.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\CSharpRazorCodeLanguage.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\DocumentParseCompleteEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\AutoCompleteEditHandler.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\BackgroundParseTask.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\EditorHints.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\EditResult.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\ImplicitExpressionEditHandler.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\SingleLineMarkupEditHandler.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\SpanEditHandler.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\AddImportCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\AttributeBlockCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\BaseCodeWriter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\BlockCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CodeGenerationCompleteEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CodeGeneratorBase.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CodeGeneratorContext.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CodeWriter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CodeWriterExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CSharpCodeWriter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CSharpRazorCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\DynamicAttributeBlockCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\ExpressionCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\ExpressionRenderingMode.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\GeneratedClassContext.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\GeneratedCodeMapping.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\HelperCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\HybridCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\IBlockCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\ISpanCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\LiteralAttributeCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\MarkupCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\RazorCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\RazorCommentCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\RazorDirectiveAttributeCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\ResolveUrlCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\SectionCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\SetBaseTypeCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\SetLayoutCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\SetVBOptionCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\SpanCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\StatementCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\TemplateBlockCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\TypeMemberCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\VBCodeWriter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\VBRazorCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\GeneratorResults.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\BalancingModes.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\CallbackVisitor.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\ConditionalAttributeCollapser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\CSharpCodeParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\CSharpCodeParser.Directives.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\CSharpCodeParser.Statements.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\CSharpLanguageCharacteristics.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\HtmlLanguageCharacteristics.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\HtmlMarkupParser.Block.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\HtmlMarkupParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\HtmlMarkupParser.Document.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\HtmlMarkupParser.Section.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\ISyntaxTreeRewriter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\LanguageCharacteristics.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\MarkupCollapser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\MarkupRewriter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\ParserBase.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\ParserContext.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\ParserHelpers.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\ParserVisitor.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\ParserVisitorExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\RazorParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\SyntaxConstants.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\SyntaxTree\AcceptedCharacters.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\SyntaxTree\Block.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\SyntaxTree\BlockBuilder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\SyntaxTree\BlockType.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\SyntaxTree\EquivalenceComparer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\SyntaxTree\RazorError.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\SyntaxTree\Span.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\SyntaxTree\SpanBuilder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\SyntaxTree\SpanKind.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\SyntaxTree\SyntaxTreeNode.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\TextReaderExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\TokenizerBackedParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\TokenizerBackedParser.Helpers.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\VBCodeParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\VBCodeParser.Directives.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\VBCodeParser.Statements.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\VBLanguageCharacteristics.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\WhitespaceRewriter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\ParserResults.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\PartialParseResult.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\RazorCodeLanguage.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\RazorDebugHelpers.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\RazorDirectiveAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\RazorEditorParser.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\RazorEngineHost.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\RazorTemplateEngine.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Resources\RazorResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\StateMachine.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Text\BufferingTextReader.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Text\ITextBuffer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Text\LineTrackingStringBuffer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Text\LocationTagged.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Text\LookaheadTextReader.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Text\LookaheadToken.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Text\SeekableTextReader.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Text\SourceLocation.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Text\SourceLocationTracker.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Text\TextBufferReader.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Text\TextChange.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Text\TextChangeType.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Text\TextDocumentReader.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Text\TextExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\CSharpHelpers.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\CSharpKeywordDetector.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\CSharpTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\HtmlTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\ITokenizer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\Symbols\CSharpKeyword.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\Symbols\CSharpSymbol.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\Symbols\CSharpSymbolType.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\Symbols\HtmlSymbol.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\Symbols\HtmlSymbolType.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\Symbols\ISymbol.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\Symbols\KnownSymbolType.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\Symbols\SymbolBase.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\Symbols\SymbolExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\Symbols\SymbolTypeSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\Symbols\VBKeyword.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\Symbols\VBSymbol.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\Symbols\VBSymbolType.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\Tokenizer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\TokenizerView.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\VBHelpers.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\VBKeywordDetector.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\VBTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\XmlHelpers.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Utils\CharUtils.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Utils\DisposableAction.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Utils\EnumeratorExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Utils\EnumUtil.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\VBRazorCodeLanguage.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.Razor.Resources.RazorResources.resources">\r
-      <LogicalName>System.Web.Razor.Resources.RazorResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Razor.Common.CommonResources.resources">\r
-      <LogicalName>System.Web.Razor.Common.CommonResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.Routing/System.Web.Routing-net_4_5.csproj b/mcs/class/System.Web.Routing/System.Web.Routing-net_4_5.csproj
deleted file mode 100644 (file)
index da044b1..0000000
--- a/mcs/class/System.Web.Routing/System.Web.Routing-net_4_5.csproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A28F2A14-901C-452C-82B6-75ECE5C7E714}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Routing</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Abstractions/System.Web.Abstractions-net_4_5.csproj">\r
-      <Project>{94BD3939-6937-47AA-86CF-5C3E4C59E272}</Project>\r
-      <Name>System.Web.Abstractions-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.Routing/System.Web.Routing-tests-net_4_5.csproj b/mcs/class/System.Web.Routing/System.Web.Routing-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 9059e20..0000000
--- a/mcs/class/System.Web.Routing/System.Web.Routing-tests-net_4_5.csproj
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B98A55A6-32F8-43D4-97EC-04118F2731CB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.Routing-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Routing_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Web.Routing\AssertExtensions.cs" />\r
-    <Compile Include="Test\System.Web.Routing\FakeHttpWorkerRequest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\HttpMethodConstraintTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\KnownResponseHeader.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RequestContext.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RouteCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RouteDataTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RouteTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\RouteValueDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\StopRoutingHandlerTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\TestStubTypes.cs" />\r
-    <Compile Include="Test\System.Web.Routing\UnknownResponseHeader.cs" />\r
-    <Compile Include="Test\System.Web.Routing\UrlRoutingHandlerTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\UrlRoutingModuleTest.cs" />\r
-    <Compile Include="Test\System.Web.Routing\VirtualPathDataTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Routing\System.Web.Routing-net_4_5.csproj">\r
-      <Project>{A28F2A14-901C-452C-82B6-75ECE5C7E714}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_5-2.csproj">\r
-      <Project>{725FB152-838A-4C6E-8A12-AC47E2DD4CEA}</Project>\r
-      <Name>System.Web\System.Web-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Abstractions\System.Web.Abstractions-net_4_5.csproj">\r
-      <Project>{94BD3939-6937-47AA-86CF-5C3E4C59E272}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.Services/System.Web.Services-net_4_5.csproj b/mcs/class/System.Web.Services/System.Web.Services-net_4_5.csproj
deleted file mode 100644 (file)
index a3bddf1..0000000
--- a/mcs/class/System.Web.Services/System.Web.Services-net_4_5.csproj
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{251DB111-FEE1-4080-8411-0AD1CC9BA94B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,168,169,219,414,612,649</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Services</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,168,169,219,414,612,649</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MONO_BROKEN_CONFIGURATION_DLL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,168,169,219,414,612,649</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MONO_BROKEN_CONFIGURATION_DLL</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\inc\InvariantComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\inc\PrivilegedConfigurationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\ComponentModel\CompModSwitches.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\DiagnosticsElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\PriorityGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\ProtocolElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\ProtocolElementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\Protocols.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapEnvelopeProcessingElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapExtensionTypeElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapExtensionTypeElementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\TypeElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\TypeElementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\WebServicesSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\WsdlHelpGeneratorElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\WsiProfilesElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\WsiProfilesElementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionPointAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionPrefixAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\HttpFormatExtensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\HttpGetProtocolImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\HttpGetProtocolReflector.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\HttpPostProtocolImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\HttpPostProtocolReflector.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\HttpProtocolImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\HttpProtocolReflector.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeAnyImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormatExtensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormReflector.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeParameters.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeReflector.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeReturn.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeTextImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeXmlImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\MimeXmlReflector.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\ProtocolImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\ProtocolReflector.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SchemaCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescription.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionReflector.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionSerializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\Soap12FormatExtensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\Soap12ProtocolImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\Soap12ProtocolReflector.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SoapExtensionImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SoapExtensionReflector.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SoapFormatExtensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SoapHttpTransportImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SoapProtocolImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SoapProtocolReflector.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\SoapTransportImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\WebCodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\WebReference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\WebReferenceCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\WebReferenceOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Description\WebServicesInteroperability.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Diagnostics\TraceUtility.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\ContractReference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\ContractSearchPattern.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientDocuments.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientReferences.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocument.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentLinksPattern.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentReference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentSearchPattern.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentSerializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryExceptionDictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryReference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryReferences.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryRequestHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoverySearchPattern.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicDiscoSearcher.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicDiscoveryDocument.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicPhysicalDiscoSearcher.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicVirtualDiscoSearcher.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\ExcludePathInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\InvalidContentTypeException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\InvalidDocumentContentsException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\LinkGrep.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\SchemaReference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\SoapBinding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Discovery\XmlSchemaSearchPattern.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Interop\CallId.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Interop\INotifyConnection2.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Interop\INotifySink2.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Interop\INotifySource2.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Interop\NotifyFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Interop\UserThread.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\NativeMethods.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\PartialTrustHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\AnyReturnReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\BufferedResponseStream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\ClientProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\DiscoveryServerProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\DocumentationServerProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HtmlFormParameterReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HtmlFormParameterWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpClientProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpGetClientProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpGetServerProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpMethodAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostClientProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostLocalhostServerProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostServerProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpServerProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\LogicalMethodInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\MatchAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeFormatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeParameterReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeParameterWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeReturnReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeReturnWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\NopReturnReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\PatternMatcher.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\RequestResponse.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\RuntimeUtils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\Scalars.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\ScatterGatherStream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\ServerProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\ServerType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\Soap11ServerProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\Soap12ServerProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapClientMessage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapClientProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapDocumentMethodAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapDocumentServiceAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtension.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtensionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtensionStream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapFaultCodes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderDirection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaders.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapMessage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapMessageStage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapParameterStyle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapProtocolVersion.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapReflector.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapRpcMethodAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapRpcServiceAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerMessage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerMethod.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerProtocol.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServiceRoutingStyle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapUnknownHeader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\TextReturnReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlEncodedParameterWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlParameterReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlParameterWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\ValueCollectionParameterReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\WebServiceHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\WebServiceHandlerFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\XmlReturnReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Protocols\XmlReturnWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\Soap.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\WebMethodAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\WebService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\WebServiceAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\WebServiceBindingAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\WebServicesDescriptionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Web.Services\System\Web\Services\WsiProfiles.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="ReferenceSources\Res.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj">\r
-      <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-plainweb-net_4_5.csproj">\r
-      <Project>{21892B00-1C9F-44F3-AE4C-A6A9A210CEC7}</Project>\r
-      <Name>System.Web-plainweb-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.DirectoryServices/System.DirectoryServices-net_4_5.csproj">\r
-      <Project>{EC4E43E7-63C0-4D64-8B7A-E00C097872A5}</Project>\r
-      <Name>System.DirectoryServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Design/System.Design-net_4_5.csproj">\r
-      <Project>{D4E6A482-761B-4B41-8B63-C930CA84D268}</Project>\r
-      <Name>System.Design-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.Services.Description/wsdl-1.1.xsd">\r
-      <LogicalName>wsdl-1.1.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Services.Description/wsdl-1.1-soap.xsd">\r
-      <LogicalName>wsdl-1.1-soap.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Services.Description/web-reference.xsd">\r
-      <LogicalName>web-reference.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.Services/System.Web.Services-tests-net_4_5.csproj b/mcs/class/System.Web.Services/System.Web.Services-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 77e797f..0000000
--- a/mcs/class/System.Web.Services/System.Web.Services-tests-net_4_5.csproj
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{D5EB5665-A3B2-462E-8753-2B2BC4C8B313}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,649,169,618</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web.Services-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.Services_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,649,169,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,649,169,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Web.Services.Configuration\DiagnosticsElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\ProtocolElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\SoapEnvelopeProcessingElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\SoapExtensionTypeElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\TypeElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\WsdlHelpGeneratorElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\WsiProfilesElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Configuration\XmlFormatExtensionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\BindingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\DocumentableItemTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\OperationCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\OperationMessageCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\OperationMessageTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\PortTypeCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\PortTypeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionFormatExtensionCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionImporterTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionReflectorTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\ServiceDescriptionTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\SoapBodyBindingTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\SoapOperationBindingTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\TypesTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\WebReferenceOptionsTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\WebReferenceTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Description\WebServicesInteroperabilityTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Discovery\ContractReferenceTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\LogicalMethodInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\SoapHttpClientProtocolTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\SoapServerTypeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\SocketResponder.cs" />\r
-    <Compile Include="Test\System.Web.Services.Protocols\WebClientProtocolTest.cs" />\r
-    <Compile Include="Test\System.Web.Services\WebMethodAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services\WebServiceAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.Services\WebServiceTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_4_5.csproj">\r
-      <Project>{251DB111-FEE1-4080-8411-0AD1CC9BA94B}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_5.csproj">\r
-      <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.Services.Description/wsdl-1.1.xsd">\r
-      <LogicalName>wsdl-1.1.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Services.Description/wsdl-1.1-soap.xsd">\r
-      <LogicalName>wsdl-1.1-soap.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.Services.Description/web-reference.xsd">\r
-      <LogicalName>web-reference.xsd</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_5.csproj b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_5.csproj
deleted file mode 100644 (file)
index bf85858..0000000
--- a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_5.csproj
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{CFBE1EF0-4B98-4752-9F6A-4D61CF9DA0EF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.WebPages.Deployment</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\ExceptionHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Deployment\AppDomainHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Deployment\AssemblyUtils.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Deployment\BuildManagerWrapper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Deployment\Common\IFileSystem.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Deployment\Common\PhysicalFileSystem.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Deployment\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Deployment\IBuildManager.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Deployment\PreApplicationStartCode.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Deployment\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Deployment\Resources\ConfigurationResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Deployment\WebPagesDeployment.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_5.csproj">\r
-      <Project>{50DC9191-2D18-4EDB-A929-4ECAB7981A1C}</Project>\r
-      <Name>Microsoft.Web.Infrastructure-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.WebPages.Deployment.Common.CommonResources.resources">\r
-      <LogicalName>System.Web.WebPages.Deployment.Common.CommonResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources">\r
-      <LogicalName>System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_5.csproj b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_5.csproj
deleted file mode 100644 (file)
index 2095663..0000000
--- a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_5.csproj
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4E601800-644F-49B2-B1C9-60D3489AAC38}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.WebPages.Razor</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\AssemblyBuilderWrapper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\CompilingPathEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\Configuration\HostSection.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\Configuration\RazorPagesSection.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\Configuration\RazorWebSectionGroup.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\HostingEnvironmentWrapper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\IAssemblyBuilder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\IHostingEnvironment.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\PreApplicationStartCode.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\RazorBuildProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\Resources\RazorWebResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\WebCodeRazorHost.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\WebPageRazorHost.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\WebRazorHostFactory.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.WebPages/System.Web.WebPages-net_4_5.csproj">\r
-      <Project>{FFDF7B0A-BD62-4E39-8A80-A42B560149C5}</Project>\r
-      <Name>System.Web.WebPages-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Razor/System.Web.Razor-net_4_5.csproj">\r
-      <Project>{FF61AB24-4492-47FA-B4D3-8D961113DD08}</Project>\r
-      <Name>System.Web.Razor-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.WebPages.Razor.Resources.RazorWebResources.resources">\r
-      <LogicalName>System.Web.WebPages.Razor.Resources.RazorWebResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.WebPages.Razor.Common.CommonResources.resources">\r
-      <LogicalName>System.Web.WebPages.Razor.Common.CommonResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_5.csproj b/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_5.csproj
deleted file mode 100644 (file)
index 69af11e..0000000
--- a/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_5.csproj
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FFDF7B0A-BD62-4E39-8A80-A42B560149C5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web.WebPages</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-    <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-    <DelaySign>true</DelaySign>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\ExceptionHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\HashCodeCombiner.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\IVirtualPathUtility.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\MimeMapping.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\ApplicationPart.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\ApplicationParts\ApplicationPartRegistry.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\ApplicationParts\DictionaryBasedVirtualPathFactory.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\ApplicationParts\IResourceAssembly.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\ApplicationParts\LazyAction.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\ApplicationParts\ResourceAssembly.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\ApplicationParts\ResourceHandler.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\ApplicationParts\ResourceRouteHandler.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\ApplicationStartPage.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\AttributeValue.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\BrowserHelpers.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\BrowserOverride.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\BrowserOverrideStore.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\BrowserOverrideStores.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\BuildManagerWrapper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Common\DisposableAction.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\CookieBrowserOverrideStore.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\DefaultDisplayMode.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\DisplayInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\DisplayModeProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\DynamicHttpApplicationState.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\DynamicPageDataDictionary.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\FileExistenceCache.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\GlobalSuppressions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\HelperPage.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\HelperResult.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiForgery.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiForgeryConfig.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\AntiForgeryConfigWrapper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\AntiForgeryToken.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\AntiForgeryTokenSerializer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\AntiForgeryTokenStore.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\AntiForgeryWorker.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\BinaryBlob.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\ClaimUidExtractor.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\IAntiForgeryConfig.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\IAntiForgeryTokenSerializer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\IClaimUidExtractor.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\ICryptoSystem.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\ITokenStore.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\ITokenValidator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\MachineKeyCryptoSystem.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\AntiXsrf\TokenValidator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\Claims\Claim.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\Claims\ClaimsIdentity.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\Claims\ClaimsIdentityConverter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\CryptoUtil.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\IAntiForgeryAdditionalDataProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\UnvalidatedRequestValues.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\Validation.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.Checkbox.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.Input.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.Internal.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.Label.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.Radio.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.Select.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.TextArea.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.Validation.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\ModelState.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\ModelStateDictionary.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\SelectListItem.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\HttpContextExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\IDisplayMode.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Instrumentation\HttpContextAdapter.Availability.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Instrumentation\HttpContextAdapter.generated.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Instrumentation\InstrumentationService.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Instrumentation\PageExecutionContextAdapter.generated.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Instrumentation\PageExecutionListenerAdapter.generated.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Instrumentation\PageInstrumentationServiceAdapter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Instrumentation\PositionTagged.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\ITemplateFile.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\IVirtualPathFactory.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\IWebPageRequestExecutor.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Mvc\HttpAntiForgeryException.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Mvc\ModelClientValidationEqualToRule.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Mvc\ModelClientValidationRangeRule.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Mvc\ModelClientValidationRegexRule.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Mvc\ModelClientValidationRemoteRule.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Mvc\ModelClientValidationRequiredRule.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Mvc\ModelClientValidationRule.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Mvc\ModelClientValidationStringLengthRule.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Mvc\TagBuilder.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Mvc\TagRenderMode.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Mvc\UnobtrusiveValidationAttributesGenerator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\PageDataDictionary.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\PageVirtualPathAttribute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\PreApplicationStartCode.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Properties\AssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\ReflectionDynamicObject.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\RequestBrowserOverrideStore.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\RequestExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\RequestResourceTracker.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Resources\WebPageResources.Designer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\ResponseExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Scope\ApplicationScopeStorageDictionary.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Scope\AspNetRequestScopeStorageProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Scope\IScopeStorageProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Scope\ScopeStorage.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Scope\ScopeStorageComparer.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Scope\ScopeStorageDictionary.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Scope\StaticScopeStorageProvider.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Scope\WebConfigScopeStorageDictionary.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\SectionWriter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\SecurityUtil.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\StartPage.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\StringExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\TemplateFileInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\TemplateStack.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\UrlDataList.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Utils\BuildManagerExceptionUtil.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Utils\CultureUtil.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Utils\PathUtil.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Utils\SessionStateUtil.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Utils\TypeHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Utils\UrlUtil.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Validation\CompareValidator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Validation\DataTypeValidator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Validation\IValidator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Validation\RequestFieldValidatorBase.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Validation\ValidationAttributeAdapter.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Validation\ValidationHelper.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Validation\Validator.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\VirtualPathFactoryExtensions.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\VirtualPathFactoryManager.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\WebPage.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\WebPageBase.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\WebPageContext.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\WebPageExecutingBase.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\WebPageHttpHandler.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\WebPageHttpModule.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\WebPageMatch.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\WebPageRenderingBase.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\WebPageRoute.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />\r
-    <Compile Include="..\..\..\external\aspnetwebstack\src\VirtualPathUtilityWrapper.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.CSharp/Microsoft.CSharp-net_4_5.csproj">\r
-      <Project>{D554618C-5D38-413A-82BA-7A70B6FC61A3}</Project>\r
-      <Name>Microsoft.CSharp-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_5.csproj">\r
-      <Project>{50DC9191-2D18-4EDB-A929-4ECAB7981A1C}</Project>\r
-      <Name>Microsoft.Web.Infrastructure-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
-      <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data.Linq/System.Data.Linq-net_4_5.csproj">\r
-      <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_5.csproj">\r
-      <Project>{CFBE1EF0-4B98-4752-9F6A-4D61CF9DA0EF}</Project>\r
-      <Name>System.Web.WebPages.Deployment-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Razor/System.Web.Razor-net_4_5.csproj">\r
-      <Project>{FF61AB24-4492-47FA-B4D3-8D961113DD08}</Project>\r
-      <Name>System.Web.Razor-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
-      <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="System.Web.WebPages.Resources.WebPageResources.resources">\r
-      <LogicalName>System.Web.WebPages.Resources.WebPageResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.WebPages.Common.CommonResources.resources">\r
-      <LogicalName>System.Web.WebPages.Common.CommonResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web/System.Web-net_4_5.csproj b/mcs/class/System.Web/System.Web-net_4_5.csproj
deleted file mode 100644 (file)
index 67956ca..0000000
--- a/mcs/class/System.Web/System.Web-net_4_5.csproj
+++ /dev/null
@@ -1,1613 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.Design\System.Data.Design\TypedDataSetGenerator.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpApplicationStateBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpApplicationStateWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpBrowserCapabilitiesBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpBrowserCapabilitiesWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpCachePolicyBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpCachePolicyWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpContextBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpContextWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpFileCollectionBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpFileCollectionWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpPostedFileBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpPostedFileWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpRequestBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpRequestWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpResponseBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpResponseWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpServerUtilityBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpServerUtilityWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpSessionStateBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpSessionStateWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpStaticObjectsCollectionBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpStaticObjectsCollectionWrapper.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\HttpMethodConstraint.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\IRouteConstraint.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\IRouteHandler.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\PatternParser.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\PatternToken.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\PatternTokenType.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RequestContext.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\Route.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteBase.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteCollection.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteData.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteDirection.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteTable.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteValueDictionary.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteValueDictionaryExtensions.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\StopRoutingHandler.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\UrlRoutingHandler.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\UrlRoutingModule.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\VirtualPathData.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\AssemblyNamesTypeResolutionService.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ByteArrayFromResXHandler.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\FileRefHandler.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\InMemoryHandler.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\NullRefHandler.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXDataNode.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXDataNodeHandler.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXFileRef.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXNullRef.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXResourceReader.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXResourceSet.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXResourceWriter.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\SerializedFromResXHandler.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\TypeConverterFromResXHandler.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Web.Util\ISectionSettingsMapper.cs" />\r
-    <Compile Include="Mono.Web.Util\MembershipSectionMapper.cs" />\r
-    <Compile Include="Mono.Web.Util\RoleManagerSectionMapper.cs" />\r
-    <Compile Include="Mono.Web.Util\SettingsMapping.cs" />\r
-    <Compile Include="Mono.Web.Util\SettingsMappingManager.cs" />\r
-    <Compile Include="Mono.Web.Util\SettingsMappingWhat.cs" />\r
-    <Compile Include="System.Collections.Concurrent\SplitOrderedList.cs" />\r
-    <Compile Include="System.Web.Caching\AggregateCacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\Cache.cs" />\r
-    <Compile Include="System.Web.Caching\CacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\CachedRawResponse.cs" />\r
-    <Compile Include="System.Web.Caching\CachedVaryBy.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItem.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemEnumerator.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemLRU.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriority.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriorityQueue.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriorityQueueDebug.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemRemovedCallback.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemRemovedReason.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemUpdateCallback.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemUpdateReason.cs" />\r
-    <Compile Include="System.Web.Caching\DatabaseNotEnabledForNotificationException.cs" />\r
-    <Compile Include="System.Web.Caching\FileResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\HeaderElement.cs" />\r
-    <Compile Include="System.Web.Caching\InMemoryOutputCacheProvider.cs" />\r
-    <Compile Include="System.Web.Caching\IOutputCacheEntry.cs" />\r
-    <Compile Include="System.Web.Caching\MemoryResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCache.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheModule.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheProvider.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheProviderCollection.cs" />\r
-    <Compile Include="System.Web.Caching\ResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\SqlCacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\SqlCacheDependencyAdmin.cs" />\r
-    <Compile Include="System.Web.Caching\SubstitutionResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\TableNotEnabledForNotificationException.cs" />\r
-    <Compile Include="System.Web.Compilation\AppCodeCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ApplicationFileBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourceFileInfo.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourceFilesCollection.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourcesAssemblyBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourcesCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\AppSettingsExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\AppWebReferencesCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\AspComponent.cs" />\r
-    <Compile Include="System.Web.Compilation\AspComponentFoundry.cs" />\r
-    <Compile Include="System.Web.Compilation\AspGenerator.cs" />\r
-    <Compile Include="System.Web.Compilation\AspParser.cs" />\r
-    <Compile Include="System.Web.Compilation\AspTokenizer.cs" />\r
-    <Compile Include="System.Web.Compilation\AssemblyBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\BaseCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildDependencySet.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManager.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerCacheItem.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerDirectoryBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHost.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHostUnloadEventArgs.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHostUnloadEventHandler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerRemoveEntryEventHandler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesTo.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesToAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderGroup.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderResultFlags.cs" />\r
-    <Compile Include="System.Web.Compilation\CachingCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManager.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManagerCallback.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManagerParameter.cs" />\r
-    <Compile Include="System.Web.Compilation\CompilationException.cs" />\r
-    <Compile Include="System.Web.Compilation\CompilerType.cs" />\r
-    <Compile Include="System.Web.Compilation\ConnectionStringsExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\DefaultResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\DefaultResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.Compilation\DesignTimeResourceProviderFactoryAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\Directive.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionBuilderContext.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionEditorAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\FolderLevelBuildProviderAppliesTo.cs" />\r
-    <Compile Include="System.Web.Compilation\FolderLevelBuildProviderAppliesToAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\ForceCopyBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\GenericBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\GlobalAsaxCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\IAssemblyPostProcessor.cs" />\r
-    <Compile Include="System.Web.Compilation\IgnoreFileBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\IImplicitResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\ILocation.cs" />\r
-    <Compile Include="System.Web.Compilation\ImplicitResourceKey.cs" />\r
-    <Compile Include="System.Web.Compilation\IResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\LinePragmaCodeInfo.cs" />\r
-    <Compile Include="System.Web.Compilation\Location.cs" />\r
-    <Compile Include="System.Web.Compilation\MasterPageBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\MasterPageCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\PageBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\PageCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\PageThemeCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ParseException.cs" />\r
-    <Compile Include="System.Web.Compilation\PrecompilationFlags.cs" />\r
-    <Compile Include="System.Web.Compilation\PreservationFile.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceExpressionFields.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.Compilation\RouteUrlExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\RouteValueExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\SimpleBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\TagAttributes.cs" />\r
-    <Compile Include="System.Web.Compilation\TagType.cs" />\r
-    <Compile Include="System.Web.Compilation\TemplateBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\TemplateControlCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ThemeDirectoryBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\ThemeDirectoryCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\UserControlBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\UserControlCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\WebHandlerBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\WebServiceBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\WebServiceCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\WsdlBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\XsdBuildProvider.cs" />\r
-    <Compile Include="System.Web.Configuration.Internal\IInternalConfigWebHost.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AdapterDictionary.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AnonymousIdentificationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ApplicationSettingsConfigurationFileMap.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AssemblyCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthenticationMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthenticationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRule.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BufferModesCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BufferModeSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BuildProvider.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BuildProviderCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CacheSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CapabilitiesBuild.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CapabilitiesResult.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTarget.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTargetCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTargetSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CodeSubDirectoriesCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CodeSubDirectory.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CompilationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\Compiler.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CompilerCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomError.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsRedirectMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\DeploymentSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\EventMappingSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\EventMappingSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ExpressionBuilderCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationConfiguration.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationCredentials.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUser.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUserCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthPasswordFormat.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsProtectionEnum.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\GlobalizationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HandlersUtil.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HealthMonitoringSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HostingEnvironmentSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCapabilitiesBase.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCapabilitiesDefaultProvider.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCapabilitiesProvider.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpConfigurationContext.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpConfigurationSystem.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCookiesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlerAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlerActionCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlersSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModuleAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModuleActionCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModulesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpRuntimeSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ICapabilitiesProcess.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPath.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPathFactory.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IdentitySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IRemoteWebConfigurationHostServer.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\LowerCaseStringConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\LruCache.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyCompatibilityMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyRegistryStorage.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyValidation.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyValidationConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MembershipSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MonoSettingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NamespaceCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NamespaceInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Build.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Exception.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\File.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Identification.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Node.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\NodeTypes.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Result.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NullableStringValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheProfile.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheProfileCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheSettingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PagesEnableSessionState.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PagesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PassportAuthentication.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PositiveTimeSpanValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComAuthenticationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComImpersonationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelLogLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertyNameValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertySettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertySettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PropertyHelper.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProvidersHelper.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RegexWorker.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RoleManagerSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RootProfilePropertySettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RuleSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RuleSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SecurityPolicySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SerializationMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SessionPageStateSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SessionStateSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SiteMapSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabase.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabaseCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SystemWebCachingSectionGroup.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SystemWebSectionGroup.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagMapCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagMapInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagPrefixCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagPrefixInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TraceDisplayMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TraceSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TransformerInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TransformerInfoCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustLevelCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMapping.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMappingCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMappingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VersionConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMapping.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMappingCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebApplicationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationFileMap.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationHost.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationManager.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebContext.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebControlsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalization.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalizationAuthorization.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceSection.cs" />\r
-    <Compile Include="System.Web.Handlers\AssemblyResourceLoader.cs" />\r
-    <Compile Include="System.Web.Handlers\TraceHandler.cs" />\r
-    <Compile Include="System.Web.Hosting\AppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationInfo.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationManager.cs" />\r
-    <Compile Include="System.Web.Hosting\AppManagerAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\BareApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualDirectory.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualFile.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualPathProvider.cs" />\r
-    <Compile Include="System.Web.Hosting\HostingEnvironment.cs" />\r
-    <Compile Include="System.Web.Hosting\IAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\IApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\IAppManagerAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\IISAPIRuntime.cs" />\r
-    <Compile Include="System.Web.Hosting\IRegisteredObject.cs" />\r
-    <Compile Include="System.Web.Hosting\ISAPIRuntime.cs" />\r
-    <Compile Include="System.Web.Hosting\SimpleWorkerRequest.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualDirectory.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualFile.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualFileBase.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualPathProvider.cs" />\r
-    <Compile Include="System.Web.Mail\Base64AttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Mail\IAttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Web.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Web.Mail\MailAttachment.cs" />\r
-    <Compile Include="System.Web.Mail\MailEncoding.cs" />\r
-    <Compile Include="System.Web.Mail\MailFormat.cs" />\r
-    <Compile Include="System.Web.Mail\MailHeader.cs" />\r
-    <Compile Include="System.Web.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Web.Mail\MailMessageWrapper.cs" />\r
-    <Compile Include="System.Web.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Web.Mail\MailUtil.cs" />\r
-    <Compile Include="System.Web.Mail\RelatedBodyPart.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpMail.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpResponse.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpStream.cs" />\r
-    <Compile Include="System.Web.Mail\ToUUEncodingTransform.cs" />\r
-    <Compile Include="System.Web.Mail\UUAttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Management\EventNotificationType.cs" />\r
-    <Compile Include="System.Web.Management\IRegiisUtility.cs" />\r
-    <Compile Include="System.Web.Management\IWebEventCustomEvaluator.cs" />\r
-    <Compile Include="System.Web.Management\RuleFiringRecord.cs" />\r
-    <Compile Include="System.Web.Management\SessionStateType.cs" />\r
-    <Compile Include="System.Web.Management\SqlFeatures.cs" />\r
-    <Compile Include="System.Web.Management\WebApplicationInformation.cs" />\r
-    <Compile Include="System.Web.Management\WebBaseEvent.cs" />\r
-    <Compile Include="System.Web.Management\WebEventCodes.cs" />\r
-    <Compile Include="System.Web.Management\WebEventFormatter.cs" />\r
-    <Compile Include="System.Web.Profile\CustomProviderDataAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\DefaultProfile.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAuthenticationOption.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAutoSaveEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAutoSaveEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileBase.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileGroupBase.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileInfo.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileInfoCollection.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileManager.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileMigrateEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileMigrateEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileModule.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileParser.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProvider.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProviderAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProviderCollection.cs" />\r
-    <Compile Include="System.Web.Profile\SettingsAllowAnonymousAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\SqliteProfileProvider.cs" />\r
-    <Compile Include="System.Web.Profile\SqlProfileProvider.cs" />\r
-    <Compile Include="System.Web.Properties\TranslationProperties.Designer.cs" />\r
-    <Compile Include="System.Web.Routing\PageRouteHandler.cs" />\r
-    <Compile Include="System.Web.Security\ActiveDirectoryConnectionProtection.cs" />\r
-    <Compile Include="System.Web.Security\ActiveDirectoryMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationModule.cs" />\r
-    <Compile Include="System.Web.Security\AspNetDBSchemaChecker.cs" />\r
-    <Compile Include="System.Web.Security\CookieProtection.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\FileAuthorizationModule.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthentication.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationTicket.cs" />\r
-    <Compile Include="System.Web.Security\FormsIdentity.cs" />\r
-    <Compile Include="System.Web.Security\MachineKey.cs" />\r
-    <Compile Include="System.Web.Security\MachineKeyProtection.cs" />\r
-    <Compile Include="System.Web.Security\Membership.cs" />\r
-    <Compile Include="System.Web.Security\MembershipHelper.cs" />\r
-    <Compile Include="System.Web.Security\MembershipPasswordAttribute.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\PassportIdentity.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerModule.cs" />\r
-    <Compile Include="System.Web.Security\RolePrincipal.cs" />\r
-    <Compile Include="System.Web.Security\RoleProviderCollection.cs" />\r
-    <Compile Include="System.Web.Security\Roles.cs" />\r
-    <Compile Include="System.Web.Security\SqliteMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqliteRoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqlMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqlRoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\UrlAuthorizationModule.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\HttpSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\HttpSessionStateContainer.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IHttpSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IReadOnlySessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IRequiresSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\ISessionIDManager.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\ISessionStateItemCollection.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IStateRuntime.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\RemoteStateServer.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionId.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionIDManager.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionInProcHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionSQLServerHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateActions.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateBehavior.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateItemCollection.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateItemExpireCallback.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateMode.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateModule.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateServerHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateStoreData.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateStoreProviderBase.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateUtility.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\StateRuntime.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\StateServerItem.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\ControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\PageAdapter.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\WmlPostFieldType.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlAnchor.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlContainerControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlEmptyTagControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlForm.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlGenericControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlHead.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlHeadBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlImage.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputCheckBox.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputFile.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputHidden.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputImage.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputPassword.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputRadioButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputReset.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputSubmit.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputText.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlLink.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlMeta.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlSelect.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlSelectBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTable.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableCell.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableCellCollection.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableRow.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTextArea.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTitle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\DataBoundControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\HideDisabledControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\HierarchicalDataBoundControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\MenuAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\WebControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionConsumerCallback.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionInterfaceCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionPointType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionProviderCallback.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConsumerConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\EditorPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\EditorPartCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITrackingPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITransformerConfigurationControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IVersioningPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebActionable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebEditable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartHttpHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartParameters.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\Part.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizableAttribute.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizationScope.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ProviderConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\TypeCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartExportMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartHelpMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartPageMenuMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerb.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AccessDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AccessDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdCreatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdCreatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdRotator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AssociatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoCompleteType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoGeneratedField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoGeneratedFieldProperties.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseCompareValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseDataList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseMenuRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BorderStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BoundColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BoundField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Button.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonColumnType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonFieldBase.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Calendar.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CalendarDay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CalendarSelectionMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ChangePassword.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBoxField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBoxList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ChildTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CircleHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CollectionDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompareValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompleteWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompositeControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompositeDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContainedTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Content.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentControlBuilderInternal.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentPlaceHolder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentPlaceHolderBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlIDConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlPropertyNameConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CookieParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserWizard.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CustomValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataBoundControlMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlCellType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlCommands.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldHeaderCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGrid.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridColumnCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPagerStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKey.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKeyArray.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKeyCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataSourceCacheManager.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayNameFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayRenderEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayRenderEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPagerRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DropDownList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EditCommandColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EmbeddedMailObject.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EmbeddedMailObjectsCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FileUpload.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FirstDayOfWeek.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontInfo.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontNamesConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontSize.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontUnit.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontUnitConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPagerRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridLines.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HiddenField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HierarchicalDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HorizontalAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HorizontalAlignConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpotCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpotMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLink.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IButtonControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICallbackContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICompositeControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundItemControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundListControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IFieldControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Image.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMap.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IMenuRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IPersistedSelector.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IPostBackContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IRenderOuterTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IRepeatInfoUser.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Label.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LabelControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LinkButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LinkButtonControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListSelectionMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Literal.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LiteralControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LiteralMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Localize.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Login.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginFailureAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginName.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginStatus.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginTextLayout.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LogoutAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailDefinition.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Menu.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemBinding.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemTemplateContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuListRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuRenderingMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuTableRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MultiView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MultiViewControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\NamedCssStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\NextPrevFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Orientation.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagedDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerButtons.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerPosition.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerSettings.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Panel.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PanelStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Parameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ParameterCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PasswordRecovery.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PathDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PlaceHolder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PlaceHolderControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PolygonHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ProfileParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\QueryStringParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RadioButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RadioButtonList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RangeValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RectangleHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RegularExpressionValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Repeater.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatInfo.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatLayout.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RequiredFieldValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RoleGroup.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RoleGroupCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RouteParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ScrollBars.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SelectedDatesCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SendMailErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SendMailErrorEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SessionParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapPath.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapViewType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SortDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StringArrayConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Style.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StyleBlock.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SubMenuStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SubMenuStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Substitution.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Table.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCaptionAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCellCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCellControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableFooterRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderScope.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableItemStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRowSection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableSectionStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TargetConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplateColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplatedWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplateField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBoxControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBoxMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TitleFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeBinding.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeSelectAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeTypes.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeViewImageSet.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Unit.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\UnitConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\UnitType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationCompareOperator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationDataType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationSummary.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationSummaryDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidatorDisplay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\VerticalAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\VerticalAlignConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\View.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ViewCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WebColorConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WebControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Wizard.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardLayoutContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardLayoutNavigationContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardNavigationEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardNavigationEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepBase.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Xml.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourceNodeDescriptor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourcePropertyDescriptor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchicalEnumerable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchyData.cs" />\r
-    <Compile Include="System.Web.UI\ApplicationFileParser.cs" />\r
-    <Compile Include="System.Web.UI\AttributeCollection.cs" />\r
-    <Compile Include="System.Web.UI\BaseParser.cs" />\r
-    <Compile Include="System.Web.UI\BasePartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\BaseTemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\BoundPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\BuilderPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\BuildMethod.cs" />\r
-    <Compile Include="System.Web.UI\BuildTemplateMethod.cs" />\r
-    <Compile Include="System.Web.UI\ChtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\ClientIDMode.cs" />\r
-    <Compile Include="System.Web.UI\ClientScriptManager.cs" />\r
-    <Compile Include="System.Web.UI\CodeBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CodeConstructType.cs" />\r
-    <Compile Include="System.Web.UI\CodeRenderBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CollectionBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CompilationMode.cs" />\r
-    <Compile Include="System.Web.UI\CompiledBindableTemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CompiledTemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\ComplexPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ConflictOptions.cs" />\r
-    <Compile Include="System.Web.UI\ConstructorNeedsTagAttribute.cs" />\r
-    <Compile Include="System.Web.UI\Control.cs" />\r
-    <Compile Include="System.Web.UI\ControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\ControlBuilderAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ControlCachePolicy.cs" />\r
-    <Compile Include="System.Web.UI\ControlCollection.cs" />\r
-    <Compile Include="System.Web.UI\ControlSkin.cs" />\r
-    <Compile Include="System.Web.UI\ControlSkinDelegate.cs" />\r
-    <Compile Include="System.Web.UI\ControlValuePropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\CssClassPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\CssStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI\DataBinder.cs" />\r
-    <Compile Include="System.Web.UI\DataBinding.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingBuilder.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingHandlerAttribute.cs" />\r
-    <Compile Include="System.Web.UI\DataBoundLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\DataKeyPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCacheDurationConverter.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCacheExpiry.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCapabilities.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceControl.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceOperation.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceSelectArguments.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceViewOperationCallback.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceViewSelectCallback.cs" />\r
-    <Compile Include="System.Web.UI\DesignerDataBoundLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\DesignTimeParseData.cs" />\r
-    <Compile Include="System.Web.UI\DesignTimeTemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\EmptyControlCollection.cs" />\r
-    <Compile Include="System.Web.UI\EventEntry.cs" />\r
-    <Compile Include="System.Web.UI\ExpressionBinding.cs" />\r
-    <Compile Include="System.Web.UI\ExpressionBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI\ExtractTemplateValuesMethod.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelControlBuilderAttribute.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelMasterPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelUserControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FilterableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HiddenFieldPageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\HierarchicalDataSourceControl.cs" />\r
-    <Compile Include="System.Web.UI\HierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\Html32TextWriter.cs" />\r
-    <Compile Include="System.Web.UI\HtmlControlPersistableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterStyle.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterTag.cs" />\r
-    <Compile Include="System.Web.UI\IAttributeAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IAutoFieldGenerator.cs" />\r
-    <Compile Include="System.Web.UI\IBindableControl.cs" />\r
-    <Compile Include="System.Web.UI\IBindableTemplate.cs" />\r
-    <Compile Include="System.Web.UI\ICallbackEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\ICheckBoxControl.cs" />\r
-    <Compile Include="System.Web.UI\IControlBuilderAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataBindingsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataItemContainer.cs" />\r
-    <Compile Include="System.Web.UI\IDataKeysControl.cs" />\r
-    <Compile Include="System.Web.UI\IDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IDataSourceViewSchemaAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDReferencePropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\IEditableTextControl.cs" />\r
-    <Compile Include="System.Web.UI\IExpressionsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IFilterResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IgnoreUnknownContentAttribute.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalEnumerable.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchyData.cs" />\r
-    <Compile Include="System.Web.UI\ImageClickEventArgs.cs" />\r
-    <Compile Include="System.Web.UI\ImageClickEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\INamingContainer.cs" />\r
-    <Compile Include="System.Web.UI\INavigateUIData.cs" />\r
-    <Compile Include="System.Web.UI\IndexedString.cs" />\r
-    <Compile Include="System.Web.UI\INonBindingContainer.cs" />\r
-    <Compile Include="System.Web.UI\IParserAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackDataHandler.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\IResourceUrlGenerator.cs" />\r
-    <Compile Include="System.Web.UI\IScriptManager.cs" />\r
-    <Compile Include="System.Web.UI\IStateFormatter.cs" />\r
-    <Compile Include="System.Web.UI\IStateManager.cs" />\r
-    <Compile Include="System.Web.UI\IStyleSheet.cs" />\r
-    <Compile Include="System.Web.UI\ITagNameToTypeMapper.cs" />\r
-    <Compile Include="System.Web.UI\ITemplate.cs" />\r
-    <Compile Include="System.Web.UI\ITextControl.cs" />\r
-    <Compile Include="System.Web.UI\IThemeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUrlResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlTypeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IValidator.cs" />\r
-    <Compile Include="System.Web.UI\ListSourceHelper.cs" />\r
-    <Compile Include="System.Web.UI\LiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\LosFormatter.cs" />\r
-    <Compile Include="System.Web.UI\MainDirectiveAttribute.cs" />\r
-    <Compile Include="System.Web.UI\MasterPage.cs" />\r
-    <Compile Include="System.Web.UI\MasterPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\MasterPageParser.cs" />\r
-    <Compile Include="System.Web.UI\MinimizableAttributeTypeConverter.cs" />\r
-    <Compile Include="System.Web.UI\NonVisualControlAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ObjectConverter.cs" />\r
-    <Compile Include="System.Web.UI\ObjectPersistData.cs" />\r
-    <Compile Include="System.Web.UI\ObjectStateFormatter.cs" />\r
-    <Compile Include="System.Web.UI\ObjectTag.cs" />\r
-    <Compile Include="System.Web.UI\ObjectTagBuilder.cs" />\r
-    <Compile Include="System.Web.UI\OutputCacheLocation.cs" />\r
-    <Compile Include="System.Web.UI\OutputCacheParameters.cs" />\r
-    <Compile Include="System.Web.UI\Page.cs" />\r
-    <Compile Include="System.Web.UI\PageAsyncTask.cs" />\r
-    <Compile Include="System.Web.UI\PageHandlerFactory.cs" />\r
-    <Compile Include="System.Web.UI\PageLifeCycle.cs" />\r
-    <Compile Include="System.Web.UI\PageParser.cs" />\r
-    <Compile Include="System.Web.UI\PageParserFilter.cs" />\r
-    <Compile Include="System.Web.UI\PageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\PageTheme.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeBuilder.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeFileParser.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeParser.cs" />\r
-    <Compile Include="System.Web.UI\Pair.cs" />\r
-    <Compile Include="System.Web.UI\ParseChildrenAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PartialCachingAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\PersistChildrenAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PersistenceMode.cs" />\r
-    <Compile Include="System.Web.UI\PersistenceModeAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PostBackOptions.cs" />\r
-    <Compile Include="System.Web.UI\PropertyConverter.cs" />\r
-    <Compile Include="System.Web.UI\PropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ReadOnlyDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\RenderMethod.cs" />\r
-    <Compile Include="System.Web.UI\ResourceBasedLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\RootBuilder.cs" />\r
-    <Compile Include="System.Web.UI\SessionPageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\SimpleHandlerFactory.cs" />\r
-    <Compile Include="System.Web.UI\SimplePropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\SimpleWebHandlerParser.cs" />\r
-    <Compile Include="System.Web.UI\SkinBuilder.cs" />\r
-    <Compile Include="System.Web.UI\StateBag.cs" />\r
-    <Compile Include="System.Web.UI\StateItem.cs" />\r
-    <Compile Include="System.Web.UI\StateManagedCollection.cs" />\r
-    <Compile Include="System.Web.UI\StaticPartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\StringPropertyBuilder.cs" />\r
-    <Compile Include="System.Web.UI\SupportsEventValidationAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TagPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\TemplateContainerAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateContentType.cs" />\r
-    <Compile Include="System.Web.UI\TemplateControl.cs" />\r
-    <Compile Include="System.Web.UI\TemplateControlParser.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstance.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstanceAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\TemplatePropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ThemeableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ThemeProvider.cs" />\r
-    <Compile Include="System.Web.UI\ToolboxDataAttribute.cs" />\r
-    <Compile Include="System.Web.UI\Triplet.cs" />\r
-    <Compile Include="System.Web.UI\UnknownAttributeDescriptor.cs" />\r
-    <Compile Include="System.Web.UI\UrlPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\UrlTypes.cs" />\r
-    <Compile Include="System.Web.UI\UserControl.cs" />\r
-    <Compile Include="System.Web.UI\UserControlControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\UserControlParser.cs" />\r
-    <Compile Include="System.Web.UI\ValidationPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ValidatorCollection.cs" />\r
-    <Compile Include="System.Web.UI\VerificationAttribute.cs" />\r
-    <Compile Include="System.Web.UI\VerificationConditionalOperator.cs" />\r
-    <Compile Include="System.Web.UI\VerificationReportLevel.cs" />\r
-    <Compile Include="System.Web.UI\VerificationRule.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateEncryptionMode.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateException.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateMode.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateModeByIdAttribute.cs" />\r
-    <Compile Include="System.Web.UI\VirtualReferenceType.cs" />\r
-    <Compile Include="System.Web.UI\WebHandlerParser.cs" />\r
-    <Compile Include="System.Web.UI\WebResourceAttribute.cs" />\r
-    <Compile Include="System.Web.UI\WebServiceParser.cs" />\r
-    <Compile Include="System.Web.UI\XhtmlMobileDocType.cs" />\r
-    <Compile Include="System.Web.UI\XhtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\XPathBinder.cs" />\r
-    <Compile Include="System.Web.Util\AltSerialization.cs" />\r
-    <Compile Include="System.Web.Util\DataSourceHelper.cs" />\r
-    <Compile Include="System.Web.Util\DataSourceResolver.cs" />\r
-    <Compile Include="System.Web.Util\FileUtils.cs" />\r
-    <Compile Include="System.Web.Util\Helpers.cs" />\r
-    <Compile Include="System.Web.Util\HttpEncoder.cs" />\r
-    <Compile Include="System.Web.Util\ICalls.cs" />\r
-    <Compile Include="System.Web.Util\IWebObjectFactory.cs" />\r
-    <Compile Include="System.Web.Util\IWebPropertyAccessor.cs" />\r
-    <Compile Include="System.Web.Util\MachineKeySectionUtils.cs" />\r
-    <Compile Include="System.Web.Util\RequestValidationSource.cs" />\r
-    <Compile Include="System.Web.Util\RequestValidator.cs" />\r
-    <Compile Include="System.Web.Util\RuntimeHelpers.cs" />\r
-    <Compile Include="System.Web.Util\SearchPattern.cs" />\r
-    <Compile Include="System.Web.Util\SecureHashCodeProvider.cs" />\r
-    <Compile Include="System.Web.Util\SerializationHelper.cs" />\r
-    <Compile Include="System.Web.Util\SimpleWebObjectFactory.cs" />\r
-    <Compile Include="System.Web.Util\StrUtils.cs" />\r
-    <Compile Include="System.Web.Util\TimeUtil.cs" />\r
-    <Compile Include="System.Web.Util\TransactedCallback.cs" />\r
-    <Compile Include="System.Web.Util\Transactions.cs" />\r
-    <Compile Include="System.Web.Util\UrlUtils.cs" />\r
-    <Compile Include="System.Web.Util\WebEncoding.cs" />\r
-    <Compile Include="System.Web.Util\WebTrace.cs" />\r
-    <Compile Include="System.Web.Util\WorkItem.cs" />\r
-    <Compile Include="System.Web.Util\WorkItemCallback.cs" />\r
-    <Compile Include="System.Web\ApplicationShutdownReason.cs" />\r
-    <Compile Include="System.Web\BaseParamsCollection.cs" />\r
-    <Compile Include="System.Web\BeginEventHandler.cs" />\r
-    <Compile Include="System.Web\BrowserCapabilities.cs" />\r
-    <Compile Include="System.Web\CapabilitiesLoader.cs" />\r
-    <Compile Include="System.Web\DefaultExceptionPageTemplate.cs" />\r
-    <Compile Include="System.Web\DefaultHttpHandler.cs" />\r
-    <Compile Include="System.Web\DynamicModuleManager.cs" />\r
-    <Compile Include="System.Web\EndEventHandler.cs" />\r
-    <Compile Include="System.Web\EventHandlerTaskAsyncHelper.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplate.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateFragment.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateFragmentValue.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateType.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateValues.cs" />\r
-    <Compile Include="System.Web\HeadersCollection.cs" />\r
-    <Compile Include="System.Web\HtmlizedException.cs" />\r
-    <Compile Include="System.Web\HtmlString.cs" />\r
-    <Compile Include="System.Web\HttpApplication.cs" />\r
-    <Compile Include="System.Web\HttpApplicationFactory.cs" />\r
-    <Compile Include="System.Web\HttpApplicationState.cs" />\r
-    <Compile Include="System.Web\HttpBrowserCapabilities.cs" />\r
-    <Compile Include="System.Web\HttpCacheability.cs" />\r
-    <Compile Include="System.Web\HttpCachePolicy.cs" />\r
-    <Compile Include="System.Web\HttpCacheRevalidation.cs" />\r
-    <Compile Include="System.Web\HttpCacheValidateHandler.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByContentEncodings.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByHeaders.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByParams.cs" />\r
-    <Compile Include="System.Web\HttpClientCertificate.cs" />\r
-    <Compile Include="System.Web\HttpCompileException.cs" />\r
-    <Compile Include="System.Web\HttpContext.cs" />\r
-    <Compile Include="System.Web\HttpCookie.cs" />\r
-    <Compile Include="System.Web\HttpCookieCollection.cs" />\r
-    <Compile Include="System.Web\HttpCookieMode.cs" />\r
-    <Compile Include="System.Web\HttpException.cs" />\r
-    <Compile Include="System.Web\HttpFileCollection.cs" />\r
-    <Compile Include="System.Web\HttpForbiddenHandler.cs" />\r
-    <Compile Include="System.Web\HttpHeaderCollection.cs" />\r
-    <Compile Include="System.Web\HttpMethodNotAllowedHandler.cs" />\r
-    <Compile Include="System.Web\HttpModuleCollection.cs" />\r
-    <Compile Include="System.Web\HttpNotFoundHandler.cs" />\r
-    <Compile Include="System.Web\HttpNotImplementedHandler.cs" />\r
-    <Compile Include="System.Web\HttpParamsCollection.cs" />\r
-    <Compile Include="System.Web\HttpParseException.cs" />\r
-    <Compile Include="System.Web\HttpPostedFile.cs" />\r
-    <Compile Include="System.Web\HttpRequest.cs" />\r
-    <Compile Include="System.Web\HttpRequestValidationException.cs" />\r
-    <Compile Include="System.Web\HttpResponse.cs" />\r
-    <Compile Include="System.Web\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Web\HttpResponseStream.cs" />\r
-    <Compile Include="System.Web\HttpResponseSubstitutionCallback.cs" />\r
-    <Compile Include="System.Web\HttpRuntime.cs" />\r
-    <Compile Include="System.Web\HttpServerUtility.cs" />\r
-    <Compile Include="System.Web\HttpStaticObjectsCollection.cs" />\r
-    <Compile Include="System.Web\HttpTaskAsyncHandler.cs" />\r
-    <Compile Include="System.Web\HttpUnhandledException.cs" />\r
-    <Compile Include="System.Web\HttpUtility.cs" />\r
-    <Compile Include="System.Web\HttpValidationStatus.cs" />\r
-    <Compile Include="System.Web\HttpWorkerRequest.cs" />\r
-    <Compile Include="System.Web\HttpWriter.cs" />\r
-    <Compile Include="System.Web\IHtmlString.cs" />\r
-    <Compile Include="System.Web\IHttpAsyncHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandlerFactory.cs" />\r
-    <Compile Include="System.Web\IHttpMapPath.cs" />\r
-    <Compile Include="System.Web\IHttpModule.cs" />\r
-    <Compile Include="System.Web\IisTraceListener.cs" />\r
-    <Compile Include="System.Web\InputFilterStream.cs" />\r
-    <Compile Include="System.Web\IntPtrStream.cs" />\r
-    <Compile Include="System.Web\IPartitionResolver.cs" />\r
-    <Compile Include="System.Web\MimeMapping.cs" />\r
-    <Compile Include="System.Web\MimeTypes.cs" />\r
-    <Compile Include="System.Web\NoParamsInvoker.cs" />\r
-    <Compile Include="System.Web\OutputFilterStream.cs" />\r
-    <Compile Include="System.Web\ParserError.cs" />\r
-    <Compile Include="System.Web\ParserErrorCollection.cs" />\r
-    <Compile Include="System.Web\PreApplicationStartMethodAttribute.cs" />\r
-    <Compile Include="System.Web\ProcessInfo.cs" />\r
-    <Compile Include="System.Web\ProcessModelInfo.cs" />\r
-    <Compile Include="System.Web\ProcessShutdownReason.cs" />\r
-    <Compile Include="System.Web\ProcessStatus.cs" />\r
-    <Compile Include="System.Web\QueueManager.cs" />\r
-    <Compile Include="System.Web\ReadEntityBodyMode.cs" />\r
-    <Compile Include="System.Web\RequestNotification.cs" />\r
-    <Compile Include="System.Web\RequestNotificationStatus.cs" />\r
-    <Compile Include="System.Web\ServerVariablesCollection.cs" />\r
-    <Compile Include="System.Web\SiteMap.cs" />\r
-    <Compile Include="System.Web\SiteMapNode.cs" />\r
-    <Compile Include="System.Web\SiteMapNodeCollection.cs" />\r
-    <Compile Include="System.Web\SiteMapProvider.cs" />\r
-    <Compile Include="System.Web\SiteMapProviderCollection.cs" />\r
-    <Compile Include="System.Web\SiteMapResolveEventArgs.cs" />\r
-    <Compile Include="System.Web\StaticFileHandler.cs" />\r
-    <Compile Include="System.Web\StaticSiteMapProvider.cs" />\r
-    <Compile Include="System.Web\TaskAsyncResult.cs" />\r
-    <Compile Include="System.Web\TaskEventHandler.cs" />\r
-    <Compile Include="System.Web\TempFileStream.cs" />\r
-    <Compile Include="System.Web\TraceContext.cs" />\r
-    <Compile Include="System.Web\TraceContextEventArgs.cs" />\r
-    <Compile Include="System.Web\TraceContextEventHandler.cs" />\r
-    <Compile Include="System.Web\TraceContextRecord.cs" />\r
-    <Compile Include="System.Web\TraceData.cs" />\r
-    <Compile Include="System.Web\TraceManager.cs" />\r
-    <Compile Include="System.Web\TraceMode.cs" />\r
-    <Compile Include="System.Web\UnvalidatedRequestValues.cs" />\r
-    <Compile Include="System.Web\UnvalidatedRequestValuesBase.cs" />\r
-    <Compile Include="System.Web\UnvalidatedRequestValuesWrapper.cs" />\r
-    <Compile Include="System.Web\VirtualPath.cs" />\r
-    <Compile Include="System.Web\VirtualPathUtility.cs" />\r
-    <Compile Include="System.Web\WebCategoryAttribute.cs" />\r
-    <Compile Include="System.Web\WebPageTraceListener.cs" />\r
-    <Compile Include="System.Web\WebROCollection.cs" />\r
-    <Compile Include="System.Web\WebSysDescriptionAttribute.cs" />\r
-    <Compile Include="System.Web\XmlSiteMapProvider.cs" />\r
-    <Compile Include="System.Web\UplevelHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_5.csproj">\r
-      <Project>{41476FBD-C1CB-4B3C-8078-3281EB1E0EAB}</Project>\r
-      <Name>Mono.Data.Sqlite-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj">\r
-      <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj">\r
-      <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj">\r
-      <Project>{B12AABBC-30D1-4885-BF3F-A53B970F68FB}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
-      <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.Services/System.Web.Services-net_4_5.csproj">\r
-      <Project>{251DB111-FEE1-4080-8411-0AD1CC9BA94B}</Project>\r
-      <Name>System.Web.Services-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Design/System.Design-net_4_5.csproj">\r
-      <Project>{D4E6A482-761B-4B41-8B63-C930CA84D268}</Project>\r
-      <Name>System.Design-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/TranslationResources.resources">\r
-      <LogicalName>TranslationResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation.js">\r
-      <LogicalName>WebUIValidation.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder.gif">\r
-      <LogicalName>folder.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/file.gif">\r
-      <LogicalName>file.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/computer.gif">\r
-      <LogicalName>computer.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_minus.gif">\r
-      <LogicalName>arrow_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_noexpand.gif">\r
-      <LogicalName>arrow_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_plus.gif">\r
-      <LogicalName>arrow_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_up.gif">\r
-      <LogicalName>arrow_up.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_down.gif">\r
-      <LogicalName>arrow_down.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_full.gif">\r
-      <LogicalName>box_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_empty.gif">\r
-      <LogicalName>box_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_minus.gif">\r
-      <LogicalName>box_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_noexpand.gif">\r
-      <LogicalName>box_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_plus.gif">\r
-      <LogicalName>box_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/contact.gif">\r
-      <LogicalName>contact.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_empty.gif">\r
-      <LogicalName>dot_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_full.gif">\r
-      <LogicalName>dot_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dots.gif">\r
-      <LogicalName>dots.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/inbox.gif">\r
-      <LogicalName>inbox.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_empty.gif">\r
-      <LogicalName>star_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_full.gif">\r
-      <LogicalName>star_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/warning.gif">\r
-      <LogicalName>warning.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_noexpand.gif">\r
-      <LogicalName>TreeView_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dash.gif">\r
-      <LogicalName>TreeView_dash.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashminus.gif">\r
-      <LogicalName>TreeView_dashminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashplus.gif">\r
-      <LogicalName>TreeView_dashplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_i.gif">\r
-      <LogicalName>TreeView_i.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_l.gif">\r
-      <LogicalName>TreeView_l.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lminus.gif">\r
-      <LogicalName>TreeView_lminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lplus.gif">\r
-      <LogicalName>TreeView_lplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_minus.gif">\r
-      <LogicalName>TreeView_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_plus.gif">\r
-      <LogicalName>TreeView_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_r.gif">\r
-      <LogicalName>TreeView_r.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rminus.gif">\r
-      <LogicalName>TreeView_rminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rplus.gif">\r
-      <LogicalName>TreeView_rplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_t.gif">\r
-      <LogicalName>TreeView_t.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tminus.gif">\r
-      <LogicalName>TreeView_tminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tplus.gif">\r
-      <LogicalName>TreeView_tplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/transparent.gif">\r
-      <LogicalName>transparent.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/webform.js">\r
-      <LogicalName>webform.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation_2.0.js">\r
-      <LogicalName>WebUIValidation_2.0.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Top.html">\r
-      <LogicalName>ErrorTemplateCommon_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_CustomErrorDefault.html">\r
-      <LogicalName>DefaultErrorTemplate_CustomErrorDefault.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Bottom.html">\r
-      <LogicalName>ErrorTemplateCommon_Bottom.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_StandardPage.html">\r
-      <LogicalName>DefaultErrorTemplate_StandardPage.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_Top.html">\r
-      <LogicalName>HtmlizedExceptionPage_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileLongSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileLongSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileShortSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileShortSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_CompilerOutput.html">\r
-      <LogicalName>HtmlizedExceptionPage_CompilerOutput.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/GridView.js">\r
-      <LogicalName>GridView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/DetailsView.js">\r
-      <LogicalName>DetailsView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/TreeView.js">\r
-      <LogicalName>TreeView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/Menu.js">\r
-      <LogicalName>Menu.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/MenuModern.js">\r
-      <LogicalName>MenuModern.js</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web/System.Web-net_4_x.csproj b/mcs/class/System.Web/System.Web-net_4_x.csproj
index bb59ec36a0df4e24e33260b9adc4d95752268c13..f63b9ab24895dc357932d9ee0dc6400a538a5e62 100644 (file)
--- a/mcs/class/System.Web/System.Web-net_4_x.csproj
+++ b/mcs/class/System.Web/System.Web-net_4_x.csproj
@@ -46,8 +46,11 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpApplicationStateBase.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpApplicationStateWrapper.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpBrowserCapabilitiesBase.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpBrowserCapabilitiesWrapper.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpCachePolicyBase.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpCachePolicyWrapper.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpFileCollectionBase.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpPostedFileBase.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpPostedFileWrapper.cs" />\r
@@ -55,9 +58,63 @@
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpResponseBase.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpServerUtilityBase.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpSessionStateBase.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpSessionStateWrapper.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpStaticObjectsCollectionBase.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpStaticObjectsCollectionWrapper.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Cache\IOutputCacheEntry.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Cache\ResponseElement.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\BuildProviderAppliesTo.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\BuildProviderAppliesToAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\DesignTimeResourceProviderFactoryAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\ExpressionEditorAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\ExpressionPrefixAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\FolderLevelBuildProviderAppliesTo.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\FolderLevelBuildProviderAppliesToAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\IAssemblyPostProcessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\IImplicitResourceProvider.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AdapterDictionary.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AsyncPreloadModeFlags.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AuthenticationMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AuthorizationRuleAction.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\BrowserCapsElementType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\BrowserTree.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\CustomErrorsMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\CustomErrorsRedirectMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\CustomWebEventKey.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\DelayedRegex.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\FormsAuthPasswordFormat.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\FormsProtectionEnum.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\IConfigMapPath.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\IConfigMapPathFactory.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\IRemoteWebConfigurationHostServer.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\MachineKeyCompatibilityMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\MachineKeyValidation.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\PagesEnableSessionState.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProcessModelComAuthenticationLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProcessModelComImpersonationLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProcessModelLogLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProfileGuidedOptimizationsFlags.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RegexMatchTimeoutValidator.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RegexMatchTimeoutValidatorAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RpcAuthent.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RpcImpers.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RpcLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\SerializationMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\SystemWebCachingSectionGroup.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\TicketCompatibilityMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\TraceDisplayMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\WebApplicationLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\WebLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\XhtmlConformanceMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Hosting\IApplicationHost.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Hosting\IRegisteredObject.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\IHtmlString.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpAsyncHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpHandlerFactory.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpModule.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\ISubscriptionToken.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\ITlsTokenBindingInfo.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\BindingBehavior.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\BindingBehaviorAttribute.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\BindNeverAttribute.cs" />\r
@@ -65,19 +122,307 @@
     <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ExtensibleModelBinderAttribute.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\IModelNameProvider.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ModelBinderProviderOptionsAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ModelError.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ModelErrorCollection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\PreApplicationStartMethodAttribute.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Profile\HttpProfileGroupBase.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Profile\ProfileEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Profile\ProfileEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\ReadEntityBodyMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\RequestNotification.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\RequestNotificationStatus.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\IRouteConstraint.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\IRouteHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RequestContext.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteBase.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteDirection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteTable.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteValueDictionary.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\VirtualPathData.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Security\AntiXss\CodeCharts.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\FormsAuthenticationEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\FormsAuthenticationEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\PassportAuthenticationEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\PassportAuthenticationEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\RoleManagerEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\RoleManagerEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\WindowsAuthenticationEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\WindowsAuthenticationEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\State\IReadOnlySessionState.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\State\IRequiresSessionState.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\State\SessionStateBehavior.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ClientIDMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ConflictOptions.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ConstructorNeedsTagAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ControlBuilderAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\CssClassPropertyAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataBindingHandlerAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataKeyPropertyAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataSourceCacheExpiry.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataSourceCapabilities.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataSourceOperation.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\FileLevelControlBuilderAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\FilterableAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\HtmlTextWriterAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\HtmlTextWriterStyle.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\HtmlTextWriterTag.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IAttributeAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IAutoFieldGenerator.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IBindableControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IBindableTemplate.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ICallbackEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IControlBuilderAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IControlDesignerAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataBindingsAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataItemContainer.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataKeysControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataSource.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataSourceViewSchemaAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDReferencePropertyAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IExpressionsAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IFilterResolutionService.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IHierarchicalDataSource.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IHierarchicalEnumerable.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IHierarchyData.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ImageClickEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\INamingContainer.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\INavigateUIData.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\INonBindingContainer.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IParserAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IPostBackDataHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IPostBackEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IResourceUrlGenerator.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IScriptResourceDefinition.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IScriptResourceMapping.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IStateFormatter.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IStateManager.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IStyleSheet.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ITemplate.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IThemeResolutionService.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IUrlResolutionService.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IUserControlDesignerAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IUserControlTypeResolutionService.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IValidator.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\NonVisualControlAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\PersistChildrenAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\PersistenceMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\SupportsEventValidationAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TemplateInstance.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TemplateInstanceAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ThemeableAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TraceContextEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TraceContextEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\UnobtrusiveValidationMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ValidateRequestMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ViewStateEncryptionMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ViewStateMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\Adapters\WmlPostFieldType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AdCreatedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AuthenticateEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AuthenticateEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AutoCompleteType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\BorderStyle.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\BulletedListEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\BulletedListEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ButtonColumnType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ButtonType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CalendarSelectionMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CallingDataMethodsEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CallingDataMethodsEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ContentDirection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CreateUserErrorEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CreateUserErrorEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataBoundControlMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataControlCellType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataControlRowState.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataControlRowType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridCommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridItemEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridItemEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridPageChangedEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridPageChangedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridSortCommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridSortCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListCommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListItemEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListItemEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DayNameFormat.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DayRenderEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewCommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewDeletedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewDeleteEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewInsertedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewInsertEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewModeEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewModeEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewPageEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewPageEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewUpdatedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewUpdateEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FirstDayOfWeek.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FontSize.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewDeletedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewDeleteEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewInsertedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewInsertEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewModeEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewModeEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewPageEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewPageEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewUpdatedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewUpdateEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridLines.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCancelEditEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCancelEditEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewDeletedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewDeleteEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewEditEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewEditEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewPageEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewPageEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewRowEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewRowEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSelectEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSelectEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSortEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSortEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewUpdatedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewUpdateEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\HorizontalAlign.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\HotSpotMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IButtonControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ICallbackContainer.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ICompositeControlDesignerAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IDataBoundControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IDataBoundItemControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IDataBoundListControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IFieldControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ImageAlign.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ImageMapEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ImageMapEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IPersistedSelector.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IRepeatInfoUser.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ListItemType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ListSelectionMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LiteralMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LoginCancelEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LoginCancelEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LoginFailureAction.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LogoutAction.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MailMessageEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MailMessageEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MenuEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MenuEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MenuRenderingMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MonthChangedEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MonthChangedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\NextPrevFormat.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceDisposingEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceDisposingEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceFilteringEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceFilteringEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceMethodEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceMethodEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceSelectingEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceSelectingEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceStatusEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceStatusEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\Orientation.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PagerButtons.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PagerMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PagerPosition.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PathDirection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeatDirection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterCommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterItemEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterItemEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeatLayout.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SendMailErrorEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ServerValidateEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SiteMapNodeItemEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SiteMapNodeItemEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SiteMapNodeItemType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SortDirection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceFilteringEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceFilteringEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceSelectingEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceSelectingEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceStatusEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceStatusEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TableCaptionAlign.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TableHeaderScope.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TableRowSection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TextAlign.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TextBoxMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TitleFormat.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeNodeEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeNodeEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeNodeSelectAction.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeViewImageSet.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\UnitType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidationCompareOperator.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidationDataType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidationSummaryDisplayMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidatorDisplay.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\VerticalAlign.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\WebColorConverter.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\FieldCallback.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\ITrackingPersonalizable.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\ITransformerConfigurationControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IVersioningPersonalizable.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebActionable.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebEditable.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPart.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartField.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartHttpHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartParameters.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartRow.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartTable.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\ParametersCallback.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\PartChromeState.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\PartChromeType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\PersonalizationScope.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\RowCallback.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\TableCallback.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebBrowsableAttribute.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebDescriptionAttribute.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebDisplayNameAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartAuthorizationEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartCancelEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartCancelEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartExportMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartHelpMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartVerbsEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartVerbsEventHandler.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\UnvalidatedRequestValuesBase.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\UnvalidatedRequestValuesWrapper.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Util\IObjectFactory.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Util\RequestValidationSource.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Util\StringUtil.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\WebSockets\AspNetWebSocketOptions.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\WebSockets\SubprotocolUtil.cs" />\r
     <Compile Include="..\..\build\common\Consts.cs" />\r
     <Compile Include="..\..\build\common\Locale.cs" />\r
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
+    <Compile Include="..\..\build\common\SR.cs" />\r
     <Compile Include="..\System.Design\System.Data.Design\TypedDataSetGenerator.cs" />\r
     <Compile Include="..\System.Windows.Forms\System.Resources\AssemblyNamesTypeResolutionService.cs" />\r
     <Compile Include="..\System.Windows.Forms\System.Resources\ByteArrayFromResXHandler.cs" />\r
@@ -100,6 +445,7 @@
     <Compile Include="Mono.Web.Util\SettingsMapping.cs" />\r
     <Compile Include="Mono.Web.Util\SettingsMappingManager.cs" />\r
     <Compile Include="Mono.Web.Util\SettingsMappingWhat.cs" />\r
+    <Compile Include="ReferenceSources\SR.cs" />\r
     <Compile Include="System.Collections.Concurrent\SplitOrderedList.cs" />\r
     <Compile Include="System.Web.Caching\AggregateCacheDependency.cs" />\r
     <Compile Include="System.Web.Caching\Cache.cs" />\r
@@ -120,13 +466,11 @@
     <Compile Include="System.Web.Caching\FileResponseElement.cs" />\r
     <Compile Include="System.Web.Caching\HeaderElement.cs" />\r
     <Compile Include="System.Web.Caching\InMemoryOutputCacheProvider.cs" />\r
-    <Compile Include="System.Web.Caching\IOutputCacheEntry.cs" />\r
     <Compile Include="System.Web.Caching\MemoryResponseElement.cs" />\r
     <Compile Include="System.Web.Caching\OutputCache.cs" />\r
     <Compile Include="System.Web.Caching\OutputCacheModule.cs" />\r
     <Compile Include="System.Web.Caching\OutputCacheProvider.cs" />\r
     <Compile Include="System.Web.Caching\OutputCacheProviderCollection.cs" />\r
-    <Compile Include="System.Web.Caching\ResponseElement.cs" />\r
     <Compile Include="System.Web.Caching\SqlCacheDependency.cs" />\r
     <Compile Include="System.Web.Caching\SqlCacheDependencyAdmin.cs" />\r
     <Compile Include="System.Web.Caching\SubstitutionResponseElement.cs" />\r
@@ -155,8 +499,6 @@
     <Compile Include="System.Web.Compilation\BuildManagerHostUnloadEventHandler.cs" />\r
     <Compile Include="System.Web.Compilation\BuildManagerRemoveEntryEventHandler.cs" />\r
     <Compile Include="System.Web.Compilation\BuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesTo.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesToAttribute.cs" />\r
     <Compile Include="System.Web.Compilation\BuildProviderGroup.cs" />\r
     <Compile Include="System.Web.Compilation\BuildProviderResultFlags.cs" />\r
     <Compile Include="System.Web.Compilation\CachingCompiler.cs" />\r
@@ -168,22 +510,14 @@
     <Compile Include="System.Web.Compilation\ConnectionStringsExpressionBuilder.cs" />\r
     <Compile Include="System.Web.Compilation\DefaultResourceProvider.cs" />\r
     <Compile Include="System.Web.Compilation\DefaultResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.Compilation\DesignTimeResourceProviderFactoryAttribute.cs" />\r
     <Compile Include="System.Web.Compilation\Directive.cs" />\r
     <Compile Include="System.Web.Compilation\ExpressionBuilder.cs" />\r
     <Compile Include="System.Web.Compilation\ExpressionBuilderContext.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionEditorAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\FolderLevelBuildProviderAppliesTo.cs" />\r
-    <Compile Include="System.Web.Compilation\FolderLevelBuildProviderAppliesToAttribute.cs" />\r
     <Compile Include="System.Web.Compilation\ForceCopyBuildProvider.cs" />\r
     <Compile Include="System.Web.Compilation\GenericBuildProvider.cs" />\r
     <Compile Include="System.Web.Compilation\GlobalAsaxCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\IAssemblyPostProcessor.cs" />\r
     <Compile Include="System.Web.Compilation\IgnoreFileBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\IImplicitResourceProvider.cs" />\r
     <Compile Include="System.Web.Compilation\ILocation.cs" />\r
-    <Compile Include="System.Web.Compilation\ImplicitResourceKey.cs" />\r
     <Compile Include="System.Web.Compilation\IResourceProvider.cs" />\r
     <Compile Include="System.Web.Compilation\LinePragmaCodeInfo.cs" />\r
     <Compile Include="System.Web.Compilation\Location.cs" />\r
@@ -215,15 +549,12 @@
     <Compile Include="System.Web.Compilation\WsdlBuildProvider.cs" />\r
     <Compile Include="System.Web.Compilation\XsdBuildProvider.cs" />\r
     <Compile Include="System.Web.Configuration.Internal\IInternalConfigWebHost.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AdapterDictionary.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\AnonymousIdentificationSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\ApplicationSettingsConfigurationFileMap.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\AssemblyCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthenticationMode.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\AuthenticationSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\AuthorizationRule.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleAction.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\AuthorizationSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\BufferModesCollection.cs" />\r
@@ -243,8 +574,6 @@
     <Compile Include="System.Web.Configuration_2.0\CompilerCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\CustomError.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\CustomErrorCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsRedirectMode.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\CustomErrorsSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\DeploymentSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\EventMappingSettings.cs" />\r
@@ -255,8 +584,6 @@
     <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationCredentials.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUser.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUserCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthPasswordFormat.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsProtectionEnum.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\GlobalizationSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\HandlersUtil.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\HealthMonitoringSection.cs" />\r
@@ -275,16 +602,11 @@
     <Compile Include="System.Web.Configuration_2.0\HttpModulesSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\HttpRuntimeSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\ICapabilitiesProcess.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPath.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPathFactory.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\IdentitySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IRemoteWebConfigurationHostServer.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\LowerCaseStringConverter.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\LruCache.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyCompatibilityMode.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\MachineKeyRegistryStorage.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\MachineKeySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyValidation.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\MachineKeyValidationConverter.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\MembershipSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\MonoSettingsSection.cs" />\r
@@ -302,13 +624,9 @@
     <Compile Include="System.Web.Configuration_2.0\OutputCacheProfileCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\OutputCacheSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\OutputCacheSettingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PagesEnableSessionState.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\PagesSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\PassportAuthentication.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\PositiveTimeSpanValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComAuthenticationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComImpersonationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelLogLevel.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\ProcessModelSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettings.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettingsCollection.cs" />\r
@@ -326,20 +644,17 @@
     <Compile Include="System.Web.Configuration_2.0\RuleSettings.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\RuleSettingsCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SecurityPolicySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SerializationMode.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SessionPageStateSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SessionStateSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SiteMapSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabase.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabaseCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SystemWebCachingSectionGroup.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SystemWebSectionGroup.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\TagMapCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\TagMapInfo.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\TagPrefixCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\TagPrefixInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TraceDisplayMode.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\TraceSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\TransformerInfo.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\TransformerInfoCollection.cs" />\r
@@ -352,7 +667,6 @@
     <Compile Include="System.Web.Configuration_2.0\VersionConverter.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMapping.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMappingCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebApplicationLevel.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\WebConfigurationFileMap.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\WebConfigurationHost.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\WebConfigurationManager.cs" />\r
@@ -361,7 +675,6 @@
     <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalization.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalizationAuthorization.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\WebPartsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceMode.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceSection.cs" />\r
     <Compile Include="System.Web.Handlers\AssemblyResourceLoader.cs" />\r
     <Compile Include="System.Web.Handlers\TraceHandler.cs" />\r
@@ -376,10 +689,8 @@
     <Compile Include="System.Web.Hosting\DefaultVirtualPathProvider.cs" />\r
     <Compile Include="System.Web.Hosting\HostingEnvironment.cs" />\r
     <Compile Include="System.Web.Hosting\IAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\IApplicationHost.cs" />\r
     <Compile Include="System.Web.Hosting\IAppManagerAppDomainFactory.cs" />\r
     <Compile Include="System.Web.Hosting\IISAPIRuntime.cs" />\r
-    <Compile Include="System.Web.Hosting\IRegisteredObject.cs" />\r
     <Compile Include="System.Web.Hosting\ISAPIRuntime.cs" />\r
     <Compile Include="System.Web.Hosting\SimpleWorkerRequest.cs" />\r
     <Compile Include="System.Web.Hosting\VirtualDirectory.cs" />\r
@@ -422,8 +733,6 @@
     <Compile Include="System.Web.Profile\ProfileAutoSaveEventArgs.cs" />\r
     <Compile Include="System.Web.Profile\ProfileAutoSaveEventHandler.cs" />\r
     <Compile Include="System.Web.Profile\ProfileBase.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventHandler.cs" />\r
     <Compile Include="System.Web.Profile\ProfileInfo.cs" />\r
     <Compile Include="System.Web.Profile\ProfileInfoCollection.cs" />\r
     <Compile Include="System.Web.Profile\ProfileManager.cs" />\r
@@ -439,24 +748,17 @@
     <Compile Include="System.Web.Profile\SqlProfileProvider.cs" />\r
     <Compile Include="System.Web.Properties\TranslationProperties.Designer.cs" />\r
     <Compile Include="System.Web.Routing\HttpMethodConstraint.cs" />\r
-    <Compile Include="System.Web.Routing\IRouteConstraint.cs" />\r
-    <Compile Include="System.Web.Routing\IRouteHandler.cs" />\r
     <Compile Include="System.Web.Routing\PageRouteHandler.cs" />\r
     <Compile Include="System.Web.Routing\PatternParser.cs" />\r
     <Compile Include="System.Web.Routing\PatternToken.cs" />\r
     <Compile Include="System.Web.Routing\PatternTokenType.cs" />\r
-    <Compile Include="System.Web.Routing\RequestContext.cs" />\r
     <Compile Include="System.Web.Routing\Route.cs" />\r
     <Compile Include="System.Web.Routing\RouteCollection.cs" />\r
     <Compile Include="System.Web.Routing\RouteData.cs" />\r
-    <Compile Include="System.Web.Routing\RouteDirection.cs" />\r
-    <Compile Include="System.Web.Routing\RouteTable.cs" />\r
-    <Compile Include="System.Web.Routing\RouteValueDictionary.cs" />\r
     <Compile Include="System.Web.Routing\RouteValueDictionaryExtensions.cs" />\r
     <Compile Include="System.Web.Routing\StopRoutingHandler.cs" />\r
     <Compile Include="System.Web.Routing\UrlRoutingHandler.cs" />\r
     <Compile Include="System.Web.Routing\UrlRoutingModule.cs" />\r
-    <Compile Include="System.Web.Routing\VirtualPathData.cs" />\r
     <Compile Include="System.Web.Security\ActiveDirectoryConnectionProtection.cs" />\r
     <Compile Include="System.Web.Security\ActiveDirectoryMembershipProvider.cs" />\r
     <Compile Include="System.Web.Security\AnonymousIdentificationEventArgs.cs" />\r
@@ -469,8 +771,6 @@
     <Compile Include="System.Web.Security\DefaultAuthenticationModule.cs" />\r
     <Compile Include="System.Web.Security\FileAuthorizationModule.cs" />\r
     <Compile Include="System.Web.Security\FormsAuthentication.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventHandler.cs" />\r
     <Compile Include="System.Web.Security\FormsAuthenticationModule.cs" />\r
     <Compile Include="System.Web.Security\FormsAuthenticationTicket.cs" />\r
     <Compile Include="System.Web.Security\FormsIdentity.cs" />\r
@@ -479,12 +779,8 @@
     <Compile Include="System.Web.Security\Membership.cs" />\r
     <Compile Include="System.Web.Security\MembershipHelper.cs" />\r
     <Compile Include="System.Web.Security\MembershipPasswordAttribute.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventHandler.cs" />\r
     <Compile Include="System.Web.Security\PassportAuthenticationModule.cs" />\r
     <Compile Include="System.Web.Security\PassportIdentity.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventHandler.cs" />\r
     <Compile Include="System.Web.Security\RoleManagerModule.cs" />\r
     <Compile Include="System.Web.Security\RolePrincipal.cs" />\r
     <Compile Include="System.Web.Security\RoleProviderCollection.cs" />\r
@@ -494,14 +790,10 @@
     <Compile Include="System.Web.Security\SqlMembershipProvider.cs" />\r
     <Compile Include="System.Web.Security\SqlRoleProvider.cs" />\r
     <Compile Include="System.Web.Security\UrlAuthorizationModule.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventHandler.cs" />\r
     <Compile Include="System.Web.Security\WindowsAuthenticationModule.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\HttpSessionState.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\HttpSessionStateContainer.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\IHttpSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IReadOnlySessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IRequiresSessionState.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\ISessionIDManager.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\ISessionStateItemCollection.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\IStateRuntime.cs" />\r
@@ -511,7 +803,6 @@
     <Compile Include="System.Web.SessionState_2.0\SessionInProcHandler.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\SessionSQLServerHandler.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\SessionStateActions.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateBehavior.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\SessionStateItemCollection.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\SessionStateItemExpireCallback.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\SessionStateMode.cs" />\r
@@ -524,7 +815,6 @@
     <Compile Include="System.Web.SessionState_2.0\StateServerItem.cs" />\r
     <Compile Include="System.Web.UI.Adapters\ControlAdapter.cs" />\r
     <Compile Include="System.Web.UI.Adapters\PageAdapter.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\WmlPostFieldType.cs" />\r
     <Compile Include="System.Web.UI.HtmlControls\HtmlAnchor.cs" />\r
     <Compile Include="System.Web.UI.HtmlControls\HtmlButton.cs" />\r
     <Compile Include="System.Web.UI.HtmlControls\HtmlContainerControl.cs" />\r
@@ -572,47 +862,20 @@
     <Compile Include="System.Web.UI.WebControls.WebParts\EditorPart.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\EditorPartCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\IPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITrackingPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITransformerConfigurationControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IVersioningPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebActionable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebEditable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartHttpHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartParameters.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartTable.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\Part.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeType.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizableAttribute.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizationScope.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\ProviderConnectionPoint.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\TypeCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\WebPart.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartExportMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartHelpMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\WebPartPageMenuMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerb.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\AccessDataSource.cs" />\r
     <Compile Include="System.Web.UI.WebControls\AccessDataSourceView.cs" />\r
     <Compile Include="System.Web.UI.WebControls\AdCreatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdCreatedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\AdRotator.cs" />\r
     <Compile Include="System.Web.UI.WebControls\AssociatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoCompleteType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\AutoGeneratedField.cs" />\r
     <Compile Include="System.Web.UI.WebControls\AutoGeneratedFieldProperties.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BaseCompareValidator.cs" />\r
@@ -620,23 +883,17 @@
     <Compile Include="System.Web.UI.WebControls\BaseDataList.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BaseMenuRenderer.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BaseValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BorderStyle.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BoundColumn.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BoundField.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BulletedList.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BulletedListDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BulletStyle.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Button.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ButtonColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonColumnType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ButtonField.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ButtonFieldBase.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Calendar.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CalendarDay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CalendarSelectionMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ChangePassword.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CheckBox.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CheckBoxField.cs" />\r
@@ -644,8 +901,6 @@
     <Compile Include="System.Web.UI.WebControls\ChildTable.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CircleHotSpot.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CollectionDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CommandField.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CompareValidator.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CompleteWizardStep.cs" />\r
@@ -654,170 +909,89 @@
     <Compile Include="System.Web.UI.WebControls\ContainedTable.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Content.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ContentControlBuilderInternal.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentDirection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ContentPlaceHolder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ContentPlaceHolderBuilder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ControlIDConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ControlParameter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ControlPropertyNameConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CookieParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CreateUserWizard.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CreateUserWizardStep.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CustomValidator.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataBoundControlMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataControlButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlCellType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataControlCommands.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataControlField.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataControlFieldCell.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataControlFieldCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataControlFieldHeaderCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataGrid.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataGridColumn.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataGridColumnCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataGridItem.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataGridItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataGridPagerStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataKey.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataKeyArray.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataKeyCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataListItem.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataListItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataSourceCacheManager.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayNameFormat.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DayRenderEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayRenderEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewPagerRow.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewRow.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewRowCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DropDownList.cs" />\r
     <Compile Include="System.Web.UI.WebControls\EditCommandColumn.cs" />\r
     <Compile Include="System.Web.UI.WebControls\EmbeddedMailObject.cs" />\r
     <Compile Include="System.Web.UI.WebControls\EmbeddedMailObjectsCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FileUpload.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FirstDayOfWeek.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FontInfo.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FontNamesConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontSize.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FontUnit.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FontUnitConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormParameter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormView.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewCommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewPagerRow.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewRow.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridLines.cs" />\r
     <Compile Include="System.Web.UI.WebControls\GridView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\GridViewRow.cs" />\r
     <Compile Include="System.Web.UI.WebControls\GridViewRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HiddenField.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HierarchicalDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HorizontalAlign.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HorizontalAlignConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HotSpot.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HotSpotCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpotMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HyperLink.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HyperLinkColumn.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HyperLinkControlBuilder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HyperLinkField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IButtonControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICallbackContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICompositeControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundItemControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundListControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IFieldControl.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Image.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageAlign.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ImageButton.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ImageField.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ImageMap.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\IMenuRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IPersistedSelector.cs" />\r
     <Compile Include="System.Web.UI.WebControls\IPostBackContainer.cs" />\r
     <Compile Include="System.Web.UI.WebControls\IRenderOuterTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IRepeatInfoUser.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Label.cs" />\r
     <Compile Include="System.Web.UI.WebControls\LabelControlBuilder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\LinkButton.cs" />\r
@@ -827,27 +1001,16 @@
     <Compile Include="System.Web.UI.WebControls\ListItem.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ListItemCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ListItemControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListSelectionMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Literal.cs" />\r
     <Compile Include="System.Web.UI.WebControls\LiteralControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LiteralMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Localize.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Login.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginFailureAction.cs" />\r
     <Compile Include="System.Web.UI.WebControls\LoginName.cs" />\r
     <Compile Include="System.Web.UI.WebControls\LoginStatus.cs" />\r
     <Compile Include="System.Web.UI.WebControls\LoginTextLayout.cs" />\r
     <Compile Include="System.Web.UI.WebControls\LoginView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LogoutAction.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MailDefinition.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Menu.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MenuItem.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MenuItemBinding.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MenuItemBindingCollection.cs" />\r
@@ -856,40 +1019,20 @@
     <Compile Include="System.Web.UI.WebControls\MenuItemStyleCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MenuItemTemplateContainer.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MenuListRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuRenderingMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MenuTableRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MultiView.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MultiViewControlBuilder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\NamedCssStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\NextPrevFormat.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ObjectDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventArgs.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ObjectDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Orientation.cs" />\r
     <Compile Include="System.Web.UI.WebControls\PagedDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerButtons.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerPosition.cs" />\r
     <Compile Include="System.Web.UI.WebControls\PagerSettings.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Panel.cs" />\r
     <Compile Include="System.Web.UI.WebControls\PanelStyle.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Parameter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ParameterCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\PasswordRecovery.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PathDirection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\PlaceHolder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\PlaceHolderControlBuilder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\PolygonHotSpot.cs" />\r
@@ -900,16 +1043,10 @@
     <Compile Include="System.Web.UI.WebControls\RangeValidator.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RectangleHotSpot.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RegularExpressionValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatDirection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Repeater.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RepeaterItem.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RepeaterItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RepeatInfo.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatLayout.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RequiredFieldValidator.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RoleGroup.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RoleGroupCollection.cs" />\r
@@ -917,31 +1054,15 @@
     <Compile Include="System.Web.UI.WebControls\ScrollBars.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SelectedDatesCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SendMailErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SendMailErrorEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ServerValidateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SessionParameter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SiteMapDataSource.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SiteMapDataSourceView.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SiteMapHierarchicalDataSourceView.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SiteMapNodeItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SiteMapPath.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SiteMapViewType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SortDirection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SqlDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SqlDataSourceView.cs" />\r
     <Compile Include="System.Web.UI.WebControls\StringArrayConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Style.cs" />\r
@@ -951,55 +1072,38 @@
     <Compile Include="System.Web.UI.WebControls\SubMenuStyleCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Substitution.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Table.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCaptionAlign.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableCell.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableCellCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableCellControlBuilder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableFooterRow.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableHeaderCell.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableHeaderRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderScope.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableItemStyle.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableRow.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRowSection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableSectionStyle.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableStyle.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TargetConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TemplateColumn.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TemplatedWizardStep.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TemplateField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextAlign.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TextBox.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TextBoxControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBoxMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TitleFormat.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeNode.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeNodeBinding.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeNodeBindingCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeNodeCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeSelectAction.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeNodeStyle.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeNodeStyleCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeNodeTypes.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeViewImageSet.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Unit.cs" />\r
     <Compile Include="System.Web.UI.WebControls\UnitConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\UnitType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ValidatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationCompareOperator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationDataType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ValidationSummary.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationSummaryDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidatorDisplay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\VerticalAlign.cs" />\r
     <Compile Include="System.Web.UI.WebControls\VerticalAlignConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\View.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ViewCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WebColorConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\WebControl.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Wizard.cs" />\r
     <Compile Include="System.Web.UI.WebControls\WizardLayoutContainer.cs" />\r
@@ -1030,7 +1134,6 @@
     <Compile Include="System.Web.UI\BuildMethod.cs" />\r
     <Compile Include="System.Web.UI\BuildTemplateMethod.cs" />\r
     <Compile Include="System.Web.UI\ChtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\ClientIDMode.cs" />\r
     <Compile Include="System.Web.UI\ClientScriptManager.cs" />\r
     <Compile Include="System.Web.UI\CodeBuilder.cs" />\r
     <Compile Include="System.Web.UI\CodeConstructType.cs" />\r
@@ -1040,31 +1143,22 @@
     <Compile Include="System.Web.UI\CompiledBindableTemplateBuilder.cs" />\r
     <Compile Include="System.Web.UI\CompiledTemplateBuilder.cs" />\r
     <Compile Include="System.Web.UI\ComplexPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ConflictOptions.cs" />\r
-    <Compile Include="System.Web.UI\ConstructorNeedsTagAttribute.cs" />\r
     <Compile Include="System.Web.UI\Control.cs" />\r
     <Compile Include="System.Web.UI\ControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\ControlBuilderAttribute.cs" />\r
     <Compile Include="System.Web.UI\ControlCachePolicy.cs" />\r
     <Compile Include="System.Web.UI\ControlCollection.cs" />\r
     <Compile Include="System.Web.UI\ControlSkin.cs" />\r
     <Compile Include="System.Web.UI\ControlSkinDelegate.cs" />\r
     <Compile Include="System.Web.UI\ControlValuePropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\CssClassPropertyAttribute.cs" />\r
     <Compile Include="System.Web.UI\CssStyleCollection.cs" />\r
     <Compile Include="System.Web.UI\DataBinder.cs" />\r
     <Compile Include="System.Web.UI\DataBinding.cs" />\r
     <Compile Include="System.Web.UI\DataBindingBuilder.cs" />\r
     <Compile Include="System.Web.UI\DataBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingHandlerAttribute.cs" />\r
     <Compile Include="System.Web.UI\DataBoundLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\DataKeyPropertyAttribute.cs" />\r
     <Compile Include="System.Web.UI\DataSourceCacheDurationConverter.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCacheExpiry.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCapabilities.cs" />\r
     <Compile Include="System.Web.UI\DataSourceControl.cs" />\r
     <Compile Include="System.Web.UI\DataSourceControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceOperation.cs" />\r
     <Compile Include="System.Web.UI\DataSourceSelectArguments.cs" />\r
     <Compile Include="System.Web.UI\DataSourceView.cs" />\r
     <Compile Include="System.Web.UI\DataSourceViewOperationCallback.cs" />\r
@@ -1077,63 +1171,23 @@
     <Compile Include="System.Web.UI\ExpressionBinding.cs" />\r
     <Compile Include="System.Web.UI\ExpressionBindingCollection.cs" />\r
     <Compile Include="System.Web.UI\ExtractTemplateValuesMethod.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelControlBuilderAttribute.cs" />\r
     <Compile Include="System.Web.UI\FileLevelMasterPageControlBuilder.cs" />\r
     <Compile Include="System.Web.UI\FileLevelPageControlBuilder.cs" />\r
     <Compile Include="System.Web.UI\FileLevelUserControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FilterableAttribute.cs" />\r
     <Compile Include="System.Web.UI\HiddenFieldPageStatePersister.cs" />\r
     <Compile Include="System.Web.UI\HierarchicalDataSourceControl.cs" />\r
     <Compile Include="System.Web.UI\HierarchicalDataSourceView.cs" />\r
     <Compile Include="System.Web.UI\Html32TextWriter.cs" />\r
     <Compile Include="System.Web.UI\HtmlControlPersistableAttribute.cs" />\r
     <Compile Include="System.Web.UI\HtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterStyle.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterTag.cs" />\r
-    <Compile Include="System.Web.UI\IAttributeAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IAutoFieldGenerator.cs" />\r
-    <Compile Include="System.Web.UI\IBindableControl.cs" />\r
-    <Compile Include="System.Web.UI\IBindableTemplate.cs" />\r
-    <Compile Include="System.Web.UI\ICallbackEventHandler.cs" />\r
     <Compile Include="System.Web.UI\ICheckBoxControl.cs" />\r
-    <Compile Include="System.Web.UI\IControlBuilderAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataBindingsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataItemContainer.cs" />\r
-    <Compile Include="System.Web.UI\IDataKeysControl.cs" />\r
-    <Compile Include="System.Web.UI\IDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IDataSourceViewSchemaAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDReferencePropertyAttribute.cs" />\r
     <Compile Include="System.Web.UI\IEditableTextControl.cs" />\r
-    <Compile Include="System.Web.UI\IExpressionsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IFilterResolutionService.cs" />\r
     <Compile Include="System.Web.UI\IgnoreUnknownContentAttribute.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalEnumerable.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchyData.cs" />\r
     <Compile Include="System.Web.UI\ImageClickEventArgs.cs" />\r
-    <Compile Include="System.Web.UI\ImageClickEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\INamingContainer.cs" />\r
-    <Compile Include="System.Web.UI\INavigateUIData.cs" />\r
     <Compile Include="System.Web.UI\IndexedString.cs" />\r
-    <Compile Include="System.Web.UI\INonBindingContainer.cs" />\r
-    <Compile Include="System.Web.UI\IParserAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackDataHandler.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\IResourceUrlGenerator.cs" />\r
     <Compile Include="System.Web.UI\IScriptManager.cs" />\r
-    <Compile Include="System.Web.UI\IStateFormatter.cs" />\r
-    <Compile Include="System.Web.UI\IStateManager.cs" />\r
-    <Compile Include="System.Web.UI\IStyleSheet.cs" />\r
     <Compile Include="System.Web.UI\ITagNameToTypeMapper.cs" />\r
-    <Compile Include="System.Web.UI\ITemplate.cs" />\r
     <Compile Include="System.Web.UI\ITextControl.cs" />\r
-    <Compile Include="System.Web.UI\IThemeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUrlResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlTypeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IValidator.cs" />\r
     <Compile Include="System.Web.UI\ListSourceHelper.cs" />\r
     <Compile Include="System.Web.UI\LiteralControl.cs" />\r
     <Compile Include="System.Web.UI\LosFormatter.cs" />\r
@@ -1142,7 +1196,6 @@
     <Compile Include="System.Web.UI\MasterPageControlBuilder.cs" />\r
     <Compile Include="System.Web.UI\MasterPageParser.cs" />\r
     <Compile Include="System.Web.UI\MinimizableAttributeTypeConverter.cs" />\r
-    <Compile Include="System.Web.UI\NonVisualControlAttribute.cs" />\r
     <Compile Include="System.Web.UI\ObjectConverter.cs" />\r
     <Compile Include="System.Web.UI\ObjectPersistData.cs" />\r
     <Compile Include="System.Web.UI\ObjectStateFormatter.cs" />\r
@@ -1165,8 +1218,6 @@
     <Compile Include="System.Web.UI\ParseChildrenAttribute.cs" />\r
     <Compile Include="System.Web.UI\PartialCachingAttribute.cs" />\r
     <Compile Include="System.Web.UI\PartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\PersistChildrenAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PersistenceMode.cs" />\r
     <Compile Include="System.Web.UI\PersistenceModeAttribute.cs" />\r
     <Compile Include="System.Web.UI\PostBackOptions.cs" />\r
     <Compile Include="System.Web.UI\PropertyConverter.cs" />\r
@@ -1185,18 +1236,14 @@
     <Compile Include="System.Web.UI\StateManagedCollection.cs" />\r
     <Compile Include="System.Web.UI\StaticPartialCachingControl.cs" />\r
     <Compile Include="System.Web.UI\StringPropertyBuilder.cs" />\r
-    <Compile Include="System.Web.UI\SupportsEventValidationAttribute.cs" />\r
     <Compile Include="System.Web.UI\TagPrefixAttribute.cs" />\r
     <Compile Include="System.Web.UI\TemplateBuilder.cs" />\r
     <Compile Include="System.Web.UI\TemplateContainerAttribute.cs" />\r
     <Compile Include="System.Web.UI\TemplateContentType.cs" />\r
     <Compile Include="System.Web.UI\TemplateControl.cs" />\r
     <Compile Include="System.Web.UI\TemplateControlParser.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstance.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstanceAttribute.cs" />\r
     <Compile Include="System.Web.UI\TemplateParser.cs" />\r
     <Compile Include="System.Web.UI\TemplatePropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ThemeableAttribute.cs" />\r
     <Compile Include="System.Web.UI\ThemeProvider.cs" />\r
     <Compile Include="System.Web.UI\ToolboxDataAttribute.cs" />\r
     <Compile Include="System.Web.UI\Triplet.cs" />\r
@@ -1212,9 +1259,7 @@
     <Compile Include="System.Web.UI\VerificationConditionalOperator.cs" />\r
     <Compile Include="System.Web.UI\VerificationReportLevel.cs" />\r
     <Compile Include="System.Web.UI\VerificationRule.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateEncryptionMode.cs" />\r
     <Compile Include="System.Web.UI\ViewStateException.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateMode.cs" />\r
     <Compile Include="System.Web.UI\ViewStateModeByIdAttribute.cs" />\r
     <Compile Include="System.Web.UI\VirtualReferenceType.cs" />\r
     <Compile Include="System.Web.UI\WebHandlerParser.cs" />\r
@@ -1230,10 +1275,8 @@
     <Compile Include="System.Web.Util\Helpers.cs" />\r
     <Compile Include="System.Web.Util\HttpEncoder.cs" />\r
     <Compile Include="System.Web.Util\ICalls.cs" />\r
-    <Compile Include="System.Web.Util\IWebObjectFactory.cs" />\r
     <Compile Include="System.Web.Util\IWebPropertyAccessor.cs" />\r
     <Compile Include="System.Web.Util\MachineKeySectionUtils.cs" />\r
-    <Compile Include="System.Web.Util\RequestValidationSource.cs" />\r
     <Compile Include="System.Web.Util\RequestValidator.cs" />\r
     <Compile Include="System.Web.Util\RuntimeHelpers.cs" />\r
     <Compile Include="System.Web.Util\SearchPattern.cs" />\r
@@ -1270,12 +1313,9 @@
     <Compile Include="System.Web\HttpApplication.cs" />\r
     <Compile Include="System.Web\HttpApplicationFactory.cs" />\r
     <Compile Include="System.Web\HttpApplicationState.cs" />\r
-    <Compile Include="System.Web\HttpApplicationStateWrapper.cs" />\r
     <Compile Include="System.Web\HttpBrowserCapabilities.cs" />\r
-    <Compile Include="System.Web\HttpBrowserCapabilitiesWrapper.cs" />\r
     <Compile Include="System.Web\HttpCacheability.cs" />\r
     <Compile Include="System.Web\HttpCachePolicy.cs" />\r
-    <Compile Include="System.Web\HttpCachePolicyWrapper.cs" />\r
     <Compile Include="System.Web\HttpCacheRevalidation.cs" />\r
     <Compile Include="System.Web\HttpCacheValidateHandler.cs" />\r
     <Compile Include="System.Web\HttpCacheVaryByContentEncodings.cs" />\r
@@ -1312,7 +1352,6 @@
     <Compile Include="System.Web\HttpRuntime.cs" />\r
     <Compile Include="System.Web\HttpServerUtility.cs" />\r
     <Compile Include="System.Web\HttpServerUtilityWrapper.cs" />\r
-    <Compile Include="System.Web\HttpSessionStateWrapper.cs" />\r
     <Compile Include="System.Web\HttpStaticObjectsCollection.cs" />\r
     <Compile Include="System.Web\HttpTaskAsyncHandler.cs" />\r
     <Compile Include="System.Web\HttpUnhandledException.cs" />\r
@@ -1320,12 +1359,7 @@
     <Compile Include="System.Web\HttpValidationStatus.cs" />\r
     <Compile Include="System.Web\HttpWorkerRequest.cs" />\r
     <Compile Include="System.Web\HttpWriter.cs" />\r
-    <Compile Include="System.Web\IHtmlString.cs" />\r
-    <Compile Include="System.Web\IHttpAsyncHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandlerFactory.cs" />\r
     <Compile Include="System.Web\IHttpMapPath.cs" />\r
-    <Compile Include="System.Web\IHttpModule.cs" />\r
     <Compile Include="System.Web\IisTraceListener.cs" />\r
     <Compile Include="System.Web\InputFilterStream.cs" />\r
     <Compile Include="System.Web\IntPtrStream.cs" />\r
@@ -1336,15 +1370,11 @@
     <Compile Include="System.Web\OutputFilterStream.cs" />\r
     <Compile Include="System.Web\ParserError.cs" />\r
     <Compile Include="System.Web\ParserErrorCollection.cs" />\r
-    <Compile Include="System.Web\PreApplicationStartMethodAttribute.cs" />\r
     <Compile Include="System.Web\ProcessInfo.cs" />\r
     <Compile Include="System.Web\ProcessModelInfo.cs" />\r
     <Compile Include="System.Web\ProcessShutdownReason.cs" />\r
     <Compile Include="System.Web\ProcessStatus.cs" />\r
     <Compile Include="System.Web\QueueManager.cs" />\r
-    <Compile Include="System.Web\ReadEntityBodyMode.cs" />\r
-    <Compile Include="System.Web\RequestNotification.cs" />\r
-    <Compile Include="System.Web\RequestNotificationStatus.cs" />\r
     <Compile Include="System.Web\ServerVariablesCollection.cs" />\r
     <Compile Include="System.Web\SiteMap.cs" />\r
     <Compile Include="System.Web\SiteMapNode.cs" />\r
@@ -1358,8 +1388,6 @@
     <Compile Include="System.Web\TaskEventHandler.cs" />\r
     <Compile Include="System.Web\TempFileStream.cs" />\r
     <Compile Include="System.Web\TraceContext.cs" />\r
-    <Compile Include="System.Web\TraceContextEventArgs.cs" />\r
-    <Compile Include="System.Web\TraceContextEventHandler.cs" />\r
     <Compile Include="System.Web\TraceContextRecord.cs" />\r
     <Compile Include="System.Web\TraceData.cs" />\r
     <Compile Include="System.Web\TraceManager.cs" />\r

diff --git a/mcs/class/System.Web/System.Web-plainweb-net_4_5.csproj b/mcs/class/System.Web/System.Web-plainweb-net_4_5.csproj
deleted file mode 100644 (file)
index 925358a..0000000
--- a/mcs/class/System.Web/System.Web-plainweb-net_4_5.csproj
+++ /dev/null
@@ -1,1605 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{21892B00-1C9F-44F3-AE4C-A6A9A210CEC7}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5/plainweb</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;INSIDE_SYSTEM_WEB</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,612,618,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;INSIDE_SYSTEM_WEB</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\System.Design\System.Data.Design\TypedDataSetGenerator.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpApplicationStateBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpApplicationStateWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpBrowserCapabilitiesBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpBrowserCapabilitiesWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpCachePolicyBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpCachePolicyWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpContextBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpContextWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpFileCollectionBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpFileCollectionWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpPostedFileBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpPostedFileWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpRequestBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpRequestWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpResponseBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpResponseWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpServerUtilityBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpServerUtilityWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpSessionStateBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpSessionStateWrapper.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpStaticObjectsCollectionBase.cs" />\r
-    <Compile Include="..\System.Web.Abstractions\System.Web\HttpStaticObjectsCollectionWrapper.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\HttpMethodConstraint.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\IRouteConstraint.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\IRouteHandler.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\PatternParser.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\PatternToken.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\PatternTokenType.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RequestContext.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\Route.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteBase.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteCollection.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteData.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteDirection.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteTable.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteValueDictionary.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\RouteValueDictionaryExtensions.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\StopRoutingHandler.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\UrlRoutingHandler.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\UrlRoutingModule.cs" />\r
-    <Compile Include="..\System.Web.Routing\System.Web.Routing\VirtualPathData.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\AssemblyNamesTypeResolutionService.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ByteArrayFromResXHandler.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\FileRefHandler.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\InMemoryHandler.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\NullRefHandler.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXDataNode.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXDataNodeHandler.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXFileRef.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXNullRef.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXResourceReader.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXResourceSet.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXResourceWriter.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\SerializedFromResXHandler.cs" />\r
-    <Compile Include="..\System.Windows.Forms\System.Resources\TypeConverterFromResXHandler.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Web.Util\ISectionSettingsMapper.cs" />\r
-    <Compile Include="Mono.Web.Util\MembershipSectionMapper.cs" />\r
-    <Compile Include="Mono.Web.Util\RoleManagerSectionMapper.cs" />\r
-    <Compile Include="Mono.Web.Util\SettingsMapping.cs" />\r
-    <Compile Include="Mono.Web.Util\SettingsMappingManager.cs" />\r
-    <Compile Include="Mono.Web.Util\SettingsMappingWhat.cs" />\r
-    <Compile Include="System.Collections.Concurrent\SplitOrderedList.cs" />\r
-    <Compile Include="System.Web.Caching\AggregateCacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\Cache.cs" />\r
-    <Compile Include="System.Web.Caching\CacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\CachedRawResponse.cs" />\r
-    <Compile Include="System.Web.Caching\CachedVaryBy.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItem.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemEnumerator.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemLRU.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriority.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriorityQueue.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemPriorityQueueDebug.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemRemovedCallback.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemRemovedReason.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemUpdateCallback.cs" />\r
-    <Compile Include="System.Web.Caching\CacheItemUpdateReason.cs" />\r
-    <Compile Include="System.Web.Caching\DatabaseNotEnabledForNotificationException.cs" />\r
-    <Compile Include="System.Web.Caching\FileResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\HeaderElement.cs" />\r
-    <Compile Include="System.Web.Caching\InMemoryOutputCacheProvider.cs" />\r
-    <Compile Include="System.Web.Caching\IOutputCacheEntry.cs" />\r
-    <Compile Include="System.Web.Caching\MemoryResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCache.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheModule.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheProvider.cs" />\r
-    <Compile Include="System.Web.Caching\OutputCacheProviderCollection.cs" />\r
-    <Compile Include="System.Web.Caching\ResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\SqlCacheDependency.cs" />\r
-    <Compile Include="System.Web.Caching\SqlCacheDependencyAdmin.cs" />\r
-    <Compile Include="System.Web.Caching\SubstitutionResponseElement.cs" />\r
-    <Compile Include="System.Web.Caching\TableNotEnabledForNotificationException.cs" />\r
-    <Compile Include="System.Web.Compilation\AppCodeCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ApplicationFileBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourceFileInfo.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourceFilesCollection.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourcesAssemblyBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\AppResourcesCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\AppSettingsExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\AppWebReferencesCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\AspComponent.cs" />\r
-    <Compile Include="System.Web.Compilation\AspComponentFoundry.cs" />\r
-    <Compile Include="System.Web.Compilation\AspGenerator.cs" />\r
-    <Compile Include="System.Web.Compilation\AspParser.cs" />\r
-    <Compile Include="System.Web.Compilation\AspTokenizer.cs" />\r
-    <Compile Include="System.Web.Compilation\AssemblyBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\BaseCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildDependencySet.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManager.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerCacheItem.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerDirectoryBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHost.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHostUnloadEventArgs.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerHostUnloadEventHandler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildManagerRemoveEntryEventHandler.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesTo.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesToAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderGroup.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderResultFlags.cs" />\r
-    <Compile Include="System.Web.Compilation\CachingCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManager.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManagerCallback.cs" />\r
-    <Compile Include="System.Web.Compilation\ClientBuildManagerParameter.cs" />\r
-    <Compile Include="System.Web.Compilation\CompilationException.cs" />\r
-    <Compile Include="System.Web.Compilation\CompilerType.cs" />\r
-    <Compile Include="System.Web.Compilation\ConnectionStringsExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\DefaultResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\DefaultResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.Compilation\DesignTimeResourceProviderFactoryAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\Directive.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionBuilderContext.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionEditorAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\FolderLevelBuildProviderAppliesTo.cs" />\r
-    <Compile Include="System.Web.Compilation\FolderLevelBuildProviderAppliesToAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\ForceCopyBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\GenericBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\GlobalAsaxCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\IAssemblyPostProcessor.cs" />\r
-    <Compile Include="System.Web.Compilation\IgnoreFileBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\IImplicitResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\ILocation.cs" />\r
-    <Compile Include="System.Web.Compilation\ImplicitResourceKey.cs" />\r
-    <Compile Include="System.Web.Compilation\IResourceProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\LinePragmaCodeInfo.cs" />\r
-    <Compile Include="System.Web.Compilation\Location.cs" />\r
-    <Compile Include="System.Web.Compilation\MasterPageBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\MasterPageCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\PageBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\PageCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\PageThemeCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ParseException.cs" />\r
-    <Compile Include="System.Web.Compilation\PrecompilationFlags.cs" />\r
-    <Compile Include="System.Web.Compilation\PreservationFile.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceExpressionFields.cs" />\r
-    <Compile Include="System.Web.Compilation\ResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.Compilation\RouteUrlExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\RouteValueExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Compilation\SimpleBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\TagAttributes.cs" />\r
-    <Compile Include="System.Web.Compilation\TagType.cs" />\r
-    <Compile Include="System.Web.Compilation\TemplateBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\TemplateControlCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\ThemeDirectoryBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\ThemeDirectoryCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\UserControlBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\UserControlCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\WebHandlerBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\WebServiceBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\WebServiceCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\WsdlBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\XsdBuildProvider.cs" />\r
-    <Compile Include="System.Web.Configuration.Internal\IInternalConfigWebHost.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AdapterDictionary.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AnonymousIdentificationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ApplicationSettingsConfigurationFileMap.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AssemblyCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthenticationMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthenticationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRule.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BufferModesCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BufferModeSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BuildProvider.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\BuildProviderCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CacheSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CapabilitiesBuild.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CapabilitiesResult.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTarget.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTargetCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ClientTargetSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CodeSubDirectoriesCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CodeSubDirectory.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CompilationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\Compiler.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CompilerCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomError.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsRedirectMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\DeploymentSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\EventMappingSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\EventMappingSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ExpressionBuilder.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ExpressionBuilderCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationConfiguration.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationCredentials.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUser.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUserCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthPasswordFormat.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsProtectionEnum.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\GlobalizationSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HandlersUtil.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HealthMonitoringSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HostingEnvironmentSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCapabilitiesBase.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCapabilitiesDefaultProvider.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCapabilitiesProvider.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpConfigurationContext.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpConfigurationSystem.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpCookiesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlerAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlerActionCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpHandlersSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModuleAction.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModuleActionCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpModulesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\HttpRuntimeSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ICapabilitiesProcess.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPath.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPathFactory.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IdentitySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IRemoteWebConfigurationHostServer.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\LowerCaseStringConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\LruCache.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyCompatibilityMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyRegistryStorage.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyValidation.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyValidationConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MembershipSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MonoSettingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NamespaceCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NamespaceInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Build.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Exception.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\File.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Identification.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Node.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\NodeTypes.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Result.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\NullableStringValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheProfile.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheProfileCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\OutputCacheSettingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PagesEnableSessionState.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PagesSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PassportAuthentication.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PositiveTimeSpanValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComAuthenticationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComImpersonationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelLogLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertyNameValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertySettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfilePropertySettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProfileSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PropertyHelper.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProvidersHelper.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RegexWorker.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RoleManagerSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RootProfilePropertySettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RuleSettings.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\RuleSettingsCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SecurityPolicySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SerializationMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SessionPageStateSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SessionStateSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SiteMapSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabase.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabaseCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SystemWebCachingSectionGroup.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SystemWebSectionGroup.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagMapCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagMapInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagPrefixCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TagPrefixInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TraceDisplayMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TraceSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TransformerInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TransformerInfoCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustLevelCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TrustSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMapping.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMappingCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\UrlMappingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VersionConverter.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMapping.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMappingCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebApplicationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationFileMap.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationHost.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebConfigurationManager.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebContext.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebControlsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalization.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalizationAuthorization.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebPartsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceSection.cs" />\r
-    <Compile Include="System.Web.Handlers\AssemblyResourceLoader.cs" />\r
-    <Compile Include="System.Web.Handlers\TraceHandler.cs" />\r
-    <Compile Include="System.Web.Hosting\AppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationInfo.cs" />\r
-    <Compile Include="System.Web.Hosting\ApplicationManager.cs" />\r
-    <Compile Include="System.Web.Hosting\AppManagerAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\BareApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualDirectory.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualFile.cs" />\r
-    <Compile Include="System.Web.Hosting\DefaultVirtualPathProvider.cs" />\r
-    <Compile Include="System.Web.Hosting\HostingEnvironment.cs" />\r
-    <Compile Include="System.Web.Hosting\IAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\IApplicationHost.cs" />\r
-    <Compile Include="System.Web.Hosting\IAppManagerAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\IISAPIRuntime.cs" />\r
-    <Compile Include="System.Web.Hosting\IRegisteredObject.cs" />\r
-    <Compile Include="System.Web.Hosting\ISAPIRuntime.cs" />\r
-    <Compile Include="System.Web.Hosting\SimpleWorkerRequest.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualDirectory.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualFile.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualFileBase.cs" />\r
-    <Compile Include="System.Web.Hosting\VirtualPathProvider.cs" />\r
-    <Compile Include="System.Web.Mail\Base64AttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Mail\IAttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Web.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Web.Mail\MailAttachment.cs" />\r
-    <Compile Include="System.Web.Mail\MailEncoding.cs" />\r
-    <Compile Include="System.Web.Mail\MailFormat.cs" />\r
-    <Compile Include="System.Web.Mail\MailHeader.cs" />\r
-    <Compile Include="System.Web.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Web.Mail\MailMessageWrapper.cs" />\r
-    <Compile Include="System.Web.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Web.Mail\MailUtil.cs" />\r
-    <Compile Include="System.Web.Mail\RelatedBodyPart.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpMail.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpResponse.cs" />\r
-    <Compile Include="System.Web.Mail\SmtpStream.cs" />\r
-    <Compile Include="System.Web.Mail\ToUUEncodingTransform.cs" />\r
-    <Compile Include="System.Web.Mail\UUAttachmentEncoder.cs" />\r
-    <Compile Include="System.Web.Management\EventNotificationType.cs" />\r
-    <Compile Include="System.Web.Management\IRegiisUtility.cs" />\r
-    <Compile Include="System.Web.Management\IWebEventCustomEvaluator.cs" />\r
-    <Compile Include="System.Web.Management\RuleFiringRecord.cs" />\r
-    <Compile Include="System.Web.Management\SessionStateType.cs" />\r
-    <Compile Include="System.Web.Management\SqlFeatures.cs" />\r
-    <Compile Include="System.Web.Management\WebApplicationInformation.cs" />\r
-    <Compile Include="System.Web.Management\WebBaseEvent.cs" />\r
-    <Compile Include="System.Web.Management\WebEventCodes.cs" />\r
-    <Compile Include="System.Web.Management\WebEventFormatter.cs" />\r
-    <Compile Include="System.Web.Profile\CustomProviderDataAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\DefaultProfile.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAuthenticationOption.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAutoSaveEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileAutoSaveEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileBase.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileGroupBase.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileInfo.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileInfoCollection.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileManager.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileMigrateEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileMigrateEventHandler.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileModule.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileParser.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProvider.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProviderAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileProviderCollection.cs" />\r
-    <Compile Include="System.Web.Profile\SettingsAllowAnonymousAttribute.cs" />\r
-    <Compile Include="System.Web.Profile\SqliteProfileProvider.cs" />\r
-    <Compile Include="System.Web.Profile\SqlProfileProvider.cs" />\r
-    <Compile Include="System.Web.Properties\TranslationProperties.Designer.cs" />\r
-    <Compile Include="System.Web.Routing\PageRouteHandler.cs" />\r
-    <Compile Include="System.Web.Security\ActiveDirectoryConnectionProtection.cs" />\r
-    <Compile Include="System.Web.Security\ActiveDirectoryMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\AnonymousIdentificationModule.cs" />\r
-    <Compile Include="System.Web.Security\AspNetDBSchemaChecker.cs" />\r
-    <Compile Include="System.Web.Security\CookieProtection.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\DefaultAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\FileAuthorizationModule.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthentication.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationTicket.cs" />\r
-    <Compile Include="System.Web.Security\FormsIdentity.cs" />\r
-    <Compile Include="System.Web.Security\MachineKey.cs" />\r
-    <Compile Include="System.Web.Security\MachineKeyProtection.cs" />\r
-    <Compile Include="System.Web.Security\Membership.cs" />\r
-    <Compile Include="System.Web.Security\MembershipHelper.cs" />\r
-    <Compile Include="System.Web.Security\MembershipPasswordAttribute.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.Security\PassportIdentity.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerModule.cs" />\r
-    <Compile Include="System.Web.Security\RolePrincipal.cs" />\r
-    <Compile Include="System.Web.Security\RoleProviderCollection.cs" />\r
-    <Compile Include="System.Web.Security\Roles.cs" />\r
-    <Compile Include="System.Web.Security\SqliteMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqliteRoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqlMembershipProvider.cs" />\r
-    <Compile Include="System.Web.Security\SqlRoleProvider.cs" />\r
-    <Compile Include="System.Web.Security\UrlAuthorizationModule.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventHandler.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationModule.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\HttpSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\HttpSessionStateContainer.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IHttpSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IReadOnlySessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IRequiresSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\ISessionIDManager.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\ISessionStateItemCollection.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IStateRuntime.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\RemoteStateServer.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionId.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionIDManager.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionInProcHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionSQLServerHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateActions.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateBehavior.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateItemCollection.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateItemExpireCallback.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateMode.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateModule.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateServerHandler.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateStoreData.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateStoreProviderBase.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateUtility.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\StateRuntime.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\StateServerItem.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\ControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\PageAdapter.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\WmlPostFieldType.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlAnchor.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlContainerControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlEmptyTagControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlForm.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlGenericControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlHead.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlHeadBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlImage.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputCheckBox.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputControl.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputFile.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputHidden.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputImage.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputPassword.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputRadioButton.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputReset.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputSubmit.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlInputText.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlLink.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlMeta.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlSelect.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlSelectBuilder.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTable.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableCell.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableCellCollection.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableRow.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTableRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTextArea.cs" />\r
-    <Compile Include="System.Web.UI.HtmlControls\HtmlTitle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\DataBoundControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\HideDisabledControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\HierarchicalDataBoundControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\MenuAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.Adapters\WebControlAdapter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionConsumerCallback.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionInterfaceCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionPointType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConnectionProviderCallback.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ConsumerConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\EditorPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\EditorPartCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITrackingPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITransformerConfigurationControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IVersioningPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebActionable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebEditable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartHttpHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartParameters.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\Part.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizableAttribute.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizationScope.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ProviderConnectionPoint.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\TypeCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartExportMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartHelpMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartPageMenuMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerb.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AccessDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AccessDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdCreatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdCreatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdRotator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AssociatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoCompleteType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoGeneratedField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoGeneratedFieldProperties.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseCompareValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseDataList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseMenuRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BaseValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BorderStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BoundColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BoundField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Button.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonColumnType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonFieldBase.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Calendar.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CalendarDay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CalendarSelectionMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ChangePassword.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBoxField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CheckBoxList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ChildTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CircleHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CollectionDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompareValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompleteWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompositeControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CompositeDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContainedTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Content.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentControlBuilderInternal.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentPlaceHolder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentPlaceHolderBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlIDConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ControlPropertyNameConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CookieParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserWizard.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CustomValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataBoundControlMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlCellType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlCommands.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlFieldHeaderCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGrid.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridColumnCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPagerStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKey.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKeyArray.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataKeyCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataSourceCacheManager.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayNameFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayRenderEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayRenderEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPagerRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DropDownList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EditCommandColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EmbeddedMailObject.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\EmbeddedMailObjectsCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FileUpload.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FirstDayOfWeek.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontInfo.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontNamesConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontSize.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontUnit.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontUnitConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPagerRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridLines.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HiddenField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HierarchicalDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HorizontalAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HorizontalAlignConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpotCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpotMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLink.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HyperLinkField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IButtonControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICallbackContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICompositeControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundItemControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundListControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IFieldControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Image.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMap.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IMenuRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IPersistedSelector.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IPostBackContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IRenderOuterTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IRepeatInfoUser.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Label.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LabelControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LinkButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LinkButtonControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListSelectionMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Literal.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LiteralControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LiteralMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Localize.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Login.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginFailureAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginName.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginStatus.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginTextLayout.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LogoutAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailDefinition.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Menu.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemBinding.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuItemTemplateContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuListRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuRenderingMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuTableRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MultiView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MultiViewControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\NamedCssStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\NextPrevFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Orientation.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagedDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerButtons.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerPosition.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerSettings.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Panel.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PanelStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Parameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ParameterCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PasswordRecovery.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PathDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PlaceHolder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PlaceHolderControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PolygonHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ProfileParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\QueryStringParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RadioButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RadioButtonList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RangeValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RectangleHotSpot.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RegularExpressionValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Repeater.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatInfo.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatLayout.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RequiredFieldValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RoleGroup.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RoleGroupCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RouteParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ScrollBars.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SelectedDatesCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SendMailErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SendMailErrorEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SessionParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapPath.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapViewType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SortDirection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StringArrayConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Style.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StyleBlock.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\StyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SubMenuStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SubMenuStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Substitution.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Table.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCaptionAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCellCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCellControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableFooterRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderScope.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableItemStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRowSection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableSectionStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TargetConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplateColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplatedWizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TemplateField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBox.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBoxControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBoxMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TitleFormat.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeBinding.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeSelectAction.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeTypes.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeViewImageSet.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Unit.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\UnitConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\UnitType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationCompareOperator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationDataType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationSummary.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationSummaryDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidatorDisplay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\VerticalAlign.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\VerticalAlignConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\View.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ViewCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WebColorConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WebControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Wizard.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardLayoutContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardLayoutNavigationContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardNavigationEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardNavigationEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStep.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepBase.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WizardStepType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Xml.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourceNodeDescriptor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourcePropertyDescriptor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchicalEnumerable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\XmlHierarchyData.cs" />\r
-    <Compile Include="System.Web.UI\ApplicationFileParser.cs" />\r
-    <Compile Include="System.Web.UI\AttributeCollection.cs" />\r
-    <Compile Include="System.Web.UI\BaseParser.cs" />\r
-    <Compile Include="System.Web.UI\BasePartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\BaseTemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\BoundPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\BuilderPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\BuildMethod.cs" />\r
-    <Compile Include="System.Web.UI\BuildTemplateMethod.cs" />\r
-    <Compile Include="System.Web.UI\ChtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\ClientIDMode.cs" />\r
-    <Compile Include="System.Web.UI\ClientScriptManager.cs" />\r
-    <Compile Include="System.Web.UI\CodeBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CodeConstructType.cs" />\r
-    <Compile Include="System.Web.UI\CodeRenderBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CollectionBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CompilationMode.cs" />\r
-    <Compile Include="System.Web.UI\CompiledBindableTemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\CompiledTemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\ComplexPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ConflictOptions.cs" />\r
-    <Compile Include="System.Web.UI\ConstructorNeedsTagAttribute.cs" />\r
-    <Compile Include="System.Web.UI\Control.cs" />\r
-    <Compile Include="System.Web.UI\ControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\ControlBuilderAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ControlCachePolicy.cs" />\r
-    <Compile Include="System.Web.UI\ControlCollection.cs" />\r
-    <Compile Include="System.Web.UI\ControlSkin.cs" />\r
-    <Compile Include="System.Web.UI\ControlSkinDelegate.cs" />\r
-    <Compile Include="System.Web.UI\ControlValuePropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\CssClassPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\CssStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI\DataBinder.cs" />\r
-    <Compile Include="System.Web.UI\DataBinding.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingBuilder.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingHandlerAttribute.cs" />\r
-    <Compile Include="System.Web.UI\DataBoundLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\DataKeyPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCacheDurationConverter.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCacheExpiry.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCapabilities.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceControl.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceOperation.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceSelectArguments.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceViewOperationCallback.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceViewSelectCallback.cs" />\r
-    <Compile Include="System.Web.UI\DesignerDataBoundLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\DesignTimeParseData.cs" />\r
-    <Compile Include="System.Web.UI\DesignTimeTemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\EmptyControlCollection.cs" />\r
-    <Compile Include="System.Web.UI\EventEntry.cs" />\r
-    <Compile Include="System.Web.UI\ExpressionBinding.cs" />\r
-    <Compile Include="System.Web.UI\ExpressionBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI\ExtractTemplateValuesMethod.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelControlBuilderAttribute.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelMasterPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelUserControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FilterableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HiddenFieldPageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\HierarchicalDataSourceControl.cs" />\r
-    <Compile Include="System.Web.UI\HierarchicalDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\Html32TextWriter.cs" />\r
-    <Compile Include="System.Web.UI\HtmlControlPersistableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterStyle.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterTag.cs" />\r
-    <Compile Include="System.Web.UI\IAttributeAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IAutoFieldGenerator.cs" />\r
-    <Compile Include="System.Web.UI\IBindableControl.cs" />\r
-    <Compile Include="System.Web.UI\IBindableTemplate.cs" />\r
-    <Compile Include="System.Web.UI\ICallbackEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\ICheckBoxControl.cs" />\r
-    <Compile Include="System.Web.UI\IControlBuilderAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataBindingsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataItemContainer.cs" />\r
-    <Compile Include="System.Web.UI\IDataKeysControl.cs" />\r
-    <Compile Include="System.Web.UI\IDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IDataSourceViewSchemaAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDReferencePropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\IEditableTextControl.cs" />\r
-    <Compile Include="System.Web.UI\IExpressionsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IFilterResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IgnoreUnknownContentAttribute.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalEnumerable.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchyData.cs" />\r
-    <Compile Include="System.Web.UI\ImageClickEventArgs.cs" />\r
-    <Compile Include="System.Web.UI\ImageClickEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\INamingContainer.cs" />\r
-    <Compile Include="System.Web.UI\INavigateUIData.cs" />\r
-    <Compile Include="System.Web.UI\IndexedString.cs" />\r
-    <Compile Include="System.Web.UI\INonBindingContainer.cs" />\r
-    <Compile Include="System.Web.UI\IParserAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackDataHandler.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\IResourceUrlGenerator.cs" />\r
-    <Compile Include="System.Web.UI\IScriptManager.cs" />\r
-    <Compile Include="System.Web.UI\IStateFormatter.cs" />\r
-    <Compile Include="System.Web.UI\IStateManager.cs" />\r
-    <Compile Include="System.Web.UI\IStyleSheet.cs" />\r
-    <Compile Include="System.Web.UI\ITagNameToTypeMapper.cs" />\r
-    <Compile Include="System.Web.UI\ITemplate.cs" />\r
-    <Compile Include="System.Web.UI\ITextControl.cs" />\r
-    <Compile Include="System.Web.UI\IThemeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUrlResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlTypeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IValidator.cs" />\r
-    <Compile Include="System.Web.UI\ListSourceHelper.cs" />\r
-    <Compile Include="System.Web.UI\LiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\LosFormatter.cs" />\r
-    <Compile Include="System.Web.UI\MainDirectiveAttribute.cs" />\r
-    <Compile Include="System.Web.UI\MasterPage.cs" />\r
-    <Compile Include="System.Web.UI\MasterPageControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\MasterPageParser.cs" />\r
-    <Compile Include="System.Web.UI\MinimizableAttributeTypeConverter.cs" />\r
-    <Compile Include="System.Web.UI\NonVisualControlAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ObjectConverter.cs" />\r
-    <Compile Include="System.Web.UI\ObjectPersistData.cs" />\r
-    <Compile Include="System.Web.UI\ObjectStateFormatter.cs" />\r
-    <Compile Include="System.Web.UI\ObjectTag.cs" />\r
-    <Compile Include="System.Web.UI\ObjectTagBuilder.cs" />\r
-    <Compile Include="System.Web.UI\OutputCacheLocation.cs" />\r
-    <Compile Include="System.Web.UI\OutputCacheParameters.cs" />\r
-    <Compile Include="System.Web.UI\Page.cs" />\r
-    <Compile Include="System.Web.UI\PageAsyncTask.cs" />\r
-    <Compile Include="System.Web.UI\PageHandlerFactory.cs" />\r
-    <Compile Include="System.Web.UI\PageLifeCycle.cs" />\r
-    <Compile Include="System.Web.UI\PageParser.cs" />\r
-    <Compile Include="System.Web.UI\PageParserFilter.cs" />\r
-    <Compile Include="System.Web.UI\PageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\PageTheme.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeBuilder.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeFileParser.cs" />\r
-    <Compile Include="System.Web.UI\PageThemeParser.cs" />\r
-    <Compile Include="System.Web.UI\Pair.cs" />\r
-    <Compile Include="System.Web.UI\ParseChildrenAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PartialCachingAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\PersistChildrenAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PersistenceMode.cs" />\r
-    <Compile Include="System.Web.UI\PersistenceModeAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PostBackOptions.cs" />\r
-    <Compile Include="System.Web.UI\PropertyConverter.cs" />\r
-    <Compile Include="System.Web.UI\PropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ReadOnlyDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI\RenderMethod.cs" />\r
-    <Compile Include="System.Web.UI\ResourceBasedLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\RootBuilder.cs" />\r
-    <Compile Include="System.Web.UI\SessionPageStatePersister.cs" />\r
-    <Compile Include="System.Web.UI\SimpleHandlerFactory.cs" />\r
-    <Compile Include="System.Web.UI\SimplePropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\SimpleWebHandlerParser.cs" />\r
-    <Compile Include="System.Web.UI\SkinBuilder.cs" />\r
-    <Compile Include="System.Web.UI\StateBag.cs" />\r
-    <Compile Include="System.Web.UI\StateItem.cs" />\r
-    <Compile Include="System.Web.UI\StateManagedCollection.cs" />\r
-    <Compile Include="System.Web.UI\StaticPartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\StringPropertyBuilder.cs" />\r
-    <Compile Include="System.Web.UI\SupportsEventValidationAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TagPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateBuilder.cs" />\r
-    <Compile Include="System.Web.UI\TemplateContainerAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateContentType.cs" />\r
-    <Compile Include="System.Web.UI\TemplateControl.cs" />\r
-    <Compile Include="System.Web.UI\TemplateControlParser.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstance.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstanceAttribute.cs" />\r
-    <Compile Include="System.Web.UI\TemplateParser.cs" />\r
-    <Compile Include="System.Web.UI\TemplatePropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ThemeableAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ThemeProvider.cs" />\r
-    <Compile Include="System.Web.UI\ToolboxDataAttribute.cs" />\r
-    <Compile Include="System.Web.UI\Triplet.cs" />\r
-    <Compile Include="System.Web.UI\UnknownAttributeDescriptor.cs" />\r
-    <Compile Include="System.Web.UI\UrlPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\UrlTypes.cs" />\r
-    <Compile Include="System.Web.UI\UserControl.cs" />\r
-    <Compile Include="System.Web.UI\UserControlControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\UserControlParser.cs" />\r
-    <Compile Include="System.Web.UI\ValidationPropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\ValidatorCollection.cs" />\r
-    <Compile Include="System.Web.UI\VerificationAttribute.cs" />\r
-    <Compile Include="System.Web.UI\VerificationConditionalOperator.cs" />\r
-    <Compile Include="System.Web.UI\VerificationReportLevel.cs" />\r
-    <Compile Include="System.Web.UI\VerificationRule.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateEncryptionMode.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateException.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateMode.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateModeByIdAttribute.cs" />\r
-    <Compile Include="System.Web.UI\VirtualReferenceType.cs" />\r
-    <Compile Include="System.Web.UI\WebHandlerParser.cs" />\r
-    <Compile Include="System.Web.UI\WebResourceAttribute.cs" />\r
-    <Compile Include="System.Web.UI\WebServiceParser.cs" />\r
-    <Compile Include="System.Web.UI\XhtmlMobileDocType.cs" />\r
-    <Compile Include="System.Web.UI\XhtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\XPathBinder.cs" />\r
-    <Compile Include="System.Web.Util\AltSerialization.cs" />\r
-    <Compile Include="System.Web.Util\DataSourceHelper.cs" />\r
-    <Compile Include="System.Web.Util\DataSourceResolver.cs" />\r
-    <Compile Include="System.Web.Util\FileUtils.cs" />\r
-    <Compile Include="System.Web.Util\Helpers.cs" />\r
-    <Compile Include="System.Web.Util\HttpEncoder.cs" />\r
-    <Compile Include="System.Web.Util\ICalls.cs" />\r
-    <Compile Include="System.Web.Util\IWebObjectFactory.cs" />\r
-    <Compile Include="System.Web.Util\IWebPropertyAccessor.cs" />\r
-    <Compile Include="System.Web.Util\MachineKeySectionUtils.cs" />\r
-    <Compile Include="System.Web.Util\RequestValidationSource.cs" />\r
-    <Compile Include="System.Web.Util\RequestValidator.cs" />\r
-    <Compile Include="System.Web.Util\RuntimeHelpers.cs" />\r
-    <Compile Include="System.Web.Util\SearchPattern.cs" />\r
-    <Compile Include="System.Web.Util\SecureHashCodeProvider.cs" />\r
-    <Compile Include="System.Web.Util\SerializationHelper.cs" />\r
-    <Compile Include="System.Web.Util\SimpleWebObjectFactory.cs" />\r
-    <Compile Include="System.Web.Util\StrUtils.cs" />\r
-    <Compile Include="System.Web.Util\TimeUtil.cs" />\r
-    <Compile Include="System.Web.Util\TransactedCallback.cs" />\r
-    <Compile Include="System.Web.Util\Transactions.cs" />\r
-    <Compile Include="System.Web.Util\UrlUtils.cs" />\r
-    <Compile Include="System.Web.Util\WebEncoding.cs" />\r
-    <Compile Include="System.Web.Util\WebTrace.cs" />\r
-    <Compile Include="System.Web.Util\WorkItem.cs" />\r
-    <Compile Include="System.Web.Util\WorkItemCallback.cs" />\r
-    <Compile Include="System.Web\ApplicationShutdownReason.cs" />\r
-    <Compile Include="System.Web\BaseParamsCollection.cs" />\r
-    <Compile Include="System.Web\BeginEventHandler.cs" />\r
-    <Compile Include="System.Web\BrowserCapabilities.cs" />\r
-    <Compile Include="System.Web\CapabilitiesLoader.cs" />\r
-    <Compile Include="System.Web\DefaultExceptionPageTemplate.cs" />\r
-    <Compile Include="System.Web\DefaultHttpHandler.cs" />\r
-    <Compile Include="System.Web\DynamicModuleManager.cs" />\r
-    <Compile Include="System.Web\EndEventHandler.cs" />\r
-    <Compile Include="System.Web\EventHandlerTaskAsyncHelper.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplate.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateFragment.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateFragmentValue.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateType.cs" />\r
-    <Compile Include="System.Web\ExceptionPageTemplateValues.cs" />\r
-    <Compile Include="System.Web\HeadersCollection.cs" />\r
-    <Compile Include="System.Web\HtmlizedException.cs" />\r
-    <Compile Include="System.Web\HtmlString.cs" />\r
-    <Compile Include="System.Web\HttpApplication.cs" />\r
-    <Compile Include="System.Web\HttpApplicationFactory.cs" />\r
-    <Compile Include="System.Web\HttpApplicationState.cs" />\r
-    <Compile Include="System.Web\HttpBrowserCapabilities.cs" />\r
-    <Compile Include="System.Web\HttpCacheability.cs" />\r
-    <Compile Include="System.Web\HttpCachePolicy.cs" />\r
-    <Compile Include="System.Web\HttpCacheRevalidation.cs" />\r
-    <Compile Include="System.Web\HttpCacheValidateHandler.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByContentEncodings.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByHeaders.cs" />\r
-    <Compile Include="System.Web\HttpCacheVaryByParams.cs" />\r
-    <Compile Include="System.Web\HttpClientCertificate.cs" />\r
-    <Compile Include="System.Web\HttpCompileException.cs" />\r
-    <Compile Include="System.Web\HttpContext.cs" />\r
-    <Compile Include="System.Web\HttpCookie.cs" />\r
-    <Compile Include="System.Web\HttpCookieCollection.cs" />\r
-    <Compile Include="System.Web\HttpCookieMode.cs" />\r
-    <Compile Include="System.Web\HttpException.cs" />\r
-    <Compile Include="System.Web\HttpFileCollection.cs" />\r
-    <Compile Include="System.Web\HttpForbiddenHandler.cs" />\r
-    <Compile Include="System.Web\HttpHeaderCollection.cs" />\r
-    <Compile Include="System.Web\HttpMethodNotAllowedHandler.cs" />\r
-    <Compile Include="System.Web\HttpModuleCollection.cs" />\r
-    <Compile Include="System.Web\HttpNotFoundHandler.cs" />\r
-    <Compile Include="System.Web\HttpNotImplementedHandler.cs" />\r
-    <Compile Include="System.Web\HttpParamsCollection.cs" />\r
-    <Compile Include="System.Web\HttpParseException.cs" />\r
-    <Compile Include="System.Web\HttpPostedFile.cs" />\r
-    <Compile Include="System.Web\HttpRequest.cs" />\r
-    <Compile Include="System.Web\HttpRequestValidationException.cs" />\r
-    <Compile Include="System.Web\HttpResponse.cs" />\r
-    <Compile Include="System.Web\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Web\HttpResponseStream.cs" />\r
-    <Compile Include="System.Web\HttpResponseSubstitutionCallback.cs" />\r
-    <Compile Include="System.Web\HttpRuntime.cs" />\r
-    <Compile Include="System.Web\HttpServerUtility.cs" />\r
-    <Compile Include="System.Web\HttpStaticObjectsCollection.cs" />\r
-    <Compile Include="System.Web\HttpTaskAsyncHandler.cs" />\r
-    <Compile Include="System.Web\HttpUnhandledException.cs" />\r
-    <Compile Include="System.Web\HttpUtility.cs" />\r
-    <Compile Include="System.Web\HttpValidationStatus.cs" />\r
-    <Compile Include="System.Web\HttpWorkerRequest.cs" />\r
-    <Compile Include="System.Web\HttpWriter.cs" />\r
-    <Compile Include="System.Web\IHtmlString.cs" />\r
-    <Compile Include="System.Web\IHttpAsyncHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandlerFactory.cs" />\r
-    <Compile Include="System.Web\IHttpMapPath.cs" />\r
-    <Compile Include="System.Web\IHttpModule.cs" />\r
-    <Compile Include="System.Web\IisTraceListener.cs" />\r
-    <Compile Include="System.Web\InputFilterStream.cs" />\r
-    <Compile Include="System.Web\IntPtrStream.cs" />\r
-    <Compile Include="System.Web\IPartitionResolver.cs" />\r
-    <Compile Include="System.Web\MimeMapping.cs" />\r
-    <Compile Include="System.Web\MimeTypes.cs" />\r
-    <Compile Include="System.Web\NoParamsInvoker.cs" />\r
-    <Compile Include="System.Web\OutputFilterStream.cs" />\r
-    <Compile Include="System.Web\ParserError.cs" />\r
-    <Compile Include="System.Web\ParserErrorCollection.cs" />\r
-    <Compile Include="System.Web\PreApplicationStartMethodAttribute.cs" />\r
-    <Compile Include="System.Web\ProcessInfo.cs" />\r
-    <Compile Include="System.Web\ProcessModelInfo.cs" />\r
-    <Compile Include="System.Web\ProcessShutdownReason.cs" />\r
-    <Compile Include="System.Web\ProcessStatus.cs" />\r
-    <Compile Include="System.Web\QueueManager.cs" />\r
-    <Compile Include="System.Web\ReadEntityBodyMode.cs" />\r
-    <Compile Include="System.Web\RequestNotification.cs" />\r
-    <Compile Include="System.Web\RequestNotificationStatus.cs" />\r
-    <Compile Include="System.Web\ServerVariablesCollection.cs" />\r
-    <Compile Include="System.Web\SiteMap.cs" />\r
-    <Compile Include="System.Web\SiteMapNode.cs" />\r
-    <Compile Include="System.Web\SiteMapNodeCollection.cs" />\r
-    <Compile Include="System.Web\SiteMapProvider.cs" />\r
-    <Compile Include="System.Web\SiteMapProviderCollection.cs" />\r
-    <Compile Include="System.Web\SiteMapResolveEventArgs.cs" />\r
-    <Compile Include="System.Web\StaticFileHandler.cs" />\r
-    <Compile Include="System.Web\StaticSiteMapProvider.cs" />\r
-    <Compile Include="System.Web\TaskAsyncResult.cs" />\r
-    <Compile Include="System.Web\TaskEventHandler.cs" />\r
-    <Compile Include="System.Web\TempFileStream.cs" />\r
-    <Compile Include="System.Web\TraceContext.cs" />\r
-    <Compile Include="System.Web\TraceContextEventArgs.cs" />\r
-    <Compile Include="System.Web\TraceContextEventHandler.cs" />\r
-    <Compile Include="System.Web\TraceContextRecord.cs" />\r
-    <Compile Include="System.Web\TraceData.cs" />\r
-    <Compile Include="System.Web\TraceManager.cs" />\r
-    <Compile Include="System.Web\TraceMode.cs" />\r
-    <Compile Include="System.Web\UnvalidatedRequestValues.cs" />\r
-    <Compile Include="System.Web\UnvalidatedRequestValuesBase.cs" />\r
-    <Compile Include="System.Web\UnvalidatedRequestValuesWrapper.cs" />\r
-    <Compile Include="System.Web\VirtualPath.cs" />\r
-    <Compile Include="System.Web\VirtualPathUtility.cs" />\r
-    <Compile Include="System.Web\WebCategoryAttribute.cs" />\r
-    <Compile Include="System.Web\WebPageTraceListener.cs" />\r
-    <Compile Include="System.Web\WebROCollection.cs" />\r
-    <Compile Include="System.Web\WebSysDescriptionAttribute.cs" />\r
-    <Compile Include="System.Web\XmlSiteMapProvider.cs" />\r
-    <Compile Include="System.Web\UplevelHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_5.csproj">\r
-      <Project>{41476FBD-C1CB-4B3C-8078-3281EB1E0EAB}</Project>\r
-      <Name>Mono.Data.Sqlite-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj">\r
-      <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj">\r
-      <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj">\r
-      <Project>{B12AABBC-30D1-4885-BF3F-A53B970F68FB}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
-      <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/TranslationResources.resources">\r
-      <LogicalName>TranslationResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation.js">\r
-      <LogicalName>WebUIValidation.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder.gif">\r
-      <LogicalName>folder.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/file.gif">\r
-      <LogicalName>file.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/computer.gif">\r
-      <LogicalName>computer.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_minus.gif">\r
-      <LogicalName>arrow_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_noexpand.gif">\r
-      <LogicalName>arrow_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_plus.gif">\r
-      <LogicalName>arrow_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_up.gif">\r
-      <LogicalName>arrow_up.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_down.gif">\r
-      <LogicalName>arrow_down.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_full.gif">\r
-      <LogicalName>box_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_empty.gif">\r
-      <LogicalName>box_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_minus.gif">\r
-      <LogicalName>box_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_noexpand.gif">\r
-      <LogicalName>box_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_plus.gif">\r
-      <LogicalName>box_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/contact.gif">\r
-      <LogicalName>contact.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_empty.gif">\r
-      <LogicalName>dot_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_full.gif">\r
-      <LogicalName>dot_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dots.gif">\r
-      <LogicalName>dots.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/inbox.gif">\r
-      <LogicalName>inbox.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_empty.gif">\r
-      <LogicalName>star_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_full.gif">\r
-      <LogicalName>star_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/warning.gif">\r
-      <LogicalName>warning.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_noexpand.gif">\r
-      <LogicalName>TreeView_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dash.gif">\r
-      <LogicalName>TreeView_dash.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashminus.gif">\r
-      <LogicalName>TreeView_dashminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashplus.gif">\r
-      <LogicalName>TreeView_dashplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_i.gif">\r
-      <LogicalName>TreeView_i.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_l.gif">\r
-      <LogicalName>TreeView_l.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lminus.gif">\r
-      <LogicalName>TreeView_lminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lplus.gif">\r
-      <LogicalName>TreeView_lplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_minus.gif">\r
-      <LogicalName>TreeView_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_plus.gif">\r
-      <LogicalName>TreeView_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_r.gif">\r
-      <LogicalName>TreeView_r.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rminus.gif">\r
-      <LogicalName>TreeView_rminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rplus.gif">\r
-      <LogicalName>TreeView_rplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_t.gif">\r
-      <LogicalName>TreeView_t.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tminus.gif">\r
-      <LogicalName>TreeView_tminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tplus.gif">\r
-      <LogicalName>TreeView_tplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/transparent.gif">\r
-      <LogicalName>transparent.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/webform.js">\r
-      <LogicalName>webform.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation_2.0.js">\r
-      <LogicalName>WebUIValidation_2.0.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Top.html">\r
-      <LogicalName>ErrorTemplateCommon_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_CustomErrorDefault.html">\r
-      <LogicalName>DefaultErrorTemplate_CustomErrorDefault.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Bottom.html">\r
-      <LogicalName>ErrorTemplateCommon_Bottom.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_StandardPage.html">\r
-      <LogicalName>DefaultErrorTemplate_StandardPage.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_Top.html">\r
-      <LogicalName>HtmlizedExceptionPage_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileLongSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileLongSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileShortSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileShortSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_CompilerOutput.html">\r
-      <LogicalName>HtmlizedExceptionPage_CompilerOutput.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/GridView.js">\r
-      <LogicalName>GridView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/DetailsView.js">\r
-      <LogicalName>DetailsView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/TreeView.js">\r
-      <LogicalName>TreeView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/Menu.js">\r
-      <LogicalName>Menu.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/MenuModern.js">\r
-      <LogicalName>MenuModern.js</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj b/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
index 97642fd1e8434a153827766b83598ab462df4ef2..df7651cee19b7126a8bc06f8a476018140d1c26c 100644 (file)
--- a/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
+++ b/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
@@ -46,8 +46,11 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpApplicationStateBase.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpApplicationStateWrapper.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpBrowserCapabilitiesBase.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpBrowserCapabilitiesWrapper.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpCachePolicyBase.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpCachePolicyWrapper.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpFileCollectionBase.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpPostedFileBase.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpPostedFileWrapper.cs" />\r
@@ -55,9 +58,63 @@
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpResponseBase.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpServerUtilityBase.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpSessionStateBase.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpSessionStateWrapper.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpStaticObjectsCollectionBase.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Abstractions\HttpStaticObjectsCollectionWrapper.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Cache\IOutputCacheEntry.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Cache\ResponseElement.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\BuildProviderAppliesTo.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\BuildProviderAppliesToAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\DesignTimeResourceProviderFactoryAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\ExpressionEditorAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\ExpressionPrefixAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\FolderLevelBuildProviderAppliesTo.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\FolderLevelBuildProviderAppliesToAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\IAssemblyPostProcessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Compilation\IImplicitResourceProvider.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AdapterDictionary.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AsyncPreloadModeFlags.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AuthenticationMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\AuthorizationRuleAction.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\BrowserCapsElementType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\BrowserTree.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\CustomErrorsMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\CustomErrorsRedirectMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\CustomWebEventKey.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\DelayedRegex.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\FormsAuthPasswordFormat.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\FormsProtectionEnum.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\IConfigMapPath.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\IConfigMapPathFactory.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\IRemoteWebConfigurationHostServer.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\MachineKeyCompatibilityMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\MachineKeyValidation.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\PagesEnableSessionState.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProcessModelComAuthenticationLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProcessModelComImpersonationLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProcessModelLogLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\ProfileGuidedOptimizationsFlags.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RegexMatchTimeoutValidator.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RegexMatchTimeoutValidatorAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RpcAuthent.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RpcImpers.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\RpcLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\SerializationMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\SystemWebCachingSectionGroup.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\TicketCompatibilityMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\TraceDisplayMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\WebApplicationLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\WebLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Configuration\XhtmlConformanceMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Hosting\IApplicationHost.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Hosting\IRegisteredObject.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\IHtmlString.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpAsyncHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpHandlerFactory.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\IHttpModule.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\ISubscriptionToken.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\ITlsTokenBindingInfo.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\BindingBehavior.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\BindingBehaviorAttribute.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\BindNeverAttribute.cs" />\r
@@ -65,19 +122,307 @@
     <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ExtensibleModelBinderAttribute.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\IModelNameProvider.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ModelBinderProviderOptionsAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ModelError.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\ModelBinding\ModelErrorCollection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\PreApplicationStartMethodAttribute.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Profile\HttpProfileGroupBase.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Profile\ProfileEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Profile\ProfileEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\ReadEntityBodyMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\RequestNotification.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\RequestNotificationStatus.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\IRouteConstraint.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\IRouteHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RequestContext.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteBase.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteDirection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteTable.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\RouteValueDictionary.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Routing\VirtualPathData.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\Security\AntiXss\CodeCharts.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\FormsAuthenticationEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\FormsAuthenticationEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\PassportAuthenticationEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\PassportAuthenticationEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\RoleManagerEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\RoleManagerEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\WindowsAuthenticationEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Security\WindowsAuthenticationEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\State\IReadOnlySessionState.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\State\IRequiresSessionState.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\State\SessionStateBehavior.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ClientIDMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ConflictOptions.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ConstructorNeedsTagAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ControlBuilderAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\CssClassPropertyAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataBindingHandlerAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataKeyPropertyAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataSourceCacheExpiry.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataSourceCapabilities.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\DataSourceOperation.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\FileLevelControlBuilderAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\FilterableAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\HtmlTextWriterAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\HtmlTextWriterStyle.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\HtmlTextWriterTag.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IAttributeAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IAutoFieldGenerator.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IBindableControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IBindableTemplate.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ICallbackEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IControlBuilderAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IControlDesignerAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataBindingsAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataItemContainer.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataKeysControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataSource.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDataSourceViewSchemaAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IDReferencePropertyAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IExpressionsAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IFilterResolutionService.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IHierarchicalDataSource.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IHierarchicalEnumerable.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IHierarchyData.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ImageClickEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\INamingContainer.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\INavigateUIData.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\INonBindingContainer.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IParserAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IPostBackDataHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IPostBackEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IResourceUrlGenerator.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IScriptResourceDefinition.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IScriptResourceMapping.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IStateFormatter.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IStateManager.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IStyleSheet.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ITemplate.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IThemeResolutionService.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IUrlResolutionService.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IUserControlDesignerAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IUserControlTypeResolutionService.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\IValidator.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\NonVisualControlAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\PersistChildrenAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\PersistenceMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\SupportsEventValidationAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TemplateInstance.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TemplateInstanceAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ThemeableAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TraceContextEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\TraceContextEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\UnobtrusiveValidationMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ValidateRequestMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ViewStateEncryptionMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\ViewStateMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\Adapters\WmlPostFieldType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AdCreatedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AuthenticateEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AuthenticateEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\AutoCompleteType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\BorderStyle.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\BulletedListEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\BulletedListEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ButtonColumnType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ButtonType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CalendarSelectionMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CallingDataMethodsEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CallingDataMethodsEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ContentDirection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CreateUserErrorEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\CreateUserErrorEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataBoundControlMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataControlCellType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataControlRowState.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataControlRowType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridCommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridItemEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridItemEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridPageChangedEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridPageChangedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridSortCommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataGridSortCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListCommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListItemEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DataListItemEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DayNameFormat.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DayRenderEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewCommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewDeletedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewDeleteEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewInsertedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewInsertEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewModeEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewModeEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewPageEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewPageEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewUpdatedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\DetailsViewUpdateEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FirstDayOfWeek.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FontSize.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewDeletedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewDeleteEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewInsertedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewInsertEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewModeEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewModeEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewPageEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewPageEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewUpdatedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\FormViewUpdateEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridLines.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCancelEditEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCancelEditEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewDeletedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewDeleteEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewEditEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewEditEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewPageEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewPageEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewRowEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewRowEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSelectEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSelectEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSortEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewSortEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewUpdatedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\GridViewUpdateEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\HorizontalAlign.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\HotSpotMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IButtonControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ICallbackContainer.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ICompositeControlDesignerAccessor.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IDataBoundControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IDataBoundItemControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IDataBoundListControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IFieldControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ImageAlign.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ImageMapEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ImageMapEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IPersistedSelector.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\IRepeatInfoUser.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ListItemType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ListSelectionMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LiteralMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LoginCancelEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LoginCancelEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LoginFailureAction.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\LogoutAction.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MailMessageEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MailMessageEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MenuEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MenuEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MenuRenderingMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MonthChangedEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\MonthChangedEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\NextPrevFormat.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceDisposingEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceDisposingEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceFilteringEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceFilteringEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceMethodEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceMethodEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceSelectingEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceSelectingEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceStatusEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ObjectDataSourceStatusEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\Orientation.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PagerButtons.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PagerMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PagerPosition.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\PathDirection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeatDirection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterCommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterItemEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeaterItemEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\RepeatLayout.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SendMailErrorEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ServerValidateEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SiteMapNodeItemEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SiteMapNodeItemEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SiteMapNodeItemType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SortDirection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceCommandType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceFilteringEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceFilteringEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceSelectingEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceSelectingEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceStatusEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\SqlDataSourceStatusEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TableCaptionAlign.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TableHeaderScope.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TableRowSection.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TextAlign.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TextBoxMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TitleFormat.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeNodeEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeNodeEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeNodeSelectAction.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\TreeViewImageSet.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\UnitType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidationCompareOperator.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidationDataType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidationSummaryDisplayMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\ValidatorDisplay.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\VerticalAlign.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebControls\WebColorConverter.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\FieldCallback.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\ITrackingPersonalizable.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\ITransformerConfigurationControl.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IVersioningPersonalizable.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebActionable.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebEditable.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPart.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartField.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartHttpHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartParameters.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartRow.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\IWebPartTable.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\ParametersCallback.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\PartChromeState.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\PartChromeType.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\PersonalizationScope.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\RowCallback.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\TableCallback.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebBrowsableAttribute.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebDescriptionAttribute.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebDisplayNameAttribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartAuthorizationEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartCancelEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartCancelEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartEventHandler.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartExportMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartHelpMode.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartVerbsEventArgs.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\UI\WebParts\WebPartVerbsEventHandler.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\UnvalidatedRequestValuesBase.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\UnvalidatedRequestValuesWrapper.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Util\IObjectFactory.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Util\RequestValidationSource.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System.Web\Util\StringUtil.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\WebSockets\AspNetWebSocketOptions.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System.Web\WebSockets\SubprotocolUtil.cs" />\r
     <Compile Include="..\..\build\common\Consts.cs" />\r
     <Compile Include="..\..\build\common\Locale.cs" />\r
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
+    <Compile Include="..\..\build\common\SR.cs" />\r
     <Compile Include="..\System.Design\System.Data.Design\TypedDataSetGenerator.cs" />\r
     <Compile Include="..\System.Windows.Forms\System.Resources\AssemblyNamesTypeResolutionService.cs" />\r
     <Compile Include="..\System.Windows.Forms\System.Resources\ByteArrayFromResXHandler.cs" />\r
@@ -100,6 +445,7 @@
     <Compile Include="Mono.Web.Util\SettingsMapping.cs" />\r
     <Compile Include="Mono.Web.Util\SettingsMappingManager.cs" />\r
     <Compile Include="Mono.Web.Util\SettingsMappingWhat.cs" />\r
+    <Compile Include="ReferenceSources\SR.cs" />\r
     <Compile Include="System.Collections.Concurrent\SplitOrderedList.cs" />\r
     <Compile Include="System.Web.Caching\AggregateCacheDependency.cs" />\r
     <Compile Include="System.Web.Caching\Cache.cs" />\r
@@ -120,13 +466,11 @@
     <Compile Include="System.Web.Caching\FileResponseElement.cs" />\r
     <Compile Include="System.Web.Caching\HeaderElement.cs" />\r
     <Compile Include="System.Web.Caching\InMemoryOutputCacheProvider.cs" />\r
-    <Compile Include="System.Web.Caching\IOutputCacheEntry.cs" />\r
     <Compile Include="System.Web.Caching\MemoryResponseElement.cs" />\r
     <Compile Include="System.Web.Caching\OutputCache.cs" />\r
     <Compile Include="System.Web.Caching\OutputCacheModule.cs" />\r
     <Compile Include="System.Web.Caching\OutputCacheProvider.cs" />\r
     <Compile Include="System.Web.Caching\OutputCacheProviderCollection.cs" />\r
-    <Compile Include="System.Web.Caching\ResponseElement.cs" />\r
     <Compile Include="System.Web.Caching\SqlCacheDependency.cs" />\r
     <Compile Include="System.Web.Caching\SqlCacheDependencyAdmin.cs" />\r
     <Compile Include="System.Web.Caching\SubstitutionResponseElement.cs" />\r
@@ -155,8 +499,6 @@
     <Compile Include="System.Web.Compilation\BuildManagerHostUnloadEventHandler.cs" />\r
     <Compile Include="System.Web.Compilation\BuildManagerRemoveEntryEventHandler.cs" />\r
     <Compile Include="System.Web.Compilation\BuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesTo.cs" />\r
-    <Compile Include="System.Web.Compilation\BuildProviderAppliesToAttribute.cs" />\r
     <Compile Include="System.Web.Compilation\BuildProviderGroup.cs" />\r
     <Compile Include="System.Web.Compilation\BuildProviderResultFlags.cs" />\r
     <Compile Include="System.Web.Compilation\CachingCompiler.cs" />\r
@@ -168,22 +510,14 @@
     <Compile Include="System.Web.Compilation\ConnectionStringsExpressionBuilder.cs" />\r
     <Compile Include="System.Web.Compilation\DefaultResourceProvider.cs" />\r
     <Compile Include="System.Web.Compilation\DefaultResourceProviderFactory.cs" />\r
-    <Compile Include="System.Web.Compilation\DesignTimeResourceProviderFactoryAttribute.cs" />\r
     <Compile Include="System.Web.Compilation\Directive.cs" />\r
     <Compile Include="System.Web.Compilation\ExpressionBuilder.cs" />\r
     <Compile Include="System.Web.Compilation\ExpressionBuilderContext.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionEditorAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\ExpressionPrefixAttribute.cs" />\r
-    <Compile Include="System.Web.Compilation\FolderLevelBuildProviderAppliesTo.cs" />\r
-    <Compile Include="System.Web.Compilation\FolderLevelBuildProviderAppliesToAttribute.cs" />\r
     <Compile Include="System.Web.Compilation\ForceCopyBuildProvider.cs" />\r
     <Compile Include="System.Web.Compilation\GenericBuildProvider.cs" />\r
     <Compile Include="System.Web.Compilation\GlobalAsaxCompiler.cs" />\r
-    <Compile Include="System.Web.Compilation\IAssemblyPostProcessor.cs" />\r
     <Compile Include="System.Web.Compilation\IgnoreFileBuildProvider.cs" />\r
-    <Compile Include="System.Web.Compilation\IImplicitResourceProvider.cs" />\r
     <Compile Include="System.Web.Compilation\ILocation.cs" />\r
-    <Compile Include="System.Web.Compilation\ImplicitResourceKey.cs" />\r
     <Compile Include="System.Web.Compilation\IResourceProvider.cs" />\r
     <Compile Include="System.Web.Compilation\LinePragmaCodeInfo.cs" />\r
     <Compile Include="System.Web.Compilation\Location.cs" />\r
@@ -215,15 +549,12 @@
     <Compile Include="System.Web.Compilation\WsdlBuildProvider.cs" />\r
     <Compile Include="System.Web.Compilation\XsdBuildProvider.cs" />\r
     <Compile Include="System.Web.Configuration.Internal\IInternalConfigWebHost.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AdapterDictionary.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\AnonymousIdentificationSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\ApplicationSettingsConfigurationFileMap.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\AssemblyCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\AssemblyInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthenticationMode.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\AuthenticationSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\AuthorizationRule.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleAction.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\AuthorizationSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\BufferModesCollection.cs" />\r
@@ -243,8 +574,6 @@
     <Compile Include="System.Web.Configuration_2.0\CompilerCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\CustomError.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\CustomErrorCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsMode.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\CustomErrorsRedirectMode.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\CustomErrorsSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\DeploymentSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\EventMappingSettings.cs" />\r
@@ -255,8 +584,6 @@
     <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationCredentials.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUser.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\FormsAuthenticationUserCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsAuthPasswordFormat.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\FormsProtectionEnum.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\GlobalizationSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\HandlersUtil.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\HealthMonitoringSection.cs" />\r
@@ -275,16 +602,11 @@
     <Compile Include="System.Web.Configuration_2.0\HttpModulesSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\HttpRuntimeSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\ICapabilitiesProcess.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPath.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IConfigMapPathFactory.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\IdentitySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\IRemoteWebConfigurationHostServer.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\LowerCaseStringConverter.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\LruCache.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyCompatibilityMode.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\MachineKeyRegistryStorage.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\MachineKeySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\MachineKeyValidation.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\MachineKeyValidationConverter.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\MembershipSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\MonoSettingsSection.cs" />\r
@@ -302,13 +624,9 @@
     <Compile Include="System.Web.Configuration_2.0\OutputCacheProfileCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\OutputCacheSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\OutputCacheSettingsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\PagesEnableSessionState.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\PagesSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\PassportAuthentication.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\PositiveTimeSpanValidator.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComAuthenticationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelComImpersonationLevel.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\ProcessModelLogLevel.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\ProcessModelSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettings.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\ProfileGroupSettingsCollection.cs" />\r
@@ -326,20 +644,17 @@
     <Compile Include="System.Web.Configuration_2.0\RuleSettings.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\RuleSettingsCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SecurityPolicySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SerializationMode.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SessionPageStateSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SessionStateSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SiteMapSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabase.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencyDatabaseCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SqlCacheDependencySection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\SystemWebCachingSectionGroup.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\SystemWebSectionGroup.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\TagMapCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\TagMapInfo.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\TagPrefixCollection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\TagPrefixInfo.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\TraceDisplayMode.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\TraceSection.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\TransformerInfo.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\TransformerInfoCollection.cs" />\r
@@ -352,7 +667,6 @@
     <Compile Include="System.Web.Configuration_2.0\VersionConverter.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMapping.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\VirtualDirectoryMappingCollection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\WebApplicationLevel.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\WebConfigurationFileMap.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\WebConfigurationHost.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\WebConfigurationManager.cs" />\r
@@ -361,7 +675,6 @@
     <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalization.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalizationAuthorization.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\WebPartsSection.cs" />\r
-    <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceMode.cs" />\r
     <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceSection.cs" />\r
     <Compile Include="System.Web.Handlers\AssemblyResourceLoader.cs" />\r
     <Compile Include="System.Web.Handlers\TraceHandler.cs" />\r
@@ -376,10 +689,8 @@
     <Compile Include="System.Web.Hosting\DefaultVirtualPathProvider.cs" />\r
     <Compile Include="System.Web.Hosting\HostingEnvironment.cs" />\r
     <Compile Include="System.Web.Hosting\IAppDomainFactory.cs" />\r
-    <Compile Include="System.Web.Hosting\IApplicationHost.cs" />\r
     <Compile Include="System.Web.Hosting\IAppManagerAppDomainFactory.cs" />\r
     <Compile Include="System.Web.Hosting\IISAPIRuntime.cs" />\r
-    <Compile Include="System.Web.Hosting\IRegisteredObject.cs" />\r
     <Compile Include="System.Web.Hosting\ISAPIRuntime.cs" />\r
     <Compile Include="System.Web.Hosting\SimpleWorkerRequest.cs" />\r
     <Compile Include="System.Web.Hosting\VirtualDirectory.cs" />\r
@@ -422,8 +733,6 @@
     <Compile Include="System.Web.Profile\ProfileAutoSaveEventArgs.cs" />\r
     <Compile Include="System.Web.Profile\ProfileAutoSaveEventHandler.cs" />\r
     <Compile Include="System.Web.Profile\ProfileBase.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventArgs.cs" />\r
-    <Compile Include="System.Web.Profile\ProfileEventHandler.cs" />\r
     <Compile Include="System.Web.Profile\ProfileInfo.cs" />\r
     <Compile Include="System.Web.Profile\ProfileInfoCollection.cs" />\r
     <Compile Include="System.Web.Profile\ProfileManager.cs" />\r
@@ -439,24 +748,17 @@
     <Compile Include="System.Web.Profile\SqlProfileProvider.cs" />\r
     <Compile Include="System.Web.Properties\TranslationProperties.Designer.cs" />\r
     <Compile Include="System.Web.Routing\HttpMethodConstraint.cs" />\r
-    <Compile Include="System.Web.Routing\IRouteConstraint.cs" />\r
-    <Compile Include="System.Web.Routing\IRouteHandler.cs" />\r
     <Compile Include="System.Web.Routing\PageRouteHandler.cs" />\r
     <Compile Include="System.Web.Routing\PatternParser.cs" />\r
     <Compile Include="System.Web.Routing\PatternToken.cs" />\r
     <Compile Include="System.Web.Routing\PatternTokenType.cs" />\r
-    <Compile Include="System.Web.Routing\RequestContext.cs" />\r
     <Compile Include="System.Web.Routing\Route.cs" />\r
     <Compile Include="System.Web.Routing\RouteCollection.cs" />\r
     <Compile Include="System.Web.Routing\RouteData.cs" />\r
-    <Compile Include="System.Web.Routing\RouteDirection.cs" />\r
-    <Compile Include="System.Web.Routing\RouteTable.cs" />\r
-    <Compile Include="System.Web.Routing\RouteValueDictionary.cs" />\r
     <Compile Include="System.Web.Routing\RouteValueDictionaryExtensions.cs" />\r
     <Compile Include="System.Web.Routing\StopRoutingHandler.cs" />\r
     <Compile Include="System.Web.Routing\UrlRoutingHandler.cs" />\r
     <Compile Include="System.Web.Routing\UrlRoutingModule.cs" />\r
-    <Compile Include="System.Web.Routing\VirtualPathData.cs" />\r
     <Compile Include="System.Web.Security\ActiveDirectoryConnectionProtection.cs" />\r
     <Compile Include="System.Web.Security\ActiveDirectoryMembershipProvider.cs" />\r
     <Compile Include="System.Web.Security\AnonymousIdentificationEventArgs.cs" />\r
@@ -469,8 +771,6 @@
     <Compile Include="System.Web.Security\DefaultAuthenticationModule.cs" />\r
     <Compile Include="System.Web.Security\FileAuthorizationModule.cs" />\r
     <Compile Include="System.Web.Security\FormsAuthentication.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\FormsAuthenticationEventHandler.cs" />\r
     <Compile Include="System.Web.Security\FormsAuthenticationModule.cs" />\r
     <Compile Include="System.Web.Security\FormsAuthenticationTicket.cs" />\r
     <Compile Include="System.Web.Security\FormsIdentity.cs" />\r
@@ -479,12 +779,8 @@
     <Compile Include="System.Web.Security\Membership.cs" />\r
     <Compile Include="System.Web.Security\MembershipHelper.cs" />\r
     <Compile Include="System.Web.Security\MembershipPasswordAttribute.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\PassportAuthenticationEventHandler.cs" />\r
     <Compile Include="System.Web.Security\PassportAuthenticationModule.cs" />\r
     <Compile Include="System.Web.Security\PassportIdentity.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\RoleManagerEventHandler.cs" />\r
     <Compile Include="System.Web.Security\RoleManagerModule.cs" />\r
     <Compile Include="System.Web.Security\RolePrincipal.cs" />\r
     <Compile Include="System.Web.Security\RoleProviderCollection.cs" />\r
@@ -494,14 +790,10 @@
     <Compile Include="System.Web.Security\SqlMembershipProvider.cs" />\r
     <Compile Include="System.Web.Security\SqlRoleProvider.cs" />\r
     <Compile Include="System.Web.Security\UrlAuthorizationModule.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventArgs.cs" />\r
-    <Compile Include="System.Web.Security\WindowsAuthenticationEventHandler.cs" />\r
     <Compile Include="System.Web.Security\WindowsAuthenticationModule.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\HttpSessionState.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\HttpSessionStateContainer.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\IHttpSessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IReadOnlySessionState.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\IRequiresSessionState.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\ISessionIDManager.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\ISessionStateItemCollection.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\IStateRuntime.cs" />\r
@@ -511,7 +803,6 @@
     <Compile Include="System.Web.SessionState_2.0\SessionInProcHandler.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\SessionSQLServerHandler.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\SessionStateActions.cs" />\r
-    <Compile Include="System.Web.SessionState_2.0\SessionStateBehavior.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\SessionStateItemCollection.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\SessionStateItemExpireCallback.cs" />\r
     <Compile Include="System.Web.SessionState_2.0\SessionStateMode.cs" />\r
@@ -524,7 +815,6 @@
     <Compile Include="System.Web.SessionState_2.0\StateServerItem.cs" />\r
     <Compile Include="System.Web.UI.Adapters\ControlAdapter.cs" />\r
     <Compile Include="System.Web.UI.Adapters\PageAdapter.cs" />\r
-    <Compile Include="System.Web.UI.Adapters\WmlPostFieldType.cs" />\r
     <Compile Include="System.Web.UI.HtmlControls\HtmlAnchor.cs" />\r
     <Compile Include="System.Web.UI.HtmlControls\HtmlButton.cs" />\r
     <Compile Include="System.Web.UI.HtmlControls\HtmlContainerControl.cs" />\r
@@ -572,47 +862,20 @@
     <Compile Include="System.Web.UI.WebControls.WebParts\EditorPart.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\EditorPartCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\IPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITrackingPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\ITransformerConfigurationControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IVersioningPersonalizable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebActionable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebEditable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPart.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartHttpHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartParameters.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\IWebPartTable.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\Part.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PartChromeType.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizableAttribute.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\PersonalizationScope.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\ProviderConnectionPoint.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\TypeCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\WebPart.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartAuthorizationEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartExportMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartHelpMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\WebPartPageMenuMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerb.cs" />\r
     <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls.WebParts\WebPartVerbsEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\AccessDataSource.cs" />\r
     <Compile Include="System.Web.UI.WebControls\AccessDataSourceView.cs" />\r
     <Compile Include="System.Web.UI.WebControls\AdCreatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AdCreatedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\AdRotator.cs" />\r
     <Compile Include="System.Web.UI.WebControls\AssociatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AuthenticateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\AutoCompleteType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\AutoGeneratedField.cs" />\r
     <Compile Include="System.Web.UI.WebControls\AutoGeneratedFieldProperties.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BaseCompareValidator.cs" />\r
@@ -620,23 +883,17 @@
     <Compile Include="System.Web.UI.WebControls\BaseDataList.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BaseMenuRenderer.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BaseValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BorderStyle.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BoundColumn.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BoundField.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BulletedList.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BulletedListDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\BulletedListEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\BulletStyle.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Button.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ButtonColumn.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonColumnType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ButtonField.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ButtonFieldBase.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ButtonType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Calendar.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CalendarDay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CalendarSelectionMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ChangePassword.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CheckBox.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CheckBoxField.cs" />\r
@@ -644,8 +901,6 @@
     <Compile Include="System.Web.UI.WebControls\ChildTable.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CircleHotSpot.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CollectionDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CommandField.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CompareValidator.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CompleteWizardStep.cs" />\r
@@ -654,170 +909,89 @@
     <Compile Include="System.Web.UI.WebControls\ContainedTable.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Content.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ContentControlBuilderInternal.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ContentDirection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ContentPlaceHolder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ContentPlaceHolderBuilder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ControlIDConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ControlParameter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ControlPropertyNameConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CookieParameter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\CreateUserErrorEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CreateUserWizard.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CreateUserWizardStep.cs" />\r
     <Compile Include="System.Web.UI.WebControls\CustomValidator.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataBoundControlMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataControlButton.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlCellType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataControlCommands.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataControlField.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataControlFieldCell.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataControlFieldCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataControlFieldHeaderCell.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowState.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataControlRowType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataGrid.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataGridColumn.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataGridColumnCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridCommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataGridItem.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataGridItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridPageChangedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataGridPagerStyle.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataGridSortCommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataKey.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataKeyArray.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataKeyCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataList.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListCommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataListItem.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataListItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DataListItemEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DataSourceCacheManager.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayNameFormat.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DayRenderEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DayRenderEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewCommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewPageEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewPagerRow.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewRow.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewRowCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\DropDownList.cs" />\r
     <Compile Include="System.Web.UI.WebControls\EditCommandColumn.cs" />\r
     <Compile Include="System.Web.UI.WebControls\EmbeddedMailObject.cs" />\r
     <Compile Include="System.Web.UI.WebControls\EmbeddedMailObjectsCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FileUpload.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FirstDayOfWeek.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FontInfo.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FontNamesConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FontSize.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FontUnit.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FontUnitConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormParameter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormView.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewCommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewInsertEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewModeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewPageEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewPagerRow.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewRow.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridLines.cs" />\r
     <Compile Include="System.Web.UI.WebControls\GridView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCancelEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewCommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewEditEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewPageEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\GridViewRow.cs" />\r
     <Compile Include="System.Web.UI.WebControls\GridViewRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewRowEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSelectEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewSortEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HiddenField.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HierarchicalDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HorizontalAlign.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HorizontalAlignConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HotSpot.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HotSpotCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\HotSpotMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HyperLink.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HyperLinkColumn.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HyperLinkControlBuilder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\HyperLinkField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IButtonControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICallbackContainer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ICompositeControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundItemControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IDataBoundListControl.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IFieldControl.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Image.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageAlign.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ImageButton.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ImageField.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ImageMap.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ImageMapEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\IMenuRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IPersistedSelector.cs" />\r
     <Compile Include="System.Web.UI.WebControls\IPostBackContainer.cs" />\r
     <Compile Include="System.Web.UI.WebControls\IRenderOuterTable.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\IRepeatInfoUser.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Label.cs" />\r
     <Compile Include="System.Web.UI.WebControls\LabelControlBuilder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\LinkButton.cs" />\r
@@ -827,27 +1001,16 @@
     <Compile Include="System.Web.UI.WebControls\ListItem.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ListItemCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ListItemControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListItemType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ListSelectionMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Literal.cs" />\r
     <Compile Include="System.Web.UI.WebControls\LiteralControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LiteralMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Localize.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Login.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginCancelEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LoginFailureAction.cs" />\r
     <Compile Include="System.Web.UI.WebControls\LoginName.cs" />\r
     <Compile Include="System.Web.UI.WebControls\LoginStatus.cs" />\r
     <Compile Include="System.Web.UI.WebControls\LoginTextLayout.cs" />\r
     <Compile Include="System.Web.UI.WebControls\LoginView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\LogoutAction.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MailDefinition.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MailMessageEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Menu.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MenuItem.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MenuItemBinding.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MenuItemBindingCollection.cs" />\r
@@ -856,40 +1019,20 @@
     <Compile Include="System.Web.UI.WebControls\MenuItemStyleCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MenuItemTemplateContainer.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MenuListRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MenuRenderingMode.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MenuTableRenderer.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\MonthChangedEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MultiView.cs" />\r
     <Compile Include="System.Web.UI.WebControls\MultiViewControlBuilder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\NamedCssStyleCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\NextPrevFormat.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ObjectDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceDisposingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventArgs.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ObjectDataSourceEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceMethodEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ObjectDataSourceStatusEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ObjectDataSourceView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\Orientation.cs" />\r
     <Compile Include="System.Web.UI.WebControls\PagedDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerButtons.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PagerPosition.cs" />\r
     <Compile Include="System.Web.UI.WebControls\PagerSettings.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Panel.cs" />\r
     <Compile Include="System.Web.UI.WebControls\PanelStyle.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Parameter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ParameterCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\PasswordRecovery.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\PathDirection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\PlaceHolder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\PlaceHolderControlBuilder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\PolygonHotSpot.cs" />\r
@@ -900,16 +1043,10 @@
     <Compile Include="System.Web.UI.WebControls\RangeValidator.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RectangleHotSpot.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RegularExpressionValidator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatDirection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Repeater.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterCommandEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RepeaterItem.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RepeaterItemCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeaterItemEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RepeatInfo.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\RepeatLayout.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RequiredFieldValidator.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RoleGroup.cs" />\r
     <Compile Include="System.Web.UI.WebControls\RoleGroupCollection.cs" />\r
@@ -917,31 +1054,15 @@
     <Compile Include="System.Web.UI.WebControls\ScrollBars.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SelectedDatesCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SendMailErrorEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SendMailErrorEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ServerValidateEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ServerValidateEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SessionParameter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SiteMapDataSource.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SiteMapDataSourceView.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SiteMapHierarchicalDataSourceView.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SiteMapNodeItem.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SiteMapNodeItemType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SiteMapPath.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SiteMapViewType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SortDirection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SqlDataSource.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceCommandType.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceFilteringEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceSelectingEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\SqlDataSourceStatusEventHandler.cs" />\r
     <Compile Include="System.Web.UI.WebControls\SqlDataSourceView.cs" />\r
     <Compile Include="System.Web.UI.WebControls\StringArrayConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Style.cs" />\r
@@ -951,55 +1072,38 @@
     <Compile Include="System.Web.UI.WebControls\SubMenuStyleCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Substitution.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Table.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableCaptionAlign.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableCell.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableCellCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableCellControlBuilder.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableFooterRow.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableHeaderCell.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableHeaderRow.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableHeaderScope.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableItemStyle.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableRow.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableRowCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TableRowSection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableSectionStyle.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TableStyle.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TargetConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TemplateColumn.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TemplatedWizardStep.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TemplateField.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextAlign.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TextBox.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TextBoxControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TextBoxMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TitleFormat.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeNode.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeNodeBinding.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeNodeBindingCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeNodeCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventArgs.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeEventHandler.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeNodeSelectAction.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeNodeStyle.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeNodeStyleCollection.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeNodeTypes.cs" />\r
     <Compile Include="System.Web.UI.WebControls\TreeView.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\TreeViewImageSet.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Unit.cs" />\r
     <Compile Include="System.Web.UI.WebControls\UnitConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\UnitType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ValidatedControlConverter.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationCompareOperator.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationDataType.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ValidationSummary.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidationSummaryDisplayMode.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\ValidatorDisplay.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\VerticalAlign.cs" />\r
     <Compile Include="System.Web.UI.WebControls\VerticalAlignConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\View.cs" />\r
     <Compile Include="System.Web.UI.WebControls\ViewCollection.cs" />\r
-    <Compile Include="System.Web.UI.WebControls\WebColorConverter.cs" />\r
     <Compile Include="System.Web.UI.WebControls\WebControl.cs" />\r
     <Compile Include="System.Web.UI.WebControls\Wizard.cs" />\r
     <Compile Include="System.Web.UI.WebControls\WizardLayoutContainer.cs" />\r
@@ -1030,7 +1134,6 @@
     <Compile Include="System.Web.UI\BuildMethod.cs" />\r
     <Compile Include="System.Web.UI\BuildTemplateMethod.cs" />\r
     <Compile Include="System.Web.UI\ChtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\ClientIDMode.cs" />\r
     <Compile Include="System.Web.UI\ClientScriptManager.cs" />\r
     <Compile Include="System.Web.UI\CodeBuilder.cs" />\r
     <Compile Include="System.Web.UI\CodeConstructType.cs" />\r
@@ -1040,31 +1143,22 @@
     <Compile Include="System.Web.UI\CompiledBindableTemplateBuilder.cs" />\r
     <Compile Include="System.Web.UI\CompiledTemplateBuilder.cs" />\r
     <Compile Include="System.Web.UI\ComplexPropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ConflictOptions.cs" />\r
-    <Compile Include="System.Web.UI\ConstructorNeedsTagAttribute.cs" />\r
     <Compile Include="System.Web.UI\Control.cs" />\r
     <Compile Include="System.Web.UI\ControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\ControlBuilderAttribute.cs" />\r
     <Compile Include="System.Web.UI\ControlCachePolicy.cs" />\r
     <Compile Include="System.Web.UI\ControlCollection.cs" />\r
     <Compile Include="System.Web.UI\ControlSkin.cs" />\r
     <Compile Include="System.Web.UI\ControlSkinDelegate.cs" />\r
     <Compile Include="System.Web.UI\ControlValuePropertyAttribute.cs" />\r
-    <Compile Include="System.Web.UI\CssClassPropertyAttribute.cs" />\r
     <Compile Include="System.Web.UI\CssStyleCollection.cs" />\r
     <Compile Include="System.Web.UI\DataBinder.cs" />\r
     <Compile Include="System.Web.UI\DataBinding.cs" />\r
     <Compile Include="System.Web.UI\DataBindingBuilder.cs" />\r
     <Compile Include="System.Web.UI\DataBindingCollection.cs" />\r
-    <Compile Include="System.Web.UI\DataBindingHandlerAttribute.cs" />\r
     <Compile Include="System.Web.UI\DataBoundLiteralControl.cs" />\r
-    <Compile Include="System.Web.UI\DataKeyPropertyAttribute.cs" />\r
     <Compile Include="System.Web.UI\DataSourceCacheDurationConverter.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCacheExpiry.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceCapabilities.cs" />\r
     <Compile Include="System.Web.UI\DataSourceControl.cs" />\r
     <Compile Include="System.Web.UI\DataSourceControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\DataSourceOperation.cs" />\r
     <Compile Include="System.Web.UI\DataSourceSelectArguments.cs" />\r
     <Compile Include="System.Web.UI\DataSourceView.cs" />\r
     <Compile Include="System.Web.UI\DataSourceViewOperationCallback.cs" />\r
@@ -1077,63 +1171,23 @@
     <Compile Include="System.Web.UI\ExpressionBinding.cs" />\r
     <Compile Include="System.Web.UI\ExpressionBindingCollection.cs" />\r
     <Compile Include="System.Web.UI\ExtractTemplateValuesMethod.cs" />\r
-    <Compile Include="System.Web.UI\FileLevelControlBuilderAttribute.cs" />\r
     <Compile Include="System.Web.UI\FileLevelMasterPageControlBuilder.cs" />\r
     <Compile Include="System.Web.UI\FileLevelPageControlBuilder.cs" />\r
     <Compile Include="System.Web.UI\FileLevelUserControlBuilder.cs" />\r
-    <Compile Include="System.Web.UI\FilterableAttribute.cs" />\r
     <Compile Include="System.Web.UI\HiddenFieldPageStatePersister.cs" />\r
     <Compile Include="System.Web.UI\HierarchicalDataSourceControl.cs" />\r
     <Compile Include="System.Web.UI\HierarchicalDataSourceView.cs" />\r
     <Compile Include="System.Web.UI\Html32TextWriter.cs" />\r
     <Compile Include="System.Web.UI\HtmlControlPersistableAttribute.cs" />\r
     <Compile Include="System.Web.UI\HtmlTextWriter.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterAttribute.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterStyle.cs" />\r
-    <Compile Include="System.Web.UI\HtmlTextWriterTag.cs" />\r
-    <Compile Include="System.Web.UI\IAttributeAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IAutoFieldGenerator.cs" />\r
-    <Compile Include="System.Web.UI\IBindableControl.cs" />\r
-    <Compile Include="System.Web.UI\IBindableTemplate.cs" />\r
-    <Compile Include="System.Web.UI\ICallbackEventHandler.cs" />\r
     <Compile Include="System.Web.UI\ICheckBoxControl.cs" />\r
-    <Compile Include="System.Web.UI\IControlBuilderAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataBindingsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDataItemContainer.cs" />\r
-    <Compile Include="System.Web.UI\IDataKeysControl.cs" />\r
-    <Compile Include="System.Web.UI\IDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IDataSourceViewSchemaAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IDReferencePropertyAttribute.cs" />\r
     <Compile Include="System.Web.UI\IEditableTextControl.cs" />\r
-    <Compile Include="System.Web.UI\IExpressionsAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IFilterResolutionService.cs" />\r
     <Compile Include="System.Web.UI\IgnoreUnknownContentAttribute.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalDataSource.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchicalEnumerable.cs" />\r
-    <Compile Include="System.Web.UI\IHierarchyData.cs" />\r
     <Compile Include="System.Web.UI\ImageClickEventArgs.cs" />\r
-    <Compile Include="System.Web.UI\ImageClickEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\INamingContainer.cs" />\r
-    <Compile Include="System.Web.UI\INavigateUIData.cs" />\r
     <Compile Include="System.Web.UI\IndexedString.cs" />\r
-    <Compile Include="System.Web.UI\INonBindingContainer.cs" />\r
-    <Compile Include="System.Web.UI\IParserAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackDataHandler.cs" />\r
-    <Compile Include="System.Web.UI\IPostBackEventHandler.cs" />\r
-    <Compile Include="System.Web.UI\IResourceUrlGenerator.cs" />\r
     <Compile Include="System.Web.UI\IScriptManager.cs" />\r
-    <Compile Include="System.Web.UI\IStateFormatter.cs" />\r
-    <Compile Include="System.Web.UI\IStateManager.cs" />\r
-    <Compile Include="System.Web.UI\IStyleSheet.cs" />\r
     <Compile Include="System.Web.UI\ITagNameToTypeMapper.cs" />\r
-    <Compile Include="System.Web.UI\ITemplate.cs" />\r
     <Compile Include="System.Web.UI\ITextControl.cs" />\r
-    <Compile Include="System.Web.UI\IThemeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUrlResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlDesignerAccessor.cs" />\r
-    <Compile Include="System.Web.UI\IUserControlTypeResolutionService.cs" />\r
-    <Compile Include="System.Web.UI\IValidator.cs" />\r
     <Compile Include="System.Web.UI\ListSourceHelper.cs" />\r
     <Compile Include="System.Web.UI\LiteralControl.cs" />\r
     <Compile Include="System.Web.UI\LosFormatter.cs" />\r
@@ -1142,7 +1196,6 @@
     <Compile Include="System.Web.UI\MasterPageControlBuilder.cs" />\r
     <Compile Include="System.Web.UI\MasterPageParser.cs" />\r
     <Compile Include="System.Web.UI\MinimizableAttributeTypeConverter.cs" />\r
-    <Compile Include="System.Web.UI\NonVisualControlAttribute.cs" />\r
     <Compile Include="System.Web.UI\ObjectConverter.cs" />\r
     <Compile Include="System.Web.UI\ObjectPersistData.cs" />\r
     <Compile Include="System.Web.UI\ObjectStateFormatter.cs" />\r
@@ -1165,8 +1218,6 @@
     <Compile Include="System.Web.UI\ParseChildrenAttribute.cs" />\r
     <Compile Include="System.Web.UI\PartialCachingAttribute.cs" />\r
     <Compile Include="System.Web.UI\PartialCachingControl.cs" />\r
-    <Compile Include="System.Web.UI\PersistChildrenAttribute.cs" />\r
-    <Compile Include="System.Web.UI\PersistenceMode.cs" />\r
     <Compile Include="System.Web.UI\PersistenceModeAttribute.cs" />\r
     <Compile Include="System.Web.UI\PostBackOptions.cs" />\r
     <Compile Include="System.Web.UI\PropertyConverter.cs" />\r
@@ -1185,18 +1236,14 @@
     <Compile Include="System.Web.UI\StateManagedCollection.cs" />\r
     <Compile Include="System.Web.UI\StaticPartialCachingControl.cs" />\r
     <Compile Include="System.Web.UI\StringPropertyBuilder.cs" />\r
-    <Compile Include="System.Web.UI\SupportsEventValidationAttribute.cs" />\r
     <Compile Include="System.Web.UI\TagPrefixAttribute.cs" />\r
     <Compile Include="System.Web.UI\TemplateBuilder.cs" />\r
     <Compile Include="System.Web.UI\TemplateContainerAttribute.cs" />\r
     <Compile Include="System.Web.UI\TemplateContentType.cs" />\r
     <Compile Include="System.Web.UI\TemplateControl.cs" />\r
     <Compile Include="System.Web.UI\TemplateControlParser.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstance.cs" />\r
-    <Compile Include="System.Web.UI\TemplateInstanceAttribute.cs" />\r
     <Compile Include="System.Web.UI\TemplateParser.cs" />\r
     <Compile Include="System.Web.UI\TemplatePropertyEntry.cs" />\r
-    <Compile Include="System.Web.UI\ThemeableAttribute.cs" />\r
     <Compile Include="System.Web.UI\ThemeProvider.cs" />\r
     <Compile Include="System.Web.UI\ToolboxDataAttribute.cs" />\r
     <Compile Include="System.Web.UI\Triplet.cs" />\r
@@ -1212,9 +1259,7 @@
     <Compile Include="System.Web.UI\VerificationConditionalOperator.cs" />\r
     <Compile Include="System.Web.UI\VerificationReportLevel.cs" />\r
     <Compile Include="System.Web.UI\VerificationRule.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateEncryptionMode.cs" />\r
     <Compile Include="System.Web.UI\ViewStateException.cs" />\r
-    <Compile Include="System.Web.UI\ViewStateMode.cs" />\r
     <Compile Include="System.Web.UI\ViewStateModeByIdAttribute.cs" />\r
     <Compile Include="System.Web.UI\VirtualReferenceType.cs" />\r
     <Compile Include="System.Web.UI\WebHandlerParser.cs" />\r
@@ -1230,10 +1275,8 @@
     <Compile Include="System.Web.Util\Helpers.cs" />\r
     <Compile Include="System.Web.Util\HttpEncoder.cs" />\r
     <Compile Include="System.Web.Util\ICalls.cs" />\r
-    <Compile Include="System.Web.Util\IWebObjectFactory.cs" />\r
     <Compile Include="System.Web.Util\IWebPropertyAccessor.cs" />\r
     <Compile Include="System.Web.Util\MachineKeySectionUtils.cs" />\r
-    <Compile Include="System.Web.Util\RequestValidationSource.cs" />\r
     <Compile Include="System.Web.Util\RequestValidator.cs" />\r
     <Compile Include="System.Web.Util\RuntimeHelpers.cs" />\r
     <Compile Include="System.Web.Util\SearchPattern.cs" />\r
@@ -1270,12 +1313,9 @@
     <Compile Include="System.Web\HttpApplication.cs" />\r
     <Compile Include="System.Web\HttpApplicationFactory.cs" />\r
     <Compile Include="System.Web\HttpApplicationState.cs" />\r
-    <Compile Include="System.Web\HttpApplicationStateWrapper.cs" />\r
     <Compile Include="System.Web\HttpBrowserCapabilities.cs" />\r
-    <Compile Include="System.Web\HttpBrowserCapabilitiesWrapper.cs" />\r
     <Compile Include="System.Web\HttpCacheability.cs" />\r
     <Compile Include="System.Web\HttpCachePolicy.cs" />\r
-    <Compile Include="System.Web\HttpCachePolicyWrapper.cs" />\r
     <Compile Include="System.Web\HttpCacheRevalidation.cs" />\r
     <Compile Include="System.Web\HttpCacheValidateHandler.cs" />\r
     <Compile Include="System.Web\HttpCacheVaryByContentEncodings.cs" />\r
@@ -1312,7 +1352,6 @@
     <Compile Include="System.Web\HttpRuntime.cs" />\r
     <Compile Include="System.Web\HttpServerUtility.cs" />\r
     <Compile Include="System.Web\HttpServerUtilityWrapper.cs" />\r
-    <Compile Include="System.Web\HttpSessionStateWrapper.cs" />\r
     <Compile Include="System.Web\HttpStaticObjectsCollection.cs" />\r
     <Compile Include="System.Web\HttpTaskAsyncHandler.cs" />\r
     <Compile Include="System.Web\HttpUnhandledException.cs" />\r
@@ -1320,12 +1359,7 @@
     <Compile Include="System.Web\HttpValidationStatus.cs" />\r
     <Compile Include="System.Web\HttpWorkerRequest.cs" />\r
     <Compile Include="System.Web\HttpWriter.cs" />\r
-    <Compile Include="System.Web\IHtmlString.cs" />\r
-    <Compile Include="System.Web\IHttpAsyncHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandler.cs" />\r
-    <Compile Include="System.Web\IHttpHandlerFactory.cs" />\r
     <Compile Include="System.Web\IHttpMapPath.cs" />\r
-    <Compile Include="System.Web\IHttpModule.cs" />\r
     <Compile Include="System.Web\IisTraceListener.cs" />\r
     <Compile Include="System.Web\InputFilterStream.cs" />\r
     <Compile Include="System.Web\IntPtrStream.cs" />\r
@@ -1336,15 +1370,11 @@
     <Compile Include="System.Web\OutputFilterStream.cs" />\r
     <Compile Include="System.Web\ParserError.cs" />\r
     <Compile Include="System.Web\ParserErrorCollection.cs" />\r
-    <Compile Include="System.Web\PreApplicationStartMethodAttribute.cs" />\r
     <Compile Include="System.Web\ProcessInfo.cs" />\r
     <Compile Include="System.Web\ProcessModelInfo.cs" />\r
     <Compile Include="System.Web\ProcessShutdownReason.cs" />\r
     <Compile Include="System.Web\ProcessStatus.cs" />\r
     <Compile Include="System.Web\QueueManager.cs" />\r
-    <Compile Include="System.Web\ReadEntityBodyMode.cs" />\r
-    <Compile Include="System.Web\RequestNotification.cs" />\r
-    <Compile Include="System.Web\RequestNotificationStatus.cs" />\r
     <Compile Include="System.Web\ServerVariablesCollection.cs" />\r
     <Compile Include="System.Web\SiteMap.cs" />\r
     <Compile Include="System.Web\SiteMapNode.cs" />\r
@@ -1358,8 +1388,6 @@
     <Compile Include="System.Web\TaskEventHandler.cs" />\r
     <Compile Include="System.Web\TempFileStream.cs" />\r
     <Compile Include="System.Web\TraceContext.cs" />\r
-    <Compile Include="System.Web\TraceContextEventArgs.cs" />\r
-    <Compile Include="System.Web\TraceContextEventHandler.cs" />\r
     <Compile Include="System.Web\TraceContextRecord.cs" />\r
     <Compile Include="System.Web\TraceData.cs" />\r
     <Compile Include="System.Web\TraceManager.cs" />\r

diff --git a/mcs/class/System.Web/System.Web-tests-net_4_5.csproj b/mcs/class/System.Web/System.Web-tests-net_4_5.csproj
deleted file mode 100644 (file)
index bb9302e..0000000
--- a/mcs/class/System.Web/System.Web-tests-net_4_5.csproj
+++ /dev/null
@@ -1,1327 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{715EA166-6447-4341-B727-C7AC2084665B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,612,618,618,219,169,1591</NoWarn>\r
-    <OutputPath>bin\Debug\System.Web-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Web_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,612,618,618,219,169,1591</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP;MONOWEB_DEP;SYSTEMCORE_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,612,618,618,219,169,1591</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP;MONOWEB_DEP;SYSTEMCORE_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\System.Web.DynamicData\Test\Common\AssertExtensions.cs" />\r
-    <Compile Include="Test\Cas\AspNetHostingMinimal.cs" />\r
-    <Compile Include="Test\Cas\AspNetHostingNone.cs" />\r
-    <Compile Include="Test\Cas\AspNetHostingPermissionHelper.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\AssemblyInfo.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\crc32.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\Header.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlAttribute.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlDocument.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlEntity.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNode.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlNodeNavigator.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\HtmlWeb.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\MixedCodeDocument.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\ParseReader.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\HtmlAgilityPack\tools.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\NunitWebTest.cs" />\r
-    <Compile Include="Test\mainsoft\MainsoftWebTest\XmlComparer.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseControl.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseControlCollection.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseInvoker.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\BaseWorkerRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\CustomSection.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\FakeMembershipProvider.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\FormRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Global.asax.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\HandlerInvoker.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\IForeignData.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\MyHandler.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\MyHost.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\MyPageHandlerFactory.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\MyTemplateControls.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\PageDelegates.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\PageInvoker.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\PostableRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\PostableWorkerRequest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Response.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\StandardUrl.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\TestRoleProvider.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\Author.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\AuthorConverter.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\Book.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\BookType.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\TagsNestedInClientTag.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\Tests\TestSiteMapProvider.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\WebTest.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\WebTestLocal.cs" />\r
-    <Compile Include="Test\mainsoft\NunitWeb\NunitWeb\WebTestResourcesSetupAttribute.cs" />\r
-    <Compile Include="Test\System.Web.Caching\AggregateCacheDependencyTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheCas.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheDependencyCas.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheItemPriorityQueueTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheItemPriorityQueueTest_generated.cs" />\r
-    <Compile Include="Test\System.Web.Caching\CacheItemPriorityQueueTestSupport.cs" />\r
-    <Compile Include="Test\System.Web.Caching\FileResponseElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\HeaderElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\MemoryResponseElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\OutputCacheTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\SqlCacheDependencyTest.cs" />\r
-    <Compile Include="Test\System.Web.Caching\SubstitutionResponseElementTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\AppResourcesCompilerTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\AppSettingsExpressionBuilderTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\BuildManagerTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\BuildProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\ClientBuildManagerParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\RouteUrlExpressionBuilderTest.cs" />\r
-    <Compile Include="Test\System.Web.Compilation\TemplateControlCompilerTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AnonymousIdentificationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AssemblyCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AssemblyInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AuthenticationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AuthorizationRuleCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AuthorizationRuleTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\AuthorizationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\BufferModeSettingsTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\BuildProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CacheSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\ClientTargetSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\ClientTargetTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CodeSubDirectoryTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CompilationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CustomErrorCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\CustomErrorsSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\DeploymentSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\GlobalizationSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\HostingEnvironmentSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\HttpCapabilitiesBaseCas.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\MachineKeySectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\MachineKeyValidationConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\NullableStringValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\ProfilePropertySettingsTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\SiteMapSectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Configuration\WebConfigurationManagerTest.cs" />\r
-    <Compile Include="Test\System.Web.Handlers\TraceHandlerCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\AppDomainFactoryCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\ApplicationHostCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\ApplicationHostTest.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\HostingEnvironmentTest.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\ISAPIRuntimeCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\SimpleWorkerRequestCas.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\SimpleWorkerRequestTest.cs" />\r
-    <Compile Include="Test\System.Web.Hosting\VirtualPathProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.Mail\MailAttachmentCas.cs" />\r
-    <Compile Include="Test\System.Web.Mail\MailMessageCas.cs" />\r
-    <Compile Include="Test\System.Web.Mail\SmtpMailCas.cs" />\r
-    <Compile Include="Test\System.Web.Profile\ProfileInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\DefaultAuthenticationEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\DefaultAuthenticationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FileAuthorizationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsAuthenticationTicketCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsIdentityCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\FormsIdentityTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MachineKeyTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MembershipProviderCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MembershipProviderTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MembershipTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\MembershipUserCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\PassportAuthenticationEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\PassportAuthenticationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\PassportIdentityCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\RolePrincipalTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\RolesTest.cs" />\r
-    <Compile Include="Test\System.Web.Security\UrlAuthorizationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\WindowsAuthenticationEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.Security\WindowsAuthenticationModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.SessionState\SessionStateModuleCas.cs" />\r
-    <Compile Include="Test\System.Web.SessionState\StateRuntimeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.Adapters\ControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.Adapters\PageAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlAnchorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlAnchorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlContainerControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlContainerControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlEmptyTagControlBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlFormCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlFormTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlGenericControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlHeadBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlHeadCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlHeadTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlImageCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlImageTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputCheckBoxCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputCheckBoxTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputFileCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputFileTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputHiddenCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputHiddenTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputImageCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputPasswordCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputPasswordTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputRadioButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputRadioButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputResetCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputResetTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputSubmitCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputSubmitTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputTextCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlInputTextTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlLinkCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlLinkTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlMetaCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlMetaTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlSelectBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlSelectCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlSelectTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableCellCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableCellTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableRowCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTableTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTextAreaCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTextAreaTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.HtmlControls\HtmlTitleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\DataBoundControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\HideDisabledControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\HierarchicalDataBoundControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\MenuAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.Adapters\WebControlAdapterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.WebParts\ConnectionInterfaceCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls.WebParts\WebPartTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\AccessDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\AdCreatedEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\AdCreatedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\AutoGeneratedFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseCompareValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseCompareValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseDataBoundControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseDataBoundControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseDataListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseDataListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BaseValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BoundColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BoundColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BoundFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\BulletedListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonFieldBaseTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CalandarCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CalendarDayCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CalendarDayTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CalendarTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CallBackTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ChangePasswordTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CheckBoxTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CircleHotSpotTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CommandFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompareValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompareValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompleteWizardStepTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompositeControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompositeControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CompositeDataBoundControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ContentTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ControlParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CookieParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CreateUserWizardStepTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CreateUserWizardTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CrossPagePostingTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CustomValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\CustomValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataBoundControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataBoundControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataControlFieldCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataControlFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridItemCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridItemCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridItemTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridPagerStyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridPagerStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataGridTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataKeyArrayTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataKeyCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataKeyCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataKeyTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListItemCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListItemCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListItemTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataSourceControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DataSourceViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DetailsViewRowCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DetailsViewRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DetailsViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DropDownListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\DropDownListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\EditCommandColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\EditCommandColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FileUploadTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontInfoCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontNamesConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontNamesConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontUnitCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FontUnitTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FormParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FormViewCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FormViewRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\FormViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\GridViewRowCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\GridViewRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\GridViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HierarchicalDataBoundControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HotSpotCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HotSpotTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkColumnCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkColumnTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\HyperLinkTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageMapTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ImageTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LabelCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LabelTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LinkButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LinkButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListBoxCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListBoxTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListItemCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListItemCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ListItemTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LiteralCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LiteralTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginNameCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginNameTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginStatusCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginStatusTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\LoginTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MappingUrlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MasterPageTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MenuItemBindingTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MenuTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MonthChangedEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MonthChangedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MultiViewControlBuilderTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\MultiViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ObjectDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ObjectDataSourceViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PagedDataSourceCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PagedDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PagerSettingsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PanelCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PanelTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PasswordRecoveryTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\PolygonHotSpotTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\QueryStringParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RadioButtonCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RadioButtonListCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RadioButtonListTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RadioButtonTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RangeValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RangeValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RectangleHotSpotTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RegularExpressionValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RegularExpressionValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeaterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeaterItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeaterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoTest.auto.2.0.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoTest.auto.4.0.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoTest.auto.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RepeatInfoUser.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RequiredFieldValidatorCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RoleGroupCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RoleGroupCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RoleGroupCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RoleGroupTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\RouteParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SelectedDatesCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SelectedDatesCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SessionParameterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SiteMapDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SiteMapPathTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SqlDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\SqlDataSourceViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\StyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\StyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableCellCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableCellTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableFooterRowCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableFooterRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableHeaderCellCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableHeaderCellTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableHeaderRowCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableHeaderRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableItemStyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableItemStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableRowCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableRowTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableSectionStyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableSectionStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableStyleCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TableTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TargetConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TargetConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TemplateFieldTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TestControlIDConverter.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TextBoxCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TextBoxTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ThemeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeBindingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeBindingTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeStyleCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeStyleTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeNodeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeViewCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\TreeViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\UnitCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\UnitConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\UnitConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\UnitTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidatedControlConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidatedControlConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidationSummaryCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidationSummaryTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\ViewTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WebColorConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WebColorConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WebControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WebControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WizardStepBaseTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WizardStepCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WizardStepTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\WizardTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\XmlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\XmlDataSourceCas.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\XmlDataSourceTest.cs" />\r
-    <Compile Include="Test\System.Web.UI.WebControls\XmlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\AttributeCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\AttributeCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\BaseParserCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ChtmlTextWriterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\CleanHtmlTextWriter.cs" />\r
-    <Compile Include="Test\System.Web.UI\ClientScriptManagerTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\CompiledTemplateBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ConstructorNeedsTagAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlBuilderAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\CssStyleCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\CssStyleCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBinderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBinderTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingHandlerAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBindingHandlerAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataBoundLiteralControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataKeyPropertyAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataSourceCacheDurationConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DataSourceSelectArgumentsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\DesignerDataBoundLiteralControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DesignTimeParseDataCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\DesignTimeTemplateParserCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\EmptyCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\Html32TextWriterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\HtmlTextWriterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\HtmlTextWriterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ImageClickEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\LiteralControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\LiteralControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\LosFormatterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\LosFormatterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\MinimizableAttributeTypeConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ObjectConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ObjectStateFormatterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\ObjectTagBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\OutputCacheParametersTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PageCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PageParserFilterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PageParserTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PageTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PairCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ParseChildrenAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PartialCachingAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PersistChildrenAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PersistenceModeAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PostBackOptionsTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\PropertyConverterCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\PropertyConverterTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\RootBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\StateBagCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\StateBagTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\StateItemCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\StaticPartialCachingControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TagPrefixAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateContainerAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateControlTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\TemplateInstanceAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\TestUrlPropertyAttribute.cs" />\r
-    <Compile Include="Test\System.Web.UI\ToolboxDataAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ToolboxDataAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web.UI\TripletCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\UserControlCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\UserControlControlBuilderCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ValidationPropertyAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\ValidatorCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web.UI\XhtmlTextWriterTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\HttpEncoderTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\MachineKeySectionUtilsTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\RequestValidatorTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\TransactionsCas.cs" />\r
-    <Compile Include="Test\System.Web.Util\UrlUtilsTest.cs" />\r
-    <Compile Include="Test\System.Web.Util\WorkItemCas.cs" />\r
-    <Compile Include="Test\System.Web\AppBrowsersTest.cs" />\r
-    <Compile Include="Test\System.Web\EventHandlerTaskAsyncHelperTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpApplicationCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpApplicationStateCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpApplicationTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpBrowserCapabilitiesCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpBrowserCapabilitiesTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCachePolicyCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByContentEncodingsTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByHeadersCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByHeadersTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByParamsCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCacheVaryByParamsTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpClientCertificateCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpClientCertificateTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCompileExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpContext.cs" />\r
-    <Compile Include="Test\System.Web\HttpContextCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCookieCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCookieCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpCookieCollectionTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpCookieTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpExceptionTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpFileCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpModuleCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpParseExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpRequestCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpRequestTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpRequestValidationExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpResponseCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpResponseTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpRuntimeCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpRuntimeTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpServerUtilityCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpServerUtilityTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpStaticObjectsCollectionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpTaskAsyncHandlerTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpUnhandledExceptionCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpUtilityCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpUtilityTest.cs" />\r
-    <Compile Include="Test\System.Web\HttpWorkerRequestCas.cs" />\r
-    <Compile Include="Test\System.Web\HttpWriter.cs" />\r
-    <Compile Include="Test\System.Web\HttpWriterCas.cs" />\r
-    <Compile Include="Test\System.Web\ProcessInfoCas.cs" />\r
-    <Compile Include="Test\System.Web\ProcessModelInfoCas.cs" />\r
-    <Compile Include="Test\System.Web\SiteMapNodeTest.cs" />\r
-    <Compile Include="Test\System.Web\SiteMapProviderTest.cs" />\r
-    <Compile Include="Test\System.Web\StaticSiteMapProviderTest.cs" />\r
-    <Compile Include="Test\System.Web\TaskAsyncResultTest.cs" />\r
-    <Compile Include="Test\System.Web\TraceContextCas.cs" />\r
-    <Compile Include="Test\System.Web\TraceContextRecordTest.cs" />\r
-    <Compile Include="Test\System.Web\VirtualPathUtilityTest.cs" />\r
-    <Compile Include="Test\System.Web\XmlSiteMapProviderTest.cs" />\r
-    <Compile Include="System.Web\UplevelHelper.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web\System.Web-net_4_5-2.csproj">\r
-      <Project>{725FB152-838A-4C6E-8A12-AC47E2DD4CEA}</Project>\r
-      <Name>System.Web\System.Web-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_5.csproj">\r
-      <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj">\r
-      <Project>{B12AABBC-30D1-4885-BF3F-A53B970F68FB}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_5.csproj">\r
-      <Project>{41476FBD-C1CB-4B3C-8078-3281EB1E0EAB}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5.csproj">\r
-      <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Web.Services\System.Web.Services-net_4_5.csproj">\r
-      <Project>{251DB111-FEE1-4080-8411-0AD1CC9BA94B}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Web\Mono.Web-net_4_5.csproj">\r
-      <Project>{4FCA6281-7800-4198-AE09-89EA51D456EB}</Project>\r
-      <Name>Mono.Web\Mono.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\SystemWebTestShim\SystemWebTestShim-net_4_5.csproj">\r
-      <Project>{337A92C8-EB50-43A9-9435-CB268AC147DC}</Project>\r
-      <Name>SystemWebTestShim\SystemWebTestShim-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/TranslationResources.resources">\r
-      <LogicalName>TranslationResources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation.js">\r
-      <LogicalName>WebUIValidation.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder.gif">\r
-      <LogicalName>folder.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/file.gif">\r
-      <LogicalName>file.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/computer.gif">\r
-      <LogicalName>computer.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_minus.gif">\r
-      <LogicalName>arrow_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_noexpand.gif">\r
-      <LogicalName>arrow_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_plus.gif">\r
-      <LogicalName>arrow_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_up.gif">\r
-      <LogicalName>arrow_up.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/arrow_down.gif">\r
-      <LogicalName>arrow_down.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_full.gif">\r
-      <LogicalName>box_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_empty.gif">\r
-      <LogicalName>box_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_minus.gif">\r
-      <LogicalName>box_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_noexpand.gif">\r
-      <LogicalName>box_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/box_plus.gif">\r
-      <LogicalName>box_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/contact.gif">\r
-      <LogicalName>contact.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_empty.gif">\r
-      <LogicalName>dot_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dot_full.gif">\r
-      <LogicalName>dot_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/dots.gif">\r
-      <LogicalName>dots.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/inbox.gif">\r
-      <LogicalName>inbox.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_empty.gif">\r
-      <LogicalName>star_empty.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/star_full.gif">\r
-      <LogicalName>star_full.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/warning.gif">\r
-      <LogicalName>warning.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_noexpand.gif">\r
-      <LogicalName>TreeView_noexpand.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dash.gif">\r
-      <LogicalName>TreeView_dash.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashminus.gif">\r
-      <LogicalName>TreeView_dashminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_dashplus.gif">\r
-      <LogicalName>TreeView_dashplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_i.gif">\r
-      <LogicalName>TreeView_i.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_l.gif">\r
-      <LogicalName>TreeView_l.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lminus.gif">\r
-      <LogicalName>TreeView_lminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_lplus.gif">\r
-      <LogicalName>TreeView_lplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_minus.gif">\r
-      <LogicalName>TreeView_minus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_plus.gif">\r
-      <LogicalName>TreeView_plus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_r.gif">\r
-      <LogicalName>TreeView_r.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rminus.gif">\r
-      <LogicalName>TreeView_rminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_rplus.gif">\r
-      <LogicalName>TreeView_rplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_t.gif">\r
-      <LogicalName>TreeView_t.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tminus.gif">\r
-      <LogicalName>TreeView_tminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/TreeView_tplus.gif">\r
-      <LogicalName>TreeView_tplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/transparent.gif">\r
-      <LogicalName>transparent.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/webform.js">\r
-      <LogicalName>webform.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/WebUIValidation_2.0.js">\r
-      <LogicalName>WebUIValidation_2.0.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Top.html">\r
-      <LogicalName>ErrorTemplateCommon_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_CustomErrorDefault.html">\r
-      <LogicalName>DefaultErrorTemplate_CustomErrorDefault.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/ErrorTemplateCommon_Bottom.html">\r
-      <LogicalName>ErrorTemplateCommon_Bottom.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DefaultErrorTemplate_StandardPage.html">\r
-      <LogicalName>DefaultErrorTemplate_StandardPage.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_Top.html">\r
-      <LogicalName>HtmlizedExceptionPage_Top.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileLongSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileLongSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_FileShortSource.html">\r
-      <LogicalName>HtmlizedExceptionPage_FileShortSource.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/HtmlizedExceptionPage_CompilerOutput.html">\r
-      <LogicalName>HtmlizedExceptionPage_CompilerOutput.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/GridView.js">\r
-      <LogicalName>GridView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/DetailsView.js">\r
-      <LogicalName>DetailsView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/TreeView.js">\r
-      <LogicalName>TreeView.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/Menu.js">\r
-      <LogicalName>Menu.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="System.Web.UI.WebControls/MenuModern.js">\r
-      <LogicalName>MenuModern.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax">\r
-      <LogicalName>Global.asax</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx">\r
-      <LogicalName>My.ashx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/My.master">\r
-      <LogicalName>My.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx">\r
-      <LogicalName>MyPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs">\r
-      <LogicalName>MyPage.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx">\r
-      <LogicalName>MyPageWithMaster.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config">\r
-      <LogicalName>Web.mono.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.4.0">\r
-      <LogicalName>Web.mono.config.4.0</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/sub_map_01.sitemap">\r
-      <LogicalName>sub_map_01.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_01.sitemap">\r
-      <LogicalName>test_map_01.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_02.sitemap">\r
-      <LogicalName>test_map_02.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_03.sitemap">\r
-      <LogicalName>test_map_03.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_04.sitemap">\r
-      <LogicalName>test_map_04.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_05.sitemap">\r
-      <LogicalName>test_map_05.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_06.sitemap">\r
-      <LogicalName>test_map_06.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_07.sitemap">\r
-      <LogicalName>test_map_07.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_08.sitemap">\r
-      <LogicalName>test_map_08.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_09.sitemap">\r
-      <LogicalName>test_map_09.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/menuclass.aspx">\r
-      <LogicalName>menuclass.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormView.aspx">\r
-      <LogicalName>FormView.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PostBackMenuTest.aspx">\r
-      <LogicalName>PostBackMenuTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageWithStyleSheet.aspx">\r
-      <LogicalName>PageWithStyleSheet.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageWithTheme.aspx">\r
-      <LogicalName>PageWithTheme.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ResolveUrl.ascx">\r
-      <LogicalName>ResolveUrl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ResolveUrl.aspx">\r
-      <LogicalName>ResolveUrl.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/RunTimeSetTheme.aspx">\r
-      <LogicalName>RunTimeSetTheme.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ReadOnlyPropertyBind.aspx">\r
-      <LogicalName>ReadOnlyPropertyBind.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ReadOnlyPropertyControl.ascx">\r
-      <LogicalName>ReadOnlyPropertyControl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Theme1.skin">\r
-      <LogicalName>Theme1.skin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Theme2.skin">\r
-      <LogicalName>Theme2.skin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/UrlProperty.aspx">\r
-      <LogicalName>UrlProperty.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/UrlProperty.ascx">\r
-      <LogicalName>UrlProperty.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/UrlProperty.ascx.cs">\r
-      <LogicalName>UrlProperty.ascx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Web.sitemap">\r
-      <LogicalName>Web.sitemap</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/WizardTest.skin">\r
-      <LogicalName>WizardTest.skin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FooterTemplateTest.aspx">\r
-      <LogicalName>FooterTemplateTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DataGrid.aspx">\r
-      <LogicalName>DataGrid.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewTemplates.aspx">\r
-      <LogicalName>DetailsViewTemplates.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewTemplates_2.aspx">\r
-      <LogicalName>DetailsViewTemplates_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewTemplates_3.aspx">\r
-      <LogicalName>DetailsViewTemplates_3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewDataActions.aspx">\r
-      <LogicalName>DetailsViewDataActions.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DetailsViewProperties1.aspx">\r
-      <LogicalName>DetailsViewProperties1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Bluehills.jpg">\r
-      <LogicalName>Bluehills.jpg</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewTest1.aspx">\r
-      <LogicalName>FormViewTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewTest1_2.aspx">\r
-      <LogicalName>FormViewTest1_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewTest1_3.aspx">\r
-      <LogicalName>FormViewTest1_3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewTest1_4.aspx">\r
-      <LogicalName>FormViewTest1_4.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewInsertEditDelete.aspx">\r
-      <LogicalName>FormViewInsertEditDelete.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/GridViewUpdate.aspx">\r
-      <LogicalName>GridViewUpdate.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest.xml">\r
-      <LogicalName>XMLDataSourceTest.xml</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest.xsl">\r
-      <LogicalName>XMLDataSourceTest.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest1.aspx">\r
-      <LogicalName>XMLDataSourceTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest2.aspx">\r
-      <LogicalName>XMLDataSourceTest2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest3.aspx">\r
-      <LogicalName>XMLDataSourceTest3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/XMLDataSourceTest4.aspx">\r
-      <LogicalName>XMLDataSourceTest4.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/LoginViewTest1.aspx">\r
-      <LogicalName>LoginViewTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/WebControl.config">\r
-      <LogicalName>WebControl.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/WebLogin.config">\r
-      <LogicalName>WebLogin.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CallbackTest1.aspx">\r
-      <LogicalName>CallbackTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CallbackTest2.aspx">\r
-      <LogicalName>CallbackTest2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/EventValidationTest2.aspx">\r
-      <LogicalName>EventValidationTest2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/EventValidationTest1.aspx">\r
-      <LogicalName>EventValidationTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ClientScript.js">\r
-      <LogicalName>ClientScript.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/EvalTest.aspx">\r
-      <LogicalName>EvalTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TemplateUserControl.ascx">\r
-      <LogicalName>TemplateUserControl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/WebMapping.config">\r
-      <LogicalName>WebMapping.config</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Mapping.aspx">\r
-      <LogicalName>Mapping.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/Mapping1.aspx">\r
-      <LogicalName>Mapping1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CrossPagePosting1.aspx">\r
-      <LogicalName>CrossPagePosting1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CrossPagePosting2.aspx">\r
-      <LogicalName>CrossPagePosting2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MyDerived.master">\r
-      <LogicalName>MyDerived.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MyPageWithDerivedMaster.aspx">\r
-      <LogicalName>MyPageWithDerivedMaster.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MasterTypeTest1.aspx">\r
-      <LogicalName>MasterTypeTest1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MasterTypeTest2.aspx">\r
-      <LogicalName>MasterTypeTest2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageLifecycleTest.aspx">\r
-      <LogicalName>PageLifecycleTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageValidationTest.aspx">\r
-      <LogicalName>PageValidationTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/AsyncPage.aspx">\r
-      <LogicalName>AsyncPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageCultureTest.aspx">\r
-      <LogicalName>PageCultureTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/adapters.browser">\r
-      <LogicalName>adapters.browser</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NoEventValidation.aspx">\r
-      <LogicalName>NoEventValidation.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ListControlPage.aspx">\r
-      <LogicalName>ListControlPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TextBoxTestlPage.aspx">\r
-      <LogicalName>TextBoxTestlPage.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ClearErrorOnError.aspx">\r
-      <LogicalName>ClearErrorOnError.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/RedirectOnError.aspx">\r
-      <LogicalName>RedirectOnError.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TestCapability.browser">\r
-      <LogicalName>TestCapability.browser</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PageWithAdapter.aspx">\r
-      <LogicalName>PageWithAdapter.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/InvalidPropertyBind1.aspx">\r
-      <LogicalName>InvalidPropertyBind1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/InvalidPropertyBind2.aspx">\r
-      <LogicalName>InvalidPropertyBind2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/InvalidPropertyBind3.aspx">\r
-      <LogicalName>InvalidPropertyBind3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/InvalidPropertyBind4.aspx">\r
-      <LogicalName>InvalidPropertyBind4.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind1.aspx">\r
-      <LogicalName>ValidPropertyBind1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind2.aspx">\r
-      <LogicalName>ValidPropertyBind2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind3.aspx">\r
-      <LogicalName>ValidPropertyBind3.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind4.aspx">\r
-      <LogicalName>ValidPropertyBind4.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ValidPropertyBind5.aspx">\r
-      <LogicalName>ValidPropertyBind5.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ReadWritePropertyControl.ascx">\r
-      <LogicalName>ReadWritePropertyControl.ascx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/MainsoftWebTest/nunitweb_config.xml">\r
-      <LogicalName>nunitweb_config.xml</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TemplateControlParsingTest.aspx">\r
-      <LogicalName>TemplateControlParsingTest.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.aspx">\r
-      <LogicalName>ContentPlaceHolderInTemplate.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.master">\r
-      <LogicalName>ContentPlaceHolderInTemplate.master</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/MissingMasterFile.aspx">\r
-      <LogicalName>MissingMasterFile.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CustomSectionEmptyCollection.aspx">\r
-      <LogicalName>CustomSectionEmptyCollection.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx">\r
-      <LogicalName>NoDoubleOnInitOnRemoveAdd.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx.cs">\r
-      <LogicalName>NoDoubleOnInitOnRemoveAdd.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/LoginDisplayRememberMe.aspx">\r
-      <LogicalName>LoginDisplayRememberMe.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NoBindForMethodsWithBindInName.aspx">\r
-      <LogicalName>NoBindForMethodsWithBindInName.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/LinkInHeadWithEmbeddedExpression.aspx">\r
-      <LogicalName>LinkInHeadWithEmbeddedExpression.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ExpressionInListControl.aspx">\r
-      <LogicalName>ExpressionInListControl.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ServerSideControlsInScriptBlock.aspx">\r
-      <LogicalName>ServerSideControlsInScriptBlock.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ServerControlInClientSideComment.aspx">\r
-      <LogicalName>ServerControlInClientSideComment.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/PreprocessorDirectivesInMarkup.aspx">\r
-      <LogicalName>PreprocessorDirectivesInMarkup.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/UnquotedAngleBrackets.aspx">\r
-      <LogicalName>UnquotedAngleBrackets.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FullTagsInText.aspx">\r
-      <LogicalName>FullTagsInText.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TagsExpressionsAndCommentsInText.aspx">\r
-      <LogicalName>TagsExpressionsAndCommentsInText.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NewlineInCodeExpression.aspx">\r
-      <LogicalName>NewlineInCodeExpression.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/DuplicateControlsInClientComment.aspx">\r
-      <LogicalName>DuplicateControlsInClientComment.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TagsNestedInClientTag.aspx">\r
-      <LogicalName>TagsNestedInClientTag.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ConditionalClientComments.aspx">\r
-      <LogicalName>ConditionalClientComments.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/OneLetterIdentifierInCodeRender.aspx">\r
-      <LogicalName>OneLetterIdentifierInCodeRender.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/GlobalResourcesLocalization.aspx">\r
-      <LogicalName>GlobalResourcesLocalization.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TableSections_Bug551666.aspx">\r
-      <LogicalName>TableSections_Bug551666.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TableSections_Bug551666.aspx.cs">\r
-      <LogicalName>TableSections_Bug551666.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/NestedParserFileText.aspx">\r
-      <LogicalName>NestedParserFileText.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/StateFormatter_CorrectConverter.aspx">\r
-      <LogicalName>StateFormatter_CorrectConverter.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/StateFormatter_CollectionConverter.aspx">\r
-      <LogicalName>StateFormatter_CollectionConverter.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/StateFormatter_CollectionConverter.aspx.cs">\r
-      <LogicalName>StateFormatter_CollectionConverter.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ChangePasswordContainer_FindControl.aspx">\r
-      <LogicalName>ChangePasswordContainer_FindControl.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/TagWithExpressionWithinAttribute.aspx">\r
-      <LogicalName>TagWithExpressionWithinAttribute.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxList_Bug377703_1.aspx">\r
-      <LogicalName>CheckBoxList_Bug377703_1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxList_Bug377703_2.aspx">\r
-      <LogicalName>CheckBoxList_Bug377703_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxList_Bug578770.aspx">\r
-      <LogicalName>CheckBoxList_Bug578770.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/EnumConverter_Bug578586.aspx">\r
-      <LogicalName>EnumConverter_Bug578586.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/ButtonColor_Bug325489.aspx">\r
-      <LogicalName>ButtonColor_Bug325489.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/SqlDataSource_OnInit_Bug572781.aspx">\r
-      <LogicalName>SqlDataSource_OnInit_Bug572781.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/FormViewPagerVisibility.aspx">\r
-      <LogicalName>FormViewPagerVisibility.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/OverridenControlsPropertyAndPostBack_Bug594238.aspx">\r
-      <LogicalName>OverridenControlsPropertyAndPostBack_Bug594238.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/GlobalizationEncodingName.aspx">\r
-      <LogicalName>GlobalizationEncodingName.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_0.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_0.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_1.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_1.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_2.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_2.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_5.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_5.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_6.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_6.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_7.aspx">\r
-      <LogicalName>CheckBoxField_Bug595568_7.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/GridView_Bug595567.aspx">\r
-      <LogicalName>GridView_Bug595567.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/CheckBoxList_Bug600415.aspx">\r
-      <LogicalName>CheckBoxList_Bug600415.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/BoundField_Bug646505.aspx">\r
-      <LogicalName>BoundField_Bug646505.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/BoundField_Bug646505.aspx.cs">\r
-      <LogicalName>BoundField_Bug646505.aspx.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/HtmlTitleCodeRender_Bug662918.aspx">\r
-      <LogicalName>HtmlTitleCodeRender_Bug662918.aspx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_Code/EnumConverterControl.cs">\r
-      <LogicalName>App_Code/EnumConverterControl.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_Code/MyContainer.cs">\r
-      <LogicalName>App_Code/MyContainer.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_Code/CustomCheckBoxColumn.cs">\r
-      <LogicalName>App_Code/CustomCheckBoxColumn.cs</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_GlobalResources/Common.resx">\r
-      <LogicalName>App_GlobalResources/Common.resx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_GlobalResources/Common.fr-FR.resx">\r
-      <LogicalName>App_GlobalResources/Common.fr-FR.resx</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/mainsoft/NunitWebResources/App_GlobalResources/Resource1.resx">\r
-      <LogicalName>App_GlobalResources/Resource1.resx</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
index 4f07e83f1345769d5dfa62d699c17d526a0eda12..e229a913f8f984008c46e2fbb770d21e29bd1188 100644 (file)
--- a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
+++ b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
@@ -54,7 +54,7 @@ namespace System.Web.Util {
                        if (path.StartsWith (appvpath))
                                path = path.Substring (appvpath.Length);
 
-                       if (path [0] == '/')
+                       if (path.StartsWith("/"))
                                path = path.Length > 1 ? path.Substring (1) : "";
 
                        return Canonic (appvpath + "(" + id + ")/" + path);

diff --git a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_5.csproj b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_5.csproj
deleted file mode 100644 (file)
index 4ba9510..0000000
--- a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_5.csproj
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5D72C9D5-37E8-4B93-A634-919A3B251C9B}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Windows.Forms.DataVisualization</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Annotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnnotationCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnnotationGroup.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnnotationPathPoint.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnnotationPathPointCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnnotationPositionChangingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnnotationSmartLabelStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AnovaResult.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AntiAliasingStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AreaAlignmentOrientations.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AreaAlignmentStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ArrowAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ArrowStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Axis.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisArrowStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisEnabled.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisName.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisScaleBreakStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisScaleView.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\AxisType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Border3DAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\BorderSkin.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\BorderSkinStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\BreakLineStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CalloutAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CalloutStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Chart.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartArea.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartArea3DStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartAreaCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartColorPalette.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartDashStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartElement.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartElementCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartElementType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartGraphics.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartHatchStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartImageAlignmentStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartImageFormat.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartImageWrapMode.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartNamedElement.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartNamedElementCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartPaintEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartSerializer.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ChartValueType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CompareMethod.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Cursor.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CursorEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CustomizeLegendEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CustomLabel.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CustomLabelCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CustomProperties.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DataFormula.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DataManipulator.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DataPoint.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DataPointCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DataPointCustomProperties.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DateRangeType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\DateTimeIntervalType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Docking.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ElementPosition.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\EllipseAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\FinancialFormula.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\FormatNumberEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\FTestResult.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\GradientStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Grid.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\GridTickTypes.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\HitTestResult.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\HorizontalLineAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\IDataPointFilter.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ImageAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\IntervalAutoMode.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\IntervalType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LabelAlignmentStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LabelAutoFitStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LabelCalloutStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LabelMarkStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LabelOutsidePlotAreaStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LabelStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Legend.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendCell.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendCellCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendCellColumn.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendCellColumnCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendCellColumnType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendCellType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendImageStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendItem.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendItemOrder.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendItemsCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendSeparatorStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LegendTableStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LightStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LineAnchorCapStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\LineAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Margins.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\MarkerStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\NamedImage.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\NamedImagesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Point3D.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\PointSortOrder.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\PolygonAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\PolylineAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\PrintingManager.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\RectangleAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ScrollBarButtonStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ScrollBarButtonType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ScrollBarEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ScrollType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\SerializationContents.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\SerializationFormat.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Series.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\SeriesChartType.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\SeriesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\SmartLabelStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\StartFromZero.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\StatisticFormula.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\StripLine.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\StripLinesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TextAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TextAntiAliasingQuality.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TextOrientation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TextStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TickMark.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TickMarkStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\Title.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TitleCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ToolTipEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TTestResult.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\VerticalLineAnnotation.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ViewEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\ZTestResult.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-tests-net_4_5.csproj b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 0df66b0..0000000
--- a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-tests-net_4_5.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{53691FB6-46CA-4725-AA1A-03418AFED79A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Windows.Forms.DataVisualization-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Windows.Forms.DataVisualization_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Windows.Forms.DataVisualization.Charting\AnnotationPathPointTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.DataVisualization.Charting\AnovaResultTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.DataVisualization.Charting\ArrowAnnotationTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.DataVisualization.Charting\AxisScaleBreakStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.DataVisualization.Charting\ChartElementTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.DataVisualization.Charting\ChartElementTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Windows.Forms.DataVisualization\System.Windows.Forms.DataVisualization-net_4_5.csproj">\r
-      <Project>{5D72C9D5-37E8-4B93-A634-919A3B251C9B}</Project>\r
-      <Name>System.Windows.Forms.DataVisualization\System.Windows.Forms.DataVisualization-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Windows.Forms\System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms\System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_5.csproj b/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_5.csproj
deleted file mode 100644 (file)
index c26d1f9..0000000
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_5.csproj
+++ /dev/null
@@ -1,1199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B102F27C-1A07-487F-BA5B-D5155D201112}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612,809</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Windows.Forms</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612,809</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612,809</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Assembly\Locale.cs" />\r
-    <Compile Include="System.Resources\AssemblyNamesTypeResolutionService.cs" />\r
-    <Compile Include="System.Resources\ByteArrayFromResXHandler.cs" />\r
-    <Compile Include="System.Resources\FileRefHandler.cs" />\r
-    <Compile Include="System.Resources\InMemoryHandler.cs" />\r
-    <Compile Include="System.Resources\NullRefHandler.cs" />\r
-    <Compile Include="System.Resources\ResXDataNode.cs" />\r
-    <Compile Include="System.Resources\ResXDataNodeHandler.cs" />\r
-    <Compile Include="System.Resources\ResXFileRef.cs" />\r
-    <Compile Include="System.Resources\ResXNullRef.cs" />\r
-    <Compile Include="System.Resources\ResXResourceReader.cs" />\r
-    <Compile Include="System.Resources\ResXResourceSet.cs" />\r
-    <Compile Include="System.Resources\ResXResourceWriter.cs" />\r
-    <Compile Include="System.Resources\SerializedFromResXHandler.cs" />\r
-    <Compile Include="System.Resources\TypeConverterFromResXHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\ApplicationHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\ControlHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Cursor.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Dnd.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Enums.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\EventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\EventHandlerBase.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\HIObjectHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\IEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\KeyboardHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\MouseHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Pasteboard.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\Structs.cs" />\r
-    <Compile Include="System.Windows.Forms.CarbonInternal\WindowHandler.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ComponentEditorForm.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ComponentEditorPage.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\EventsTab.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IUIService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\IWindowsFormsEditorService.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\PropertyTab.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ToolStripItemDesignerAvailability.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\ToolStripItemDesignerAvailabilityAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms.Design\WindowsFormsComponentEditor.cs" />\r
-    <Compile Include="System.Windows.Forms.Internal\Accessor.cs" />\r
-    <Compile Include="System.Windows.Forms.Internal\DebugHelper.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\ArrangedElementCollection.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\DefaultLayout.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\FlowLayout.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\LayoutEngine.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\TableLayout.cs" />\r
-    <Compile Include="System.Windows.Forms.Layout\TableLayoutSettingsTypeConverter.cs" />\r
-    <Compile Include="System.Windows.Forms.PropertyGridInternal\PropertiesTab.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Charcode.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Charset.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\CharsetFlags.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\CharsetType.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\ClassDelegate.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Color.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\DestinationDelegate.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Font.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\KeysInit.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\KeyStruct.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Major.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Minor.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Picture.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\RTF.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\RTFException.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\StandardCharCode.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\StandardCharName.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\Style.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\StyleElement.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\StyleType.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\TextMap.cs" />\r
-    <Compile Include="System.Windows.Forms.RTF\TokenClass.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\ButtonPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\CheckBoxPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\LabelPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\LinkLabelPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\RadioButtonPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\TabControlPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\Default\ToolStripPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\ThemeElements.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\ThemeElementsDefault.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\ThemeElementsVisualStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\VisualStyles\CheckBoxPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\VisualStyles\RadioButtonPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\VisualStyles\TabControlPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.Theming\VisualStyles\ToolStripPainter.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\BackgroundType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\BooleanProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\BorderType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\CheckBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ColorProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ComboBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ContentAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\EdgeEffects.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\Edges.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\EdgeStyle.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\EnumProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\FilenameProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\FillType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\FontProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\GlyphFontSizingType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\GlyphType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\GroupBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\GtkPlus.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\HitTestCode.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\HitTestOptions.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\HorizontalAlign.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\IconEffect.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ImageOrientation.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ImageSelectType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\IntegerProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\IVisualStyles.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\MarginProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\OffsetType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\PointProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\PushButtonState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\RadioButtonState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ScrollBarArrowButtonState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ScrollBarSizeBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ScrollBarState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\SizingType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\StringProperty.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TabItemState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextBoxState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextMetrics.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextMetricsCharacterSet.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextMetricsPitchAndFamilyValues.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TextShadowType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ThemeSizeType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\ToolBarState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TrackBarThumbState.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\TrueSizeScalingType.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\UXTheme.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VerticalAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleElement.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleInformation.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStylesEngine.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStylesGtkPlus.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStylesNative.cs" />\r
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleState.cs" />\r
-    <Compile Include="System.Windows.Forms.WebBrowserDialogs\AlertCheck.cs" />\r
-    <Compile Include="System.Windows.Forms.WebBrowserDialogs\ConfirmCheck.cs" />\r
-    <Compile Include="System.Windows.Forms.WebBrowserDialogs\Generic.cs" />\r
-    <Compile Include="System.Windows.Forms.WebBrowserDialogs\Prompt.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleEvents.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleNavigation.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleObject.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleRole.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleSelection.cs" />\r
-    <Compile Include="System.Windows.Forms\AccessibleStates.cs" />\r
-    <Compile Include="System.Windows.Forms\AmbientProperties.cs" />\r
-    <Compile Include="System.Windows.Forms\AnchorStyles.cs" />\r
-    <Compile Include="System.Windows.Forms\Appearance.cs" />\r
-    <Compile Include="System.Windows.Forms\Application.cs" />\r
-    <Compile Include="System.Windows.Forms\ApplicationContext.cs" />\r
-    <Compile Include="System.Windows.Forms\ArrangeDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\ArrangeStartingPosition.cs" />\r
-    <Compile Include="System.Windows.Forms\ArrowDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\AsyncMethodData.cs" />\r
-    <Compile Include="System.Windows.Forms\AsyncMethodResult.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoCompleteMode.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoCompleteSource.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoCompleteStringCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoScaleMode.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\AutoValidate.cs" />\r
-    <Compile Include="System.Windows.Forms\AxHost.cs" />\r
-    <Compile Include="System.Windows.Forms\BaseCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\BatteryChargeStatus.cs" />\r
-    <Compile Include="System.Windows.Forms\Binding.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingCompleteContext.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingCompleteEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingCompleteEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingCompleteState.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingContext.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingManagerBase.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingManagerDataErrorEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingManagerDataErrorEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingMemberInfo.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingNavigator.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingsCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\BindingSource.cs" />\r
-    <Compile Include="System.Windows.Forms\BootMode.cs" />\r
-    <Compile Include="System.Windows.Forms\Border3DSide.cs" />\r
-    <Compile Include="System.Windows.Forms\Border3DStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\BorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\BoundsSpecified.cs" />\r
-    <Compile Include="System.Windows.Forms\Button.cs" />\r
-    <Compile Include="System.Windows.Forms\ButtonBase.cs" />\r
-    <Compile Include="System.Windows.Forms\ButtonBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ButtonRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ButtonState.cs" />\r
-    <Compile Include="System.Windows.Forms\CacheVirtualItemsEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\CacheVirtualItemsEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\CaptionButton.cs" />\r
-    <Compile Include="System.Windows.Forms\CategoryGridEntry.cs" />\r
-    <Compile Include="System.Windows.Forms\CharacterCasing.cs" />\r
-    <Compile Include="System.Windows.Forms\CheckBox.cs" />\r
-    <Compile Include="System.Windows.Forms\CheckBoxRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\CheckedListBox.cs" />\r
-    <Compile Include="System.Windows.Forms\CheckState.cs" />\r
-    <Compile Include="System.Windows.Forms\Clipboard.cs" />\r
-    <Compile Include="System.Windows.Forms\CloseReason.cs" />\r
-    <Compile Include="System.Windows.Forms\ColorDepth.cs" />\r
-    <Compile Include="System.Windows.Forms\ColorDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnHeader.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnHeaderAutoResizeStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnHeaderConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnHeaderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnReorderedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnReorderedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnWidthChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnWidthChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnWidthChangingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ColumnWidthChangingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ComboBox.cs" />\r
-    <Compile Include="System.Windows.Forms\ComboBoxRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ComboBoxStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\CommonDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\ComponentModel.cs" />\r
-    <Compile Include="System.Windows.Forms\ContainerControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ContentsResizedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ContentsResizedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ContextMenu.cs" />\r
-    <Compile Include="System.Windows.Forms\ContextMenuStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\Control.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlBindingsCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlPaint.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlStyles.cs" />\r
-    <Compile Include="System.Windows.Forms\ControlUpdateMode.cs" />\r
-    <Compile Include="System.Windows.Forms\ConvertEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ConvertEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\CreateParams.cs" />\r
-    <Compile Include="System.Windows.Forms\CurrencyManager.cs" />\r
-    <Compile Include="System.Windows.Forms\Cursor.cs" />\r
-    <Compile Include="System.Windows.Forms\CursorConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\Cursors.cs" />\r
-    <Compile Include="System.Windows.Forms\DataFormats.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGrid.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridBoolColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridColumnStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridLineStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridParentRowsLabelStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridPreferredColumnWidthTypeConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridTableStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridTextBoxColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridView.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAdvancedBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAdvancedCellBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnModeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnModeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnsMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnsModeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeColumnsModeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeModeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeModeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeRowMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewAutoSizeRowsMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewBand.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewBindingCompleteEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewBindingCompleteEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewButtonCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewButtonColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellContextMenuStripNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellContextMenuStripNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellErrorTextNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellErrorTextNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellFormattingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellFormattingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellMouseEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellMouseEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellPaintingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellPaintingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellParsingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellParsingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStateChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStateChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyleContentChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyleContentChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyleConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellStyleScopes.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellToolTipTextNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellToolTipTextNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellValidatingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellValidatingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellValueEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCellValueEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCheckBoxCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewCheckBoxColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewClipboardCopyMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnDesignTimeVisibleAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnDividerDoubleClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnDividerDoubleClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnHeaderCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnHeadersHeightSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnSortMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnStateChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewColumnStateChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewComboBoxCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewComboBoxColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewComboBoxDisplayStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewComboBoxEditingControl.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewContentAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewDataErrorContexts.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewDataErrorEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewDataErrorEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewEditingControlShowingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewEditingControlShowingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewEditMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewElement.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewElementStates.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewHeaderBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewHeaderCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewHitTestType.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewImageCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewImageCellLayout.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewImageColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewLinkCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewLinkColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewPaintParts.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRow.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowContextMenuStripNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowContextMenuStripNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowDividerDoubleClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowDividerDoubleClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowErrorTextNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowErrorTextNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeaderCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeadersWidthSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeightInfoNeededEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeightInfoNeededEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeightInfoPushedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowHeightInfoPushedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowPostPaintEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowPostPaintEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowPrePaintEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowPrePaintEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowsAddedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowsAddedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowsRemovedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowsRemovedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowStateChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewRowStateChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSelectedCellCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSelectedColumnCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSelectedRowCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSelectionMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSortCompareEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewSortCompareEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTextBoxCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTextBoxColumn.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTextBoxEditingControl.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTopLeftHeaderCell.cs" />\r
-    <Compile Include="System.Windows.Forms\DataGridViewTriState.cs" />\r
-    <Compile Include="System.Windows.Forms\DataObject.cs" />\r
-    <Compile Include="System.Windows.Forms\DataSourceUpdateMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DateBoldEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DateBoldEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DateRangeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DateRangeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DateTimePicker.cs" />\r
-    <Compile Include="System.Windows.Forms\DateTimePickerFormat.cs" />\r
-    <Compile Include="System.Windows.Forms\Day.cs" />\r
-    <Compile Include="System.Windows.Forms\DialogResult.cs" />\r
-    <Compile Include="System.Windows.Forms\DockingAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\DockingBehavior.cs" />\r
-    <Compile Include="System.Windows.Forms\DockStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\DomainUpDown.cs" />\r
-    <Compile Include="System.Windows.Forms\DragAction.cs" />\r
-    <Compile Include="System.Windows.Forms\DragDropEffects.cs" />\r
-    <Compile Include="System.Windows.Forms\DragEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DragEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawItemState.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewColumnHeaderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewColumnHeaderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewSubItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawListViewSubItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawMode.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawToolTipEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawToolTipEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawTreeNodeEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\DrawTreeNodeEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ErrorBlinkStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ErrorIconAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\ErrorProvider.cs" />\r
-    <Compile Include="System.Windows.Forms\FeatureSupport.cs" />\r
-    <Compile Include="System.Windows.Forms\FileDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\FileDialogCustomPlace.cs" />\r
-    <Compile Include="System.Windows.Forms\FileDialogCustomPlacesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\FixedPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\FixedSizeTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\FlatButtonAppearance.cs" />\r
-    <Compile Include="System.Windows.Forms\FlatStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\FlowDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\FlowLayoutPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\FlowLayoutSettings.cs" />\r
-    <Compile Include="System.Windows.Forms\FolderBrowserDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\FontDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\Form.cs" />\r
-    <Compile Include="System.Windows.Forms\FormBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\FormClosedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\FormClosedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\FormClosingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\FormClosingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\FormCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\FormStartPosition.cs" />\r
-    <Compile Include="System.Windows.Forms\FormWindowManager.cs" />\r
-    <Compile Include="System.Windows.Forms\FormWindowState.cs" />\r
-    <Compile Include="System.Windows.Forms\FrameStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\GetChildAtPointSkip.cs" />\r
-    <Compile Include="System.Windows.Forms\GiveFeedbackEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\GiveFeedbackEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\GridColumnStylesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\GridEntry.cs" />\r
-    <Compile Include="System.Windows.Forms\GridItem.cs" />\r
-    <Compile Include="System.Windows.Forms\GridItemCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\GridItemType.cs" />\r
-    <Compile Include="System.Windows.Forms\GridTablesFactory.cs" />\r
-    <Compile Include="System.Windows.Forms\GridTableStylesCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\GroupBox.cs" />\r
-    <Compile Include="System.Windows.Forms\GroupBoxRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\HandledMouseEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\Help.cs" />\r
-    <Compile Include="System.Windows.Forms\HelpEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\HelpEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\HelpNavigator.cs" />\r
-    <Compile Include="System.Windows.Forms\HelpProvider.cs" />\r
-    <Compile Include="System.Windows.Forms\HorizontalAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\HScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\HScrollProperties.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlDocument.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElement.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementErrorEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementErrorEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlElementInsertionOrientation.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlHistory.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlWindow.cs" />\r
-    <Compile Include="System.Windows.Forms\HtmlWindowCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\Hwnd.cs" />\r
-    <Compile Include="System.Windows.Forms\IBindableComponent.cs" />\r
-    <Compile Include="System.Windows.Forms\IBounds.cs" />\r
-    <Compile Include="System.Windows.Forms\IButtonControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ICommandExecutor.cs" />\r
-    <Compile Include="System.Windows.Forms\IComponentEditorPageSite.cs" />\r
-    <Compile Include="System.Windows.Forms\IContainerControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ICurrencyManagerProvider.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataGridColumnStyleEditingNotificationService.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataGridEditingService.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataGridViewEditingCell.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataGridViewEditingControl.cs" />\r
-    <Compile Include="System.Windows.Forms\IDataObject.cs" />\r
-    <Compile Include="System.Windows.Forms\IDropTarget.cs" />\r
-    <Compile Include="System.Windows.Forms\IFeatureSupport.cs" />\r
-    <Compile Include="System.Windows.Forms\IFileReaderService.cs" />\r
-    <Compile Include="System.Windows.Forms\IKeyFilter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageIndexConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageKeyConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageLayout.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageList.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageListConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImageListStreamer.cs" />\r
-    <Compile Include="System.Windows.Forms\ImeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\IMessageFilter.cs" />\r
-    <Compile Include="System.Windows.Forms\ImplicitHScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ImplicitVScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguage.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageChangingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageChangingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\InputLanguageCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\InsertKeyMode.cs" />\r
-    <Compile Include="System.Windows.Forms\InternalWindowManager.cs" />\r
-    <Compile Include="System.Windows.Forms\InvalidateEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\InvalidateEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\IRootGridEntry.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemActivation.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemBoundsPortion.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemCheckedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemCheckedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemCheckEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemCheckEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemDragEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ItemDragEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\IToolStripData.cs" />\r
-    <Compile Include="System.Windows.Forms\IWin32Window.cs" />\r
-    <Compile Include="System.Windows.Forms\IWindowTarget.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyboardLayouts.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyPressEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\KeyPressEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\Keys.cs" />\r
-    <Compile Include="System.Windows.Forms\KeysConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\Label.cs" />\r
-    <Compile Include="System.Windows.Forms\LabelEditEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\LabelEditEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\LabelEditTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\LayoutEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\LayoutEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\LayoutSettings.cs" />\r
-    <Compile Include="System.Windows.Forms\LeftRightAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\Line.cs" />\r
-    <Compile Include="System.Windows.Forms\LineTag.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkArea.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkBehavior.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkClickedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkClickedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkLabel.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkLabelLinkClickedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkLabelLinkClickedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\LinkState.cs" />\r
-    <Compile Include="System.Windows.Forms\ListBindingConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ListBindingHelper.cs" />\r
-    <Compile Include="System.Windows.Forms\ListBox.cs" />\r
-    <Compile Include="System.Windows.Forms\ListControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ListControlConvertEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ListControlConvertEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ListView.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewGroup.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewGroupCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewHitTestInfo.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewHitTestLocations.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewInsertionMark.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItem.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemMouseHoverEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemMouseHoverEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemSelectionChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemSelectionChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewItemStates.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewVirtualItemsSelectionRangeChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ListViewVirtualItemsSelectionRangeChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\MainMenu.cs" />\r
-    <Compile Include="System.Windows.Forms\MaskedTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\MaskFormat.cs" />\r
-    <Compile Include="System.Windows.Forms\MaskInputRejectedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\MaskInputRejectedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\MdiClient.cs" />\r
-    <Compile Include="System.Windows.Forms\MdiControlStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\MdiLayout.cs" />\r
-    <Compile Include="System.Windows.Forms\MdiWindowManager.cs" />\r
-    <Compile Include="System.Windows.Forms\MeasureItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\MeasureItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\Menu.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuAPI.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuGlyph.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuItem.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuMerge.cs" />\r
-    <Compile Include="System.Windows.Forms\MenuStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\MergeAction.cs" />\r
-    <Compile Include="System.Windows.Forms\Message.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBox.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBoxButtons.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBoxDefaultButton.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBoxIcon.cs" />\r
-    <Compile Include="System.Windows.Forms\MessageBoxOptions.cs" />\r
-    <Compile Include="System.Windows.Forms\MethodInvoker.cs" />\r
-    <Compile Include="System.Windows.Forms\Mime.cs" />\r
-    <Compile Include="System.Windows.Forms\MimeIcon.cs" />\r
-    <Compile Include="System.Windows.Forms\MonthCalendar.cs" />\r
-    <Compile Include="System.Windows.Forms\MouseButtons.cs" />\r
-    <Compile Include="System.Windows.Forms\MouseEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\MouseEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\MWFCategoryAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\MWFDescriptionAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\NativeWindow.cs" />\r
-    <Compile Include="System.Windows.Forms\NavigateEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\NavigateEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\NodeLabelEditEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\NodeLabelEditEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\NotifyIcon.cs" />\r
-    <Compile Include="System.Windows.Forms\NumericTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\NumericUpDown.cs" />\r
-    <Compile Include="System.Windows.Forms\NumericUpDownAcceleration.cs" />\r
-    <Compile Include="System.Windows.Forms\NumericUpDownAccelerationCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\OpacityConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\OpenFileDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\OpenTreeNodeEnumerator.cs" />\r
-    <Compile Include="System.Windows.Forms\Orientation.cs" />\r
-    <Compile Include="System.Windows.Forms\OSFeature.cs" />\r
-    <Compile Include="System.Windows.Forms\OwnerDrawPropertyBag.cs" />\r
-    <Compile Include="System.Windows.Forms\Padding.cs" />\r
-    <Compile Include="System.Windows.Forms\PaddingConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\PageSetupDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\PaintEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PaintEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\Panel.cs" />\r
-    <Compile Include="System.Windows.Forms\PictureBox.cs" />\r
-    <Compile Include="System.Windows.Forms\PictureBoxSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\PopupEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PopupEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\PowerLineStatus.cs" />\r
-    <Compile Include="System.Windows.Forms\PowerState.cs" />\r
-    <Compile Include="System.Windows.Forms\PowerStatus.cs" />\r
-    <Compile Include="System.Windows.Forms\PreProcessControlState.cs" />\r
-    <Compile Include="System.Windows.Forms\PreviewKeyDownEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PreviewKeyDownEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\PrintControllerWithStatusDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\PrintDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\PrintPreviewControl.cs" />\r
-    <Compile Include="System.Windows.Forms\PrintPreviewDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\ProfessionalColors.cs" />\r
-    <Compile Include="System.Windows.Forms\ProfessionalColorTable.cs" />\r
-    <Compile Include="System.Windows.Forms\ProgressBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ProgressBarRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ProgressBarStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyGrid.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyGridCommands.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyGridTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyGridView.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyManager.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertySort.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyTabChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyTabChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyValueChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\PropertyValueChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\QueryAccessibilityHelpEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\QueryAccessibilityHelpEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\QueryContinueDragEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\QueryContinueDragEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\QuestionEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\QuestionEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\RadioButton.cs" />\r
-    <Compile Include="System.Windows.Forms\RadioButtonRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\RelatedCurrencyManager.cs" />\r
-    <Compile Include="System.Windows.Forms\RelatedImageListAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\RelatedPropertyManager.cs" />\r
-    <Compile Include="System.Windows.Forms\RetrieveVirtualItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\RetrieveVirtualItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxFinds.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxLanguageOptions.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxScrollBars.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxSelectionAttribute.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxSelectionTypes.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxStreamType.cs" />\r
-    <Compile Include="System.Windows.Forms\RichTextBoxWordPunctuations.cs" />\r
-    <Compile Include="System.Windows.Forms\RightToLeft.cs" />\r
-    <Compile Include="System.Windows.Forms\RootGridEntry.cs" />\r
-    <Compile Include="System.Windows.Forms\RowStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\SaveFileDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\Screen.cs" />\r
-    <Compile Include="System.Windows.Forms\ScreenOrientation.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollableControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollBarRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollBars.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollEventType.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollOrientation.cs" />\r
-    <Compile Include="System.Windows.Forms\ScrollProperties.cs" />\r
-    <Compile Include="System.Windows.Forms\SearchDirectionHint.cs" />\r
-    <Compile Include="System.Windows.Forms\SearchForVirtualItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\SearchForVirtualItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\SecurityIDType.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectedGridItemChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectedGridItemChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectionMode.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectionRange.cs" />\r
-    <Compile Include="System.Windows.Forms\SelectionRangeConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\SendKeys.cs" />\r
-    <Compile Include="System.Windows.Forms\Shortcut.cs" />\r
-    <Compile Include="System.Windows.Forms\SizeGrip.cs" />\r
-    <Compile Include="System.Windows.Forms\SizeGripStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\SizeType.cs" />\r
-    <Compile Include="System.Windows.Forms\SortOrder.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitContainer.cs" />\r
-    <Compile Include="System.Windows.Forms\Splitter.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\SplitterPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBar.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarDrawItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarDrawItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelAutoSize.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusBarPanelStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\StatusStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\StructFormat.cs" />\r
-    <Compile Include="System.Windows.Forms\SystemInformation.cs" />\r
-    <Compile Include="System.Windows.Forms\SystemParameter.cs" />\r
-    <Compile Include="System.Windows.Forms\TabAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\TabAppearance.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControl.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlAction.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TabControlEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TabDrawMode.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutCellPaintEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutCellPaintEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutColumnStyleCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutControlCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutPanelCellBorderStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutPanelCellPosition.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutPanelGrowStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutRowStyleCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutSettings.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\TableLayoutStyleCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TabPage.cs" />\r
-    <Compile Include="System.Windows.Forms\TabRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\TabSizeMode.cs" />\r
-    <Compile Include="System.Windows.Forms\TextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\TextBoxBase.cs" />\r
-    <Compile Include="System.Windows.Forms\TextBoxRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\TextBoxTextRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\TextControl.cs" />\r
-    <Compile Include="System.Windows.Forms\TextDataFormat.cs" />\r
-    <Compile Include="System.Windows.Forms\TextFormatFlags.cs" />\r
-    <Compile Include="System.Windows.Forms\TextImageRelation.cs" />\r
-    <Compile Include="System.Windows.Forms\TextRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\Theme.cs" />\r
-    <Compile Include="System.Windows.Forms\ThemeEngine.cs" />\r
-    <Compile Include="System.Windows.Forms\ThemeVisualStyles.cs" />\r
-    <Compile Include="System.Windows.Forms\ThemeWin32Classic.cs" />\r
-    <Compile Include="System.Windows.Forms\ThreadExceptionDialog.cs" />\r
-    <Compile Include="System.Windows.Forms\TickStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\Timer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarAppearance.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarButtonClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarButtonClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarButtonStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolBarTextAlign.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStrip.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripArrowRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripArrowRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripComboBox.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripContainer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripContentPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripContentPanelRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripContentPanelRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripControlHost.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDown.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownClosedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownClosedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownCloseReason.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownClosingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownClosingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownItem.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownItemAccessibleObject.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripDropDownMenu.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripGripDisplayStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripGripRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripGripRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripGripStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItem.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemAlignment.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemClickedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemClickedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemDisplayStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemEventType.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemImageRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemImageRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemImageScaling.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemOverflow.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemPlacement.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemTextRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripItemTextRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripLabel.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripLayoutStyle.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripManager.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripManagerRenderMode.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripMenuItem.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripOverflow.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripOverflowButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripPanel.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripPanelRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripPanelRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripPanelRow.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripProfessionalRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripProgressBar.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripRenderMode.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSeparator.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSeparatorRenderEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSeparatorRenderEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSplitButton.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSplitStackLayout.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripStatusLabel.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripStatusLabelBorderSides.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripSystemRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripTextBox.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolStripTextDirection.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolTip.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolTipIcon.cs" />\r
-    <Compile Include="System.Windows.Forms\ToolWindowManager.cs" />\r
-    <Compile Include="System.Windows.Forms\TrackBar.cs" />\r
-    <Compile Include="System.Windows.Forms\TrackBarRenderer.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNode.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeCollection.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeMouseClickEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeMouseClickEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeMouseHoverEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeMouseHoverEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeNodeStates.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeView.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewAction.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewCancelEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewCancelEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewDrawMode.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewHitTestInfo.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewHitTestLocations.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewImageIndexConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\TreeViewImageKeyConverter.cs" />\r
-    <Compile Include="System.Windows.Forms\TypeValidationEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\TypeValidationEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\UICues.cs" />\r
-    <Compile Include="System.Windows.Forms\UICuesEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\UICuesEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\UnhandledExceptionMode.cs" />\r
-    <Compile Include="System.Windows.Forms\UpDownBase.cs" />\r
-    <Compile Include="System.Windows.Forms\UpDownEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\UpDownEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\UserControl.cs" />\r
-    <Compile Include="System.Windows.Forms\ValidationConstraints.cs" />\r
-    <Compile Include="System.Windows.Forms\View.cs" />\r
-    <Compile Include="System.Windows.Forms\VScrollBar.cs" />\r
-    <Compile Include="System.Windows.Forms\VScrollProperties.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowser.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserBase.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserDocumentCompletedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserDocumentCompletedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserEncryptionLevel.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserNavigatedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserNavigatedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserNavigatingEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserNavigatingEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserProgressChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserProgressChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserReadyState.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserRefreshOption.cs" />\r
-    <Compile Include="System.Windows.Forms\WebBrowserSiteBase.cs" />\r
-    <Compile Include="System.Windows.Forms\Win32DnD.cs" />\r
-    <Compile Include="System.Windows.Forms\WindowsFormsSection.cs" />\r
-    <Compile Include="System.Windows.Forms\WindowsFormsSynchronizationContext.cs" />\r
-    <Compile Include="System.Windows.Forms\X11Clipboard.cs" />\r
-    <Compile Include="System.Windows.Forms\X11DesktopColors.cs" />\r
-    <Compile Include="System.Windows.Forms\X11Dnd.cs" />\r
-    <Compile Include="System.Windows.Forms\X11Keyboard.cs" />\r
-    <Compile Include="System.Windows.Forms\X11Structs.cs" />\r
-    <Compile Include="System.Windows.Forms\XEventQueue.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUI.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUICarbon.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUIDriver.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUIStructs.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUIWin32.cs" />\r
-    <Compile Include="System.Windows.Forms\XplatUIX11.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Accessibility/Accessibility-net_4_5.csproj">\r
-      <Project>{FACE8136-C95A-4788-90B2-DB0ECF7A020A}</Project>\r
-      <Name>Accessibility-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Posix/Mono.Posix-net_4_5.csproj">\r
-      <Project>{85A9B29B-58FF-4FBE-8998-B0A89AC22880}</Project>\r
-      <Name>Mono.Posix-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../Mono.WebBrowser/Mono.WebBrowser-net_4_5.csproj">\r
-      <Project>{1D660912-8164-4499-A2D7-A3B2FE742E17}</Project>\r
-      <Name>Mono.WebBrowser-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj">\r
-      <Project>{B12AABBC-30D1-4885-BF3F-A53B970F68FB}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/SplitterNS.cur">\r
-      <LogicalName>System.Windows.Forms.SplitterNS.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/SplitterWE.cur">\r
-      <LogicalName>System.Windows.Forms.SplitterWE.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/NESW.cur">\r
-      <LogicalName>System.Windows.Forms.NESW.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/NWSE.cur">\r
-      <LogicalName>System.Windows.Forms.NWSE.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DnDNo.cur">\r
-      <LogicalName>System.Windows.Forms.DnDNo.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DnDCopy.cur">\r
-      <LogicalName>System.Windows.Forms.DnDCopy.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DnDLink.cur">\r
-      <LogicalName>System.Windows.Forms.DnDLink.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/DnDMove.cur">\r
-      <LogicalName>System.Windows.Forms.DnDMove.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/keyboards.resources">\r
-      <LogicalName>keyboards.resources</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_computer.png">\r
-      <LogicalName>16_computer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_computer.png">\r
-      <LogicalName>32_computer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/computer.png">\r
-      <LogicalName>computer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_document-open.png">\r
-      <LogicalName>16_document-open.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_document-open.png">\r
-      <LogicalName>32_document-open.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/document-open.png">\r
-      <LogicalName>document-open.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_folder.png">\r
-      <LogicalName>16_folder.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder-new.png">\r
-      <LogicalName>folder-new.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder.png">\r
-      <LogicalName>folder.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_folder-remote.png">\r
-      <LogicalName>16_folder-remote.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_folder-remote.png">\r
-      <LogicalName>32_folder-remote.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/folder-remote.png">\r
-      <LogicalName>folder-remote.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/go-previous.png">\r
-      <LogicalName>go-previous.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/go-top.png">\r
-      <LogicalName>go-top.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/22_page-magnifier.png">\r
-      <LogicalName>22_page-magnifier.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/preferences-system-windows.png">\r
-      <LogicalName>preferences-system-windows.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_printer.png">\r
-      <LogicalName>16_printer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_printer.png">\r
-      <LogicalName>32_printer.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/text-x-generic.png">\r
-      <LogicalName>text-x-generic.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_user-desktop.png">\r
-      <LogicalName>16_user-desktop.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_user-desktop.png">\r
-      <LogicalName>32_user-desktop.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/user-desktop.png">\r
-      <LogicalName>user-desktop.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_user-home.png">\r
-      <LogicalName>16_user-home.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/32_user-home.png">\r
-      <LogicalName>32_user-home.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/user-home.png">\r
-      <LogicalName>user-home.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_dialog-error.png">\r
-      <LogicalName>16_dialog-error.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_dialog-information.png">\r
-      <LogicalName>16_dialog-information.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/16_dialog-warning.png">\r
-      <LogicalName>16_dialog-warning.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/1-up.png">\r
-      <LogicalName>1-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/2-up.png">\r
-      <LogicalName>2-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/3-up.png">\r
-      <LogicalName>3-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/4-up.png">\r
-      <LogicalName>4-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/6-up.png">\r
-      <LogicalName>6-up.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_delete.png">\r
-      <LogicalName>nav_delete.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_end.png">\r
-      <LogicalName>nav_end.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_first.png">\r
-      <LogicalName>nav_first.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_next.png">\r
-      <LogicalName>nav_next.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_plus.png">\r
-      <LogicalName>nav_plus.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/nav_previous.png">\r
-      <LogicalName>nav_previous.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/image-missing.png">\r
-      <LogicalName>image-missing.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/image-x-generic.png">\r
-      <LogicalName>image-x-generic.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/propertygrid-alphabetical.png">\r
-      <LogicalName>System.Windows.Forms.propertygrid-alphabetical.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/propertygrid-categorized.png">\r
-      <LogicalName>System.Windows.Forms.propertygrid-categorized.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/propertygrid-propertypages.png">\r
-      <LogicalName>System.Windows.Forms.propertygrid-propertypages.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/EventsTab.bmp">\r
-      <LogicalName>System.Windows.Forms.Design.EventsTab.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/PropertiesTab.bmp">\r
-      <LogicalName>System.Windows.Forms.PropertyGridInternal.PropertiesTab.bmp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/mono.ico">\r
-      <LogicalName>mono.ico</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/errorProvider.ico">\r
-      <LogicalName>errorProvider.ico</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms-tests-net_4_5.csproj b/mcs/class/System.Windows.Forms/System.Windows.Forms-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 3c40c97..0000000
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms-tests-net_4_5.csproj
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{B636AE9C-EC26-43BB-B179-29FB9F60A0FA}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <OutputPath>bin\Debug\System.Windows.Forms-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Windows.Forms_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Test\System.Resources\CompatTest.cs" />\r
-    <Compile Include="Test\System.Resources\CultureTest.cs" />\r
-    <Compile Include="Test\System.Resources\HelperClasses_ITRS.cs" />\r
-    <Compile Include="Test\System.Resources\HelperClasses_Resources.cs" />\r
-    <Compile Include="Test\System.Resources\ResourcesTestHelper.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeAliasTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeByteArrayTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeFileRefGetValueTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeFileRefGetValueTypeNameTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeSerialisedGetValueTypeNameTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeSerializedGetValueTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeTypeConverterGetValueTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeTypeConverterGetValueTypeNameTests.cs" />\r
-    <Compile Include="Test\System.Resources\ResXDataNodeWriteBehavior.cs" />\r
-    <Compile Include="Test\System.Resources\ResXFileRefTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResXResourceReaderTest.cs" />\r
-    <Compile Include="Test\System.Resources\WriterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.Layout\ArrangedElementCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms.Layout\TableLayoutSettingsTypeConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ApplicationContextTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ApplicationTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\AutoCompleteStringCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingContextTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingManagerBaseTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingMemberInfoTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingNavigatorTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingsCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingSourceTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\BindingTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ButtonBaseTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CheckBoxEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CheckBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CheckedListBoxEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CheckedListBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ClipboardTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ColumnClickEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ColumnHeaderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ColumnStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ComboBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\Common.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CommonDialogsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ContainerControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ContextMenuTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlBindingsCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlBindingsConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlHandleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlLogger.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlLogger2.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlPaintTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlPropertyEventsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CurrencyManagerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\CursorTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataBindingTests.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridColumnStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridTableStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridTextBoxColumnTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridTextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewAdvancedBorderStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewBandTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewButtonCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCellCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCellStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCheckBoxCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewClipboardHeaderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewClipboardTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewColumnCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewColumnHeaderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewColumnTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewComboBoxCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewCommon.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewDataBindingTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewElementTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewImageCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewLinkCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewRowCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewRowHeaderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewRowTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewTextBoxCellTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataGridViewTextBoxColumnTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DataObjectTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DateTimePickerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DefaultLayoutTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\DragEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ErrorProviderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\EventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\EventLogger.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FlowPanelTests.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FocusTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FolderBrowserDialogTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FormEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FormHandleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\FormTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\GridColumnStylesCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\GridTableStylesCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\GroupBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\HelpProviderTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\HScrollPropertiesTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ImageKeyConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ImageListStreamerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ImageListTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\InputLanguageTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\KeyEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\KeysConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\LabelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\LinkAreaTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\LinkConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\LinkLabelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListBindingHelperTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListBoxEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewCollectionsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewEventTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewGroupCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewGroupTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ListViewTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MaskedTextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MdiFormHandleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MdiFormTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MenuItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MenuStripTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MenuTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MessageTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\MonthCalendarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\NotifyIconTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\NumericUpDownTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PaddingConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PaddingTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PaintEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PanelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PictureBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PrintDialogTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ProgressBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PropertyGridTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\PropertyManagerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\RadioButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\RichTextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\RowStyleTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SaveFileDialogTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ScrollableControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ScrollBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SelectionRangeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SendKeysTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SplitContainerTests.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SplitterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\StatusBarPanelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\StatusBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\StatusStripTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\SystemInformationTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TabControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TableLayoutTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TestHelper.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TestImageIndexConverter.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TimerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolBarButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripComboBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripContainerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripContentPanelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripControlHostTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripDropDownItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripDropDownTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripItemCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripLabelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripManagerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripMenuItemTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripOverflowButtonTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripOverflowTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripPanelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripProgressBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripSeparatorTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripStatusLabelTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolStripTextBoxTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\ToolTipTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TrackBarTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeNodeCollectionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeNodeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewEventsTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewHitTestInfoTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewImageIndexConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewImageKeyConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\TreeViewTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\UpDownTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\UserControlTest.cs" />\r
-    <Compile Include="Test\System.Windows.Forms\VScrollPropertiesTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Windows.Forms\System.Windows.Forms-net_4_5.csproj">\r
-      <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>System.Windows.Forms\System.Windows.Forms-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_5.csproj">\r
-      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Accessibility\Accessibility-net_4_5.csproj">\r
-      <Project>{FACE8136-C95A-4788-90B2-DB0ECF7A020A}</Project>\r
-      <Name>Accessibility\Accessibility-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj">\r
-      <Project>{B12AABBC-30D1-4885-BF3F-A53B970F68FB}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Test/resources/a.cur">\r
-      <LogicalName>a.cur</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/resources/32x32.ico">\r
-      <LogicalName>32x32.ico</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/XEventQueue.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/XEventQueue.cs
index 11391af1a7279093caeaea71e177f8d3447a5adb..11b7ad542c20fd335632fb3d19695672758c4b00 100644 (file)
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/XEventQueue.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/XEventQueue.cs
@@ -118,7 +118,7 @@ namespace System.Windows.Forms {
                                        return lqueue.Peek ();
                                }
                        }                               
-                       return xqueue.Peek();
+                       return xqueue.Peek ();
                }
 
                public bool DispatchIdle {
@@ -136,22 +136,30 @@ namespace System.Windows.Forms {
                        private XEvent          xevent;
                        
                        public PaintQueue (int size) {
-                               hwnds = new ArrayList(size);
-                               xevent = new XEvent();
+                               hwnds = new ArrayList (size);
+                               xevent = new XEvent ();
                                xevent.AnyEvent.type = XEventName.Expose;
                        }
 
                        public int Count {
-                               get { return hwnds.Count; }
+                               get {
+                                       lock (hwnds) {
+                                               return hwnds.Count;
+                                       }
+                               }
                        }
 
                        public void Enqueue (Hwnd hwnd) {
-                               hwnds.Add(hwnd);
+                               lock (hwnds) {
+                                       hwnds.Add (hwnd);
+                               }
                        }
 
                        public void Remove(Hwnd hwnd) {
                                if (!hwnd.expose_pending && !hwnd.nc_expose_pending) {
-                                       hwnds.Remove(hwnd);
+                                       lock (hwnds) {
+                                               hwnds.Remove (hwnd);
+                                       }
                                }
                        }
 
@@ -159,36 +167,38 @@ namespace System.Windows.Forms {
                                Hwnd            hwnd;
                                IEnumerator     next;
 
-                               if (hwnds.Count == 0) {
-                                       xevent.ExposeEvent.window = IntPtr.Zero;
-                                       return xevent;
-                               }
-
-                               next = hwnds.GetEnumerator();
-                               next.MoveNext();
-                               hwnd = (Hwnd)next.Current;
-
-                               // We only remove the event from the queue if we have one expose left since
-                               // a single 'entry in our queue may be for both NC and Client exposed
-                               if ( !(hwnd.nc_expose_pending && hwnd.expose_pending)) {
-                                       hwnds.Remove(hwnd);
-                               }
-                               if (hwnd.expose_pending) {
-                                       xevent.ExposeEvent.window = hwnd.client_window;
+                               lock (hwnds) {
+                                       if (hwnds.Count == 0) {
+                                               xevent.ExposeEvent.window = IntPtr.Zero;
+                                               return xevent;
+                                       }
+
+                                       next = hwnds.GetEnumerator ();
+                                       next.MoveNext ();
+                                       hwnd = (Hwnd)next.Current;
+
+                                       // We only remove the event from the queue if we have one expose left since
+                                       // a single 'entry in our queue may be for both NC and Client exposed
+                                       if (!(hwnd.nc_expose_pending && hwnd.expose_pending)) {
+                                               hwnds.Remove (hwnd);
+                                       }
+                                       if (hwnd.expose_pending) {
+                                               xevent.ExposeEvent.window = hwnd.client_window;
 #if not
-                                       xevent.ExposeEvent.x = hwnd.invalid.X;
-                                       xevent.ExposeEvent.y = hwnd.invalid.Y;
-                                       xevent.ExposeEvent.width = hwnd.invalid.Width;
-                                       xevent.ExposeEvent.height = hwnd.invalid.Height;
+                                               xevent.ExposeEvent.x = hwnd.invalid.X;
+                                               xevent.ExposeEvent.y = hwnd.invalid.Y;
+                                               xevent.ExposeEvent.width = hwnd.invalid.Width;
+                                               xevent.ExposeEvent.height = hwnd.invalid.Height;
 #endif
-                                       return xevent;
-                               } else {
-                                       xevent.ExposeEvent.window = hwnd.whole_window;
-                                       xevent.ExposeEvent.x = hwnd.nc_invalid.X;
-                                       xevent.ExposeEvent.y = hwnd.nc_invalid.Y;
-                                       xevent.ExposeEvent.width = hwnd.nc_invalid.Width;
-                                       xevent.ExposeEvent.height = hwnd.nc_invalid.Height;
-                                       return xevent;
+                                               return xevent;
+                                       } else {
+                                               xevent.ExposeEvent.window = hwnd.whole_window;
+                                               xevent.ExposeEvent.x = hwnd.nc_invalid.X;
+                                               xevent.ExposeEvent.y = hwnd.nc_invalid.Y;
+                                               xevent.ExposeEvent.width = hwnd.nc_invalid.Width;
+                                               xevent.ExposeEvent.height = hwnd.nc_invalid.Height;
+                                               return xevent;
+                                       }
                                }
                        }
                }

diff --git a/mcs/class/System.Windows/System.Windows-net_4_5.csproj b/mcs/class/System.Windows/System.Windows-net_4_5.csproj
deleted file mode 100644 (file)
index 9b5af1f..0000000
--- a/mcs/class/System.Windows/System.Windows-net_4_5.csproj
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{050D4277-82D2-4544-A929-EDCBEA5FD69D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Windows</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.XML/System.Xml-bare-net_4_5.csproj b/mcs/class/System.XML/System.Xml-bare-net_4_5.csproj
deleted file mode 100644 (file)
index 1a53e23..0000000
--- a/mcs/class/System.XML/System.Xml-bare-net_4_5.csproj
+++ /dev/null
@@ -1,750 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{21FB091E-0F84-479E-AB16-6503D36852F9}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,219,414,649,1717</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5/bare</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,219,414,649,1717</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASYNC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,219,414,649,1717</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASYNC</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\GenerateHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\IteratorDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\OptimizerPatterns.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\StaticDataManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\TailCallAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILAnnotation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILConstructAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILModule.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILOptimization.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILOptimizerVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlTrace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlTypeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\ISourceLineInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\ListBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Pair.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilBinary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilChoice.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilCloneVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilDataSource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilFunction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvoke.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvokeEarlyBound.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvokeLateBound.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilLiteral.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilLoop.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilName.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilNodeType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilPatternFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilPatternVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilReference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilReplaceVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilScopedVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilSortKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilStrConcat.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTargetType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTernary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTypeChecker.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilUnary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilValidationVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilXmlReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilXmlWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\SerializationHints.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\SubstitutionList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\WhitespaceRule.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QueryReaderSettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\ContentIterators.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DecimalFormatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DocumentOrderComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DodSequenceMerge.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\EarlyBoundInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\NumberFormatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\RtfNavigator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\SetIterators.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\SiblingIterators.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\StringConcat.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\TreeIterators.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\WhitespaceRuleLookup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\WhitespaceRuleReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlAggregates.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlAttributeCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlCollation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlExtensionFunction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlILIndex.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlILStorageConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlIterators.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlNavigatorFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlNavigatorStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryRuntime.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQuerySequence.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryStaticData.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlRawWriterWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSequenceWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSortKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSortKeyAccumulator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XslNumber.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltConvert.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltLibrary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\SourceLineInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlILCommand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlIlGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlNodeKindFlags.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQualifiedNameTest.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryCardinality.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryTypeFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXpathBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXPathEnvironment.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathAxis.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathCompileException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathQilFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathScanner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPathConvert.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XslException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Compiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\CompilerScopeManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Focus.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\IErrorHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\InvokeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\KeyMatchBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Keywords.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\MatcherBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\OutputScopeManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilGeneratorEnv.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilStrConcatenator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Scripts.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Stylesheet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XPathPatternBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XPathPatternParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAst.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAstAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslFlags.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltInput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltQilFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Action.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ActionFrame.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ApplyImportsAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ApplyTemplatesAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AttributeAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AttributeSetAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Avt.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AvtEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\BeginEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\BuilderInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CallTemplateAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ChooseAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CommentAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CompiledAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Compiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ContainerAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyAttributesAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyCodeAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyNamespacesAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyNodesetAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyOfAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\DbgCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\DocumentScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ElementAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\EndEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Event.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ForeachAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\HtmlProps.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\IfAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\InputScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\InputScopeManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\MessageAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NamespaceDecl.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NamespaceEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NavigatorInput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NavigatorOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NewInstructionAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NumberAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutKeywords.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutputScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutputScopeManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\PrefixQname.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ProcessingInstructionAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Processor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ReaderOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RecordBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RecordOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RootAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\SequentialOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\SortAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\StateMachine.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\StringOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Stylesheet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateBaseAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateLookupAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Templatemanager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextOnlyOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TheQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\UseAttributesetsAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ValueOfAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\VariableAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\WithParamAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\WriterOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltCompileContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltDebugger.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\InternalApis\NDP_Common\inc\Win8Helpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\misc\HResults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\misc\InvariantComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\misc\PrivilegedConfigurationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Assembly\System.Xml.Assembly.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\AsyncHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Base64Decoder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Base64Encoder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Base64EncoderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\BinXmltoken.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\SqlUtils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\XmlBinaryReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\XmlBinaryReaderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinHexDecoder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinHexEncoder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinHexEncoderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Bits.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BitStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\ByteStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\Shape.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\ShapeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentNavigator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeInfoAtom.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeViewPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\BinaryCompatibility.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\CharEntityEncoderFallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ConformanceLevel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\DtdProcessing.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\EntityHandling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\HtmlEncodedRawTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\HtmlTernaryTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\HtmlUtf8RawTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParserAdapter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParserAdapterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParserAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IncrementalReadDecoders.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IRemovableWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IValidationEventHandling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\NamespaceHandling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\NewLineHandling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\QueryOutputWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\QueryOutputWriterV1.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadContentAsBinaryHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadContentAsBinaryHelperAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadOnlyTernaryTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\SecureStringHasher.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\TextEncodedRawTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\TextUtf8RawTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ValidatingReaderNodeData.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ValidationType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\WhitespaceHandling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlAsyncCheckReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlAsyncCheckWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlAutoDetectWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingReaderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingWriterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlConfiguration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlEncodedRawTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlEncodedRawTextWriterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlEventCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlParserContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlRawWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlRawWriterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlReaderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlReaderSettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlSpace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlSubtreeReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlSubtreeReaderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextEncoder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImpl.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplHelpersAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlUtf8RawTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlUtf8RawTextWriterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlValidatingReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlValidatingReaderImpl.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlValidatingReaderImplAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterHelpersAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingReaderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingWriterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWriterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWriterSettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdCachingReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdCachingReaderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdValidatingReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdValidatingReaderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\DiagnosticsSwitches.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DocumentSchemaValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DocumentXmlWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DocumentXPathNavigator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DomNameTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlAttributeCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlCDataSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlCharacterData.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlChildEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlChildNodes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlComment.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDeclaration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDocument.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDocumentFragment.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDocumentType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDomTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlElementList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlEntity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlEntityReference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlEventChangedAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlImplementation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlLinkedNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlName.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodemap.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodeMap.SmallXmlNodeList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeChangedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeChangedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNotation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlProcessingInstruction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlSignificantWhiteSpace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlText.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlUnspecifiedAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlWhitespace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XPathNodeList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\EmptyEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\HWStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IApplicationResourceStreamResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IHasXmlNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IXmlLineInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IXmlNamespaceResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\LineInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\MTNameTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\NameTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Ref.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Resolvers\XmlKnownDtds.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Resolvers\XmlPreloadedResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Resolvers\XmlPreloadedResolverAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Asttree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\AutoValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\BaseProcessor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\BaseValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\BitSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Chameleonkey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\CompiledidEntityConstraint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ConstraintStruct.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ContentValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DataTypeImplementation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DtdParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DtdParserAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DtdValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\FacetChecker.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Inference\Infer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Inference\XmlSchemaInferenceException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\IXmlSchemaInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\NamespaceList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Parser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ParserAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Preprocessor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaAttDef.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaCollectionCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaCollectionpreProcessor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaDeclBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaElementDecl.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaEntity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaNames.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaNamespacemanager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaNotation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaSetCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ValidationEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ValidationEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ValidationState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XdrBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XdrValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlAtomicValue.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchema.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAll.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnnotated.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnnotation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAny.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAppInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttributeGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttributeGroupref.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaChoice.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaCompilationSettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContentExtension.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContentRestriction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentModel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentProcessing.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDataType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDerivationMethod.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDocumentation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaExternal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaFacet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaForm.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroupBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroupRef.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaIdEntityConstraint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaImport.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaInclude.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaNotation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObjectCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObjectTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaParticle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaRedefine.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSequence.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContentExtension.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContentRestriction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeContent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeRestriction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeUnion.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSubstitutionGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaUse.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidationException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSeverityType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlTokenizedType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlTypeCode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlValueConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdDateTime.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdDuration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\_Events.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Advanced\SchemaImporterExtension.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\AppSettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeExporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeGenerationoptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeIdentifier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeIdentifiers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Compilation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Compiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\ConfigurationStrings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\DateTimeSerializationSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionElementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionsSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SerializationSectionGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\XmlSerializerSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\ImportContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\indentedWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\IXmlSerializable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\IXmlTextParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Mappings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Models.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\NameTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\PrimitiveXmlSerializers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SchemaImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SchemaObjectWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapAttributeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapAttributeOverrides.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapCodeExporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapElementAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapEnumAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapIgnoreAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapIncludeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapReflectionImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapSchemaExporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapSchemaImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapSchemamember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SourceInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\TypeExtensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Types.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAnyAttributeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAnyElementAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAnyElementAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlArrayAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlArrayItemAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlArrayItemAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAttributeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAttributeOverrides.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlChoiceIdentifierAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlCodeExporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlCountingReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Xmlcustomformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlEnumAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlIgnoreAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlIncludeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlMemberMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlMembersMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlNamespaceDeclarationsAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlReflectionImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlReflectionMember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlRootAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaExporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemas.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationGeneratedCode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationILGen.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationReaderILGen.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationWriterILGen.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerAssemblyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerNamespaces.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerVersionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlTextAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlTypeMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\ValidateNames.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlCharType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlComplianceUtil.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlConvert.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlDownloadManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlDownloadManagerAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlEncoding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNamespacemanager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNamespaceScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNameTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNodeOrder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNodeType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNullResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlQualifiedName.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlReservedNs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlResolverAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlSecureResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlSecureResolverAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlUrlResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlUrlResolverAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlXapResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\AbsoluteQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\AstNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\AttributeQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Axis.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\BaseAxisQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\BooleanExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\BooleanFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CacheAxisQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CacheChildrenQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CacheOutputQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ChildrenQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ClonableStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CompiledXPathExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ContextQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantBaseQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantoverDescendantQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DocumentorderQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\EmptyQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ExtensionQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Filter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FilterQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FollowingQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FollowingSibling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ForwardPositionQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Function.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FunctionQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Group.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\GroupQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\IdQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\IteratorFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\LogicalExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\MergeFilterQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NamespaceQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NodeFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NumberFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NumericExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Operand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\OperandQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Operator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ParentQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\PrecedingQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\PrecedingSibling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Query.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\QueryBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ResetableIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ReversePositionQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Root.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\SortQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\StringFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\UnionExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ValueQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Variable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\VariableQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAncestorIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAncestorQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathArrayIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAxisIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathChildIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathDescendantIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathEmptyIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathMultyIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathScanner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSelectionIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSelfQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSingletonIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\IXPathNavigable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathDocument.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathItem.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNamespaceScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNavigator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNavigatorKeyComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNavigatorReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNodeIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNodeType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XslCompiledTransform.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltArgumentList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XslTransform.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltSettings.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\SR.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="ReferenceSources\Res.cs" />\r
-    <Compile Include="ReferenceSources\ThisAssembly.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-bare-net_4_5.csproj">\r
-      <Project>{91CDF14E-F60F-4AB7-BC9D-5CBD7E669076}</Project>\r
-      <Name>System-bare-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.XML/System.Xml-bare-net_4_x.csproj b/mcs/class/System.XML/System.Xml-bare-net_4_x.csproj
index 53a6be689d820a1fb5facf04b78b3989de337379..07e626b09335305faff46edd89e8b680498a763e 100644 (file)
--- a/mcs/class/System.XML/System.Xml-bare-net_4_x.csproj
+++ b/mcs/class/System.XML/System.Xml-bare-net_4_x.csproj
@@ -709,6 +709,7 @@
     <Compile Include="..\..\build\common\Consts.cs" />\r
     <Compile Include="..\..\build\common\SR.cs" />\r
     <Compile Include="Assembly\AssemblyInfo.cs" />\r
+    <Compile Include="ReferenceSources\LocalAppContextSwitches.cs" />\r
     <Compile Include="ReferenceSources\Res.cs" />\r
     <Compile Include="ReferenceSources\ThisAssembly.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r

diff --git a/mcs/class/System.XML/System.Xml-net_4_5.csproj b/mcs/class/System.XML/System.Xml-net_4_5.csproj
deleted file mode 100644 (file)
index 15f19ab..0000000
--- a/mcs/class/System.XML/System.Xml-net_4_5.csproj
+++ /dev/null
@@ -1,754 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,219,414,649,1717</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,219,414,649,1717</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASYNC;CONFIGURATION_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,219,414,649,1717</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;ASYNC;CONFIGURATION_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\GenerateHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\IteratorDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\OptimizerPatterns.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\StaticDataManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\TailCallAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILAnnotation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILConstructAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILModule.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILOptimization.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILOptimizerVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlTrace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlTypeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\ISourceLineInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\ListBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Pair.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilBinary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilChoice.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilCloneVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilDataSource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilFunction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvoke.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvokeEarlyBound.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvokeLateBound.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilLiteral.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilLoop.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilName.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilNodeType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilPatternFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilPatternVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilReference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilReplaceVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilScopedVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilSortKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilStrConcat.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTargetType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTernary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTypeChecker.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilUnary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilValidationVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilXmlReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilXmlWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\SerializationHints.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\SubstitutionList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\WhitespaceRule.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\QueryReaderSettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\ContentIterators.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DecimalFormatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DocumentOrderComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DodSequenceMerge.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\EarlyBoundInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\NumberFormatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\RtfNavigator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\SetIterators.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\SiblingIterators.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\StringConcat.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\TreeIterators.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\WhitespaceRuleLookup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\WhitespaceRuleReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlAggregates.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlAttributeCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlCollation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlExtensionFunction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlILIndex.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlILStorageConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlIterators.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlNavigatorFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlNavigatorStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryRuntime.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQuerySequence.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryStaticData.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlRawWriterWrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSequenceWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSortKey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSortKeyAccumulator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XslNumber.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltConvert.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltLibrary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\SourceLineInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlILCommand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlIlGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlNodeKindFlags.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQualifiedNameTest.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryCardinality.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryTypeFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXpathBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXPathEnvironment.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathAxis.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathCompileException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathOperator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathQilFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathScanner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPathConvert.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XslException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Compiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\CompilerScopeManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Focus.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\IErrorHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\InvokeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\KeyMatchBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Keywords.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\MatcherBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\OutputScopeManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilGeneratorEnv.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilStrConcatenator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Scripts.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Stylesheet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XPathPatternBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XPathPatternParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAst.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAstAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslFlags.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltInput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltQilFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslVisitor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Action.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ActionFrame.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ApplyImportsAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ApplyTemplatesAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AttributeAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AttributeSetAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Avt.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\AvtEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\BeginEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\BuilderInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CallTemplateAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ChooseAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CommentAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CompiledAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Compiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ContainerAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyAttributesAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyCodeAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyNamespacesAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyNodesetAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\CopyOfAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\DbgCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\DocumentScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ElementAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\EndEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Event.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ForeachAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\HtmlProps.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\IfAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\InputScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\InputScopeManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\MessageAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NamespaceDecl.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NamespaceEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NavigatorInput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NavigatorOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NewInstructionAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\NumberAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutKeywords.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutputScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\OutputScopeManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\PrefixQname.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ProcessingInstructionAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Processor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ReaderOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RecordBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RecordOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\RootAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\SequentialOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\SortAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\StateMachine.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\StringOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Stylesheet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateBaseAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TemplateLookupAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Templatemanager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextOnlyOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TextOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\TheQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\UseAttributesetsAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ValueOfAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\VariableAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\WithParamAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\WriterOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltCompileContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltDebugger.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltOutput.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\InternalApis\NDP_Common\inc\Win8Helpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\misc\HResults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\misc\InvariantComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\misc\PrivilegedConfigurationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Assembly\System.Xml.Assembly.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\AsyncHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Base64Decoder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Base64Encoder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Base64EncoderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\BinXmltoken.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\SqlUtils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\XmlBinaryReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinaryXml\XmlBinaryReaderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinHexDecoder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinHexEncoder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BinHexEncoderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Bits.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\BitStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\ByteStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\Shape.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\ShapeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentNavigator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathDocumentView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeInfoAtom.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Cache\XPathNodeViewPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\BinaryCompatibility.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\CharEntityEncoderFallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ConformanceLevel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\DtdProcessing.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\EntityHandling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\HtmlEncodedRawTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\HtmlTernaryTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\HtmlUtf8RawTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParserAdapter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParserAdapterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IDtdParserAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IncrementalReadDecoders.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IRemovableWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\IValidationEventHandling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\NamespaceHandling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\NewLineHandling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\QueryOutputWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\QueryOutputWriterV1.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadContentAsBinaryHelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadContentAsBinaryHelperAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadOnlyTernaryTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ReadState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\SecureStringHasher.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\TextEncodedRawTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\TextUtf8RawTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ValidatingReaderNodeData.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\ValidationType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\WhitespaceHandling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlAsyncCheckReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlAsyncCheckWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlAutoDetectWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingReaderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlCharCheckingWriterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlConfiguration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlEncodedRawTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlEncodedRawTextWriterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlEventCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlParserContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlRawWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlRawWriterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlReaderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlReaderSettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlSpace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlSubtreeReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlSubtreeReaderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextEncoder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImpl.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextReaderImplHelpersAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlUtf8RawTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlUtf8RawTextWriterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlValidatingReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlValidatingReaderImpl.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlValidatingReaderImplAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterHelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWellFormedWriterHelpersAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingReaderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWrappingWriterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWriterAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XmlWriterSettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdCachingReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdCachingReaderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdValidatingReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Core\XsdValidatingReaderAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\DiagnosticsSwitches.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DocumentSchemaValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DocumentXmlWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DocumentXPathNavigator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\DomNameTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlAttributeCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlCDataSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlCharacterData.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlChildEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlChildNodes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlComment.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDeclaration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDocument.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDocumentFragment.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDocumentType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlDomTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlElementList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlEntity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlEntityReference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlEventChangedAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlImplementation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlLinkedNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlName.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodemap.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodeMap.SmallXmlNodeList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeChangedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeChangedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNodeReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlNotation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlProcessingInstruction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlSignificantWhiteSpace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlText.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlUnspecifiedAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XmlWhitespace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Dom\XPathNodeList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\EmptyEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\HWStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IApplicationResourceStreamResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IHasXmlNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IXmlLineInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\IXmlNamespaceResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\LineInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\MTNameTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\NameTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Ref.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Resolvers\XmlKnownDtds.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Resolvers\XmlPreloadedResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Resolvers\XmlPreloadedResolverAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Asttree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\AutoValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\BaseProcessor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\BaseValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\BitSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Chameleonkey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\CompiledidEntityConstraint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ConstraintStruct.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ContentValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DataTypeImplementation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DtdParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DtdParserAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\DtdValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\FacetChecker.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Inference\Infer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Inference\XmlSchemaInferenceException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\IXmlSchemaInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\NamespaceList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Parser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ParserAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\Preprocessor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaAttDef.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaCollectionCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaCollectionpreProcessor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaDeclBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaElementDecl.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaEntity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaNames.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaNamespacemanager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaNotation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaSetCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\SchemaType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ValidationEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ValidationEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\ValidationState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XdrBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XdrValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlAtomicValue.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchema.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAll.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnnotated.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnnotation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAny.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAnyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAppInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttributeGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaAttributeGroupref.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaChoice.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaCompilationSettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContentExtension.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexContentRestriction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaComplexType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentModel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentProcessing.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaContentType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDataType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDerivationMethod.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaDocumentation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaExternal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaFacet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaForm.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroupBase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaGroupRef.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaIdEntityConstraint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaImport.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaInclude.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaNotation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObjectCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaObjectTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaParticle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaRedefine.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSequence.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSet.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContentExtension.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleContentRestriction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeContent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeRestriction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSimpleTypeUnion.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaSubstitutionGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaUse.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidationException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSchemaValidity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlSeverityType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlTokenizedType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlTypeCode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XmlValueConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdDateTime.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdDuration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Schema\XsdValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\_Events.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Advanced\SchemaImporterExtension.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\AppSettings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeExporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeGenerationoptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeIdentifier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\CodeIdentifiers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Compilation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Compiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\ConfigurationStrings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\DateTimeSerializationSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionElementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionsSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\SerializationSectionGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Configuration\XmlSerializerSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\ImportContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\indentedWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\IXmlSerializable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\IXmlTextParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Mappings.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Models.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\NameTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\PrimitiveXmlSerializers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SchemaImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SchemaObjectWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapAttributeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapAttributeOverrides.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapCodeExporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapElementAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapEnumAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapIgnoreAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapIncludeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapReflectionImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapSchemaExporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapSchemaImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapSchemamember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SoapTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\SourceInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\TypeExtensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Types.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAnyAttributeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAnyElementAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAnyElementAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlArrayAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlArrayItemAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlArrayItemAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAttributeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAttributeOverrides.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlChoiceIdentifierAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlCodeExporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlCountingReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\Xmlcustomformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlEnumAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlIgnoreAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlIncludeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlMemberMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlMembersMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlNamespaceDeclarationsAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlReflectionImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlReflectionMember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlRootAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaExporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaImporter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSchemas.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationGeneratedCode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationILGen.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationReaderILGen.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationWriterILGen.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerAssemblyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerNamespaces.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerVersionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlTextAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Serialization\XmlTypeMapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\ValidateNames.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlCharType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlComplianceUtil.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlConvert.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlDownloadManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlDownloadManagerAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlEncoding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNamespacemanager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNamespaceScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNameTable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNodeOrder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNodeType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlNullResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlQualifiedName.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlReservedNs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlResolverAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlSecureResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlSecureResolverAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlUrlResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlUrlResolverAsync.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XmlXapResolver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\AbsoluteQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\AstNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\AttributeQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Axis.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\BaseAxisQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\BooleanExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\BooleanFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CacheAxisQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CacheChildrenQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CacheOutputQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ChildrenQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ClonableStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\CompiledXPathExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ContextQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantBaseQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantoverDescendantQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\DocumentorderQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\EmptyQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ExtensionQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Filter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FilterQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FollowingQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FollowingSibling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ForwardPositionQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Function.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\FunctionQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Group.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\GroupQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\IdQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\IteratorFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\LogicalExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\MergeFilterQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NamespaceQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NodeFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NumberFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\NumericExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Operand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\OperandQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Operator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ParentQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\PrecedingQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\PrecedingSibling.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Query.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\QueryBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ResetableIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ReversePositionQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Root.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\SortQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\StringFunctions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\UnionExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\ValueQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\Variable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\VariableQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAncestorIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAncestorQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathArrayIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathAxisIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathChildIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathDescendantIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathEmptyIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathMultyIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathScanner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSelectionIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSelfQuery.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSingletonIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\IXPathNavigable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathDocument.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathExpr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathItem.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNamespaceScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNavigator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNavigatorKeyComparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNavigatorReader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNodeIterator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\XPath\XPathNodeType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XslCompiledTransform.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltArgumentList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XslTransform.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml\System\Xml\Xslt\XsltSettings.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\SR.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="ReferenceSources\Res.cs" />\r
-    <Compile Include="ReferenceSources\ThisAssembly.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-bare-net_4_5.csproj">\r
-      <Project>{91CDF14E-F60F-4AB7-BC9D-5CBD7E669076}</Project>\r
-      <Name>System-bare-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.XML/System.Xml-net_4_x.csproj b/mcs/class/System.XML/System.Xml-net_4_x.csproj
index 2f5e7bacb860524f2d3c0e6c48774cd0552b7a51..cdfb3fdeff89c373c3a959d777dc4ac50420a8cb 100644 (file)
--- a/mcs/class/System.XML/System.Xml-net_4_x.csproj
+++ b/mcs/class/System.XML/System.Xml-net_4_x.csproj
@@ -709,6 +709,7 @@
     <Compile Include="..\..\build\common\Consts.cs" />\r
     <Compile Include="..\..\build\common\SR.cs" />\r
     <Compile Include="Assembly\AssemblyInfo.cs" />\r
+    <Compile Include="ReferenceSources\LocalAppContextSwitches.cs" />\r
     <Compile Include="ReferenceSources\Res.cs" />\r
     <Compile Include="ReferenceSources\ThisAssembly.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r

diff --git a/mcs/class/System.XML/System.Xml-tests-net_4_5.csproj b/mcs/class/System.XML/System.Xml-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 0f0c1b3..0000000
--- a/mcs/class/System.XML/System.Xml-tests-net_4_5.csproj
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{5CFB4B4E-2DD9-4033-ADEC-D6E26A357B78}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,612,642,618,219,169</NoWarn>\r
-    <OutputPath>bin\Debug\System.Xml-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,612,642,618,219,169</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,612,642,618,219,169</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaAssertion.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaBuiltInDatatypeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaCollectionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaDatatypeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaExceptionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaLengthFacetTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaSetTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaTypeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\XmlSchemaValidatorTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization.Advanced\SchemaImporterExtensionCollectionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization.Advanced\SchemaImporterExtensionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\CodeIdentifiersTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\ComplexDataStructure.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\DeserializeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapAttributeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapAttributesTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapElementAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapEnumAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapIncludeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapReflectionImporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapSchemaExporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapSchemaMemberTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\SoapTypeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlAnyElementAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlArrayAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlArrayItemAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlAttributeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlAttributesTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlChoiceIdentifierAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlCodeExporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlElementAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlEnumAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlIncludeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlReflectionImporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlRootAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSchemaExporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSchemaImporterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSchemasTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializationReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializationWriterTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializerImplementationTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializerTestClasses.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlSerializerTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlTextAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.Serialization\XmlTypeAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\SelectNodesTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathEditableNavigatorTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorCommonTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorEvaluateTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorMatchesTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\XPathNavigatorTests.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\MsxslScriptTests.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltArgumentListCas.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltCompileExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltCompileExceptionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XsltExceptionTests.cs" />\r
-    <Compile Include="Test\System.Xml.Xsl\XslTransformTests.cs" />\r
-    <Compile Include="Test\System.Xml\NameTableTests.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Attr\Attr.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\CharacterData\CharacterData.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Comment\Comment.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Document\Document.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\DOMImplementation\DOMImplementation.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Element\Element.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\NamedNodeMap\NamedNodeMap.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Node\Node.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\NodeList\NodeList.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\fundamental\Text\Text.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\ITest.cs" />\r
-    <Compile Include="Test\System.Xml\nist_dom\util.cs" />\r
-    <Compile Include="Test\System.Xml\XmlAssert.cs" />\r
-    <Compile Include="Test\System.Xml\XmlAttributeCollectionTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlAttributeTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlCDataSectionTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlCharacterDataTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlCommentTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlConvertTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDeclarationTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDefaultReader.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDocumentEventTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDocumentFragmentTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDocumentTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlDocumentTypeTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlElementTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlEntityReferenceTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlEntityTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlExceptionCas.cs" />\r
-    <Compile Include="Test\System.Xml\XmlNamespaceManagerTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlNodeListTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlNodeReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlNodeTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlParserContextTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlProcessingInstructionTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlReaderCommonTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlReaderSettingsTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlResolverTest.cs" />\r
-    <Compile Include="Test\System.Xml\XmlSecureResolverCas.cs" />\r
-    <Compile Include="Test\System.Xml\XmlSecureResolverTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlSignificantWhitespaceTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlTextReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlTextTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlTextWriterTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlUrlResolverTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlValidatingReaderTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlWhiteSpaceTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlWriterSettingsTests.cs" />\r
-    <Compile Include="Test\System.Xml\XmlWriterTests.cs" />\r
-    <Compile Include="Test\System.Xml\XsdParticleValidationTests.cs" />\r
-    <Compile Include="Test\System.Xml\XsdValidatingReaderTests.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\PatternParser.cs" />\r
-    <Compile Include="Mono.Xml.Xsl\PatternTokenizer.cs" />\r
-    <Compile Include="System.Xml.XPath\Parser.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-$(ProjectDir)\..\..\..\mono\msvc\scripts\prepare.exe $(ProjectDir)..\.. xml\r
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs\r
-echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
-echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-type $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
-\r\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.XML/System.Xml.Xsl/XslCompiledTransform_Mobile.cs b/mcs/class/System.XML/System.Xml.Xsl/XslCompiledTransform_Mobile.cs
index 808fa1ace2823ced7f8d6f457b77a147170f417f..94dcc0285baf146428ccc8cb596d6777d8f015de 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Xsl/XslCompiledTransform_Mobile.cs
+++ b/mcs/class/System.XML/System.Xml.Xsl/XslCompiledTransform_Mobile.cs
@@ -121,7 +121,9 @@ namespace System.Xml.Xsl
 
                public void Transform (IXPathNavigable input, XsltArgumentList arguments, Stream results)
                {
-                       Transform (input.CreateNavigator (), arguments, results);
+                       using (var sw = new StreamWriter (results)) {
+                               Transform (input.CreateNavigator (), arguments, sw);
+                       }
                }
 
                public void Transform (IXPathNavigable input, XmlWriter results)

diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/XslCompiledTransformTests.cs b/mcs/class/System.XML/Test/System.Xml.Xsl/XslCompiledTransformTests.cs
index aa333328d962b5cf0d7640c6500f03d266c21e83..3ed7fc3a0667034bde88251c40626829e935f05a 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml.Xsl/XslCompiledTransformTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Xsl/XslCompiledTransformTests.cs
@@ -168,5 +168,31 @@ xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl='urn:schemas-micros
                        // Returns true on .NET and False on mono 2.10.2
                        Assert.IsTrue (xslCompiledTransform.OutputSettings.Indent, "#1");
                }
+
+               [Test] // Bug 36436
+               public void TransformWithXmlDocument ()
+               {
+                       XmlDocument doc = new XmlDocument ();
+                       doc.LoadXml (@"<ROOT/>");
+                       XmlDocument st = new XmlDocument ();
+                       st.LoadXml (@"<?xml version=""1.0"" encoding=""utf-8""?>
+<xsl:stylesheet version=""1.0"" xmlns:vy=""Vineyard.Elements""
+    xmlns:xsl=""http://www.w3.org/1999/XSL/Transform"" xmlns:xlink=""http://www.w3.org/1999/xlink"" xmlns:user=""http://www.mydomain.com/mynamespace"">
+  <xsl:output method=""xml""/>
+
+  <xsl:param name=""os"" select=""ios""/>
+
+  <xsl:template match=""/ROOT"" >
+    <xsl:copy/>
+</xsl:template>
+</xsl:stylesheet>");
+                       XslCompiledTransform xsl = new XslCompiledTransform ();
+                       xsl.Load (st);
+
+                       XsltArgumentList args = new XsltArgumentList ();
+
+                       MemoryStream mstr = new MemoryStream ();
+                       xsl.Transform (doc, args, mstr);
+               }
        }
 }

diff --git a/mcs/class/System.XML/mobile_System.Xml.dll.sources b/mcs/class/System.XML/mobile_System.Xml.dll.sources
index 7a992e74ea310b062bae7d5869025b8fde9b670b..9306044810f02c3f1491fa556fd8b522c9813452 100644 (file)
--- a/mcs/class/System.XML/mobile_System.Xml.dll.sources
+++ b/mcs/class/System.XML/mobile_System.Xml.dll.sources
@@ -108,7 +108,6 @@ ReferenceSources/CodeDom.cs
 ../../../external/referencesource/System.Data.SqlXml/System/Xml/Xsl/XsltOld/XsltCompileContext.cs
 ../../../external/referencesource/System.Data.SqlXml/System/Xml/Xsl/XsltOld/XsltDebugger.cs
 ../../../external/referencesource/System.Data.SqlXml/System/Xml/Xsl/XsltOld/XsltOutput.cs
-../../../external/referencesource/System.Xml/InternalApis/NDP_Common/inc/Win8Helpers.cs
 ../../../external/referencesource/System.Xml/misc/HResults.cs
 ../../../external/referencesource/System.Xml/misc/InvariantComparer.cs
 ../../../external/referencesource/System.Xml/misc/PrivilegedConfigurationManager.cs

diff --git a/mcs/class/System.Xaml/System.Xaml-net_4_5.csproj b/mcs/class/System.Xaml/System.Xaml-net_4_5.csproj
deleted file mode 100644 (file)
index 61c63ae..0000000
--- a/mcs/class/System.Xaml/System.Xaml-net_4_5.csproj
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{F574F9BD-1838-4C13-8722-7D6D33DE1781}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xaml</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Windows.Markup\AmbientAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ArrayExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\ConstructorArgumentAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ContentPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ContentWrapperAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\DateTimeValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Markup\DependsOnAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\DictionaryKeyPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\IComponentConnector.cs" />\r
-    <Compile Include="System.Windows.Markup\INameScope.cs" />\r
-    <Compile Include="System.Windows.Markup\INameScopeDictionary.cs" />\r
-    <Compile Include="System.Windows.Markup\IProvideValueTarget.cs" />\r
-    <Compile Include="System.Windows.Markup\IQueryAmbient.cs" />\r
-    <Compile Include="System.Windows.Markup\IUriContext.cs" />\r
-    <Compile Include="System.Windows.Markup\IValueSerializerContext.cs" />\r
-    <Compile Include="System.Windows.Markup\IXamlTypeResolver.cs" />\r
-    <Compile Include="System.Windows.Markup\MarkupExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\MarkupExtensionReturnTypeAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\MemberDefinition.cs" />\r
-    <Compile Include="System.Windows.Markup\NameReferenceConverter.cs" />\r
-    <Compile Include="System.Windows.Markup\NameScopePropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\NullExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\PropertyDefinition.cs" />\r
-    <Compile Include="System.Windows.Markup\Reference.cs" />\r
-    <Compile Include="System.Windows.Markup\RootNamespaceAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\RuntimeNamePropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\StaticExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\StaticExtensionConverter.cs" />\r
-    <Compile Include="System.Windows.Markup\TrimSurroundingWhitespaceAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\TypeExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\TypeExtensionConverter.cs" />\r
-    <Compile Include="System.Windows.Markup\UidPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\UsableDuringInitializationAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Markup\WhitespaceSignificantCollectionAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XamlDeferLoadAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XamlSetMarkupExtensionAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XamlSetMarkupExtensionEventArgs.cs" />\r
-    <Compile Include="System.Windows.Markup\XamlSetTypeConverterAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XamlSetTypeConverterEventArgs.cs" />\r
-    <Compile Include="System.Windows.Markup\XamlSetValueEventArgs.cs" />\r
-    <Compile Include="System.Windows.Markup\XData.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlLangPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsCompatibleWithAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsDefinitionAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsPrefixAttribute.cs" />\r
-    <Compile Include="System.Xaml.Permissions\XamlAccessLevel.cs" />\r
-    <Compile Include="System.Xaml.Permissions\XamlLoadPermission.cs" />\r
-    <Compile Include="System.Xaml.Schema\AllowedMemberLocations.cs" />\r
-    <Compile Include="System.Xaml.Schema\ShouldSerializeResult.cs" />\r
-    <Compile Include="System.Xaml.Schema\XamlCollectionKind.cs" />\r
-    <Compile Include="System.Xaml.Schema\XamlMemberInvoker.cs" />\r
-    <Compile Include="System.Xaml.Schema\XamlTypeInvoker.cs" />\r
-    <Compile Include="System.Xaml.Schema\XamlTypeName.cs" />\r
-    <Compile Include="System.Xaml.Schema\XamlTypeTypeConverter.cs" />\r
-    <Compile Include="System.Xaml.Schema\XamlValueConverter.cs" />\r
-    <Compile Include="System.Xaml\AmbientPropertyValue.cs" />\r
-    <Compile Include="System.Xaml\AttachableMemberIdentifier.cs" />\r
-    <Compile Include="System.Xaml\AttachablePropertyServices.cs" />\r
-    <Compile Include="System.Xaml\IAmbientProvider.cs" />\r
-    <Compile Include="System.Xaml\IAttachedPropertyStore.cs" />\r
-    <Compile Include="System.Xaml\IDestinationTypeProvider.cs" />\r
-    <Compile Include="System.Xaml\INamespacePrefixLookup.cs" />\r
-    <Compile Include="System.Xaml\IRootObjectProvider.cs" />\r
-    <Compile Include="System.Xaml\IXamlIndexingReader.cs" />\r
-    <Compile Include="System.Xaml\IXamlLineInfo.cs" />\r
-    <Compile Include="System.Xaml\IXamlLineInfoConsumer.cs" />\r
-    <Compile Include="System.Xaml\IXamlNameProvider.cs" />\r
-    <Compile Include="System.Xaml\IXamlNameResolver.cs" />\r
-    <Compile Include="System.Xaml\IXamlNamespaceResolver.cs" />\r
-    <Compile Include="System.Xaml\IXamlObjectWriterFactory.cs" />\r
-    <Compile Include="System.Xaml\IXamlSchemaContextProvider.cs" />\r
-    <Compile Include="System.Xaml\NameScope.cs" />\r
-    <Compile Include="System.Xaml\NamespaceDeclaration.cs" />\r
-    <Compile Include="System.Xaml\ParsedMarkupExtensionInfo.cs" />\r
-    <Compile Include="System.Xaml\PrefixLookup.cs" />\r
-    <Compile Include="System.Xaml\TypeExtensionMethods.cs" />\r
-    <Compile Include="System.Xaml\ValueSerializerContext.cs" />\r
-    <Compile Include="System.Xaml\XamlBackgroundReader.cs" />\r
-    <Compile Include="System.Xaml\XamlDeferringLoader.cs" />\r
-    <Compile Include="System.Xaml\XamlDirective.cs" />\r
-    <Compile Include="System.Xaml\XamlDuplicateMemberException.cs" />\r
-    <Compile Include="System.Xaml\XamlException.cs" />\r
-    <Compile Include="System.Xaml\XamlInternalException.cs" />\r
-    <Compile Include="System.Xaml\XamlLanguage.cs" />\r
-    <Compile Include="System.Xaml\XamlMember.cs" />\r
-    <Compile Include="System.Xaml\XamlNameResolver.cs" />\r
-    <Compile Include="System.Xaml\XamlNode.cs" />\r
-    <Compile Include="System.Xaml\XamlNodeList.cs" />\r
-    <Compile Include="System.Xaml\XamlNodeQueue.cs" />\r
-    <Compile Include="System.Xaml\XamlNodeQueueReader.cs" />\r
-    <Compile Include="System.Xaml\XamlNodeQueueWriter.cs" />\r
-    <Compile Include="System.Xaml\XamlNodeType.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectEventArgs.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectNodeIterator.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectReader.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectReaderException.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectReaderSettings.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectWriter.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectWriterException.cs" />\r
-    <Compile Include="System.Xaml\XamlObjectWriterSettings.cs" />\r
-    <Compile Include="System.Xaml\XamlParseException.cs" />\r
-    <Compile Include="System.Xaml\XamlReader.cs" />\r
-    <Compile Include="System.Xaml\XamlReaderSettings.cs" />\r
-    <Compile Include="System.Xaml\XamlSchemaContext.cs" />\r
-    <Compile Include="System.Xaml\XamlSchemaContextSettings.cs" />\r
-    <Compile Include="System.Xaml\XamlSchemaException.cs" />\r
-    <Compile Include="System.Xaml\XamlServices.cs" />\r
-    <Compile Include="System.Xaml\XamlSubtreeReader.cs" />\r
-    <Compile Include="System.Xaml\XamlType.cs" />\r
-    <Compile Include="System.Xaml\XamlWriter.cs" />\r
-    <Compile Include="System.Xaml\XamlWriterInternalBase.cs" />\r
-    <Compile Include="System.Xaml\XamlWriterSettings.cs" />\r
-    <Compile Include="System.Xaml\XamlWriterStateManager.cs" />\r
-    <Compile Include="System.Xaml\XamlXmlReader.cs" />\r
-    <Compile Include="System.Xaml\XamlXmlReaderSettings.cs" />\r
-    <Compile Include="System.Xaml\XamlXmlWriter.cs" />\r
-    <Compile Include="System.Xaml\XamlXmlWriterException.cs" />\r
-    <Compile Include="System.Xaml\XamlXmlWriterSettings.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Xaml/System.Xaml-tests-net_4_5.csproj b/mcs/class/System.Xaml/System.Xaml-tests-net_4_5.csproj
deleted file mode 100644 (file)
index e78a6bb..0000000
--- a/mcs/class/System.Xaml/System.Xaml-tests-net_4_5.csproj
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FDA04C3E-7386-4F45-A7F2-C69DB33B72FF}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Xaml-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xaml_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Windows.Markup\ArrayExtensionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ReferenceTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\StaticExtensionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\TypeExtensionConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\TypeExtensionTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ValueSerializerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\XDataTest.cs" />\r
-    <Compile Include="Test\System.Xaml.Schema\XamlMemberInvokerTest.cs" />\r
-    <Compile Include="Test\System.Xaml.Schema\XamlTypeInvokerTest.cs" />\r
-    <Compile Include="Test\System.Xaml.Schema\XamlTypeNameTest.cs" />\r
-    <Compile Include="Test\System.Xaml.Schema\XamlTypeTypeConverterTest.cs" />\r
-    <Compile Include="Test\System.Xaml.Schema\XamlValueConverterTest.cs" />\r
-    <Compile Include="Test\System.Xaml\AmbientPropertyValueTest.cs" />\r
-    <Compile Include="Test\System.Xaml\AttachableMemberIdentifierTest.cs" />\r
-    <Compile Include="Test\System.Xaml\AttachablePropertyServicesTest.cs" />\r
-    <Compile Include="Test\System.Xaml\DummyValueSerializerContext.cs" />\r
-    <Compile Include="Test\System.Xaml\NamespaceDeclarationTest.cs" />\r
-    <Compile Include="Test\System.Xaml\TestedTypes.cs" />\r
-    <Compile Include="Test\System.Xaml\ValueSerializerContextTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlBackgroundReaderTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlDirectiveTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlDuplicateMemberExceptionTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlLanguageTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlMemberTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlNodeQueueTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlObjectEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlObjectReaderSettingsTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlObjectReaderTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlObjectWriterSettingsTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlObjectWriterTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlReaderSettingsTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlReaderTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlReaderTestBase.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlSchemaContextSettingsTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlSchemaContextTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlTypeTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlXmlReaderSettingsTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlXmlReaderTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlXmlWriterSettingsTest.cs" />\r
-    <Compile Include="Test\System.Xaml\XamlXmlWriterTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xaml\System.Xaml-net_4_5.csproj">\r
-      <Project>{F574F9BD-1838-4C13-8722-7D6D33DE1781}</Project>\r
-      <Name>System.Xaml\System.Xaml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_5.csproj b/mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_5.csproj
deleted file mode 100644 (file)
index 9a5bd93..0000000
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_5.csproj
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml.Linq</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml.Linq\System\Xml\Linq\XComponentModel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml.Linq\System\Xml\Linq\XLinq.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml.Linq\System\Xml\Linq\XNodeNavigator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System.Xml.Linq\System\Xml\Linq\XNodeValidator.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
-      <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq-tests-net_4_5.csproj b/mcs/class/System.Xml.Linq/System.Xml.Linq-tests-net_4_5.csproj
deleted file mode 100644 (file)
index fa9c220..0000000
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq-tests-net_4_5.csproj
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{63E33F71-AF79-425B-A8C6-A99998A982AB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <OutputPath>bin\Debug\System.Xml.Linq-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml.Linq_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1720</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_3_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Xml.Linq\ExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XAttributeTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XDocumentTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XElementTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNamespaceTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNameTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeDocumentOrderComparerTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeEqualityComparerTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeNavigatorTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeReaderTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XNodeWriterTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XObjectTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XProcessingInstructionTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XStreamingElementTest.cs" />\r
-    <Compile Include="Test\System.Xml.Linq\XTextTest.cs" />\r
-    <Compile Include="Test\System.Xml.Schema\ExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\ExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\ExtensionsTest2.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\ExtensionsTest3.cs" />\r
-    <Compile Include="Test\System.Xml.XPath\ExtensionsTest4.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xml.Linq\System.Xml.Linq-net_4_5.csproj">\r
-      <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System.Xml.Serialization/System.Xml.Serialization-net_4_5.csproj b/mcs/class/System.Xml.Serialization/System.Xml.Serialization-net_4_5.csproj
deleted file mode 100644 (file)
index da5b194..0000000
--- a/mcs/class/System.Xml.Serialization/System.Xml.Serialization-net_4_5.csproj
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8888F00F-4ADC-4C1E-B542-7A8FA406CD98}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System.Xml.Serialization</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
-      <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System/Documentation/en/System.Net/WebRequest.xml b/mcs/class/System/Documentation/en/System.Net/WebRequest.xml
index fd2611422255732b4805de94c92d1bae492192e3..9ab8e3c068f57165d7f7b075bf501a692085eee7 100644 (file)
--- a/mcs/class/System/Documentation/en/System.Net/WebRequest.xml
+++ b/mcs/class/System/Documentation/en/System.Net/WebRequest.xml
@@ -1036,9 +1036,10 @@ public class CreateDefaultExample
       <Parameters />
       <Docs>
         <remarks>
-          <attribution license="cc4" from="Microsoft" modified="false" />
-          <para>
-            <see cref="M:System.Net.WebRequest.GetSystemWebProxy" /> method reads the current user's Internet Explorer (IE) proxy settings. This process includes the IE options to automatically detect proxy settings, use an automatic configuration script, manual proxy server settings, and advanced manual proxy server settings.</para>
+          <attribution license="cc4" from="Microsoft" modified="true" />
+          <para><see cref="M:System.Net.WebRequest.GetSystemWebProxy" /> creates an appropriate proxy object for the current user.</para>
+          <para>On Windows, the method reads the current user's Internet Explorer (IE) proxy settings. The settings supported on Mono are proxy enabled, proxy URL, and proxy excluded domains.</para>
+          <para>On UNIX-like systems (but not including Mac OS, iOS, or Android), the method reads the environment variables "MONO_PROXY" (or "mono_proxy") and "NO_PROXY" (or "no_proxy"). See the mono man page for more information.</para>
           <para>If your application is impersonating several users, you can use the <see cref="M:System.Net.WebRequest.GetSystemWebProxy" /> method to retrieve a proxy for each impersonated user.</para>
         </remarks>
         <summary>

diff --git a/mcs/class/System/Documentation/en/ns-System.Security.Cryptography.xml b/mcs/class/System/Documentation/en/ns-System.Security.Cryptography.xml
index 1ca4d6fe4ba85263f56fce29658e45481d8dad43..0aff7f512b538767fdc6eaad07cbaef751a604cb 100644 (file)
--- a/mcs/class/System/Documentation/en/ns-System.Security.Cryptography.xml
+++ b/mcs/class/System/Documentation/en/ns-System.Security.Cryptography.xml
@@ -4,7 +4,7 @@
     <remarks>To be added.</remarks>
     <summary>
       <attribution license="cc4" from="Microsoft" modified="false" />
-      <para>The <see cref="N:System.Security.Cryptography" /> namespace provides cryptographic services, including secure encoding and decoding of data, as well as many other operations, such as hashing, random number generation, and message authentication. For more information, see <format type="text/html"><a href="f96284bc-7b73-44b5-ac59-fac613ad09f8">Cryptographic Services</a></format>.</para>
+      <para>The <see cref="N:System.Security.Cryptography" /> namespace provides cryptographic services, including secure encoding and decoding of data, as well as many other operations, such as hashing, random number generation, and message authentication. For more information, see <format type="text/html"><a href="https://msdn.microsoft.com/en-us/library/92f9ye3s(v=vs.110).aspx">Cryptographic Services</a></format>.</para>
     </summary>
   </Docs>
 </Namespace>
\ No newline at end of file

diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile
index aef9e5f2b468b068198384282d7672acd2bf369e..5f52ecca39176e02e956f997839208bf77a07d5e 100644 (file)
--- a/mcs/class/System/Makefile
+++ b/mcs/class/System/Makefile
@@ -23,6 +23,11 @@ TEST_MCS_FLAGS = -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -r:Sy
        $(foreach f, $(TEST_RESOURCES), -resource:$(f),$(notdir $(f)))
 
 REFERENCE_SOURCES_FLAGS = -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX
+ifndef NO_PROCESS_START
+REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_PROCESS_START
+TEST_MCS_FLAGS += -d:MONO_FEATURE_PROCESS_START
+endif
+
 LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 $(REFERENCE_SOURCES_FLAGS) -unsafe $(RESOURCE_FILES:%=-resource:%)
 TEST_MCS_FLAGS += -r:System.Configuration
 
@@ -99,7 +104,7 @@ artifacts = $(system_library_deps)                   \
 
 .NOTPARALLEL: $(system_library_deps)
 
-$(the_libdir_base)System.dll: $(system_library_deps) 
+$(the_libdir_base)System.dll: $(system_library_deps) ../Mono.Security/Makefile
 
 ifeq (bare/,$(intermediate))
 build-bare:
@@ -121,7 +126,7 @@ $(the_libdir_base)System.Xml.dll:
 $(bare_libdir)/System.Xml.dll:
        (cd ../System.XML; $(MAKE) $@)
 
-$(the_libdir_base)Mono.Security.dll:
+$(the_libdir_base)Mono.Security.dll: ../Mono.Security/Makefile
        (cd ../Mono.Security; $(MAKE))
 
 $(the_libdir_base)System.Configuration.dll:

diff --git a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
index 5c389a0ea7bbf77b007cd2f1ee498a5ac5f02958..271f500772b62c5e3a254878aa65b8479346e8cf 100644 (file)
--- a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
+++ b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
@@ -387,6 +387,12 @@ namespace Mono.CSharp
                        \s*
                        (?<message>.*)$";
 
+               static readonly Regex RelatedSymbolsRegex = new Regex(
+                       @"
+            \(Location\ of\ the\ symbol\ related\ to\ previous\ (warning|error)\)
+                       ",
+                       RegexOptions.Compiled | RegexOptions.ExplicitCapture | RegexOptions.IgnorePatternWhitespace);
+
                private static CompilerError CreateErrorFromString(string error_string)
                {
                        if (error_string.StartsWith ("BETA"))
@@ -399,11 +405,17 @@ namespace Mono.CSharp
                        Regex reg = new Regex (ErrorRegexPattern, RegexOptions.Compiled | RegexOptions.ExplicitCapture | RegexOptions.IgnorePatternWhitespace);
                        Match match=reg.Match(error_string);
                        if (!match.Success) {
-                               // We had some sort of runtime crash
-                               error.ErrorText = error_string;
-                               error.IsWarning = false;
-                               error.ErrorNumber = "";
-                               return error;
+                               match = RelatedSymbolsRegex.Match (error_string);
+                               if (!match.Success) {
+                                       // We had some sort of runtime crash
+                                       error.ErrorText = error_string;
+                                       error.IsWarning = false;
+                                       error.ErrorNumber = "";
+                                       return error;
+                               } else {
+                                       // This line is a continuation of previous warning of error
+                                       return null;
+                               }
                        }
                        if (String.Empty != match.Result("${file}"))
                                error.FileName=match.Result("${file}");

diff --git a/mcs/class/System/Mono.Http/NtlmClient.cs b/mcs/class/System/Mono.Http/NtlmClient.cs
index 54e85db013edb1ab9dc4d3c2fa9ebb1a8b601a2c..b40d601b4b1c5544c56f443ecec9cf0ab96cfafd 100644 (file)
--- a/mcs/class/System/Mono.Http/NtlmClient.cs
+++ b/mcs/class/System/Mono.Http/NtlmClient.cs
@@ -40,6 +40,7 @@ using MonoSecurity::Mono.Security.Protocol.Ntlm;
 using System;
 using System.Collections;
 using System.Net;
+using System.Runtime.CompilerServices;
 
 namespace Mono.Http
 {
@@ -122,14 +123,8 @@ namespace Mono.Http
 
        class NtlmClient : IAuthenticationModule
        {
-               static Hashtable cache;
-
-               static NtlmClient () 
-               {
-                       cache = new Hashtable ();
-               }
-       
-               public NtlmClient () {}
+               static readonly ConditionalWeakTable<HttpWebRequest, NtlmSession> cache =
+                       new ConditionalWeakTable<HttpWebRequest, NtlmSession> ();
        
                public Authorization Authenticate (string challenge, WebRequest webRequest, ICredentials credentials) 
                {
@@ -153,12 +148,7 @@ namespace Mono.Http
                                return null;
 
                        lock (cache) {
-                               NtlmSession ds = (NtlmSession) cache [request];
-                               if (ds == null) {
-                                       ds = new NtlmSession ();
-                                       cache.Add (request, ds);
-                               }
-
+                               var ds = cache.GetOrCreateValue (request);
                                return ds.Authenticate (header, webRequest, credentials);
                        }
                }

diff --git a/mcs/class/System/Mono.Net.Security/ChainValidationHelper.cs b/mcs/class/System/Mono.Net.Security/ChainValidationHelper.cs
index b0470537b509e590f4695319aa37cd36a6f99bdf..1f37bc47589c7cebf77d7b621cd499d095f0c3db 100644 (file)
--- a/mcs/class/System/Mono.Net.Security/ChainValidationHelper.cs
+++ b/mcs/class/System/Mono.Net.Security/ChainValidationHelper.cs
@@ -156,8 +156,11 @@ namespace Mono.Net.Security
                        tlsStream = other.tlsStream;
                        request = other.request;
 
+                       if (settings == null)
+                               settings = MonoTlsSettings.DefaultSettings;
+
                        this.provider = provider;
-                       this.settings = settings = settings.CloneWithValidator (this);
+                       this.settings = settings.CloneWithValidator (this);
                        this.callbackWrapper = callbackWrapper;
                }
 
@@ -170,6 +173,8 @@ namespace Mono.Net.Security
 
                ChainValidationHelper (MonoTlsProvider provider, MonoTlsSettings settings, bool cloneSettings, MonoTlsStream stream, ServerCertValidationCallbackWrapper callbackWrapper)
                {
+                       if (settings == null)
+                               settings = MonoTlsSettings.CopyDefaultSettings ();
                        if (cloneSettings)
                                settings = settings.CloneWithValidator (this);
 

diff --git a/mcs/class/System/Mono.Net.Security/MonoDefaultTlsProvider.cs b/mcs/class/System/Mono.Net.Security/MonoDefaultTlsProvider.cs
index 8fd50fd1a3e6378edefcb01fe93453e1e638f4f5..4051b1502dcf6bf0dfa8211614a82652040ee588 100644 (file)
--- a/mcs/class/System/Mono.Net.Security/MonoDefaultTlsProvider.cs
+++ b/mcs/class/System/Mono.Net.Security/MonoDefaultTlsProvider.cs
@@ -60,6 +60,16 @@ namespace Mono.Net.Security.Private
         */
        class MonoDefaultTlsProvider : MonoTlsProviderImpl
        {
+               static readonly Guid id = new Guid ("809e77d5-56cc-4da8-b9f0-45e65ba9cceb");
+
+               public override Guid ID {
+                       get { return id; }
+               }
+
+               public override string Name {
+                       get { return "legacy"; }
+               }
+
                public MonoTlsProvider Provider {
                        get { return this; }
                }

diff --git a/mcs/class/System/Mono.Net.Security/MonoSslStreamImpl.cs b/mcs/class/System/Mono.Net.Security/MonoSslStreamImpl.cs
index 8418cf8d207b0a06df7963826cfac6b2fffee79b..999a8868ab61a7866df5e970abfbf712a35a7682 100644 (file)
--- a/mcs/class/System/Mono.Net.Security/MonoSslStreamImpl.cs
+++ b/mcs/class/System/Mono.Net.Security/MonoSslStreamImpl.cs
@@ -34,9 +34,9 @@ extern alias MonoSecurity;
 #endif
 
 #if MONO_SECURITY_ALIAS
-using MonoSecurity::Mono.Security.Interface;
+using MSI = MonoSecurity::Mono.Security.Interface;
 #else
-using Mono.Security.Interface;
+using MSI = Mono.Security.Interface;
 #endif
 #if MONO_X509_ALIAS
 using XX509CertificateCollection = PrebuiltSystem::System.Security.Cryptography.X509Certificates.X509CertificateCollection;
@@ -72,7 +72,7 @@ using System.Security.Cryptography;
 
 namespace Mono.Net.Security
 {
-       class MonoSslStreamImpl : MonoSslStream
+       class MonoSslStreamImpl : MSI.IMonoSslStream
        {
                IMonoSslStream impl;
 
@@ -88,220 +88,220 @@ namespace Mono.Net.Security
                        this.impl = impl;
                }
 
-               public override void AuthenticateAsClient (string targetHost)
+               public void AuthenticateAsClient (string targetHost)
                {
                        Impl.AuthenticateAsClient (targetHost);
                }
 
-               public override void AuthenticateAsClient (string targetHost, XX509CertificateCollection clientCertificates, XSslProtocols enabledSslProtocols, bool checkCertificateRevocation)
+               public void AuthenticateAsClient (string targetHost, XX509CertificateCollection clientCertificates, XSslProtocols enabledSslProtocols, bool checkCertificateRevocation)
                {
                        Impl.AuthenticateAsClient (targetHost, clientCertificates, (SslProtocols)enabledSslProtocols, checkCertificateRevocation);
                }
 
-               public override IAsyncResult BeginAuthenticateAsClient (string targetHost, AsyncCallback asyncCallback, object asyncState)
+               public IAsyncResult BeginAuthenticateAsClient (string targetHost, AsyncCallback asyncCallback, object asyncState)
                {
                        return Impl.BeginAuthenticateAsClient (targetHost, asyncCallback, asyncState);
                }
 
-               public override IAsyncResult BeginAuthenticateAsClient (string targetHost, XX509CertificateCollection clientCertificates, XSslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState)
+               public IAsyncResult BeginAuthenticateAsClient (string targetHost, XX509CertificateCollection clientCertificates, XSslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState)
                {
                        return Impl.BeginAuthenticateAsClient (targetHost, clientCertificates, (SslProtocols)enabledSslProtocols, checkCertificateRevocation, asyncCallback, asyncState);
                }
 
-               public override void EndAuthenticateAsClient (IAsyncResult asyncResult)
+               public void EndAuthenticateAsClient (IAsyncResult asyncResult)
                {
                        Impl.EndAuthenticateAsClient (asyncResult);
                }
 
-               public override void AuthenticateAsServer (X509Certificate serverCertificate)
+               public void AuthenticateAsServer (X509Certificate serverCertificate)
                {
                        Impl.AuthenticateAsServer (serverCertificate);
                }
 
-               public override void AuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, XSslProtocols enabledSslProtocols, bool checkCertificateRevocation)
+               public void AuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, XSslProtocols enabledSslProtocols, bool checkCertificateRevocation)
                {
                        Impl.AuthenticateAsServer (serverCertificate, clientCertificateRequired, (SslProtocols)enabledSslProtocols, checkCertificateRevocation);
                }
 
-               public override IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, AsyncCallback asyncCallback, object asyncState)
+               public IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, AsyncCallback asyncCallback, object asyncState)
                {
                        return Impl.BeginAuthenticateAsServer (serverCertificate, asyncCallback, asyncState);
                }
 
-               public override IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, XSslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState)
+               public IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, XSslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState)
                {
                        return Impl.BeginAuthenticateAsServer (serverCertificate, clientCertificateRequired, (SslProtocols)enabledSslProtocols, checkCertificateRevocation, asyncCallback, asyncState);
                }
 
-               public override void EndAuthenticateAsServer (IAsyncResult asyncResult)
+               public void EndAuthenticateAsServer (IAsyncResult asyncResult)
                {
                        Impl.EndAuthenticateAsServer (asyncResult);
                }
 
-               public override Task AuthenticateAsClientAsync (string targetHost)
+               public Task AuthenticateAsClientAsync (string targetHost)
                {
                        return Impl.AuthenticateAsClientAsync (targetHost);
                }
 
-               public override Task AuthenticateAsClientAsync (string targetHost, XX509CertificateCollection clientCertificates, XSslProtocols enabledSslProtocols, bool checkCertificateRevocation)
+               public Task AuthenticateAsClientAsync (string targetHost, XX509CertificateCollection clientCertificates, XSslProtocols enabledSslProtocols, bool checkCertificateRevocation)
                {
                        return Impl.AuthenticateAsClientAsync (targetHost, clientCertificates, (SslProtocols)enabledSslProtocols, checkCertificateRevocation);
                }
 
-               public override Task AuthenticateAsServerAsync (X509Certificate serverCertificate)
+               public Task AuthenticateAsServerAsync (X509Certificate serverCertificate)
                {
                        return Impl.AuthenticateAsServerAsync (serverCertificate);
                }
 
-               public override Task AuthenticateAsServerAsync (X509Certificate serverCertificate, bool clientCertificateRequired, XSslProtocols enabledSslProtocols, bool checkCertificateRevocation)
+               public Task AuthenticateAsServerAsync (X509Certificate serverCertificate, bool clientCertificateRequired, XSslProtocols enabledSslProtocols, bool checkCertificateRevocation)
                {
                        return Impl.AuthenticateAsServerAsync (serverCertificate, clientCertificateRequired, (SslProtocols)enabledSslProtocols, checkCertificateRevocation);
                }
 
-               public override void Flush ()
+               public void Flush ()
                {
                        Impl.Flush ();
                }
 
-               public override int Read (byte[] buffer, int offset, int count)
+               public int Read (byte[] buffer, int offset, int count)
                {
                        return Impl.Read (buffer, offset, count);
                }
 
-               public override void Write (byte[] buffer)
+               public void Write (byte[] buffer)
                {
                        Impl.Write (buffer);
                }
 
-               public override void Write (byte[] buffer, int offset, int count)
+               public void Write (byte[] buffer, int offset, int count)
                {
                        Impl.Write (buffer, offset, count);
                }
 
-               public override IAsyncResult BeginRead (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState)
+               public IAsyncResult BeginRead (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState)
                {
                        return Impl.BeginRead (buffer, offset, count, asyncCallback, asyncState);
                }
 
-               public override int EndRead (IAsyncResult asyncResult)
+               public int EndRead (IAsyncResult asyncResult)
                {
                        return Impl.EndRead (asyncResult);
                }
 
-               public override IAsyncResult BeginWrite (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState)
+               public IAsyncResult BeginWrite (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState)
                {
                        return Impl.BeginWrite (buffer, offset, count, asyncCallback, asyncState);
                }
 
-               public override void EndWrite (IAsyncResult asyncResult)
+               public void EndWrite (IAsyncResult asyncResult)
                {
                        Impl.EndWrite (asyncResult);
                }
 
-               public override XTransportContext TransportContext {
+               public XTransportContext TransportContext {
                        get { return (XTransportContext)(object)Impl.TransportContext; }
                }
 
-               public override bool IsAuthenticated {
+               public bool IsAuthenticated {
                        get { return Impl.IsAuthenticated; }
                }
 
-               public override bool IsMutuallyAuthenticated {
+               public bool IsMutuallyAuthenticated {
                        get { return Impl.IsMutuallyAuthenticated; }
                }
 
-               public override bool IsEncrypted {
+               public bool IsEncrypted {
                        get { return Impl.IsEncrypted; }
                }
 
-               public override bool IsSigned {
+               public bool IsSigned {
                        get { return Impl.IsSigned; }
                }
 
-               public override bool IsServer {
+               public bool IsServer {
                        get { return Impl.IsServer; }
                }
 
-               public override XCipherAlgorithmType CipherAlgorithm {
+               public XCipherAlgorithmType CipherAlgorithm {
                        get { return (XCipherAlgorithmType)Impl.CipherAlgorithm; }
                }
 
-               public override int CipherStrength {
+               public int CipherStrength {
                        get { return Impl.CipherStrength; }
                }
 
-               public override XHashAlgorithmType HashAlgorithm {
+               public XHashAlgorithmType HashAlgorithm {
                        get { return (XHashAlgorithmType)Impl.HashAlgorithm; }
                }
 
-               public override int HashStrength {
+               public int HashStrength {
                        get { return Impl.HashStrength; }
                }
 
-               public override XExchangeAlgorithmType KeyExchangeAlgorithm {
+               public XExchangeAlgorithmType KeyExchangeAlgorithm {
                        get { return (XExchangeAlgorithmType)Impl.KeyExchangeAlgorithm; }
                }
 
-               public override int KeyExchangeStrength {
+               public int KeyExchangeStrength {
                        get { return KeyExchangeStrength; }
                }
 
-               public override bool CanRead {
+               public bool CanRead {
                        get { return Impl.CanRead; }
                }
 
-               public override bool CanTimeout {
+               public bool CanTimeout {
                        get { return Impl.CanTimeout; }
                }
 
-               public override bool CanWrite {
+               public bool CanWrite {
                        get { return Impl.CanWrite; }
                }
 
-               public override long Length {
+               public long Length {
                        get { return Impl.Length; }
                }
 
-               public override long Position {
+               public long Position {
                        get { return Impl.Position; }
                }
 
-               public override void SetLength (long value)
+               public void SetLength (long value)
                {
                        Impl.SetLength (value);
                }
 
-               public override XAuthenticatedStream AuthenticatedStream {
+               public XAuthenticatedStream AuthenticatedStream {
                        get { return (XAuthenticatedStream)(Stream)Impl.AuthenticatedStream; }
                }
 
-               public override int ReadTimeout {
+               public int ReadTimeout {
                        get { return Impl.ReadTimeout; }
                        set { Impl.ReadTimeout = value; }
                }
 
-               public override int WriteTimeout {
+               public int WriteTimeout {
                        get { return Impl.WriteTimeout; }
                        set { Impl.WriteTimeout = value; }
                }
 
-               public override bool CheckCertRevocationStatus {
+               public bool CheckCertRevocationStatus {
                        get { return Impl.CheckCertRevocationStatus; }
                }
 
-               public override X509Certificate InternalLocalCertificate {
+               public X509Certificate InternalLocalCertificate {
                        get { return Impl.InternalLocalCertificate; }
                }
 
-               public override X509Certificate LocalCertificate {
+               public X509Certificate LocalCertificate {
                        get { return Impl.LocalCertificate; }
                }
 
-               public override X509Certificate RemoteCertificate {
+               public X509Certificate RemoteCertificate {
                        get { return Impl.RemoteCertificate; }
                }
 
-               public override XSslProtocols SslProtocol {
+               public XSslProtocols SslProtocol {
                        get { return (XSslProtocols)Impl.SslProtocol; }
                }
 
@@ -311,7 +311,13 @@ namespace Mono.Net.Security
                                throw new ObjectDisposedException ("MonoSslStream");
                }
 
-               protected override void Dispose (bool disposing)
+               public void Dispose ()
+               {
+                       Dispose (true);
+                       GC.SuppressFinalize (this);
+               }
+
+               protected virtual void Dispose (bool disposing)
                {
                        if (impl != null && disposing) {
                                impl.Dispose ();

diff --git a/mcs/class/System/Mono.Net.Security/MonoSslStreamWrapper.cs b/mcs/class/System/Mono.Net.Security/MonoSslStreamWrapper.cs
index 24b777c87adaa56f728bd1c628b29a4557b06d1d..d04383dced10719dabc2454bebd851ed895b11cb 100644 (file)
--- a/mcs/class/System/Mono.Net.Security/MonoSslStreamWrapper.cs
+++ b/mcs/class/System/Mono.Net.Security/MonoSslStreamWrapper.cs
@@ -34,9 +34,9 @@ extern alias MonoSecurity;
 #endif
 
 #if MONO_SECURITY_ALIAS
-using MonoSecurity::Mono.Security.Interface;
+using MSI = MonoSecurity::Mono.Security.Interface;
 #else
-using Mono.Security.Interface;
+using MSI = Mono.Security.Interface;
 #endif
 #if MONO_X509_ALIAS
 using XSslProtocols = PrebuiltSystem::System.Security.Authentication.SslProtocols;
@@ -65,16 +65,16 @@ namespace Mono.Net.Security.Private
 {
        class MonoSslStreamWrapper : IMonoSslStream
        {
-               MonoSslStream impl;
+               MSI.IMonoSslStream impl;
 
-               internal MonoSslStream Impl {
+               internal MSI.IMonoSslStream Impl {
                        get {
                                CheckDisposed ();
                                return impl;
                        }
                }
 
-               public MonoSslStreamWrapper (MonoSslStream impl)
+               public MonoSslStreamWrapper (MSI.IMonoSslStream impl)
                {
                        this.impl = impl;
                }

diff --git a/mcs/class/System/Mono.Net.Security/MonoTlsProviderImpl.cs b/mcs/class/System/Mono.Net.Security/MonoTlsProviderImpl.cs
index c21341b4f5b7a5ea41fcfeeb896bb9e31f8d4cb2..4216e5809f3ca9b44bb2684d485093463118554b 100644 (file)
--- a/mcs/class/System/Mono.Net.Security/MonoTlsProviderImpl.cs
+++ b/mcs/class/System/Mono.Net.Security/MonoTlsProviderImpl.cs
@@ -74,7 +74,7 @@ namespace Mono.Net.Security.Private
                        Stream innerStream, bool leaveInnerStreamOpen,
                        MSI.MonoTlsSettings settings);
 
-               public override MSI.MonoSslStream CreateSslStream (
+               public override MSI.IMonoSslStream CreateSslStream (
                        Stream innerStream, bool leaveInnerStreamOpen,
                        MSI.MonoTlsSettings settings = null)
                {

diff --git a/mcs/class/System/Mono.Net.Security/MonoTlsStream.cs b/mcs/class/System/Mono.Net.Security/MonoTlsStream.cs
index f10f99f5176366a0080eadf401426b9f3171b335..db6e66ca283313a5d06000cd4e2c0a6039f5c1b7 100644 (file)
--- a/mcs/class/System/Mono.Net.Security/MonoTlsStream.cs
+++ b/mcs/class/System/Mono.Net.Security/MonoTlsStream.cs
@@ -95,9 +95,6 @@ namespace Mono.Net.Security
                        provider = request.TlsProvider ?? MonoTlsProviderFactory.GetProviderInternal ();
                        status = WebExceptionStatus.SecureChannelFailure;
 
-                       if (settings == null)
-                               settings = new MonoTlsSettings ();
-
                        validationHelper = ChainValidationHelper.Create (provider.Provider, ref settings, this);
                }
 

diff --git a/mcs/class/System/ReferenceSources/SR.cs b/mcs/class/System/ReferenceSources/SR.cs
index 0e6a8f67ff3d32f6d1547e943449dc3d1165e021..fe0aedf17c849fa0330db2a5353a6a13895f658d 100644 (file)
--- a/mcs/class/System/ReferenceSources/SR.cs
+++ b/mcs/class/System/ReferenceSources/SR.cs
@@ -75,6 +75,7 @@ partial class SR
        public const string Argument_AddingDuplicate = "Argument_AddingDuplicate";
        public const string Argument_ImplementIComparable = "Argument_ImplementIComparable";
        public const string Argument_InvalidOffLen = "Argument_InvalidOffLen";
+       public const string Argument_InvalidThreshold = "Argument_InvalidThreshold";
        public const string ExternalLinkedListNode = "ExternalLinkedListNode";
        public const string InvalidOperation_CannotRemoveFromStackOrQueue = "InvalidOperation_CannotRemoveFromStackOrQueue";
        public const string InvalidOperation_EmptyCollection = "InvalidOperation_EmptyCollection";
@@ -84,6 +85,7 @@ partial class SR
        public const string InvalidOperation_EnumFailedVersion = "InvalidOperation_EnumFailedVersion";
        public const string InvalidOperation_EnumNotStarted = "InvalidOperation_EnumNotStarted";
        public const string InvalidOperation_EnumOpCantHappen = "InvalidOperation_EnumOpCantHappen";
+       public const string InvalidOperation_HCCountOverflow = "InvalidOperation_HCCountOverflow";
        public const string Invalid_Array_Type = "Invalid_Array_Type";
        public const string LinkedListEmpty = "LinkedListEmpty";
        public const string LinkedListNodeIsAttached = "LinkedListNodeIsAttached";

diff --git a/mcs/class/System/System-bare-net_4_5.csproj b/mcs/class/System/System-bare-net_4_5.csproj
deleted file mode 100644 (file)
index b45c994..0000000
--- a/mcs/class/System/System-bare-net_4_5.csproj
+++ /dev/null
@@ -1,1203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{91CDF14E-F60F-4AB7-BC9D-5CBD7E669076}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5/bare</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArgumentReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArrayCreateExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArrayIndexerExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAssignStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttachEventStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeArgument.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeArgumentCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeDeclaration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeDeclarationCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBaseReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBinaryOperatorExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBinaryOperatorType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCastExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCatchClause.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCatchClauseCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeChecksumPragma.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeComment.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCommentStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCommentStatementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCompileUnit.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeConditionStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeConstructor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDefaultValueExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDelegateCreateExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDelegateInvokeExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirectionExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirective.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirectiveCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeEntryPointMethod.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeEventReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpressionCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpressionStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeFieldReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeGotoStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeIndexerExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeIterationStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeLabeledStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeLinePragma.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberField.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberMethod.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberProperty.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMethodInvokeExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\codemethodreferenceexpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMethodReturnStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceImport.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceImportCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeObjectCreateExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpressionCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePrimitiveExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePropertyReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePropertySetValueReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRegionDirective.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRegionMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRemoveEventStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetCompileUnit.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetTypeMember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeStatementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeThisReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeThrowExceptionStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTryCatchFinallyStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeConstructor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDeclaration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDeclarationCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDelegate.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeMember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeMemberCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeOfExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeParameterCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReferenceCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeVariableDeclarationStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeVariableReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeGeneratorOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerError.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerErrorCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerParameters.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\GeneratedCodeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\GeneratorSupport.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\IndentTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\LanguageOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\FieldDirection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\MemberAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\bithelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\debugview.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\iset.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\linkedlist.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\queue.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sorteddictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedlist.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedset.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedsetdebugview.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\stack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\throwhelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\objectmodel\observablecollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\objectmodel\readonlyobservablecollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\bitvector32.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\casesensitivestringdictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\collectionsutil.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\fixedstringlookup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\hybriddictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\inotifycollectionchanged.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\iordereddictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\listdictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\nameobjectcollectionbase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\namevaluecollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\notifycollectionchangedeventargs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\ordereddictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringcollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringdictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringdictionarywithcomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AddingNewEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AddingNewEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AmbientValueAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ArrayConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ArraySubsetEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncOperation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncOperationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AttributeCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AttributeProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BackgroundWorker.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BaseComponentEditor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\basenumberconverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindableSupport.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindingDirection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindingList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BooleanConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BrowsableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ByteConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CancelEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CancelEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CategoryAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CharConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComplexBindingPropertiesAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CompModSwitches.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Component.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentResourceManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Container.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ContainerFilterService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CultureInfoConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CustomTypeDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataErrorsChangedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectFieldAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectMethodAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectMethodType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DateTimeConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DateTimeOffsetConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugExtendedPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugReflectEventDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugReflectPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugTypeDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DecimalConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultBindingPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultEventAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultValueAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DelegatingTypeDescriptionProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DescriptionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\CheckoutException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\CommandID.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerOptionService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransaction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerVerb.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerVerbCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContextSerializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpContextType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpKeywordAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpKeywordType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentChangeService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentDiscoveryService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentInitializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesigner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerEventService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerHost.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerHostTransactionState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerOptionService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDictionaryService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IEventPropertyService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IExtenderListService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IExtenderProviderService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IHelpService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IInheritanceService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IMenuCommandService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\InheritanceAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\InheritanceLevel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IReferenceService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IResourceService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IRootDesigner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ISelectionService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IServiceObjectContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITreeDesigner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeDescriptorFilterService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeDiscoveryService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeResolutionService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\MenuCommand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\NotifyParentPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ParenthesizePropertyNameAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\PropertyTabAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\PropertyTabScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\RefreshProperties.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\RefreshPropertiesAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\SelectionTypes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ComponentSerializationService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ContextStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DefaultSerializationProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerSerializerAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderHost.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\INameCreationService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\InstanceDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\MemberRelationshipService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\RootDesignerSerializerAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\SerializationStore.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ServiceCreatorCallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ServiceObjectContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\StandardCommands.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\StandardToolWindows.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ToolboxItemAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ViewTechnology.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerCategoryAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibility.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibilityAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignOnlyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignTimeVisibleAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DisplayNameAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoubleConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoWorkEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoWorkEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EditorAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EditorBrowsableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EnumConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventDescriptorCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventHandlerList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExpandableObjectConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExtendedPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExtenderProvidedPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\FxCopSuppression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\GuidConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\HandledEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\HandledEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IBindingList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IBindingListView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ICancelAddNew.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IChangeTracking.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IComNativeDescriptorHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IComponent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ICustomTypeDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IDataErrorInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IEditableObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IExtenderProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IIntellisenseBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IListSource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ImmutableObjectAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INestedContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INestedSite.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InitializationEventAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyDataErrorInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanged.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanging.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InstallerTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InstanceCreationEditor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int16Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int32Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int64Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IntSecurity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InvalidAsynchronousStateException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InvalidEnumArgumentException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IRaiseItemChangedEvents.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IRevertibleChangeTracking.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISite.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISupportInitialize.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISupportInitializeNotification.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISynchronizeInvoke.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ITypeDescriptorContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ITypedList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\License.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseUsageMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicFileLicenseProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListBindableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDescription.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDescriptionCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDirection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LocalizableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LookupBindingPropertiesAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MarshalByValueComponent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MaskedTextProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MaskedTextResultHint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MemberDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MergablePropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MultilineStringConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\NestedContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\NullableConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PasswordPropertyTextAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProgressChangedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProgressChangedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangingEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangingEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyDescriptorCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProvidePropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReadOnlyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RecommendedAsConfigurableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReferenceConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectEventDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectTypeDescriptionProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RefreshEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RefreshEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunInstallerAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SByteConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SettingsBindableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SingleConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\StringConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SyntaxCheck.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TimeSpanConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeConverterAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeListConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt16Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt32Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt64Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\WarningException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Win32Exception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\AssertSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\BooleanSwitch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\ConsoleTraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\CorrelationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Debug.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\DelimitedListTraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\DiagnosticsConfiguration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\FilterElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\ListenerElementsCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\PerfCounterSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SeverityFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceElementsCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceLevels.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceSwitch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Switch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchElementsCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchLevelAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SystemDiagnosticsSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TextWriterTraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Trace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceEventCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceEventType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceInternal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceLevel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceListeners.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSwitch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\traceutils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TypedElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\XmlWriterTraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\hresults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\invariantcomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\PrivilegedConfigurationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\SecurityUtils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\WeakHashtable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_BufferOffsetSize.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LazyAsyncResult.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LoggingObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_ScatterGatherBuffers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookie.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookiecollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookiecontainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookieexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\HttpListenerRequestUriBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Internal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketOptionName.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeDecodingConformance.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeEncodingConformance.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\webclient.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WebPermission.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WriteStreamClosedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunnerfactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\Regex.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexBoyerMoore.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCapture.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCaptureCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCharClass.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompilationInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexFCD.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroupCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexInterpreter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchTimeoutException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexReplacement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunnerFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\security\system\security\permissions\typedescriptorpermission.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\ElapsedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\Timer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\TimersDescriptionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\BlockingCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\ConcurrentBag.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\runtime\versioning\FrameworkName.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\threading\Barrier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />\r
-    <Compile Include="..\..\build\common\SR.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeProvider.cs" />\r
-    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModes.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />\r
-    <Compile Include="Microsoft.Win32\SystemEvents.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />\r
-    <Compile Include="Mono.Http\NtlmClient.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverError.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />\r
-    <Compile Include="ReferenceSources\AssertWrapper.cs" />\r
-    <Compile Include="ReferenceSources\BinaryCompatibility.cs" />\r
-    <Compile Include="ReferenceSources\ConfigurationManagerInternalFactory.cs" />\r
-    <Compile Include="ReferenceSources\HttpSysSettings.cs" />\r
-    <Compile Include="ReferenceSources\Logging.cs" />\r
-    <Compile Include="ReferenceSources\NativeMethods.cs" />\r
-    <Compile Include="ReferenceSources\SettingsSectionInternal.cs" />\r
-    <Compile Include="ReferenceSources\Socket.cs" />\r
-    <Compile Include="ReferenceSources\SR.cs" />\r
-    <Compile Include="ReferenceSources\SRCategoryAttribute.cs" />\r
-    <Compile Include="ReferenceSources\SystemNetworkCredential.cs" />\r
-    <Compile Include="ReferenceSources\WebHeaderCollectionType.cs" />\r
-    <Compile Include="ReferenceSources\Win32Exception.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomProvider.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerInfo.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerResults.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Executor.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\TempFileCollection.cs" />\r
-    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />\r
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />\r
-    <Compile Include="System.Configuration\ClientSettingsSection.cs" />\r
-    <Compile Include="System.Configuration\ConfigHelper.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationException.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSettings.cs" />\r
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />\r
-    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />\r
-    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSystem.cs" />\r
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />\r
-    <Compile Include="System.Configuration\IdnElement.cs" />\r
-    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />\r
-    <Compile Include="System.Configuration\IriParsingElement.cs" />\r
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />\r
-    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingElement.cs" />\r
-    <Compile Include="System.Configuration\SettingElementCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />\r
-    <Compile Include="System.Configuration\SettingsBase.cs" />\r
-    <Compile Include="System.Configuration\SettingsContext.cs" />\r
-    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageability.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProperty.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />\r
-    <Compile Include="System.Configuration\SettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingValueElement.cs" />\r
-    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\SpecialSetting.cs" />\r
-    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UriSection.cs" />\r
-    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UserSettingsGroup.cs" />\r
-    <Compile Include="System.Diagnostics.CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSample.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\DefaultTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EventInstance.cs" />\r
-    <Compile Include="System.Diagnostics\EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogImpl.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermission.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\FileVersionInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ICollectData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />\r
-    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\MonitoringDescriptionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\NullEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\OverflowAction.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />\r
-    <Compile Include="System.Diagnostics\Process.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModule.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModuleCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessPriorityClass.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessStartInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThread.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThreadCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessWindowStyle.cs" />\r
-    <Compile Include="System.Diagnostics\Stopwatch.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadPriorityLevel.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadState.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadWaitReason.cs" />\r
-    <Compile Include="System.Diagnostics\TraceImpl.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />\r
-    <Compile Include="System.Diagnostics\Win32EventLog.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionLevel.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionMode.cs" />\r
-    <Compile Include="System.IO.Compression\DeflateStream.cs" />\r
-    <Compile Include="System.IO.Compression\GZipStream.cs" />\r
-    <Compile Include="System.IO.Ports\Handshake.cs" />\r
-    <Compile Include="System.IO.Ports\ISerialStream.cs" />\r
-    <Compile Include="System.IO.Ports\Parity.cs" />\r
-    <Compile Include="System.IO.Ports\SerialData.cs" />\r
-    <Compile Include="System.IO.Ports\SerialError.cs" />\r
-    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChange.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPort.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPortStream.cs" />\r
-    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialSignal.cs" />\r
-    <Compile Include="System.IO.Ports\StopBits.cs" />\r
-    <Compile Include="System.IO.Ports\WinSerialStream.cs" />\r
-    <Compile Include="System.IO\DefaultWatcher.cs" />\r
-    <Compile Include="System.IO\ErrorEventArgs.cs" />\r
-    <Compile Include="System.IO\ErrorEventHandler.cs" />\r
-    <Compile Include="System.IO\FAMWatcher.cs" />\r
-    <Compile Include="System.IO\FileAction.cs" />\r
-    <Compile Include="System.IO\FileSystemEventArgs.cs" />\r
-    <Compile Include="System.IO\FileSystemEventHandler.cs" />\r
-    <Compile Include="System.IO\FileSystemWatcher.cs" />\r
-    <Compile Include="System.IO\IFileWatcher.cs" />\r
-    <Compile Include="System.IO\InotifyWatcher.cs" />\r
-    <Compile Include="System.IO\InternalBufferOverflowException.cs" />\r
-    <Compile Include="System.IO\InvalidDataException.cs" />\r
-    <Compile Include="System.IO\IODescriptionAttribute.cs" />\r
-    <Compile Include="System.IO\KeventWatcher.cs" />\r
-    <Compile Include="System.IO\MonoSyncFileStream.cs" />\r
-    <Compile Include="System.IO\NotifyFilters.cs" />\r
-    <Compile Include="System.IO\NullFileWatcher.cs" />\r
-    <Compile Include="System.IO\RenamedEventArgs.cs" />\r
-    <Compile Include="System.IO\RenamedEventHandler.cs" />\r
-    <Compile Include="System.IO\SearchPattern.cs" />\r
-    <Compile Include="System.IO\WaitForChangedResult.cs" />\r
-    <Compile Include="System.IO\WatcherChangeTypes.cs" />\r
-    <Compile Include="System.IO\WindowsWatcher.cs" />\r
-    <Compile Include="System.Media\AudioData.cs" />\r
-    <Compile Include="System.Media\AudioDevice.cs" />\r
-    <Compile Include="System.Media\SoundPlayer.cs" />\r
-    <Compile Include="System.Media\SystemSound.cs" />\r
-    <Compile Include="System.Media\SystemSounds.cs" />\r
-    <Compile Include="System.Media\Win32SoundPlayer.cs" />\r
-    <Compile Include="System.Net.Cache\HttpCacheAgeControl.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElement.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />\r
-    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />\r
-    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />\r
-    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\ModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ProxyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />\r
-    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SettingsSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SocketElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateView.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateViewCollection.cs" />\r
-    <Compile Include="System.Net.Mail\Attachment.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentBase.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentCollection.cs" />\r
-    <Compile Include="System.Net.Mail\DeliveryNotificationOptions.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResource.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResourceCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Net.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Net.Mail\SendCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpAccess.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpDeliveryMethod.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientsException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermission.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />\r
-    <Compile Include="System.Net.Mime\ContentDisposition.cs" />\r
-    <Compile Include="System.Net.Mime\ContentType.cs" />\r
-    <Compile Include="System.Net.Mime\DispositionTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\MediaTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\TransferEncoding.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Ping.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticatedStream.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticationLevel.cs" />\r
-    <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />\r
-    <Compile Include="System.Net.Security\NegotiateStream.cs" />\r
-    <Compile Include="System.Net.Security\ProtectionLevel.cs" />\r
-    <Compile Include="System.Net.Security\RemoteCertificateValidationCallback.cs" />\r
-    <Compile Include="System.Net.Security\SslPolicyErrors.cs" />\r
-    <Compile Include="System.Net.Security\SslStream.cs" />\r
-    <Compile Include="System.Net.Sockets\AddressFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\IOControlCode.cs" />\r
-    <Compile Include="System.Net.Sockets\IPPacketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\LingerOption.cs" />\r
-    <Compile Include="System.Net.Sockets\MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolType.cs" />\r
-    <Compile Include="System.Net.Sockets\SafeSocketHandle.cs" />\r
-    <Compile Include="System.Net.Sockets\SelectMode.cs" />\r
-    <Compile Include="System.Net.Sockets\SendPacketsElement.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncOperation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncResult.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketError.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketException.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketFlags.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformationOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOperation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionLevel.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketShutdown.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketType.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpListener.cs" />\r
-    <Compile Include="System.Net.Sockets\TransmitFileOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />\r
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketCloseStatus.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketError.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketException.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketMessageType.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketState.cs" />\r
-    <Compile Include="System.Net\AuthenticationManager.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />\r
-    <Compile Include="System.Net\Authorization.cs" />\r
-    <Compile Include="System.Net\BasicClient.cs" />\r
-    <Compile Include="System.Net\BindIPEndPoint.cs" />\r
-    <Compile Include="System.Net\ChunkedInputStream.cs" />\r
-    <Compile Include="System.Net\ChunkStream.cs" />\r
-    <Compile Include="System.Net\ConnectionModes.cs" />\r
-    <Compile Include="System.Net\CredentialCache.cs" />\r
-    <Compile Include="System.Net\DecompressionMethods.cs" />\r
-    <Compile Include="System.Net\DefaultCertificatePolicy.cs" />\r
-    <Compile Include="System.Net\DigestClient.cs" />\r
-    <Compile Include="System.Net\Dns.cs" />\r
-    <Compile Include="System.Net\DnsAsyncResult.cs" />\r
-    <Compile Include="System.Net\DnsEndPoint.cs" />\r
-    <Compile Include="System.Net\DnsPermission.cs" />\r
-    <Compile Include="System.Net\DnsPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\EndPoint.cs" />\r
-    <Compile Include="System.Net\EndPointListener.cs" />\r
-    <Compile Include="System.Net\EndPointManager.cs" />\r
-    <Compile Include="System.Net\EndpointPermission.cs" />\r
-    <Compile Include="System.Net\FileWebRequest.cs" />\r
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />\r
-    <Compile Include="System.Net\FileWebResponse.cs" />\r
-    <Compile Include="System.Net\FtpAsyncResult.cs" />\r
-    <Compile Include="System.Net\FtpDataStream.cs" />\r
-    <Compile Include="System.Net\FtpRequestCreator.cs" />\r
-    <Compile Include="System.Net\FtpStatus.cs" />\r
-    <Compile Include="System.Net\FtpStatusCode.cs" />\r
-    <Compile Include="System.Net\FtpWebRequest.cs" />\r
-    <Compile Include="System.Net\FtpWebResponse.cs" />\r
-    <Compile Include="System.Net\GlobalProxySelection.cs" />\r
-    <Compile Include="System.Net\HttpConnection.cs" />\r
-    <Compile Include="System.Net\HttpListener.cs" />\r
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />\r
-    <Compile Include="System.Net\HttpListenerContext.cs" />\r
-    <Compile Include="System.Net\HttpListenerException.cs" />\r
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />\r
-    <Compile Include="System.Net\HttpListenerRequest.cs" />\r
-    <Compile Include="System.Net\HttpListenerResponse.cs" />\r
-    <Compile Include="System.Net\HttpRequestCreator.cs" />\r
-    <Compile Include="System.Net\HttpRequestHeader.cs" />\r
-    <Compile Include="System.Net\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Net\HttpStatusCode.cs" />\r
-    <Compile Include="System.Net\HttpStreamAsyncResult.cs" />\r
-    <Compile Include="System.Net\HttpUtility.cs" />\r
-    <Compile Include="System.Net\HttpVersion.cs" />\r
-    <Compile Include="System.Net\HttpWebRequest.cs" />\r
-    <Compile Include="System.Net\HttpWebResponse.cs" />\r
-    <Compile Include="System.Net\IAuthenticationModule.cs" />\r
-    <Compile Include="System.Net\ICertificatePolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialLookup.cs" />\r
-    <Compile Include="System.Net\ICredentialPolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialsByHost.cs" />\r
-    <Compile Include="System.Net\IPAddress.cs" />\r
-    <Compile Include="System.Net\IPEndPoint.cs" />\r
-    <Compile Include="System.Net\IPHostEntry.cs" />\r
-    <Compile Include="System.Net\IPv6Address.cs" />\r
-    <Compile Include="System.Net\IWebConnectionState.cs" />\r
-    <Compile Include="System.Net\IWebProxy.cs" />\r
-    <Compile Include="System.Net\IWebProxyScript.cs" />\r
-    <Compile Include="System.Net\IWebRequestCreate.cs" />\r
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />\r
-    <Compile Include="System.Net\ListenerPrefix.cs" />\r
-    <Compile Include="System.Net\MacProxy.cs" />\r
-    <Compile Include="System.Net\MonoHttpDate.cs" />\r
-    <Compile Include="System.Net\NetConfig.cs" />\r
-    <Compile Include="System.Net\NetworkAccess.cs" />\r
-    <Compile Include="System.Net\NetworkCredential.cs" />\r
-    <Compile Include="System.Net\NtlmClient.cs" />\r
-    <Compile Include="System.Net\ProtocolViolationException.cs" />\r
-    <Compile Include="System.Net\RequestStream.cs" />\r
-    <Compile Include="System.Net\ResponseStream.cs" />\r
-    <Compile Include="System.Net\SecurityProtocolType.cs" />\r
-    <Compile Include="System.Net\ServicePoint.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />\r
-    <Compile Include="System.Net\SimpleAsyncResult.cs" />\r
-    <Compile Include="System.Net\SocketAddress.cs" />\r
-    <Compile Include="System.Net\SocketPermission.cs" />\r
-    <Compile Include="System.Net\SocketPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\TransportContext.cs" />\r
-    <Compile Include="System.Net\TransportType.cs" />\r
-    <Compile Include="System.Net\WebAsyncResult.cs" />\r
-    <Compile Include="System.Net\WebConnection.cs" />\r
-    <Compile Include="System.Net\WebConnectionData.cs" />\r
-    <Compile Include="System.Net\WebConnectionGroup.cs" />\r
-    <Compile Include="System.Net\WebConnectionStream.cs" />\r
-    <Compile Include="System.Net\WebException.cs" />\r
-    <Compile Include="System.Net\WebExceptionStatus.cs" />\r
-    <Compile Include="System.Net\WebHeaderCollection.cs" />\r
-    <Compile Include="System.Net\WebProxy.cs" />\r
-    <Compile Include="System.Net\WebRequest.cs" />\r
-    <Compile Include="System.Net\WebRequestMethods.cs" />\r
-    <Compile Include="System.Net\WebResponse.cs" />\r
-    <Compile Include="System.Net\WebUtility.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IAdviseSink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDataObject.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumFORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumSTATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STGMEDIUM.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYMED.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DefaultParameterValueAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\HandleCollector.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreSecurity.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ExtendedProtectionPolicyElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElementCollection.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBinding.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBindingKind.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicy.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicyTypeConverter.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\PolicyEnforcement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ProtectionScenario.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ServiceNameCollection.cs" />\r
-    <Compile Include="System.Security.Authentication\AuthenticationException.cs" />\r
-    <Compile Include="System.Security.Authentication\CipherAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\HashAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\InvalidCredentialException.cs" />\r
-    <Compile Include="System.Security.Authentication\SslProtocols.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OpenFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\PublicKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreLocation.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedNameFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Extension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509NameType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationFlag.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationMode.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Store.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierHashAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509VerificationFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography\Oid.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />\r
-    <Compile Include="System.Threading\Semaphore.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventArgs.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermission.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />\r
-    <Compile Include="System.Windows.Input\ICommand.cs" />\r
-    <Compile Include="System\DefaultUriParser.cs" />\r
-    <Compile Include="System\FileStyleUriParser.cs" />\r
-    <Compile Include="System\FtpStyleUriParser.cs" />\r
-    <Compile Include="System\GenericUriParser.cs" />\r
-    <Compile Include="System\GenericUriParserOptions.cs" />\r
-    <Compile Include="System\GopherStyleUriParser.cs" />\r
-    <Compile Include="System\HttpStyleUriParser.cs" />\r
-    <Compile Include="System\IUriData.cs" />\r
-    <Compile Include="System\LdapStyleUriParser.cs" />\r
-    <Compile Include="System\NetPipeStyleUriParser.cs" />\r
-    <Compile Include="System\NetTcpStyleUriParser.cs" />\r
-    <Compile Include="System\NewsStyleUriParser.cs" />\r
-    <Compile Include="System\Platform.cs" />\r
-    <Compile Include="System\SRDescriptionAttribute.cs" />\r
-    <Compile Include="System\Uri.cs" />\r
-    <Compile Include="System\UriBuilder.cs" />\r
-    <Compile Include="System\UriComponents.cs" />\r
-    <Compile Include="System\UriData.cs" />\r
-    <Compile Include="System\UriElements.cs" />\r
-    <Compile Include="System\UriFormat.cs" />\r
-    <Compile Include="System\UriFormatException.cs" />\r
-    <Compile Include="System\UriHelper.cs" />\r
-    <Compile Include="System\UriHostNameType.cs" />\r
-    <Compile Include="System\UriIdnScope.cs" />\r
-    <Compile Include="System\UriKind.cs" />\r
-    <Compile Include="System\UriParseComponents.cs" />\r
-    <Compile Include="System\UriParser.cs" />\r
-    <Compile Include="System\UriPartial.cs" />\r
-    <Compile Include="System\UriTypeConverter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/Asterisk.wav">\r
-      <LogicalName>Asterisk.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Beep.wav">\r
-      <LogicalName>Beep.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Exclamation.wav">\r
-      <LogicalName>Exclamation.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Hand.wav">\r
-      <LogicalName>Hand.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Question.wav">\r
-      <LogicalName>Question.wav</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System/System-bare-net_4_x.csproj b/mcs/class/System/System-bare-net_4_x.csproj
index 9e4ca99eef1919e9cf3ecbc49b99bbdfb4e21900..1da957bfcc99d84d504c6132f4848f0a5a8d5c18 100644 (file)
--- a/mcs/class/System/System-bare-net_4_x.csproj
+++ b/mcs/class/System/System-bare-net_4_x.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>\r
     <NoWarn>1699,618</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX</DefineConstants>\r
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -33,7 +33,7 @@
     <DebugType>pdbonly</DebugType>\r
     <NoWarn>1699,618</NoWarn>\r
     <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX</DefineConstants>\r
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -491,7 +491,9 @@
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\IPInterfaceStatistics.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\ScopeLevel.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\UnicastIPAddressInformation.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\ServicePointManager.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\IPProtectionLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\NetworkStream.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketOptionName.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeDecodingConformance.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeEncodingConformance.cs" />\r
@@ -584,16 +586,39 @@
     <Compile Include="Mono.Net.Dns\ResolverError.cs" />\r
     <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />\r
     <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />\r
+    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />\r
+    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />\r
+    <Compile Include="Mono.Net.Security\IMonoSslStream.cs" />\r
+    <Compile Include="Mono.Net.Security\IMonoTlsProvider.cs" />\r
+    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoDefaultTlsProvider.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoSslStreamImpl.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoSslStreamWrapper.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoTlsProviderImpl.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoTlsProviderWrapper.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />\r
+    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />\r
+    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />\r
+    <Compile Include="ReferenceSources\_SecureChannel.cs" />\r
+    <Compile Include="ReferenceSources\_SslState.cs" />\r
+    <Compile Include="ReferenceSources\_SslStream.cs" />\r
     <Compile Include="ReferenceSources\AssertWrapper.cs" />\r
     <Compile Include="ReferenceSources\BinaryCompatibility.cs" />\r
     <Compile Include="ReferenceSources\ConfigurationManagerInternalFactory.cs" />\r
     <Compile Include="ReferenceSources\HttpSysSettings.cs" />\r
+    <Compile Include="ReferenceSources\Internal.cs" />\r
     <Compile Include="ReferenceSources\Logging.cs" />\r
     <Compile Include="ReferenceSources\NativeMethods.cs" />\r
     <Compile Include="ReferenceSources\SettingsSectionInternal.cs" />\r
     <Compile Include="ReferenceSources\Socket.cs" />\r
     <Compile Include="ReferenceSources\SR.cs" />\r
+    <Compile Include="ReferenceSources\SR2.cs" />\r
     <Compile Include="ReferenceSources\SRCategoryAttribute.cs" />\r
+    <Compile Include="ReferenceSources\SslStream.cs" />\r
+    <Compile Include="ReferenceSources\SSPIConfiguration.cs" />\r
+    <Compile Include="ReferenceSources\SSPISafeHandles.cs" />\r
+    <Compile Include="ReferenceSources\SSPIWrapper.cs" />\r
     <Compile Include="ReferenceSources\SystemNetworkCredential.cs" />\r
     <Compile Include="ReferenceSources\WebHeaderCollectionType.cs" />\r
     <Compile Include="ReferenceSources\Win32Exception.cs" />\r
@@ -907,7 +932,6 @@
     <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />\r
     <Compile Include="System.Net.Sockets\LingerOption.cs" />\r
     <Compile Include="System.Net.Sockets\MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />\r
     <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />\r
     <Compile Include="System.Net.Sockets\ProtocolType.cs" />\r
     <Compile Include="System.Net.Sockets\SafeSocketHandle.cs" />\r
@@ -1135,6 +1159,7 @@
     <Compile Include="System\GenericUriParserOptions.cs" />\r
     <Compile Include="System\GopherStyleUriParser.cs" />\r
     <Compile Include="System\HttpStyleUriParser.cs" />\r
+    <Compile Include="System\IOSelector.cs" />\r
     <Compile Include="System\IUriData.cs" />\r
     <Compile Include="System\LdapStyleUriParser.cs" />\r
     <Compile Include="System\NetPipeStyleUriParser.cs" />\r

diff --git a/mcs/class/System/System-net_4_5.csproj b/mcs/class/System/System-net_4_5.csproj
deleted file mode 100644 (file)
index 79c57dc..0000000
--- a/mcs/class/System/System-net_4_5.csproj
+++ /dev/null
@@ -1,1219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FFAC0B73-D997-493B-9C62-27656CD858BB}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;SECURITY_DEP;XML_DEP;CONFIGURATION_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;SECURITY_DEP;XML_DEP;CONFIGURATION_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArgumentReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArrayCreateExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArrayIndexerExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAssignStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttachEventStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeArgument.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeArgumentCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeDeclaration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeDeclarationCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBaseReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBinaryOperatorExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBinaryOperatorType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCastExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCatchClause.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCatchClauseCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeChecksumPragma.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeComment.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCommentStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCommentStatementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCompileUnit.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeConditionStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeConstructor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDefaultValueExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDelegateCreateExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDelegateInvokeExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirectionExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirective.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirectiveCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeEntryPointMethod.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeEventReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpressionCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpressionStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeFieldReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeGotoStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeIndexerExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeIterationStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeLabeledStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeLinePragma.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberField.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberMethod.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberProperty.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMethodInvokeExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\codemethodreferenceexpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMethodReturnStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceImport.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceImportCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeObjectCreateExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpressionCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePrimitiveExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePropertyReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePropertySetValueReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRegionDirective.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRegionMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRemoveEventStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetCompileUnit.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetTypeMember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeStatementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeThisReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeThrowExceptionStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTryCatchFinallyStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeConstructor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDeclaration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDeclarationCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDelegate.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeMember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeMemberCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeOfExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeParameterCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReferenceCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeVariableDeclarationStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeVariableReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeGeneratorOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerError.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerErrorCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerParameters.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\GeneratedCodeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\GeneratorSupport.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\IndentTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\LanguageOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\FieldDirection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\MemberAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\bithelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\debugview.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\iset.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\linkedlist.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\queue.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sorteddictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedlist.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedset.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedsetdebugview.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\stack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\throwhelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\objectmodel\observablecollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\objectmodel\readonlyobservablecollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\bitvector32.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\casesensitivestringdictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\collectionsutil.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\fixedstringlookup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\hybriddictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\inotifycollectionchanged.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\iordereddictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\listdictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\nameobjectcollectionbase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\namevaluecollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\notifycollectionchangedeventargs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\ordereddictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringcollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringdictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringdictionarywithcomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AddingNewEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AddingNewEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AmbientValueAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ArrayConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ArraySubsetEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncOperation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncOperationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AttributeCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AttributeProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BackgroundWorker.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BaseComponentEditor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\basenumberconverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindableSupport.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindingDirection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindingList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BooleanConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BrowsableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ByteConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CancelEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CancelEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CategoryAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CharConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComplexBindingPropertiesAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CompModSwitches.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Component.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentResourceManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Container.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ContainerFilterService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CultureInfoConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CustomTypeDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataErrorsChangedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectFieldAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectMethodAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectMethodType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DateTimeConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DateTimeOffsetConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugExtendedPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugReflectEventDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugReflectPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugTypeDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DecimalConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultBindingPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultEventAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultValueAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DelegatingTypeDescriptionProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DescriptionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\CheckoutException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\CommandID.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerOptionService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransaction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerVerb.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerVerbCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContextSerializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpContextType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpKeywordAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpKeywordType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentChangeService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentDiscoveryService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentInitializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesigner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerEventService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerHost.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerHostTransactionState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerOptionService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDictionaryService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IEventPropertyService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IExtenderListService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IExtenderProviderService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IHelpService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IInheritanceService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IMenuCommandService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\InheritanceAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\InheritanceLevel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IReferenceService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IResourceService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IRootDesigner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ISelectionService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IServiceObjectContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITreeDesigner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeDescriptorFilterService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeDiscoveryService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeResolutionService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\MenuCommand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\NotifyParentPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ParenthesizePropertyNameAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\PropertyTabAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\PropertyTabScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\RefreshProperties.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\RefreshPropertiesAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\SelectionTypes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ComponentSerializationService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ContextStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DefaultSerializationProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerSerializerAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderHost.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\INameCreationService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\InstanceDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\MemberRelationshipService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\RootDesignerSerializerAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\SerializationStore.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ServiceCreatorCallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ServiceObjectContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\StandardCommands.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\StandardToolWindows.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ToolboxItemAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ViewTechnology.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerCategoryAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibility.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibilityAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignOnlyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignTimeVisibleAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DisplayNameAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoubleConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoWorkEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoWorkEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EditorAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EditorBrowsableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EnumConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventDescriptorCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventHandlerList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExpandableObjectConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExtendedPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExtenderProvidedPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\FxCopSuppression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\GuidConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\HandledEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\HandledEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IBindingList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IBindingListView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ICancelAddNew.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IChangeTracking.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IComNativeDescriptorHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IComponent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ICustomTypeDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IDataErrorInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IEditableObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IExtenderProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IIntellisenseBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IListSource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ImmutableObjectAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INestedContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INestedSite.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InitializationEventAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyDataErrorInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanged.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanging.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InstallerTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InstanceCreationEditor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int16Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int32Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int64Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IntSecurity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InvalidAsynchronousStateException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InvalidEnumArgumentException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IRaiseItemChangedEvents.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IRevertibleChangeTracking.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISite.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISupportInitialize.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISupportInitializeNotification.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISynchronizeInvoke.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ITypeDescriptorContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ITypedList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\License.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseUsageMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicFileLicenseProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListBindableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDescription.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDescriptionCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDirection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LocalizableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LookupBindingPropertiesAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MarshalByValueComponent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MaskedTextProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MaskedTextResultHint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MemberDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MergablePropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MultilineStringConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\NestedContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\NullableConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PasswordPropertyTextAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProgressChangedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProgressChangedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangingEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangingEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyDescriptorCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProvidePropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReadOnlyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RecommendedAsConfigurableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReferenceConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectEventDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectTypeDescriptionProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RefreshEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RefreshEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunInstallerAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SByteConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SettingsBindableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SingleConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\StringConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SyntaxCheck.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TimeSpanConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeConverterAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeListConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt16Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt32Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt64Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\WarningException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Win32Exception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\AssertSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\BooleanSwitch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\ConsoleTraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\CorrelationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Debug.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\DelimitedListTraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\DiagnosticsConfiguration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\FilterElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\ListenerElementsCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\PerfCounterSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SeverityFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceElementsCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceLevels.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceSwitch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Switch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchElementsCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchLevelAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SystemDiagnosticsSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TextWriterTraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Trace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceEventCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceEventType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceInternal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceLevel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceListeners.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSwitch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\traceutils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TypedElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\XmlWriterTraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\hresults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\invariantcomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\PrivilegedConfigurationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\SecurityUtils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\WeakHashtable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_BufferOffsetSize.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LazyAsyncResult.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LoggingObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_ScatterGatherBuffers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookie.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookiecollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookiecontainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookieexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\HttpListenerRequestUriBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Internal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketOptionName.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeDecodingConformance.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeEncodingConformance.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\webclient.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WebPermission.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WriteStreamClosedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunnerfactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\Regex.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexBoyerMoore.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCapture.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCaptureCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCharClass.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompilationInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexFCD.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroupCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexInterpreter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchTimeoutException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexReplacement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunnerFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\security\system\security\permissions\typedescriptorpermission.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\ElapsedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\Timer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\TimersDescriptionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\BlockingCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\ConcurrentBag.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\runtime\versioning\FrameworkName.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\threading\Barrier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />\r
-    <Compile Include="..\..\build\common\SR.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeProvider.cs" />\r
-    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModes.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />\r
-    <Compile Include="Microsoft.Win32\SystemEvents.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />\r
-    <Compile Include="Mono.Http\NtlmClient.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverError.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />\r
-    <Compile Include="ReferenceSources\AssertWrapper.cs" />\r
-    <Compile Include="ReferenceSources\BinaryCompatibility.cs" />\r
-    <Compile Include="ReferenceSources\ConfigurationManagerInternalFactory.cs" />\r
-    <Compile Include="ReferenceSources\HttpSysSettings.cs" />\r
-    <Compile Include="ReferenceSources\Logging.cs" />\r
-    <Compile Include="ReferenceSources\NativeMethods.cs" />\r
-    <Compile Include="ReferenceSources\SettingsSectionInternal.cs" />\r
-    <Compile Include="ReferenceSources\Socket.cs" />\r
-    <Compile Include="ReferenceSources\SR.cs" />\r
-    <Compile Include="ReferenceSources\SRCategoryAttribute.cs" />\r
-    <Compile Include="ReferenceSources\SystemNetworkCredential.cs" />\r
-    <Compile Include="ReferenceSources\WebHeaderCollectionType.cs" />\r
-    <Compile Include="ReferenceSources\Win32Exception.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomProvider.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerInfo.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerResults.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Executor.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\TempFileCollection.cs" />\r
-    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />\r
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />\r
-    <Compile Include="System.Configuration\ClientSettingsSection.cs" />\r
-    <Compile Include="System.Configuration\ConfigHelper.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationException.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSettings.cs" />\r
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />\r
-    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />\r
-    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSystem.cs" />\r
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />\r
-    <Compile Include="System.Configuration\IdnElement.cs" />\r
-    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />\r
-    <Compile Include="System.Configuration\IriParsingElement.cs" />\r
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />\r
-    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingElement.cs" />\r
-    <Compile Include="System.Configuration\SettingElementCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />\r
-    <Compile Include="System.Configuration\SettingsBase.cs" />\r
-    <Compile Include="System.Configuration\SettingsContext.cs" />\r
-    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageability.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProperty.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />\r
-    <Compile Include="System.Configuration\SettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingValueElement.cs" />\r
-    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\SpecialSetting.cs" />\r
-    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UriSection.cs" />\r
-    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UserSettingsGroup.cs" />\r
-    <Compile Include="System.Diagnostics.CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSample.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\DefaultTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EventInstance.cs" />\r
-    <Compile Include="System.Diagnostics\EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogImpl.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermission.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\FileVersionInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ICollectData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />\r
-    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\MonitoringDescriptionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\NullEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\OverflowAction.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />\r
-    <Compile Include="System.Diagnostics\Process.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModule.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModuleCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessPriorityClass.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessStartInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThread.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThreadCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessWindowStyle.cs" />\r
-    <Compile Include="System.Diagnostics\Stopwatch.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadPriorityLevel.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadState.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadWaitReason.cs" />\r
-    <Compile Include="System.Diagnostics\TraceImpl.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />\r
-    <Compile Include="System.Diagnostics\Win32EventLog.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionLevel.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionMode.cs" />\r
-    <Compile Include="System.IO.Compression\DeflateStream.cs" />\r
-    <Compile Include="System.IO.Compression\GZipStream.cs" />\r
-    <Compile Include="System.IO.Ports\Handshake.cs" />\r
-    <Compile Include="System.IO.Ports\ISerialStream.cs" />\r
-    <Compile Include="System.IO.Ports\Parity.cs" />\r
-    <Compile Include="System.IO.Ports\SerialData.cs" />\r
-    <Compile Include="System.IO.Ports\SerialError.cs" />\r
-    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChange.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPort.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPortStream.cs" />\r
-    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialSignal.cs" />\r
-    <Compile Include="System.IO.Ports\StopBits.cs" />\r
-    <Compile Include="System.IO.Ports\WinSerialStream.cs" />\r
-    <Compile Include="System.IO\DefaultWatcher.cs" />\r
-    <Compile Include="System.IO\ErrorEventArgs.cs" />\r
-    <Compile Include="System.IO\ErrorEventHandler.cs" />\r
-    <Compile Include="System.IO\FAMWatcher.cs" />\r
-    <Compile Include="System.IO\FileAction.cs" />\r
-    <Compile Include="System.IO\FileSystemEventArgs.cs" />\r
-    <Compile Include="System.IO\FileSystemEventHandler.cs" />\r
-    <Compile Include="System.IO\FileSystemWatcher.cs" />\r
-    <Compile Include="System.IO\IFileWatcher.cs" />\r
-    <Compile Include="System.IO\InotifyWatcher.cs" />\r
-    <Compile Include="System.IO\InternalBufferOverflowException.cs" />\r
-    <Compile Include="System.IO\InvalidDataException.cs" />\r
-    <Compile Include="System.IO\IODescriptionAttribute.cs" />\r
-    <Compile Include="System.IO\KeventWatcher.cs" />\r
-    <Compile Include="System.IO\MonoSyncFileStream.cs" />\r
-    <Compile Include="System.IO\NotifyFilters.cs" />\r
-    <Compile Include="System.IO\NullFileWatcher.cs" />\r
-    <Compile Include="System.IO\RenamedEventArgs.cs" />\r
-    <Compile Include="System.IO\RenamedEventHandler.cs" />\r
-    <Compile Include="System.IO\SearchPattern.cs" />\r
-    <Compile Include="System.IO\WaitForChangedResult.cs" />\r
-    <Compile Include="System.IO\WatcherChangeTypes.cs" />\r
-    <Compile Include="System.IO\WindowsWatcher.cs" />\r
-    <Compile Include="System.Media\AudioData.cs" />\r
-    <Compile Include="System.Media\AudioDevice.cs" />\r
-    <Compile Include="System.Media\SoundPlayer.cs" />\r
-    <Compile Include="System.Media\SystemSound.cs" />\r
-    <Compile Include="System.Media\SystemSounds.cs" />\r
-    <Compile Include="System.Media\Win32SoundPlayer.cs" />\r
-    <Compile Include="System.Net.Cache\HttpCacheAgeControl.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElement.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />\r
-    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />\r
-    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />\r
-    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\ModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ProxyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />\r
-    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SettingsSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SocketElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateView.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateViewCollection.cs" />\r
-    <Compile Include="System.Net.Mail\Attachment.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentBase.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentCollection.cs" />\r
-    <Compile Include="System.Net.Mail\DeliveryNotificationOptions.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResource.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResourceCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Net.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Net.Mail\SendCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpAccess.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpDeliveryMethod.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientsException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermission.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />\r
-    <Compile Include="System.Net.Mime\ContentDisposition.cs" />\r
-    <Compile Include="System.Net.Mime\ContentType.cs" />\r
-    <Compile Include="System.Net.Mime\DispositionTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\MediaTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\TransferEncoding.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Ping.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticatedStream.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticationLevel.cs" />\r
-    <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />\r
-    <Compile Include="System.Net.Security\NegotiateStream.cs" />\r
-    <Compile Include="System.Net.Security\ProtectionLevel.cs" />\r
-    <Compile Include="System.Net.Security\RemoteCertificateValidationCallback.cs" />\r
-    <Compile Include="System.Net.Security\SslPolicyErrors.cs" />\r
-    <Compile Include="System.Net.Security\SslStream.cs" />\r
-    <Compile Include="System.Net.Sockets\AddressFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\IOControlCode.cs" />\r
-    <Compile Include="System.Net.Sockets\IPPacketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\LingerOption.cs" />\r
-    <Compile Include="System.Net.Sockets\MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolType.cs" />\r
-    <Compile Include="System.Net.Sockets\SafeSocketHandle.cs" />\r
-    <Compile Include="System.Net.Sockets\SelectMode.cs" />\r
-    <Compile Include="System.Net.Sockets\SendPacketsElement.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncOperation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncResult.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketError.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketException.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketFlags.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformationOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOperation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionLevel.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketShutdown.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketType.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpListener.cs" />\r
-    <Compile Include="System.Net.Sockets\TransmitFileOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />\r
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketCloseStatus.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketError.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketException.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketMessageType.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketState.cs" />\r
-    <Compile Include="System.Net\AuthenticationManager.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />\r
-    <Compile Include="System.Net\Authorization.cs" />\r
-    <Compile Include="System.Net\BasicClient.cs" />\r
-    <Compile Include="System.Net\BindIPEndPoint.cs" />\r
-    <Compile Include="System.Net\ChunkedInputStream.cs" />\r
-    <Compile Include="System.Net\ChunkStream.cs" />\r
-    <Compile Include="System.Net\ConnectionModes.cs" />\r
-    <Compile Include="System.Net\CredentialCache.cs" />\r
-    <Compile Include="System.Net\DecompressionMethods.cs" />\r
-    <Compile Include="System.Net\DefaultCertificatePolicy.cs" />\r
-    <Compile Include="System.Net\DigestClient.cs" />\r
-    <Compile Include="System.Net\Dns.cs" />\r
-    <Compile Include="System.Net\DnsAsyncResult.cs" />\r
-    <Compile Include="System.Net\DnsEndPoint.cs" />\r
-    <Compile Include="System.Net\DnsPermission.cs" />\r
-    <Compile Include="System.Net\DnsPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\EndPoint.cs" />\r
-    <Compile Include="System.Net\EndPointListener.cs" />\r
-    <Compile Include="System.Net\EndPointManager.cs" />\r
-    <Compile Include="System.Net\EndpointPermission.cs" />\r
-    <Compile Include="System.Net\FileWebRequest.cs" />\r
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />\r
-    <Compile Include="System.Net\FileWebResponse.cs" />\r
-    <Compile Include="System.Net\FtpAsyncResult.cs" />\r
-    <Compile Include="System.Net\FtpDataStream.cs" />\r
-    <Compile Include="System.Net\FtpRequestCreator.cs" />\r
-    <Compile Include="System.Net\FtpStatus.cs" />\r
-    <Compile Include="System.Net\FtpStatusCode.cs" />\r
-    <Compile Include="System.Net\FtpWebRequest.cs" />\r
-    <Compile Include="System.Net\FtpWebResponse.cs" />\r
-    <Compile Include="System.Net\GlobalProxySelection.cs" />\r
-    <Compile Include="System.Net\HttpConnection.cs" />\r
-    <Compile Include="System.Net\HttpListener.cs" />\r
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />\r
-    <Compile Include="System.Net\HttpListenerContext.cs" />\r
-    <Compile Include="System.Net\HttpListenerException.cs" />\r
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />\r
-    <Compile Include="System.Net\HttpListenerRequest.cs" />\r
-    <Compile Include="System.Net\HttpListenerResponse.cs" />\r
-    <Compile Include="System.Net\HttpRequestCreator.cs" />\r
-    <Compile Include="System.Net\HttpRequestHeader.cs" />\r
-    <Compile Include="System.Net\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Net\HttpStatusCode.cs" />\r
-    <Compile Include="System.Net\HttpStreamAsyncResult.cs" />\r
-    <Compile Include="System.Net\HttpUtility.cs" />\r
-    <Compile Include="System.Net\HttpVersion.cs" />\r
-    <Compile Include="System.Net\HttpWebRequest.cs" />\r
-    <Compile Include="System.Net\HttpWebResponse.cs" />\r
-    <Compile Include="System.Net\IAuthenticationModule.cs" />\r
-    <Compile Include="System.Net\ICertificatePolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialLookup.cs" />\r
-    <Compile Include="System.Net\ICredentialPolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialsByHost.cs" />\r
-    <Compile Include="System.Net\IPAddress.cs" />\r
-    <Compile Include="System.Net\IPEndPoint.cs" />\r
-    <Compile Include="System.Net\IPHostEntry.cs" />\r
-    <Compile Include="System.Net\IPv6Address.cs" />\r
-    <Compile Include="System.Net\IWebConnectionState.cs" />\r
-    <Compile Include="System.Net\IWebProxy.cs" />\r
-    <Compile Include="System.Net\IWebProxyScript.cs" />\r
-    <Compile Include="System.Net\IWebRequestCreate.cs" />\r
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />\r
-    <Compile Include="System.Net\ListenerPrefix.cs" />\r
-    <Compile Include="System.Net\MacProxy.cs" />\r
-    <Compile Include="System.Net\MonoHttpDate.cs" />\r
-    <Compile Include="System.Net\NetConfig.cs" />\r
-    <Compile Include="System.Net\NetworkAccess.cs" />\r
-    <Compile Include="System.Net\NetworkCredential.cs" />\r
-    <Compile Include="System.Net\NtlmClient.cs" />\r
-    <Compile Include="System.Net\ProtocolViolationException.cs" />\r
-    <Compile Include="System.Net\RequestStream.cs" />\r
-    <Compile Include="System.Net\ResponseStream.cs" />\r
-    <Compile Include="System.Net\SecurityProtocolType.cs" />\r
-    <Compile Include="System.Net\ServicePoint.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />\r
-    <Compile Include="System.Net\SimpleAsyncResult.cs" />\r
-    <Compile Include="System.Net\SocketAddress.cs" />\r
-    <Compile Include="System.Net\SocketPermission.cs" />\r
-    <Compile Include="System.Net\SocketPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\TransportContext.cs" />\r
-    <Compile Include="System.Net\TransportType.cs" />\r
-    <Compile Include="System.Net\WebAsyncResult.cs" />\r
-    <Compile Include="System.Net\WebConnection.cs" />\r
-    <Compile Include="System.Net\WebConnectionData.cs" />\r
-    <Compile Include="System.Net\WebConnectionGroup.cs" />\r
-    <Compile Include="System.Net\WebConnectionStream.cs" />\r
-    <Compile Include="System.Net\WebException.cs" />\r
-    <Compile Include="System.Net\WebExceptionStatus.cs" />\r
-    <Compile Include="System.Net\WebHeaderCollection.cs" />\r
-    <Compile Include="System.Net\WebProxy.cs" />\r
-    <Compile Include="System.Net\WebRequest.cs" />\r
-    <Compile Include="System.Net\WebRequestMethods.cs" />\r
-    <Compile Include="System.Net\WebResponse.cs" />\r
-    <Compile Include="System.Net\WebUtility.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IAdviseSink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDataObject.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumFORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumSTATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STGMEDIUM.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYMED.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DefaultParameterValueAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\HandleCollector.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreSecurity.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ExtendedProtectionPolicyElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElementCollection.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBinding.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBindingKind.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicy.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicyTypeConverter.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\PolicyEnforcement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ProtectionScenario.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ServiceNameCollection.cs" />\r
-    <Compile Include="System.Security.Authentication\AuthenticationException.cs" />\r
-    <Compile Include="System.Security.Authentication\CipherAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\HashAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\InvalidCredentialException.cs" />\r
-    <Compile Include="System.Security.Authentication\SslProtocols.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OpenFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\PublicKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreLocation.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedNameFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Extension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509NameType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationFlag.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationMode.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Store.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierHashAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509VerificationFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography\Oid.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />\r
-    <Compile Include="System.Threading\Semaphore.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventArgs.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermission.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />\r
-    <Compile Include="System.Windows.Input\ICommand.cs" />\r
-    <Compile Include="System\DefaultUriParser.cs" />\r
-    <Compile Include="System\FileStyleUriParser.cs" />\r
-    <Compile Include="System\FtpStyleUriParser.cs" />\r
-    <Compile Include="System\GenericUriParser.cs" />\r
-    <Compile Include="System\GenericUriParserOptions.cs" />\r
-    <Compile Include="System\GopherStyleUriParser.cs" />\r
-    <Compile Include="System\HttpStyleUriParser.cs" />\r
-    <Compile Include="System\IUriData.cs" />\r
-    <Compile Include="System\LdapStyleUriParser.cs" />\r
-    <Compile Include="System\NetPipeStyleUriParser.cs" />\r
-    <Compile Include="System\NetTcpStyleUriParser.cs" />\r
-    <Compile Include="System\NewsStyleUriParser.cs" />\r
-    <Compile Include="System\Platform.cs" />\r
-    <Compile Include="System\SRDescriptionAttribute.cs" />\r
-    <Compile Include="System\Uri.cs" />\r
-    <Compile Include="System\UriBuilder.cs" />\r
-    <Compile Include="System\UriComponents.cs" />\r
-    <Compile Include="System\UriData.cs" />\r
-    <Compile Include="System\UriElements.cs" />\r
-    <Compile Include="System\UriFormat.cs" />\r
-    <Compile Include="System\UriFormatException.cs" />\r
-    <Compile Include="System\UriHelper.cs" />\r
-    <Compile Include="System\UriHostNameType.cs" />\r
-    <Compile Include="System\UriIdnScope.cs" />\r
-    <Compile Include="System\UriKind.cs" />\r
-    <Compile Include="System\UriParseComponents.cs" />\r
-    <Compile Include="System\UriParser.cs" />\r
-    <Compile Include="System\UriPartial.cs" />\r
-    <Compile Include="System\UriTypeConverter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="System-secxml-net_4_5.csproj">\r
-      <Project>{46F151F2-A422-4A1B-9D29-2E148CE73629}</Project>\r
-      <Name>System-secxml-net_4_5</Name>\r
-      <Aliases>PrebuiltSystem</Aliases>    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security-net_4_5</Name>\r
-      <Aliases>MonoSecurity</Aliases>    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/Asterisk.wav">\r
-      <LogicalName>Asterisk.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Beep.wav">\r
-      <LogicalName>Beep.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Exclamation.wav">\r
-      <LogicalName>Exclamation.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Hand.wav">\r
-      <LogicalName>Hand.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Question.wav">\r
-      <LogicalName>Question.wav</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System/System-net_4_x.csproj b/mcs/class/System/System-net_4_x.csproj
index d959dbe4255d837cff26973bcd5e99686b933262..efd6708584481599414fa333f9b839f0a4bb0175 100644 (file)
--- a/mcs/class/System/System-net_4_x.csproj
+++ b/mcs/class/System/System-net_4_x.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>\r
     <NoWarn>1699,618</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;SECURITY_DEP;XML_DEP;CONFIGURATION_DEP</DefineConstants>\r
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS;MONO_X509_ALIAS;CONFIGURATION_DEP</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -33,7 +33,7 @@
     <DebugType>pdbonly</DebugType>\r
     <NoWarn>1699,618</NoWarn>\r
     <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;SECURITY_DEP;XML_DEP;CONFIGURATION_DEP</DefineConstants>\r
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS;MONO_X509_ALIAS;CONFIGURATION_DEP</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -491,7 +491,9 @@
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\IPInterfaceStatistics.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\ScopeLevel.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\UnicastIPAddressInformation.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\ServicePointManager.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\IPProtectionLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\NetworkStream.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketOptionName.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeDecodingConformance.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeEncodingConformance.cs" />\r
@@ -584,16 +586,39 @@
     <Compile Include="Mono.Net.Dns\ResolverError.cs" />\r
     <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />\r
     <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />\r
+    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />\r
+    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />\r
+    <Compile Include="Mono.Net.Security\IMonoSslStream.cs" />\r
+    <Compile Include="Mono.Net.Security\IMonoTlsProvider.cs" />\r
+    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoDefaultTlsProvider.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoSslStreamImpl.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoSslStreamWrapper.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoTlsProviderImpl.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoTlsProviderWrapper.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />\r
+    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />\r
+    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />\r
+    <Compile Include="ReferenceSources\_SecureChannel.cs" />\r
+    <Compile Include="ReferenceSources\_SslState.cs" />\r
+    <Compile Include="ReferenceSources\_SslStream.cs" />\r
     <Compile Include="ReferenceSources\AssertWrapper.cs" />\r
     <Compile Include="ReferenceSources\BinaryCompatibility.cs" />\r
     <Compile Include="ReferenceSources\ConfigurationManagerInternalFactory.cs" />\r
     <Compile Include="ReferenceSources\HttpSysSettings.cs" />\r
+    <Compile Include="ReferenceSources\Internal.cs" />\r
     <Compile Include="ReferenceSources\Logging.cs" />\r
     <Compile Include="ReferenceSources\NativeMethods.cs" />\r
     <Compile Include="ReferenceSources\SettingsSectionInternal.cs" />\r
     <Compile Include="ReferenceSources\Socket.cs" />\r
     <Compile Include="ReferenceSources\SR.cs" />\r
+    <Compile Include="ReferenceSources\SR2.cs" />\r
     <Compile Include="ReferenceSources\SRCategoryAttribute.cs" />\r
+    <Compile Include="ReferenceSources\SslStream.cs" />\r
+    <Compile Include="ReferenceSources\SSPIConfiguration.cs" />\r
+    <Compile Include="ReferenceSources\SSPISafeHandles.cs" />\r
+    <Compile Include="ReferenceSources\SSPIWrapper.cs" />\r
     <Compile Include="ReferenceSources\SystemNetworkCredential.cs" />\r
     <Compile Include="ReferenceSources\WebHeaderCollectionType.cs" />\r
     <Compile Include="ReferenceSources\Win32Exception.cs" />\r
@@ -907,7 +932,6 @@
     <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />\r
     <Compile Include="System.Net.Sockets\LingerOption.cs" />\r
     <Compile Include="System.Net.Sockets\MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />\r
     <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />\r
     <Compile Include="System.Net.Sockets\ProtocolType.cs" />\r
     <Compile Include="System.Net.Sockets\SafeSocketHandle.cs" />\r
@@ -1135,6 +1159,7 @@
     <Compile Include="System\GenericUriParserOptions.cs" />\r
     <Compile Include="System\GopherStyleUriParser.cs" />\r
     <Compile Include="System\HttpStyleUriParser.cs" />\r
+    <Compile Include="System\IOSelector.cs" />\r
     <Compile Include="System\IUriData.cs" />\r
     <Compile Include="System\LdapStyleUriParser.cs" />\r
     <Compile Include="System\NetPipeStyleUriParser.cs" />\r

diff --git a/mcs/class/System/System-secxml-net_4_5.csproj b/mcs/class/System/System-secxml-net_4_5.csproj
deleted file mode 100644 (file)
index 1998084..0000000
--- a/mcs/class/System/System-secxml-net_4_5.csproj
+++ /dev/null
@@ -1,1215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{46F151F2-A422-4A1B-9D29-2E148CE73629}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5/secxml</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;SECURITY_DEP;XML_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;SECURITY_DEP;XML_DEP</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArgumentReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArrayCreateExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeArrayIndexerExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAssignStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttachEventStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeArgument.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeArgumentCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeDeclaration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeAttributeDeclarationCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBaseReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBinaryOperatorExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeBinaryOperatorType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCastExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCatchClause.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCatchClauseCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeChecksumPragma.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeComment.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCommentStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCommentStatementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeCompileUnit.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeConditionStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeConstructor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDefaultValueExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDelegateCreateExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDelegateInvokeExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirectionExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirective.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeDirectiveCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeEntryPointMethod.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeEventReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpressionCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeExpressionStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeFieldReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeGotoStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeIndexerExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeIterationStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeLabeledStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeLinePragma.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberField.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberMethod.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMemberProperty.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMethodInvokeExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\codemethodreferenceexpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeMethodReturnStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceImport.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeNamespaceImportCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeObjectCreateExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeParameterDeclarationExpressionCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePrimitiveExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePropertyReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodePropertySetValueReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRegionDirective.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRegionMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeRemoveEventStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetCompileUnit.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeSnippetTypeMember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeStatementCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeThisReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeThrowExceptionStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTryCatchFinallyStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeConstructor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDeclaration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDeclarationCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeDelegate.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeMember.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeMemberCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeOfExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeParameter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeParameterCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReferenceCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeTypeReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeVariableDeclarationStatement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\CodeVariableReferenceExpression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeGeneratorOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CodeValidator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerError.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerErrorCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\CompilerParameters.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\GeneratedCodeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\GeneratorSupport.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeGenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\ICodeParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\IndentTextWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\compiler\LanguageOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\FieldDirection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\codedom\MemberAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\bithelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\debugview.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\iset.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\linkedlist.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\queue.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sorteddictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedlist.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedset.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\sortedsetdebugview.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\stack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\generic\throwhelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\objectmodel\observablecollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\objectmodel\readonlyobservablecollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\bitvector32.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\casesensitivestringdictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\collectionsutil.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\fixedstringlookup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\hybriddictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\inotifycollectionchanged.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\iordereddictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\listdictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\nameobjectcollectionbase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\namevaluecollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\notifycollectionchangedeventargs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\ordereddictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringcollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringdictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\collections\specialized\stringdictionarywithcomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AddingNewEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AddingNewEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AmbientValueAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ArrayConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ArraySubsetEnumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncCompletedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncOperation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AsyncOperationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AttributeCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\AttributeProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BackgroundWorker.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BaseComponentEditor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\basenumberconverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindableSupport.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindingDirection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BindingList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BooleanConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\BrowsableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ByteConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CancelEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CancelEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CategoryAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CharConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeAction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionChangeEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CollectionConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComplexBindingPropertiesAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CompModSwitches.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Component.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ComponentResourceManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Container.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ContainerFilterService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CultureInfoConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\CustomTypeDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataErrorsChangedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectFieldAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectMethodAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DataObjectMethodType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DateTimeConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DateTimeOffsetConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugExtendedPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugReflectEventDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugReflectPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DebugTypeDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DecimalConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultBindingPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultEventAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DefaultValueAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DelegatingTypeDescriptionProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DescriptionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ActiveDocumentEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\CheckoutException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\CommandID.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentChangingEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ComponentRenameEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerOptionService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransaction.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerTransactionCloseEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerVerb.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesignerVerbCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DesigntimeLicenseContextSerializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\DocumentEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpContextType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpKeywordAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\HelpKeywordType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentChangeService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentDiscoveryService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IComponentInitializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesigner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerEventService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerHost.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerHostTransactionState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDesignerOptionService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IDictionaryService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IEventPropertyService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IExtenderListService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IExtenderProviderService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IHelpService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IInheritanceService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IMenuCommandService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\InheritanceAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\InheritanceLevel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IReferenceService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IResourceService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IRootDesigner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ISelectionService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\IServiceObjectContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITreeDesigner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeDescriptorFilterService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeDiscoveryService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ITypeResolutionService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\MenuCommand.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\NotifyParentPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ParenthesizePropertyNameAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\PropertyTabAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\PropertyTabScope.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\RefreshProperties.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\RefreshPropertiesAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\SelectionTypes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ComponentSerializationService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ContextStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DefaultSerializationProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerLoader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\DesignerSerializerAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderHost.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerLoaderService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\IDesignerSerializationService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\INameCreationService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\InstanceDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\MemberRelationshipService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\ResolveNameEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\RootDesignerSerializerAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\serialization\SerializationStore.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ServiceCreatorCallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ServiceObjectContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\StandardCommands.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\StandardToolWindows.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ToolboxItemAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\design\ViewTechnology.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerCategoryAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibility.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignerSerializationVisibilityAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignOnlyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DesignTimeVisibleAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DisplayNameAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoubleConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoWorkEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\DoWorkEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EditorAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EditorBrowsableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EnumConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventDescriptorCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\EventHandlerList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExpandableObjectConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExtendedPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ExtenderProvidedPropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\FxCopSuppression.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\GuidConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\HandledEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\HandledEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IBindingList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IBindingListView.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ICancelAddNew.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IChangeTracking.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IComNativeDescriptorHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IComponent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ICustomTypeDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IDataErrorInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IEditableObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IExtenderProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IIntellisenseBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IListSource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ImmutableObjectAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INestedContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INestedSite.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InitializationEventAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyDataErrorInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanged.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\INotifyPropertyChanging.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InstallerTypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InstanceCreationEditor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int16Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int32Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Int64Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IntSecurity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InvalidAsynchronousStateException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\InvalidEnumArgumentException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IRaiseItemChangedEvents.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\IRevertibleChangeTracking.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISite.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISupportInitialize.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISupportInitializeNotification.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ISynchronizeInvoke.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ITypeDescriptorContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ITypedList.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\License.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseContext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicenseUsageMode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LicFileLicenseProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListBindableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListChangedType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDescription.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDescriptionCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ListSortDirection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LocalizableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\LookupBindingPropertiesAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MarshalByValueComponent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MaskedTextProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MaskedTextResultHint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MemberDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MergablePropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\MultilineStringConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\NestedContainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\NullableConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PasswordPropertyTextAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProgressChangedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProgressChangedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangingEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyChangingEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\PropertyDescriptorCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ProvidePropertyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReadOnlyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RecommendedAsConfigurableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReferenceConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectEventDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectPropertyDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ReflectTypeDescriptionProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RefreshEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RefreshEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunInstallerAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\RunWorkerCompletedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SByteConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SettingsBindableAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SingleConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\StringConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\SyntaxCheck.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TimeSpanConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\ToolboxItemFilterType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeConverterAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptionProviderService.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeDescriptor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\TypeListConverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt16Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt32Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\UInt64Converter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\WarningException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\componentmodel\Win32Exception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\AssertSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\BooleanSwitch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\ConsoleTraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\CorrelationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Debug.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\DelimitedListTraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\DiagnosticsConfiguration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\FilterElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\ListenerElementsCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\PerfCounterSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SeverityFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceElementsCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceLevels.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SourceSwitch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Switch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchElementsCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SwitchLevelAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\SystemDiagnosticsSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TextWriterTraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\Trace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceEventCache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceEventType.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceFilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceInternal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceLevel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceListeners.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TraceSwitch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\traceutils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\TypedElement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\compmod\system\diagnostics\XmlWriterTraceListener.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\hresults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\invariantcomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\PrivilegedConfigurationManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\SecurityUtils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\misc\WeakHashtable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_BufferOffsetSize.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LazyAsyncResult.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_LoggingObject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\_ScatterGatherBuffers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookie.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookiecollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookiecontainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\cookieexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\HttpListenerRequestUriBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Internal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketOptionName.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeDecodingConformance.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeEncodingConformance.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\webclient.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WebPermission.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\WriteStreamClosedEventArgs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\compiledregexrunnerfactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\Regex.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexBoyerMoore.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCapture.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCaptureCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCharClass.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompilationInfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexCompiler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexFCD.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexGroupCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexInterpreter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatch.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexMatchTimeoutException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexNode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexOptions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexParser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexReplacement.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexRunnerFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexTree.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\regex\system\text\regularexpressions\RegexWriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\security\system\security\permissions\typedescriptorpermission.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\ElapsedEventHandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\Timer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\services\timers\system\timers\TimersDescriptionAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\BlockingCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\collections\concurrent\ConcurrentBag.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\runtime\versioning\FrameworkName.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\threading\Barrier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />\r
-    <Compile Include="..\..\build\common\SR.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeCompiler.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />\r
-    <Compile Include="Microsoft.VisualBasic\VBCodeProvider.cs" />\r
-    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\PowerModes.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />\r
-    <Compile Include="Microsoft.Win32\SystemEvents.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />\r
-    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />\r
-    <Compile Include="Mono.Http\NtlmClient.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsType.cs" />\r
-    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />\r
-    <Compile Include="Mono.Net.Dns\ResolverError.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />\r
-    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />\r
-    <Compile Include="ReferenceSources\AssertWrapper.cs" />\r
-    <Compile Include="ReferenceSources\BinaryCompatibility.cs" />\r
-    <Compile Include="ReferenceSources\ConfigurationManagerInternalFactory.cs" />\r
-    <Compile Include="ReferenceSources\HttpSysSettings.cs" />\r
-    <Compile Include="ReferenceSources\Logging.cs" />\r
-    <Compile Include="ReferenceSources\NativeMethods.cs" />\r
-    <Compile Include="ReferenceSources\SettingsSectionInternal.cs" />\r
-    <Compile Include="ReferenceSources\Socket.cs" />\r
-    <Compile Include="ReferenceSources\SR.cs" />\r
-    <Compile Include="ReferenceSources\SRCategoryAttribute.cs" />\r
-    <Compile Include="ReferenceSources\SystemNetworkCredential.cs" />\r
-    <Compile Include="ReferenceSources\WebHeaderCollectionType.cs" />\r
-    <Compile Include="ReferenceSources\Win32Exception.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeCompiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeDomProvider.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CodeParser.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerInfo.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\CompilerResults.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\Executor.cs" />\r
-    <Compile Include="System.CodeDom.Compiler\TempFileCollection.cs" />\r
-    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />\r
-    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />\r
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />\r
-    <Compile Include="System.Configuration\ClientSettingsSection.cs" />\r
-    <Compile Include="System.Configuration\ConfigHelper.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationException.cs" />\r
-    <Compile Include="System.Configuration\ConfigurationSettings.cs" />\r
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />\r
-    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />\r
-    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IConfigurationSystem.cs" />\r
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />\r
-    <Compile Include="System.Configuration\IdnElement.cs" />\r
-    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />\r
-    <Compile Include="System.Configuration\IriParsingElement.cs" />\r
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />\r
-    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingElement.cs" />\r
-    <Compile Include="System.Configuration\SettingElementCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />\r
-    <Compile Include="System.Configuration\SettingsBase.cs" />\r
-    <Compile Include="System.Configuration\SettingsContext.cs" />\r
-    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />\r
-    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageability.cs" />\r
-    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProperty.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />\r
-    <Compile Include="System.Configuration\SettingsProvider.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />\r
-    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />\r
-    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />\r
-    <Compile Include="System.Configuration\SettingValueElement.cs" />\r
-    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />\r
-    <Compile Include="System.Configuration\SpecialSetting.cs" />\r
-    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UriSection.cs" />\r
-    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />\r
-    <Compile Include="System.Configuration\UserSettingsGroup.cs" />\r
-    <Compile Include="System.Diagnostics.CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSample.cs" />\r
-    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\DataReceivedEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\DefaultTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />\r
-    <Compile Include="System.Diagnostics\EventInstance.cs" />\r
-    <Compile Include="System.Diagnostics\EventLog.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogImpl.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermission.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />\r
-    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />\r
-    <Compile Include="System.Diagnostics\FileVersionInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ICollectData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceData.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />\r
-    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />\r
-    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\MonitoringDescriptionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\NullEventLog.cs" />\r
-    <Compile Include="System.Diagnostics\OverflowAction.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />\r
-    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />\r
-    <Compile Include="System.Diagnostics\Process.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModule.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessModuleCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessPriorityClass.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessStartInfo.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThread.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessThreadCollection.cs" />\r
-    <Compile Include="System.Diagnostics\ProcessWindowStyle.cs" />\r
-    <Compile Include="System.Diagnostics\Stopwatch.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadPriorityLevel.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadState.cs" />\r
-    <Compile Include="System.Diagnostics\ThreadWaitReason.cs" />\r
-    <Compile Include="System.Diagnostics\TraceImpl.cs" />\r
-    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />\r
-    <Compile Include="System.Diagnostics\Win32EventLog.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionLevel.cs" />\r
-    <Compile Include="System.IO.Compression\CompressionMode.cs" />\r
-    <Compile Include="System.IO.Compression\DeflateStream.cs" />\r
-    <Compile Include="System.IO.Compression\GZipStream.cs" />\r
-    <Compile Include="System.IO.Ports\Handshake.cs" />\r
-    <Compile Include="System.IO.Ports\ISerialStream.cs" />\r
-    <Compile Include="System.IO.Ports\Parity.cs" />\r
-    <Compile Include="System.IO.Ports\SerialData.cs" />\r
-    <Compile Include="System.IO.Ports\SerialError.cs" />\r
-    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChange.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPort.cs" />\r
-    <Compile Include="System.IO.Ports\SerialPortStream.cs" />\r
-    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />\r
-    <Compile Include="System.IO.Ports\SerialSignal.cs" />\r
-    <Compile Include="System.IO.Ports\StopBits.cs" />\r
-    <Compile Include="System.IO.Ports\WinSerialStream.cs" />\r
-    <Compile Include="System.IO\DefaultWatcher.cs" />\r
-    <Compile Include="System.IO\ErrorEventArgs.cs" />\r
-    <Compile Include="System.IO\ErrorEventHandler.cs" />\r
-    <Compile Include="System.IO\FAMWatcher.cs" />\r
-    <Compile Include="System.IO\FileAction.cs" />\r
-    <Compile Include="System.IO\FileSystemEventArgs.cs" />\r
-    <Compile Include="System.IO\FileSystemEventHandler.cs" />\r
-    <Compile Include="System.IO\FileSystemWatcher.cs" />\r
-    <Compile Include="System.IO\IFileWatcher.cs" />\r
-    <Compile Include="System.IO\InotifyWatcher.cs" />\r
-    <Compile Include="System.IO\InternalBufferOverflowException.cs" />\r
-    <Compile Include="System.IO\InvalidDataException.cs" />\r
-    <Compile Include="System.IO\IODescriptionAttribute.cs" />\r
-    <Compile Include="System.IO\KeventWatcher.cs" />\r
-    <Compile Include="System.IO\MonoSyncFileStream.cs" />\r
-    <Compile Include="System.IO\NotifyFilters.cs" />\r
-    <Compile Include="System.IO\NullFileWatcher.cs" />\r
-    <Compile Include="System.IO\RenamedEventArgs.cs" />\r
-    <Compile Include="System.IO\RenamedEventHandler.cs" />\r
-    <Compile Include="System.IO\SearchPattern.cs" />\r
-    <Compile Include="System.IO\WaitForChangedResult.cs" />\r
-    <Compile Include="System.IO\WatcherChangeTypes.cs" />\r
-    <Compile Include="System.IO\WindowsWatcher.cs" />\r
-    <Compile Include="System.Media\AudioData.cs" />\r
-    <Compile Include="System.Media\AudioDevice.cs" />\r
-    <Compile Include="System.Media\SoundPlayer.cs" />\r
-    <Compile Include="System.Media\SystemSound.cs" />\r
-    <Compile Include="System.Media\SystemSounds.cs" />\r
-    <Compile Include="System.Media\Win32SoundPlayer.cs" />\r
-    <Compile Include="System.Net.Cache\HttpCacheAgeControl.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\HttpRequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCacheLevel.cs" />\r
-    <Compile Include="System.Net.Cache\RequestCachePolicy.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElement.cs" />\r
-    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />\r
-    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />\r
-    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />\r
-    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\ModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />\r
-    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />\r
-    <Compile Include="System.Net.Configuration\ProxyElement.cs" />\r
-    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />\r
-    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SettingsSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSection.cs" />\r
-    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />\r
-    <Compile Include="System.Net.Configuration\SocketElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />\r
-    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateView.cs" />\r
-    <Compile Include="System.Net.Mail\AlternateViewCollection.cs" />\r
-    <Compile Include="System.Net.Mail\Attachment.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentBase.cs" />\r
-    <Compile Include="System.Net.Mail\AttachmentCollection.cs" />\r
-    <Compile Include="System.Net.Mail\DeliveryNotificationOptions.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResource.cs" />\r
-    <Compile Include="System.Net.Mail\LinkedResourceCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddress.cs" />\r
-    <Compile Include="System.Net.Mail\MailAddressCollection.cs" />\r
-    <Compile Include="System.Net.Mail\MailMessage.cs" />\r
-    <Compile Include="System.Net.Mail\MailPriority.cs" />\r
-    <Compile Include="System.Net.Mail\SendCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpAccess.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpDeliveryMethod.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpFailedRecipientsException.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermission.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />\r
-    <Compile Include="System.Net.Mime\ContentDisposition.cs" />\r
-    <Compile Include="System.Net.Mime\ContentType.cs" />\r
-    <Compile Include="System.Net.Mime\DispositionTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\MediaTypeNames.cs" />\r
-    <Compile Include="System.Net.Mime\TransferEncoding.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\DuplicateAddressDetectionState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\GatewayIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPInterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\MulticastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetBiosNodeType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAddressChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityChangedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkAvailabilityEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationAccess.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermission.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInformationPermissionAttribute.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterface.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceComponent.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\NetworkInterfaceType.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\OperationalStatus.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PhysicalAddress.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Ping.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventArgs.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingCompletedEventHandler.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingException.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingOptions.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PingReply.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\PrefixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\SuffixOrigin.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpConnectionInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpState.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\TcpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UdpStatistics.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformation.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\UnicastIPAddressInformationCollection.cs" />\r
-    <Compile Include="System.Net.NetworkInformation\Win32NetworkInterfaceMarshal.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticatedStream.cs" />\r
-    <Compile Include="System.Net.Security\AuthenticationLevel.cs" />\r
-    <Compile Include="System.Net.Security\LocalCertificateSelectionCallback.cs" />\r
-    <Compile Include="System.Net.Security\NegotiateStream.cs" />\r
-    <Compile Include="System.Net.Security\ProtectionLevel.cs" />\r
-    <Compile Include="System.Net.Security\RemoteCertificateValidationCallback.cs" />\r
-    <Compile Include="System.Net.Security\SslPolicyErrors.cs" />\r
-    <Compile Include="System.Net.Security\SslStream.cs" />\r
-    <Compile Include="System.Net.Sockets\AddressFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\IOControlCode.cs" />\r
-    <Compile Include="System.Net.Sockets\IPPacketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\LingerOption.cs" />\r
-    <Compile Include="System.Net.Sockets\MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />\r
-    <Compile Include="System.Net.Sockets\ProtocolType.cs" />\r
-    <Compile Include="System.Net.Sockets\SafeSocketHandle.cs" />\r
-    <Compile Include="System.Net.Sockets\SelectMode.cs" />\r
-    <Compile Include="System.Net.Sockets\SendPacketsElement.cs" />\r
-    <Compile Include="System.Net.Sockets\Socket.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncOperation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketAsyncResult.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketError.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketException.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketFlags.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketInformationOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOperation.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketOptionLevel.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketShutdown.cs" />\r
-    <Compile Include="System.Net.Sockets\SocketType.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\TcpListener.cs" />\r
-    <Compile Include="System.Net.Sockets\TransmitFileOptions.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpClient.cs" />\r
-    <Compile Include="System.Net.Sockets\UdpReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />\r
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocket.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketCloseStatus.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketContext.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketError.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketException.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketMessageType.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketReceiveResult.cs" />\r
-    <Compile Include="System.Net.WebSockets\WebSocketState.cs" />\r
-    <Compile Include="System.Net\AuthenticationManager.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemes.cs" />\r
-    <Compile Include="System.Net\AuthenticationSchemeSelector.cs" />\r
-    <Compile Include="System.Net\Authorization.cs" />\r
-    <Compile Include="System.Net\BasicClient.cs" />\r
-    <Compile Include="System.Net\BindIPEndPoint.cs" />\r
-    <Compile Include="System.Net\ChunkedInputStream.cs" />\r
-    <Compile Include="System.Net\ChunkStream.cs" />\r
-    <Compile Include="System.Net\ConnectionModes.cs" />\r
-    <Compile Include="System.Net\CredentialCache.cs" />\r
-    <Compile Include="System.Net\DecompressionMethods.cs" />\r
-    <Compile Include="System.Net\DefaultCertificatePolicy.cs" />\r
-    <Compile Include="System.Net\DigestClient.cs" />\r
-    <Compile Include="System.Net\Dns.cs" />\r
-    <Compile Include="System.Net\DnsAsyncResult.cs" />\r
-    <Compile Include="System.Net\DnsEndPoint.cs" />\r
-    <Compile Include="System.Net\DnsPermission.cs" />\r
-    <Compile Include="System.Net\DnsPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\EndPoint.cs" />\r
-    <Compile Include="System.Net\EndPointListener.cs" />\r
-    <Compile Include="System.Net\EndPointManager.cs" />\r
-    <Compile Include="System.Net\EndpointPermission.cs" />\r
-    <Compile Include="System.Net\FileWebRequest.cs" />\r
-    <Compile Include="System.Net\FileWebRequestCreator.cs" />\r
-    <Compile Include="System.Net\FileWebResponse.cs" />\r
-    <Compile Include="System.Net\FtpAsyncResult.cs" />\r
-    <Compile Include="System.Net\FtpDataStream.cs" />\r
-    <Compile Include="System.Net\FtpRequestCreator.cs" />\r
-    <Compile Include="System.Net\FtpStatus.cs" />\r
-    <Compile Include="System.Net\FtpStatusCode.cs" />\r
-    <Compile Include="System.Net\FtpWebRequest.cs" />\r
-    <Compile Include="System.Net\FtpWebResponse.cs" />\r
-    <Compile Include="System.Net\GlobalProxySelection.cs" />\r
-    <Compile Include="System.Net\HttpConnection.cs" />\r
-    <Compile Include="System.Net\HttpListener.cs" />\r
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />\r
-    <Compile Include="System.Net\HttpListenerContext.cs" />\r
-    <Compile Include="System.Net\HttpListenerException.cs" />\r
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />\r
-    <Compile Include="System.Net\HttpListenerRequest.cs" />\r
-    <Compile Include="System.Net\HttpListenerResponse.cs" />\r
-    <Compile Include="System.Net\HttpRequestCreator.cs" />\r
-    <Compile Include="System.Net\HttpRequestHeader.cs" />\r
-    <Compile Include="System.Net\HttpResponseHeader.cs" />\r
-    <Compile Include="System.Net\HttpStatusCode.cs" />\r
-    <Compile Include="System.Net\HttpStreamAsyncResult.cs" />\r
-    <Compile Include="System.Net\HttpUtility.cs" />\r
-    <Compile Include="System.Net\HttpVersion.cs" />\r
-    <Compile Include="System.Net\HttpWebRequest.cs" />\r
-    <Compile Include="System.Net\HttpWebResponse.cs" />\r
-    <Compile Include="System.Net\IAuthenticationModule.cs" />\r
-    <Compile Include="System.Net\ICertificatePolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialLookup.cs" />\r
-    <Compile Include="System.Net\ICredentialPolicy.cs" />\r
-    <Compile Include="System.Net\ICredentialsByHost.cs" />\r
-    <Compile Include="System.Net\IPAddress.cs" />\r
-    <Compile Include="System.Net\IPEndPoint.cs" />\r
-    <Compile Include="System.Net\IPHostEntry.cs" />\r
-    <Compile Include="System.Net\IPv6Address.cs" />\r
-    <Compile Include="System.Net\IWebConnectionState.cs" />\r
-    <Compile Include="System.Net\IWebProxy.cs" />\r
-    <Compile Include="System.Net\IWebProxyScript.cs" />\r
-    <Compile Include="System.Net\IWebRequestCreate.cs" />\r
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />\r
-    <Compile Include="System.Net\ListenerPrefix.cs" />\r
-    <Compile Include="System.Net\MacProxy.cs" />\r
-    <Compile Include="System.Net\MonoHttpDate.cs" />\r
-    <Compile Include="System.Net\NetConfig.cs" />\r
-    <Compile Include="System.Net\NetworkAccess.cs" />\r
-    <Compile Include="System.Net\NetworkCredential.cs" />\r
-    <Compile Include="System.Net\NtlmClient.cs" />\r
-    <Compile Include="System.Net\ProtocolViolationException.cs" />\r
-    <Compile Include="System.Net\RequestStream.cs" />\r
-    <Compile Include="System.Net\ResponseStream.cs" />\r
-    <Compile Include="System.Net\SecurityProtocolType.cs" />\r
-    <Compile Include="System.Net\ServicePoint.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.cs" />\r
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />\r
-    <Compile Include="System.Net\SimpleAsyncResult.cs" />\r
-    <Compile Include="System.Net\SocketAddress.cs" />\r
-    <Compile Include="System.Net\SocketPermission.cs" />\r
-    <Compile Include="System.Net\SocketPermissionAttribute.cs" />\r
-    <Compile Include="System.Net\TransportContext.cs" />\r
-    <Compile Include="System.Net\TransportType.cs" />\r
-    <Compile Include="System.Net\WebAsyncResult.cs" />\r
-    <Compile Include="System.Net\WebConnection.cs" />\r
-    <Compile Include="System.Net\WebConnectionData.cs" />\r
-    <Compile Include="System.Net\WebConnectionGroup.cs" />\r
-    <Compile Include="System.Net\WebConnectionStream.cs" />\r
-    <Compile Include="System.Net\WebException.cs" />\r
-    <Compile Include="System.Net\WebExceptionStatus.cs" />\r
-    <Compile Include="System.Net\WebHeaderCollection.cs" />\r
-    <Compile Include="System.Net\WebProxy.cs" />\r
-    <Compile Include="System.Net\WebRequest.cs" />\r
-    <Compile Include="System.Net\WebRequestMethods.cs" />\r
-    <Compile Include="System.Net\WebResponse.cs" />\r
-    <Compile Include="System.Net\WebUtility.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\ADVF.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DATADIR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\DVASPECT.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\FORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IAdviseSink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IDataObject.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumFORMATETC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\IEnumSTATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STATDATA.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\STGMEDIUM.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.ComTypes\TYMED.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DefaultParameterValueAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\HandleCollector.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\SemaphoreSecurity.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ConfigUtil.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ExtendedProtectionPolicyElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection.Configuration\ServiceNameElementCollection.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBinding.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ChannelBindingKind.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicy.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ExtendedProtectionPolicyTypeConverter.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\PolicyEnforcement.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ProtectionScenario.cs" />\r
-    <Compile Include="System.Security.Authentication.ExtendedProtection\ServiceNameCollection.cs" />\r
-    <Compile Include="System.Security.Authentication\AuthenticationException.cs" />\r
-    <Compile Include="System.Security.Authentication\CipherAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\ExchangeAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\HashAlgorithmType.cs" />\r
-    <Compile Include="System.Security.Authentication\InvalidCredentialException.cs" />\r
-    <Compile Include="System.Security.Authentication\SslProtocols.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OpenFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\PublicKey.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreLocation.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\StoreName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedName.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X500DistinguishedNameFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Collection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2Enumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509CertificateCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Chain.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElement.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainElementEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainPolicy.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatus.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ChainStatusFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Extension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ExtensionEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509FindType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509IncludeOption.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyUsageFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509NameType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationFlag.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509RevocationMode.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Store.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierHashAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509VerificationFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedData.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\AsnEncodedDataEnumerator.cs" />\r
-    <Compile Include="System.Security.Cryptography\Oid.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidCollection.cs" />\r
-    <Compile Include="System.Security.Cryptography\OidEnumerator.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />\r
-    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />\r
-    <Compile Include="System.Threading\Semaphore.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventArgs.cs" />\r
-    <Compile Include="System.Threading\ThreadExceptionEventHandler.cs" />\r
-    <Compile Include="System.Timers\ElapsedEventArgs.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermission.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />\r
-    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />\r
-    <Compile Include="System.Windows.Input\ICommand.cs" />\r
-    <Compile Include="System\DefaultUriParser.cs" />\r
-    <Compile Include="System\FileStyleUriParser.cs" />\r
-    <Compile Include="System\FtpStyleUriParser.cs" />\r
-    <Compile Include="System\GenericUriParser.cs" />\r
-    <Compile Include="System\GenericUriParserOptions.cs" />\r
-    <Compile Include="System\GopherStyleUriParser.cs" />\r
-    <Compile Include="System\HttpStyleUriParser.cs" />\r
-    <Compile Include="System\IUriData.cs" />\r
-    <Compile Include="System\LdapStyleUriParser.cs" />\r
-    <Compile Include="System\NetPipeStyleUriParser.cs" />\r
-    <Compile Include="System\NetTcpStyleUriParser.cs" />\r
-    <Compile Include="System\NewsStyleUriParser.cs" />\r
-    <Compile Include="System\Platform.cs" />\r
-    <Compile Include="System\SRDescriptionAttribute.cs" />\r
-    <Compile Include="System\Uri.cs" />\r
-    <Compile Include="System\UriBuilder.cs" />\r
-    <Compile Include="System\UriComponents.cs" />\r
-    <Compile Include="System\UriData.cs" />\r
-    <Compile Include="System\UriElements.cs" />\r
-    <Compile Include="System\UriFormat.cs" />\r
-    <Compile Include="System\UriFormatException.cs" />\r
-    <Compile Include="System\UriHelper.cs" />\r
-    <Compile Include="System\UriHostNameType.cs" />\r
-    <Compile Include="System\UriIdnScope.cs" />\r
-    <Compile Include="System\UriKind.cs" />\r
-    <Compile Include="System\UriParseComponents.cs" />\r
-    <Compile Include="System\UriParser.cs" />\r
-    <Compile Include="System\UriPartial.cs" />\r
-    <Compile Include="System\UriTypeConverter.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-bare-net_4_5.csproj">\r
-      <Project>{21FB091E-0F84-479E-AB16-6503D36852F9}</Project>\r
-      <Name>System.Xml-bare-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="System-bare-net_4_5.csproj">\r
-      <Project>{91CDF14E-F60F-4AB7-BC9D-5CBD7E669076}</Project>\r
-      <Name>System-bare-net_4_5</Name>\r
-      <Aliases>PrebuiltSystem</Aliases>    </ProjectReference>\r
-    <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security-net_4_5</Name>\r
-      <Aliases>MonoSecurity</Aliases>    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/Asterisk.wav">\r
-      <LogicalName>Asterisk.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Beep.wav">\r
-      <LogicalName>Beep.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Exclamation.wav">\r
-      <LogicalName>Exclamation.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Hand.wav">\r
-      <LogicalName>Hand.wav</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/Question.wav">\r
-      <LogicalName>Question.wav</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System/System-secxml-net_4_x.csproj b/mcs/class/System/System-secxml-net_4_x.csproj
index 904ca651aa3d946406376ebfebe04ae8ed91ef20..0b98933187c01c234348a5c259d26fc4c7c600cd 100644 (file)
--- a/mcs/class/System/System-secxml-net_4_x.csproj
+++ b/mcs/class/System/System-secxml-net_4_x.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>\r
     <NoWarn>1699,618</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;SECURITY_DEP;XML_DEP</DefineConstants>\r
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS;MONO_X509_ALIAS</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -33,7 +33,7 @@
     <DebugType>pdbonly</DebugType>\r
     <NoWarn>1699,618</NoWarn>\r
     <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;SECURITY_DEP;XML_DEP</DefineConstants>\r
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS;MONO_X509_ALIAS</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -491,7 +491,9 @@
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\IPInterfaceStatistics.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\ScopeLevel.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\NetworkInformation\UnicastIPAddressInformation.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\ServicePointManager.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\IPProtectionLevel.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\NetworkStream.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\Sockets\SocketOptionName.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeDecodingConformance.cs" />\r
     <Compile Include="..\..\..\external\referencesource\System\net\System\Net\UnicodeEncodingConformance.cs" />\r
@@ -584,16 +586,39 @@
     <Compile Include="Mono.Net.Dns\ResolverError.cs" />\r
     <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />\r
     <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />\r
+    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />\r
+    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />\r
+    <Compile Include="Mono.Net.Security\IMonoSslStream.cs" />\r
+    <Compile Include="Mono.Net.Security\IMonoTlsProvider.cs" />\r
+    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoDefaultTlsProvider.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoSslStreamImpl.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoSslStreamWrapper.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoTlsProviderImpl.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoTlsProviderWrapper.cs" />\r
+    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />\r
+    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />\r
+    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />\r
+    <Compile Include="ReferenceSources\_SecureChannel.cs" />\r
+    <Compile Include="ReferenceSources\_SslState.cs" />\r
+    <Compile Include="ReferenceSources\_SslStream.cs" />\r
     <Compile Include="ReferenceSources\AssertWrapper.cs" />\r
     <Compile Include="ReferenceSources\BinaryCompatibility.cs" />\r
     <Compile Include="ReferenceSources\ConfigurationManagerInternalFactory.cs" />\r
     <Compile Include="ReferenceSources\HttpSysSettings.cs" />\r
+    <Compile Include="ReferenceSources\Internal.cs" />\r
     <Compile Include="ReferenceSources\Logging.cs" />\r
     <Compile Include="ReferenceSources\NativeMethods.cs" />\r
     <Compile Include="ReferenceSources\SettingsSectionInternal.cs" />\r
     <Compile Include="ReferenceSources\Socket.cs" />\r
     <Compile Include="ReferenceSources\SR.cs" />\r
+    <Compile Include="ReferenceSources\SR2.cs" />\r
     <Compile Include="ReferenceSources\SRCategoryAttribute.cs" />\r
+    <Compile Include="ReferenceSources\SslStream.cs" />\r
+    <Compile Include="ReferenceSources\SSPIConfiguration.cs" />\r
+    <Compile Include="ReferenceSources\SSPISafeHandles.cs" />\r
+    <Compile Include="ReferenceSources\SSPIWrapper.cs" />\r
     <Compile Include="ReferenceSources\SystemNetworkCredential.cs" />\r
     <Compile Include="ReferenceSources\WebHeaderCollectionType.cs" />\r
     <Compile Include="ReferenceSources\Win32Exception.cs" />\r
@@ -907,7 +932,6 @@
     <Compile Include="System.Net.Sockets\IPv6MulticastOption.cs" />\r
     <Compile Include="System.Net.Sockets\LingerOption.cs" />\r
     <Compile Include="System.Net.Sockets\MulticastOption.cs" />\r
-    <Compile Include="System.Net.Sockets\NetworkStream.cs" />\r
     <Compile Include="System.Net.Sockets\ProtocolFamily.cs" />\r
     <Compile Include="System.Net.Sockets\ProtocolType.cs" />\r
     <Compile Include="System.Net.Sockets\SafeSocketHandle.cs" />\r
@@ -1135,6 +1159,7 @@
     <Compile Include="System\GenericUriParserOptions.cs" />\r
     <Compile Include="System\GopherStyleUriParser.cs" />\r
     <Compile Include="System\HttpStyleUriParser.cs" />\r
+    <Compile Include="System\IOSelector.cs" />\r
     <Compile Include="System\IUriData.cs" />\r
     <Compile Include="System\LdapStyleUriParser.cs" />\r
     <Compile Include="System\NetPipeStyleUriParser.cs" />\r

diff --git a/mcs/class/System/System-tests-net_4_5.csproj b/mcs/class/System/System-tests-net_4_5.csproj
deleted file mode 100644 (file)
index eebbf58..0000000
--- a/mcs/class/System/System-tests-net_4_5.csproj
+++ /dev/null
@@ -1,617 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{3CE9EB07-FC9C-4C80-83E6-28259B947E7F}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699,618,672,219,67,169,612</NoWarn>\r
-    <OutputPath>bin\Debug\System-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>System_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699,618,672,219,67,169,612</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,618,672,219,67,169,612</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromCompileUnitTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromExpressionTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromNamespaceTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromStatementTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorFromTypeTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorIdentifierTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorTestBase.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CodeGeneratorTypeOutputTest.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CSharpCodeProviderCas.cs" />\r
-    <Compile Include="Test\Microsoft.CSharp\CSharpCodeProviderTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromBinaryOperatorTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromCompileUnitTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromExpressionTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromNamespaceTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromStatementTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorFromTypeTest.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\CodeGeneratorTestBase.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\VBCodeProviderCas.cs" />\r
-    <Compile Include="Test\Microsoft.VisualBasic\VBCodeProviderTest.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\IntranetZoneCredentialPolicyCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\IntranetZoneCredentialPolicyTest.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\PowerModeChangedEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SessionEndedEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SessionEndingEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SessionSwitchEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SessionSwitchEventArgsTest.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\SystemEventsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\TimerElapsedEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\UserPreferenceChangedEventArgsCas.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\UserPreferenceChangingEventArgsCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeCompilerCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeDomProviderCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorFromTypeTestBase.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorGenerateFromCompileUnitTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorOptionsCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorOptionsTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeGeneratorTestBase.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CodeParserCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerErrorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerErrorCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerInfoCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerParametersCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\CompilerResultsCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\ExecutorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\ExecutorTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\GeneratedCodeAttributeCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\GeneratedCodeAttributeTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\IndentedTextWriterCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\IndentedTextWriterTest.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\TempFileCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom.Compiler\TempFileCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArgumentReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArgumentReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArrayCreateExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArrayCreateExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeArrayIndexerExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAssignStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttachEventStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttachEventStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeArgumentCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeArgumentCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeArgumentCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeArgumentTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeDeclarationCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeDeclarationCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeDeclarationCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeAttributeDeclarationTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeBaseReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeBinaryOperatorExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCastExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCastExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCatchClauseCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCatchClauseCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCatchClauseCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCatchClauseTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeChecksumPragmaCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeChecksumPragmaTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCommentStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCommentStatementCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCommentStatementCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeCompileUnitCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeConditionStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeConstructorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeConstructorTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDefaultValueExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDefaultValueExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDelegateCreateExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDelegateCreateExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDelegateInvokeExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDirectionExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDirectiveCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDirectiveCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeDirectiveCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeEntryPointMethodCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeEventReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeEventReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeExpressionCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeExpressionCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeExpressionStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeFieldReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeGotoStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeGotoStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeIndexerExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeIterationStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeLabeledStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeLinePragmaCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeLinePragmaTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberEventCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberFieldCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberFieldTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberMethodCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberMethodTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberPropertyCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMemberPropertyTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodInvokeExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodInvokeExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeMethodReturnStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceImportCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceImportCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceImportCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceImportTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeNamespaceTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeObjectCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeObjectCreateExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeObjectCreateExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeParameterDeclarationExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeParameterDeclarationExpressionCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeParameterDeclarationExpressionCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeParameterDeclarationExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodePrimitiveExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodePropertyReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodePropertyReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodePropertySetValueReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeRegionDirectiveCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeRegionDirectiveTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeRemoveEventStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeRemoveEventStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetCompileUnitCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetCompileUnitTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetTypeMemberCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeSnippetTypeMemberTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeStatementCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeStatementCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeThisReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeThrowExceptionStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTryCatchFinallyStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeConstructorCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeConstructorTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDeclarationCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDeclarationCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDeclarationCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDelegateCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeDelegateTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeMemberCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeMemberCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeMemberCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeOfExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeOfExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeParameterCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeParameterCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeParameterTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceCollectionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceCollectionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeTypeReferenceTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeVariableDeclarationStatementCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeVariableDeclarationStatementTest.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeVariableReferenceExpressionCas.cs" />\r
-    <Compile Include="Test\System.CodeDom\CodeVariableReferenceExpressionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\BlockingCollectionTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\CollectionStressTestHelper.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ConcurrentBagTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ParallelTestHelper.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\LinkedListTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\QueueTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\SortedDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\SortedListTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\SortedSetTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\StackTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\CollectionChangedEventValidators.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\ObservableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\ReadOnlyObservableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\BasicOperationsTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\BitVector32Cas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\BitVector32Test.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\CollectionsUtilCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\HybridDictionaryCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\HybridDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\ListDictionaryCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\ListDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NameObjectCollectionBaseCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NameObjectCollectionBaseTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NameValueCollectionCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NameValueCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\OrderedDictionaryCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\OrderedDictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\StringCollectionCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\StringCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\StringDictionaryCas.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\StringDictionaryTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design.Serialization\ContextStackTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design.Serialization\InstanceDescriptorCas.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design.Serialization\InstanceDescriptorTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design\CheckoutExceptionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel.Design\ServiceContainerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ArrayConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\AsyncOperationManagerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\AttributeCollectionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\AttributeProviderAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\BackgroundWorkerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\BindingListTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ByteConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\CharConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\CollectionConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ComplexBindingPropertiesAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ComponentConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ComponentResourceManagerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ContainerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\CultureInfoConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DataObjectMethodAttributeTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DateTimeConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DateTimeOffsetConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DecimalConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DefaultBindingPropertyAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DefaultValueAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DesignerAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DisplayNameAttributeTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\DoubleConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\EnumConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\EventDescriptorCollectionTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\EventHandlerListTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\Int16ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\Int32ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\Int64ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\InvalidEnumArgumentExceptionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\LicenseManagerTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ListChangedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\LookupBindingPropertiesAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\MaskedTextProviderTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\MultilineStringConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\NestedContainerTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\NullableConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\PropertyDescriptorCollectionTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\PropertyDescriptorTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ReferenceConverterTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\SByteConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\SingleConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\ToolboxItemAttributeTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\TypeConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\TypeDescriptionProviderTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\TypeDescriptorTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\UInt16ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\UInt32ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\UInt64ConverterTests.cs" />\r
-    <Compile Include="Test\System.ComponentModel\Win32ExceptionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ApplicationSettingsBaseTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigurationExceptionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\ConfigXmlDocumentTest.cs" />\r
-    <Compile Include="Test\System.Configuration\LocalFileSettingsProviderTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingElementTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsBaseTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsPropertyCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsPropertyTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsPropertyValueCollectionTest.cs" />\r
-    <Compile Include="Test\System.Configuration\SettingsPropertyValueTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\CounterCreationDataTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DebugTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DelimitedListTraceListenerTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DiagnosticsConfigurationHandlerTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventInstanceTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventLogPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventLogPermissionTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventLogTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\EventSourceCreationDataTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\FileVersionInfoTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\PerformanceCounterPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\PerformanceCounterPermissionTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\ProcessStartInfoTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\ProcessTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\SourceSwitchTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StopwatchTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\SwitchesTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\TextWriterTraceListenerTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\TraceListenerTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\TraceSourceTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\TraceTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\XmlWriterTraceListenerTest.cs" />\r
-    <Compile Include="Test\System.IO.Compression\DeflateStreamCas.cs" />\r
-    <Compile Include="Test\System.IO.Compression\DeflateStreamTest.cs" />\r
-    <Compile Include="Test\System.IO.Compression\GZipStreamCas.cs" />\r
-    <Compile Include="Test\System.IO.Compression\GzipStreamTest.cs" />\r
-    <Compile Include="Test\System.IO.Ports\SerialPortTest.cs" />\r
-    <Compile Include="Test\System.IO\FileSystemWatcherTest.cs" />\r
-    <Compile Include="Test\System.Net.Configuration\ConnectionManagementSectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Configuration\HttpWebRequestElementTest.cs" />\r
-    <Compile Include="Test\System.Net.Configuration\WebRequestModulesSectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\AlternateViewCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\AlternateViewTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\AttachmentCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\AttachmentTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\LinkedResourceCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\LinkedResourceTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\MailAddressCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\MailAddressTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\MailMessageTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpClientTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpExceptionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpPermissionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mail\SmtpServer.cs" />\r
-    <Compile Include="Test\System.Net.Mime\ContentDispositionTest.cs" />\r
-    <Compile Include="Test\System.Net.Mime\ContentTypeTest.cs" />\r
-    <Compile Include="Test\System.Net.NetworkInformation\PhysicalAddressTest.cs" />\r
-    <Compile Include="Test\System.Net.Security\SslStreamTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\IPv6MulticastOptionTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\MulticastOptionTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\NetworkStreamCas.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\NetworkStreamTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\SocketAsyncEventArgsTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\SocketAsyncTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\SocketCas.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\SocketTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\TcpClientCas.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\TcpClientTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\TcpListenerTest.cs" />\r
-    <Compile Include="Test\System.Net.Sockets\UdpClientTest.cs" />\r
-    <Compile Include="Test\System.Net.WebSockets\ClientWebSocketTest.cs" />\r
-    <Compile Include="Test\System.Net\CookieCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net\CookieContainerTest.cs" />\r
-    <Compile Include="Test\System.Net\CookieParserTest.cs" />\r
-    <Compile Include="Test\System.Net\CookieTest.cs" />\r
-    <Compile Include="Test\System.Net\CredentialCacheTest.cs" />\r
-    <Compile Include="Test\System.Net\DnsCas.cs" />\r
-    <Compile Include="Test\System.Net\DnsPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Net\DnsPermissionTest.cs" />\r
-    <Compile Include="Test\System.Net\DnsTest.cs" />\r
-    <Compile Include="Test\System.Net\EndPointTest.cs" />\r
-    <Compile Include="Test\System.Net\FileWebRequestCas.cs" />\r
-    <Compile Include="Test\System.Net\FileWebRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\FileWebResponseTest.cs" />\r
-    <Compile Include="Test\System.Net\FtpWebRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpListener2Test.cs" />\r
-    <Compile Include="Test\System.Net\HttpListenerBasicIdentityTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpListenerPrefixCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpListenerRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpListenerTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpWebRequestCas.cs" />\r
-    <Compile Include="Test\System.Net\HttpWebRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\HttpWebResponseTest.cs" />\r
-    <Compile Include="Test\System.Net\IPAddressTest.cs" />\r
-    <Compile Include="Test\System.Net\IPEndPointTest.cs" />\r
-    <Compile Include="Test\System.Net\NetworkCredentialTest.cs" />\r
-    <Compile Include="Test\System.Net\ServicePointManagerTest.cs" />\r
-    <Compile Include="Test\System.Net\ServicePointTest.cs" />\r
-    <Compile Include="Test\System.Net\SocketPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Net\SocketPermissionTest.cs" />\r
-    <Compile Include="Test\System.Net\SocketResponder.cs" />\r
-    <Compile Include="Test\System.Net\WebClientTest.cs" />\r
-    <Compile Include="Test\System.Net\WebClientTestAsync.cs" />\r
-    <Compile Include="Test\System.Net\WebHeaderCollectionTest.cs" />\r
-    <Compile Include="Test\System.Net\WebPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Net\WebPermissionTest.cs" />\r
-    <Compile Include="Test\System.Net\WebProxyTest.cs" />\r
-    <Compile Include="Test\System.Net\WebRequestTest.cs" />\r
-    <Compile Include="Test\System.Net\WebUtilityTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\FrameworkNameTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\SemaphoreSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_01_SignatureVerification.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_02_ValidityPeriod.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_03_VerifyingNameChaining.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_04_BasicCertificateRevocationTests.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_05_VerifyingPathWithSelfIssuedCertificates.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_06_VerifyingBasicConstraints.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_07_KeyUsage.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_08_CertificatePolicies.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_09_RequireExplicitPolicy.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_10_PolicyMappings.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_11_InhibitPolicyMapping.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_12_InhibitAnyPolicy.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_13_NameConstraints.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_14_DistributionPoints.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_15_DeltaCRL.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\Pkits_4_16_PrivateCertificateExtensions.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\PkitsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\PublicKeyCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\PublicKeyTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X500DistinguishedNameCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X500DistinguishedNameTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509BasicConstraintsExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Cert20Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Certificate2CollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509Certificate2Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CertificateCollectionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CertificateCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ChainCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ChainPolicyCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ChainPolicyTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ChainTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509EnhancedKeyUsageExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ExtensionCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509ExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509KeyUsageExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509KeyUsageExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509StoreCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509StoreTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtensionCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509SubjectKeyIdentifierExtensionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AsnEncodedDataTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\OidCollectionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\OidEnumeratorTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\OidTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ResourcePermissionBaseCas.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ResourcePermissionBaseEntryCas.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ResourcePermissionBaseEntryTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ResourcePermissionBaseTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StorePermissionAttributeCas.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StorePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StorePermissionCas.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StorePermissionTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\CaptureCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\CaptureCollectionCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\GroupCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\GroupCollectionCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\GroupTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\MatchCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\MatchCollectionCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\MatchTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\PerlTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\PerlTrials.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexBugs.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexCompilationInfoCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexCompilationInfoTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexMatchTests.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexReplace.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexReplaceTests.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexResultTests.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexRunnerCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexRunnerFactoryCas.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexTest.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\RegexTrial.cs" />\r
-    <Compile Include="Test\System.Text.RegularExpressions\SplitTests.cs" />\r
-    <Compile Include="Test\System.Threading\BarrierTest.cs" />\r
-    <Compile Include="Test\System.Threading\SemaphoreCas.cs" />\r
-    <Compile Include="Test\System.Threading\SemaphoreFullExceptionCas.cs" />\r
-    <Compile Include="Test\System.Threading\SemaphoreTest.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadExceptionEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Timers\ElapsedEventArgsCas.cs" />\r
-    <Compile Include="Test\System.Timers\TimerCas.cs" />\r
-    <Compile Include="Test\System.Timers\TimersDescriptionAttributeCas.cs" />\r
-    <Compile Include="Test\System.Timers\TimersDescriptionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Timers\TimerTest.cs" />\r
-    <Compile Include="Test\System.Web\AspNetHostingPermissionAttributeCas.cs" />\r
-    <Compile Include="Test\System.Web\AspNetHostingPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Web\AspNetHostingPermissionCas.cs" />\r
-    <Compile Include="Test\System.Web\AspNetHostingPermissionTest.cs" />\r
-    <Compile Include="Test\System\FileStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\FileStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\FtpStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\FtpStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\GenericUriParserCas.cs" />\r
-    <Compile Include="Test\System\GenericUriParserTest.cs" />\r
-    <Compile Include="Test\System\GopherStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\GopherStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\HttpStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\HttpStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\LdapStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\LdapStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\NetPipeStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\NetPipeStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\NetTcpStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\NetTcpStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\NewsStyleUriParserCas.cs" />\r
-    <Compile Include="Test\System\NewsStyleUriParserTest.cs" />\r
-    <Compile Include="Test\System\UriBuilderCas.cs" />\r
-    <Compile Include="Test\System\UriBuilderTest.cs" />\r
-    <Compile Include="Test\System\UriFormatExceptionCas.cs" />\r
-    <Compile Include="Test\System\UriParserCas.cs" />\r
-    <Compile Include="Test\System\UriParserTest.cs" />\r
-    <Compile Include="Test\System\UriTest.cs" />\r
-    <Compile Include="Test\System\UriTest2.cs" />\r
-    <Compile Include="Test\System\UriTest3.cs" />\r
-    <Compile Include="Test\System\UriTypeConverterCas.cs" />\r
-    <Compile Include="Test\System\UriTypeConverterTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">\r
-      <Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Security\Mono.Security-net_4_5.csproj">\r
-      <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">\r
-      <Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>\r
-      <Name>System.Data\System.Data-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Test/System/test-uri-props.txt">\r
-      <LogicalName>test-uri-props.txt</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/System/test-uri-props-manual.txt">\r
-      <LogicalName>test-uri-props-manual.txt</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Test/System/test-uri-relative-props.txt">\r
-      <LogicalName>test-uri-relative-props.txt</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/System/System.Diagnostics/Process.cs b/mcs/class/System/System.Diagnostics/Process.cs
index 76f2a7fc1a6ab69c601858faa71724530c122d29..b46bc936c1df2df53242753e43da03d6a2b0aa72 100644 (file)
--- a/mcs/class/System/System.Diagnostics/Process.cs
+++ b/mcs/class/System/System.Diagnostics/Process.cs
@@ -577,6 +577,7 @@ namespace System.Diagnostics {
                        }
                }
 
+#if MONO_FEATURE_PROCESS_START
                private StreamReader error_stream=null;
                bool error_stream_exposed;
 
@@ -648,6 +649,28 @@ namespace System.Diagnostics {
                                start_info = value;
                        }
                }
+#else
+               [Obsolete ("Process.StandardError is not supported on the current platform.", true)]
+               public StreamReader StandardError {
+                       get { throw new PlatformNotSupportedException ("Process.StandardError is not supported on the current platform."); }
+               }
+
+               [Obsolete ("Process.StandardInput is not supported on the current platform.", true)]
+               public StreamWriter StandardInput {
+                       get { throw new PlatformNotSupportedException ("Process.StandardInput is not supported on the current platform."); }
+               }
+
+               [Obsolete ("Process.StandardOutput is not supported on the current platform.", true)]
+               public StreamReader StandardOutput {
+                       get { throw new PlatformNotSupportedException ("Process.StandardOutput is not supported on the current platform."); }
+               }
+
+               [Obsolete ("Process.StartInfo is not supported on the current platform.", true)]
+               public ProcessStartInfo StartInfo {
+                       get { throw new PlatformNotSupportedException ("Process.StartInfo is not supported on the current platform."); }
+                       set { throw new PlatformNotSupportedException ("Process.StartInfo is not supported on the current platform."); }
+               }
+#endif // MONO_FEATURE_PROCESS_START
 
                /* Returns the process start time in Windows file
                 * times (ticks from DateTime(1/1/1601 00:00 GMT))
@@ -895,6 +918,7 @@ namespace System.Diagnostics {
                        // the process (currently we have none).
                }
 
+#if MONO_FEATURE_PROCESS_START
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private extern static bool ShellExecuteEx_internal(ProcessStartInfo startInfo,
                                                                   ref ProcInfo proc_info);
@@ -1191,6 +1215,43 @@ namespace System.Diagnostics {
                        psi.UseShellExecute = false;
                        return Start(psi);
                }
+#else
+               [Obsolete ("Process.Start is not supported on the current platform.", true)]
+               public bool Start ()
+               {
+                       throw new PlatformNotSupportedException ("Process.Start is not supported on the current platform.");
+               }
+
+               [Obsolete ("Process.Start is not supported on the current platform.", true)]
+               public static Process Start (ProcessStartInfo startInfo)
+               {
+                       throw new PlatformNotSupportedException ("Process.Start is not supported on the current platform.");
+               }
+
+               [Obsolete ("Process.Start is not supported on the current platform.", true)]
+               public static Process Start (string fileName)
+               {
+                       throw new PlatformNotSupportedException ("Process.Start is not supported on the current platform.");
+               }
+
+               [Obsolete ("Process.Start is not supported on the current platform.", true)]
+               public static Process Start(string fileName, string arguments)
+               {
+                       throw new PlatformNotSupportedException ("Process.Start is not supported on the current platform.");
+               }
+
+               [Obsolete ("Process.Start is not supported on the current platform.", true)]
+               public static Process Start(string fileName, string username, SecureString password, string domain)
+               {
+                       throw new PlatformNotSupportedException ("Process.Start is not supported on the current platform.");
+               }
+
+               [Obsolete ("Process.Start is not supported on the current platform.", true)]
+               public static Process Start(string fileName, string arguments, string username, SecureString password, string domain)
+               {
+                       throw new PlatformNotSupportedException ("Process.Start is not supported on the current platform.");
+               }
+#endif // MONO_FEATURE_PROCESS_START
 
                public override string ToString()
                {
@@ -1219,11 +1280,13 @@ namespace System.Diagnostics {
                        if (!WaitForExit_internal (process_handle, ms))
                                return false;
 
+#if MONO_FEATURE_PROCESS_START
                        if (async_output != null && !async_output.IsCompleted)
                                async_output.AsyncWaitHandle.WaitOne ();
 
                        if (async_error != null && !async_error.IsCompleted)
                                async_error.AsyncWaitHandle.WaitOne ();
+#endif // MONO_FEATURE_PROCESS_START
 
                        OnExited ();
 
@@ -1277,6 +1340,7 @@ namespace System.Diagnostics {
                                cb (this, new DataReceivedEventArgs (str));
                }
 
+#if MONO_FEATURE_PROCESS_START
                [Flags]
                enum AsyncModes {
                        NoneYet = 0,
@@ -1465,6 +1529,31 @@ namespace System.Diagnostics {
 
                        error_canceled = true;
                }
+#else
+               [Obsolete ("Process.BeginOutputReadLine is not supported on the current platform.", true)]
+               public void BeginOutputReadLine ()
+               {
+                       throw new PlatformNotSupportedException ("Process.BeginOutputReadLine is not supported on the current platform.");
+               }
+
+               [Obsolete ("Process.BeginOutputReadLine is not supported on the current platform.", true)]
+               public void CancelOutputRead ()
+               {
+                       throw new PlatformNotSupportedException ("Process.BeginOutputReadLine is not supported on the current platform.");
+               }
+
+               [Obsolete ("Process.BeginOutputReadLine is not supported on the current platform.", true)]
+               public void BeginErrorReadLine ()
+               {
+                       throw new PlatformNotSupportedException ("Process.BeginOutputReadLine is not supported on the current platform.");
+               }
+
+               [Obsolete ("Process.BeginOutputReadLine is not supported on the current platform.", true)]
+               public void CancelErrorRead ()
+               {
+                       throw new PlatformNotSupportedException ("Process.BeginOutputReadLine is not supported on the current platform.");
+               }
+#endif // MONO_FEATURE_PROCESS_START
 
                [Category ("Behavior")]
                [MonitoringDescription ("Raised when this process exits.")]
@@ -1497,6 +1586,7 @@ namespace System.Diagnostics {
                        // If this is a call to Dispose,
                        // dispose all managed resources.
                        if (disposing) {
+#if MONO_FEATURE_PROCESS_START
                                /* These have open FileStreams on the pipes we are about to close */
                                if (async_output != null)
                                        async_output.Close ();
@@ -1518,6 +1608,7 @@ namespace System.Diagnostics {
                                                error_stream.Close ();
                                        error_stream = null;
                                }
+#endif // MONO_FEATURE_PROCESS_START
                        }
 
                        // Release unmanaged resources

diff --git a/mcs/class/System/System.IO/DefaultWatcher.cs b/mcs/class/System/System.IO/DefaultWatcher.cs
index d2d8b28d86cef4ebbeeff516308503d14cf10fe2..d08e60984161333f17f2b4ebab9bb5dc8b75c5c6 100644 (file)
--- a/mcs/class/System/System.IO/DefaultWatcher.cs
+++ b/mcs/class/System/System.IO/DefaultWatcher.cs
@@ -43,6 +43,8 @@ namespace System.IO {
                public bool Enabled;
                public bool NoWildcards;
                public DateTime DisabledTime;
+
+               public object FilesLock = new object ();
                public Hashtable Files;
        }
 
@@ -211,6 +213,13 @@ namespace System.IO {
                                        files = NoStringsArray;
                        }
 
+                       lock (data.FilesLock) {
+                               IterateAndModifyFilesData (data, directory, dispatch, files);
+                       }
+               }
+
+               void IterateAndModifyFilesData (DefaultWatcherData data, string directory, bool dispatch, string[] files)
+               {
                        /* Set all as untested */
                        foreach (string filename in data.Files.Keys) {
                                FileData fd = (FileData) data.Files [filename];

diff --git a/mcs/class/System/System.IO/KeventWatcher.cs b/mcs/class/System/System.IO/KeventWatcher.cs
index 0d2e39ee02baddcd7c5f4743b3c8087a6af1cdc6..996e0e9b61fafdaf6fa845d870a1e19b7a372ff5 100644 (file)
--- a/mcs/class/System/System.IO/KeventWatcher.cs
+++ b/mcs/class/System/System.IO/KeventWatcher.cs
@@ -162,6 +162,8 @@ namespace System.IO {
 
        class KqueueMonitor : IDisposable
        {
+               static bool initialized;
+               
                public int Connection
                {
                        get { return conn; }
@@ -171,6 +173,13 @@ namespace System.IO {
                {
                        this.fsw = fsw;
                        this.conn = -1;
+                       if (!initialized){
+                               int t;
+                               initialized = true;
+                               var maxenv = Environment.GetEnvironmentVariable ("MONO_DARWIN_WATCHER_MAXFDS");
+                               if (maxenv != null && Int32.TryParse (maxenv, out t))
+                                       maxFds = t;
+                       }
                }
 
                public void Dispose ()
@@ -638,7 +647,7 @@ namespace System.IO {
                const int F_GETPATH = 50;
                const int __DARWIN_MAXPATHLEN = 1024;
                static readonly kevent[] emptyEventList = new System.IO.kevent[0];
-               const int maxFds = 200;
+               int maxFds = Int32.MaxValue;
 
                FileSystemWatcher fsw;
                int conn;

diff --git a/mcs/class/System/System.Net.Cache/ChangeLog b/mcs/class/System/System.Net.Cache/ChangeLog
deleted file mode 100644 (file)
index e73f284..0000000
--- a/mcs/class/System/System.Net.Cache/ChangeLog
+++ /dev/null
@@ -1,11 +0,0 @@
-2007-11-13  Atsushi Enomoto  <atsushi@ximian.com>
-
-       * HttpRequestCachePolicy.cs
-         HttpCacheAgeControl.cs
-         HttpRequestCacheLevel.cs
-         RequestCacheLevel.cs : fixed enum value binary compat to .net.
-
-2004-09-10  Tim Coleman <tim@timcoleman.com>
-       * HttpCacheAgeControl.cs HttpRequestCacheLevel.cs HttpRequestCachePolicy.cs 
-       * RequestCacheLevel.cs RequestCachePolicy.cs:
-               New classes for Fx 2.0

diff --git a/mcs/class/System/System.Net.Cache/HttpCacheAgeControl.cs b/mcs/class/System/System.Net.Cache/HttpCacheAgeControl.cs
deleted file mode 100644 (file)
index f574237..0000000
--- a/mcs/class/System/System.Net.Cache/HttpCacheAgeControl.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Net.Cache.HttpCacheAgeControl.cs
-//
-// Authors:
-//     Tim Coleman (tim@timcoleman.com)
-//
-// Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.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.
-//
-
-namespace System.Net.Cache 
-{
-       public enum HttpCacheAgeControl
-       {
-               None = 0,
-               MinFresh = 0x01,
-               MaxAge = 0x02,
-               MaxAgeAndMinFresh = 0x03,
-               MaxStale = 0x04,
-               MaxAgeAndMaxStale = 0x06,
-       }
-}
-

diff --git a/mcs/class/System/System.Net.Cache/HttpRequestCacheLevel.cs b/mcs/class/System/System.Net.Cache/HttpRequestCacheLevel.cs
deleted file mode 100644 (file)
index 9aa816d..0000000
--- a/mcs/class/System/System.Net.Cache/HttpRequestCacheLevel.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// System.Net.Cache.HttpRequestCacheLevel.cs
-//
-// Authors:
-//     Tim Coleman (tim@timcoleman.com)
-//
-// Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.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.
-//
-
-namespace System.Net.Cache 
-{
-       public enum HttpRequestCacheLevel
-       {
-               Default = 0x00,
-               BypassCache = 0x01,
-               CacheOnly = 0x02,
-               CacheIfAvailable = 0x03,
-               Revalidate = 0x04,
-               Reload = 0x05,
-               NoCacheNoStore = 0x06,
-               CacheOrNextCacheOnly = 0x07,
-               Refresh = 0x08,
-       }
-}
-

diff --git a/mcs/class/System/System.Net.Cache/HttpRequestCachePolicy.cs b/mcs/class/System/System.Net.Cache/HttpRequestCachePolicy.cs
deleted file mode 100644 (file)
index d0e2843..0000000
--- a/mcs/class/System/System.Net.Cache/HttpRequestCachePolicy.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// System.Net.Cache.HttpRequestCachePolicy.cs
-//
-// Authors:
-//     Tim Coleman (tim@timcoleman.com)
-//
-// Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.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;
-
-namespace System.Net.Cache 
-{
-       public class HttpRequestCachePolicy : RequestCachePolicy
-       {
-               #region Fields
-
-               DateTime cacheSyncDate;
-               HttpRequestCacheLevel level = HttpRequestCacheLevel.Default;
-               TimeSpan maxAge;
-               TimeSpan maxStale;
-               TimeSpan minFresh;
-
-               #endregion // Fields
-
-               #region Constructors
-
-               public HttpRequestCachePolicy ()
-               {
-               }
-
-               public HttpRequestCachePolicy (DateTime cacheSyncDate)
-               {
-                       this.cacheSyncDate = cacheSyncDate;
-               }
-
-               public HttpRequestCachePolicy (HttpRequestCacheLevel level)
-               {
-                       this.level = level;
-               }
-
-               public HttpRequestCachePolicy (HttpCacheAgeControl cacheAgeControl, TimeSpan ageOrFreshOrStale)
-               {
-                       switch (cacheAgeControl) {
-                       case HttpCacheAgeControl.MaxAge:
-                               maxAge = ageOrFreshOrStale;
-                               break;
-                       case HttpCacheAgeControl.MaxStale:
-                               maxStale = ageOrFreshOrStale;
-                               break;
-                       case HttpCacheAgeControl.MinFresh:
-                               minFresh = ageOrFreshOrStale;
-                               break;
-                       default:
-                               throw new ArgumentException ("ageOrFreshOrStale");
-                       }
-               }
-
-               public HttpRequestCachePolicy (HttpCacheAgeControl cacheAgeControl, TimeSpan maxAge, TimeSpan freshOrStale)
-               {
-                       this.maxAge = maxAge;
-
-                       switch (cacheAgeControl) {
-                       case HttpCacheAgeControl.MaxStale:
-                               maxStale = freshOrStale;
-                               break;
-                       case HttpCacheAgeControl.MinFresh:
-                               minFresh = freshOrStale;
-                               break;
-                       default:
-                               throw new ArgumentException ("freshOrStale");
-                       }
-               }
-
-               public HttpRequestCachePolicy (HttpCacheAgeControl cacheAgeControl, TimeSpan maxAge, TimeSpan freshOrStale, DateTime cacheSyncDate)
-                       : this (cacheAgeControl, maxAge, freshOrStale)
-               {
-                       this.cacheSyncDate = cacheSyncDate;
-               }
-
-               #endregion // Constructors
-
-               #region Properties
-
-               public DateTime CacheSyncDate {
-                       get { return cacheSyncDate; }
-               }
-
-               public new HttpRequestCacheLevel Level {
-                       get { return level; }
-               }
-
-               public TimeSpan MaxAge {
-                       get { return maxAge; }
-               }
-
-               public TimeSpan MaxStale {
-                       get { return maxStale; }
-               }
-
-               public TimeSpan MinFresh {
-                       get { return minFresh; }
-               }
-
-               #endregion // Properties
-
-               #region Methods
-
-               [MonoTODO]
-               public override string ToString ()
-               {
-                       throw new NotImplementedException ();
-               }
-
-               #endregion // Methods
-       }
-}
-

diff --git a/mcs/class/System/System.Net.Cache/RequestCacheLevel.cs b/mcs/class/System/System.Net.Cache/RequestCacheLevel.cs
deleted file mode 100644 (file)
index 3b78221..0000000
--- a/mcs/class/System/System.Net.Cache/RequestCacheLevel.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// System.Net.Cache.RequestCacheLevel.cs
-//
-// Authors:
-//     Tim Coleman (tim@timcoleman.com)
-//
-// Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.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.
-//
-
-namespace System.Net.Cache 
-{
-       public enum RequestCacheLevel
-       {
-               Default = 0x00,
-               BypassCache = 0x01,
-               CacheOnly = 0x02,
-               CacheIfAvailable = 0x03,
-               Revalidate = 0x04,
-               Reload = 0x05,
-               NoCacheNoStore = 0x06,
-       }
-}
-

diff --git a/mcs/class/System/System.Net.Cache/RequestCachePolicy.cs b/mcs/class/System/System.Net.Cache/RequestCachePolicy.cs
deleted file mode 100644 (file)
index 0483192..0000000
--- a/mcs/class/System/System.Net.Cache/RequestCachePolicy.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// System.Net.Cache.RequestCachePolicy.cs
-//
-// Authors:
-//     Tim Coleman (tim@timcoleman.com)
-//
-// Copyright (C) Tim Coleman, 2004
-// (c) 2004 Novell, Inc. (http://www.novell.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;
-
-namespace System.Net.Cache 
-{
-       public class RequestCachePolicy
-       {
-               #region Fields
-
-               RequestCacheLevel level = RequestCacheLevel.Default;
-
-               #endregion // Fields
-
-               #region Constructors
-
-               public RequestCachePolicy ()
-               {
-               }
-
-               public RequestCachePolicy (RequestCacheLevel level)
-               {
-                       this.level = level;
-               }
-
-               #endregion // Constructors
-
-               #region Properties
-
-               public RequestCacheLevel Level {
-                       get { return level; }
-               }
-
-               #endregion // Properties
-
-               #region Methods
-
-               [MonoTODO]
-               public override string ToString ()
-               {
-                       throw new NotImplementedException ();
-               }
-
-               #endregion // Methods
-       }
-}
-

diff --git a/mcs/class/System/System.Net.Mail/SmtpClient.cs b/mcs/class/System/System.Net.Mail/SmtpClient.cs
index f4376a2ac3cdf260f2134024cdbffe30965516ec..69fd3480999bf05ccbbc20a14f5290043c7626d6 100644 (file)
--- a/mcs/class/System/System.Net.Mail/SmtpClient.cs
+++ b/mcs/class/System/System.Net.Mail/SmtpClient.cs
@@ -1161,7 +1161,7 @@ try {
 
 #if SECURITY_DEP
                        var tlsProvider = MonoTlsProviderFactory.GetProviderInternal ();
-                       var settings = new MSI.MonoTlsSettings ();
+                       var settings = MSI.MonoTlsSettings.CopyDefaultSettings ();
                        settings.UseServicePointManagerCallback = true;
                        var sslStream = tlsProvider.CreateSslStream (stream, false, settings);
                        CheckCancellation ();

diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
index 92a5dfe0a60892c3e5321b07a0308a4754975cb3..2177ecf43c2792f0e1681fb95f40005c6702fc80 100644 (file)
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
@@ -250,6 +250,10 @@ namespace System.Net.NetworkInformation {
 
                class LinuxNetworkInterfaceAPI : UnixNetworkInterfaceAPI
                {
+                       const int AF_INET = 2;
+                       const int AF_INET6 = 10;
+                       const int AF_PACKET = 17;
+
                        static void FreeInterfaceAddresses (IntPtr ifap)
                        {
 #if MONODROID
@@ -270,9 +274,6 @@ namespace System.Net.NetworkInformation {
 
                        public override NetworkInterface [] GetAllNetworkInterfaces ()
                        {
-                               const int AF_INET   = 2;
-                               const int AF_INET6  = 10;
-                               const int AF_PACKET = 17;
 
                                var interfaces = new Dictionary <string, LinuxNetworkInterface> ();
                                IntPtr ifap;
@@ -406,7 +407,43 @@ namespace System.Net.NetworkInformation {
 
                        public override IPAddress GetNetMask (IPAddress address)
                        {
-                               throw new NotImplementedException ();
+                               foreach (ifaddrs networkInteface in GetNetworkInterfaces()) {
+                                       if (networkInteface.ifa_addr == IntPtr.Zero)
+                                               continue;
+
+                                       var sockaddr = (sockaddr_in)Marshal.PtrToStructure(networkInteface.ifa_addr, typeof(sockaddr_in));
+
+                                       if (sockaddr.sin_family != AF_INET)
+                                               continue;
+
+                                       if (!address.Equals(new IPAddress(sockaddr.sin_addr)))
+                                               continue;
+
+                                       var netmask = (sockaddr_in)Marshal.PtrToStructure(networkInteface.ifa_netmask, typeof(sockaddr_in));
+                                       return new IPAddress(netmask.sin_addr);
+                               }
+
+                               return null;
+                       }
+
+                       private static IEnumerable<ifaddrs> GetNetworkInterfaces()
+                       {
+                               IntPtr ifap = IntPtr.Zero;
+
+                               try {
+                                       if (GetInterfaceAddresses(out ifap) != 0)
+                                               yield break;
+
+                                       var next = ifap;
+                                       while (next != IntPtr.Zero) {
+                                               var addr = (ifaddrs)Marshal.PtrToStructure(next, typeof(ifaddrs));
+                                               yield return addr;
+                                               next = addr.ifa_next;
+                                       }
+                               } finally {
+                                       if (ifap != IntPtr.Zero)
+                                               FreeInterfaceAddresses(ifap);
+                               }
                        }
                }
 
@@ -479,8 +516,10 @@ namespace System.Net.NetworkInformation {
                                return new LinuxNetworkInterfaceAPI ();
                        }
 
+#if !MONODROID
                        if (Environment.OSVersion.Version >= windowsVer51)
                                return new Win32NetworkInterfaceAPI ();
+#endif
 
                        throw new NotImplementedException ();
 #endif

diff --git a/mcs/class/System/System.Net.NetworkInformation/Ping.cs b/mcs/class/System/System.Net.NetworkInformation/Ping.cs
index 157b888871d4ff1b4b5f90e456bef5d7da26b217..f18b70c0f9ad0babef214d3c27daf9627aebc156 100644 (file)
--- a/mcs/class/System/System.Net.NetworkInformation/Ping.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/Ping.cs
@@ -6,6 +6,7 @@
 //     Atsushi Enomoto (atsushi@ximian.com)
 //
 // Copyright (c) 2006-2007 Novell, Inc. (http://www.novell.com)
+// Copyright 2015 Xamarin Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -26,6 +27,7 @@
 // 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.IO;
 using System.Text;
@@ -43,6 +45,7 @@ namespace System.Net.NetworkInformation {
        [MonoTODO ("IPv6 support is missing")]
        public class Ping : Component, IDisposable
        {
+#if !MONOTOUCH
                [StructLayout(LayoutKind.Sequential)]
                struct cap_user_header_t
                {
@@ -68,6 +71,7 @@ namespace System.Net.NetworkInformation {
 #endif
                };
                static readonly string PingBinPath;
+#endif
                const int default_timeout = 4000; // 4 sec.
                ushort identifier;
 
@@ -84,7 +88,8 @@ namespace System.Net.NetworkInformation {
                CancellationTokenSource cts;
                
                public event PingCompletedEventHandler PingCompleted;
-               
+
+#if !MONOTOUCH
                static Ping ()
                {
                        if (Environment.OSVersion.Platform == PlatformID.Unix) {
@@ -106,6 +111,7 @@ namespace System.Net.NetworkInformation {
                        if (PingBinPath == null)
                                PingBinPath = "/bin/ping"; // default, fallback value
                }
+#endif
                
                public Ping ()
                {
@@ -115,7 +121,8 @@ namespace System.Net.NetworkInformation {
                        rng.GetBytes (randomIdentifier);
                        identifier = (ushort)(randomIdentifier [0] + (randomIdentifier [1] << 8));
                }
-  
+
+#if !MONOTOUCH
                [DllImport ("libc", EntryPoint="capget")]
                static extern int capget (ref cap_user_header_t header, ref cap_user_data_t data);
 
@@ -142,6 +149,7 @@ namespace System.Net.NetworkInformation {
                                canSendPrivileged = false;
                        }
                }
+#endif
                
                void IDisposable.Dispose ()
                {
@@ -215,11 +223,16 @@ namespace System.Net.NetworkInformation {
                                throw new ArgumentException ("buffer");
                        // options can be null.
 
+#if MONOTOUCH
+                       throw new InvalidOperationException ();
+#else
                        if (canSendPrivileged)
                                return SendPrivileged (address, timeout, buffer, options);
                        return SendUnprivileged (address, timeout, buffer, options);
+#endif
                }
 
+#if !MONOTOUCH
                private PingReply SendPrivileged (IPAddress address, int timeout, byte [] buffer, PingOptions options)
                {
                        IPEndPoint target = new IPEndPoint (address, 0);
@@ -286,6 +299,7 @@ namespace System.Net.NetworkInformation {
 
                private PingReply SendUnprivileged (IPAddress address, int timeout, byte [] buffer, PingOptions options)
                {
+#if MONO_FEATURE_PROCESS_START
                        DateTime sentTime = DateTime.UtcNow;
 
                        Process ping = new Process ();
@@ -325,7 +339,11 @@ namespace System.Net.NetworkInformation {
                        }
 
                        return new PingReply (address, buffer, options, trip_time, status);
+#else
+                       throw new PlatformNotSupportedException ("Ping is not supported on this platform.");
+#endif // MONO_FEATURE_PROCESS_START
                }
+#endif // !MONOTOUCH
 
                // Async
 
@@ -401,6 +419,7 @@ namespace System.Net.NetworkInformation {
                        worker.CancelAsync ();
                }
 
+#if !MONOTOUCH
                // ICMP message
 
                class IcmpMessage
@@ -534,6 +553,7 @@ namespace System.Net.NetworkInformation {
 
                        return args.ToString ();
                }
+#endif // !MONOTOUCH
 
                public Task<PingReply> SendPingAsync (IPAddress address, int timeout, byte [] buffer)
                {
@@ -592,4 +612,3 @@ namespace System.Net.NetworkInformation {
                }
        }
 }
-

diff --git a/mcs/class/System/System.Net.Security/SslStream.cs b/mcs/class/System/System.Net.Security/SslStream.cs
index 67266618aaee535695f55b1b66d48d954d725a80..281c6fa7016baf4de2a960c3a88fe92fba1cbfb1 100644 (file)
--- a/mcs/class/System/System.Net.Security/SslStream.cs
+++ b/mcs/class/System/System.Net.Security/SslStream.cs
@@ -85,15 +85,23 @@ namespace System.Net.Security
 
        public class SslStream : AuthenticatedStream, MNS.IMonoSslStream
        {
-               MonoSslStream impl;
+               MonoTlsProvider provider;
+               IMonoSslStream impl;
 
-               internal MonoSslStream Impl {
+               internal IMonoSslStream Impl {
                        get {
                                CheckDisposed ();
                                return impl;
                        }
                }
 
+               internal MonoTlsProvider Provider {
+                       get {
+                               CheckDisposed ();
+                               return provider;
+                       }
+               }
+
                static MonoTlsProvider GetProvider ()
                {
                        return MonoTlsProviderFactory.GetDefaultProvider ();
@@ -107,7 +115,7 @@ namespace System.Net.Security
                public SslStream (Stream innerStream, bool leaveInnerStreamOpen)
                        : base (innerStream, leaveInnerStreamOpen)
                {
-                       var provider = GetProvider ();
+                       provider = GetProvider ();
                        impl = provider.CreateSslStream (innerStream, leaveInnerStreamOpen);
                }
 
@@ -119,14 +127,14 @@ namespace System.Net.Security
                public SslStream (Stream innerStream, bool leaveInnerStreamOpen, RemoteCertificateValidationCallback userCertificateValidationCallback, LocalCertificateSelectionCallback userCertificateSelectionCallback)
                        : base (innerStream, leaveInnerStreamOpen)
                {
-                       var provider = GetProvider ();
-                       var settings = new MonoTlsSettings ();
+                       provider = GetProvider ();
+                       var settings = MonoTlsSettings.CopyDefaultSettings ();
                        settings.RemoteCertificateValidationCallback = MNS.Private.CallbackHelpers.PublicToMono (userCertificateValidationCallback);
                        settings.ClientCertificateSelectionCallback = MNS.Private.CallbackHelpers.PublicToMono (userCertificateSelectionCallback);
                        impl = provider.CreateSslStream (innerStream, leaveInnerStreamOpen, settings);
                }
 
-               internal SslStream (Stream innerStream, bool leaveInnerStreamOpen, MonoSslStream impl)
+               internal SslStream (Stream innerStream, bool leaveInnerStreamOpen, IMonoSslStream impl)
                        : base (innerStream, leaveInnerStreamOpen)
                {
                        this.impl = impl;
@@ -331,7 +339,7 @@ namespace System.Net.Security
                void CheckDisposed ()
                {
                        if (impl == null)
-                               throw new ObjectDisposedException ("MonoSslStream");
+                               throw new ObjectDisposedException ("SslStream");
                }
 
                protected override void Dispose (bool disposing)

diff --git a/mcs/class/System/System.Net/FtpWebRequest.cs b/mcs/class/System/System.Net/FtpWebRequest.cs
index bb900979a48ff614732e30717f06f15925b1981f..1fbf80dc7ce4473a80518b3a7d07a146a956a538 100644 (file)
--- a/mcs/class/System/System.Net/FtpWebRequest.cs
+++ b/mcs/class/System/System.Net/FtpWebRequest.cs
@@ -1168,7 +1168,7 @@ namespace System.Net
                internal bool ChangeToSSLSocket (ref Stream stream) {
 #if SECURITY_DEP
                        var provider = MonoTlsProviderFactory.GetProviderInternal ();
-                       var settings = new MSI.MonoTlsSettings ();
+                       var settings = MSI.MonoTlsSettings.CopyDefaultSettings ();
                        settings.UseServicePointManagerCallback = true;
                        var sslStream = provider.CreateSslStream (stream, true, settings);
                        sslStream.AuthenticateAsClient (requestUri.Host, null, SslProtocols.Default, false);

diff --git a/mcs/class/System/System.Net/HttpListener.cs b/mcs/class/System/System.Net/HttpListener.cs
index 15580d3b70514fb650dff0c92f64886a4379a72a..29afc0fd84b78ceca4e33b0dfe9efa2b4f9767fd 100644 (file)
--- a/mcs/class/System/System.Net/HttpListener.cs
+++ b/mcs/class/System/System.Net/HttpListener.cs
@@ -122,7 +122,7 @@ namespace System.Net {
                                if (tlsProvider == null)
                                        tlsProvider = MonoTlsProviderFactory.GetProviderInternal ();
                                if (tlsSettings == null)
-                                       tlsSettings = new MSI.MonoTlsSettings ();
+                                       tlsSettings = MSI.MonoTlsSettings.CopyDefaultSettings ();
                                if (tlsSettings.RemoteCertificateValidationCallback == null)
                                        tlsSettings.RemoteCertificateValidationCallback = callback;
                                return tlsProvider.CreateSslStream (innerStream, ownsStream, tlsSettings);

diff --git a/mcs/class/System/System.Net/HttpListenerRequest.cs b/mcs/class/System/System.Net/HttpListenerRequest.cs
index ac59eb51cd3e72a782b009b80411e4da9ed64170..769195a2b3ec4c965278d9ed8aa7670388d5e800 100644 (file)
--- a/mcs/class/System/System.Net/HttpListenerRequest.cs
+++ b/mcs/class/System/System.Net/HttpListenerRequest.cs
@@ -38,6 +38,7 @@ using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Security.Authentication.ExtendedProtection;
 using System.Threading.Tasks;
+using System.Net;
 
 namespace System.Net {
        public sealed class HttpListenerRequest
@@ -175,7 +176,7 @@ namespace System.Net {
                                                                host, LocalEndPoint.Port);
 
                        if (!Uri.TryCreate (base_uri + path, UriKind.Absolute, out url)){
-                               context.ErrorMessage = "Invalid url: " + base_uri + path;
+                               context.ErrorMessage = WebUtility.HtmlEncode ("Invalid url: " + base_uri + path);
                                return;
                        }
 

diff --git a/mcs/class/System/System.Net/WebRequest.cs b/mcs/class/System/System.Net/WebRequest.cs
index efb06fe9aa82385b6a9df86d0c63fb8c121111b2..ae1159958aa3ef0738f811e29f27e2cd640cc61b 100644 (file)
--- a/mcs/class/System/System.Net/WebRequest.cs
+++ b/mcs/class/System/System.Net/WebRequest.cs
@@ -40,6 +40,7 @@ using System.Net.Security;
 using System.Net.Cache;
 using System.Security.Principal;
 using System.Threading.Tasks;
+using System.Text.RegularExpressions;
 
 #if NET_2_1
 using ConfigurationException = System.ArgumentException;
@@ -332,6 +333,19 @@ namespace System.Net
                        throw GetMustImplement ();
                }
                
+               // Takes an ArrayList of fileglob-formatted strings and returns an array of Regex-formatted strings
+               private static string[] CreateBypassList (ArrayList al)
+               {
+                       string[] result = al.ToArray (typeof (string)) as string[];
+                       for (int c = 0; c < result.Length; c++)
+                       {
+                               result [c] = "^" +
+                                       Regex.Escape (result [c]).Replace (@"\*", ".*").Replace (@"\?", ".") +
+                                       "$";
+                       }
+                       return result;
+               }
+
                [MonoTODO("Look in other places for proxy config info")]
                public static IWebProxy GetSystemWebProxy ()
                {
@@ -375,7 +389,7 @@ namespace System.Net
                                                }
                                        }
                                        
-                                       return new WebProxy (strHttpProxy, bBypassOnLocal, al.ToArray (typeof(string)) as string[]);
+                                       return new WebProxy (strHttpProxy, bBypassOnLocal, CreateBypassList (al));
                                }
                        } else {
 #endif
@@ -425,7 +439,7 @@ namespace System.Net
                                                        }
                                                }
                                                
-                                               return new WebProxy (uri, bBypassOnLocal, al.ToArray (typeof(string)) as string[]);
+                                               return new WebProxy (uri, bBypassOnLocal, CreateBypassList (al));
                                        } catch (UriFormatException) {
                                        }
                                }

diff --git a/mcs/class/System/System.Runtime.InteropServices/ChangeLog b/mcs/class/System/System.Runtime.InteropServices/ChangeLog
deleted file mode 100644 (file)
index ca83262..0000000
--- a/mcs/class/System/System.Runtime.InteropServices/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2007-09-05  Atsushi Enomoto  <atsushi@ximian.com>
-
-       * HandleCollector.cs : new file.
-
-2007-03-12  Raja R Harinath  <rharinath@novell.com>
-
-       * StandardOleMarshalObject.cs: New .net2.0 class.
-       * DefaultParameterValueAttribute.cs: Move here from corlib.
-

diff --git a/mcs/class/System/System.Runtime.InteropServices/DefaultParameterValueAttribute.cs b/mcs/class/System/System.Runtime.InteropServices/DefaultParameterValueAttribute.cs
deleted file mode 100644 (file)
index e8988f0..0000000
--- a/mcs/class/System/System.Runtime.InteropServices/DefaultParameterValueAttribute.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// System.Runtime.InteropServices.DefaultParameterValueAttribute.cs
-//
-// Author: Zoltan Varga (vargaz@gmail.com)
-//
-// (C) Ximian, Inc.
-//
-
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.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;
-
-namespace System.Runtime.InteropServices {
-       [AttributeUsage (AttributeTargets.Parameter)]
-       public sealed class DefaultParameterValueAttribute : Attribute
-       {
-               object value;
-               
-               public DefaultParameterValueAttribute (object value)
-               {
-                       this.value = value;
-               }
-
-               public object Value {
-                       get {
-                               return value;
-                       }
-               }
-       }
-}

diff --git a/mcs/class/System/System.Runtime.InteropServices/HandleCollector.cs b/mcs/class/System/System.Runtime.InteropServices/HandleCollector.cs
deleted file mode 100644 (file)
index ff51de2..0000000
--- a/mcs/class/System/System.Runtime.InteropServices/HandleCollector.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// HandleCollector.cs
-//
-// Author: Atsushi Enomoto  <atsushi@ximian.com>
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.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;
-
-namespace System.Runtime.InteropServices
-{
-       public sealed class HandleCollector
-       {
-               int count;
-               readonly int init, max;
-               readonly string name;
-               DateTime previous_collection = DateTime.MinValue;
-
-               public HandleCollector (string name, int initialThreshold)
-                       : this (name, initialThreshold, int.MaxValue)
-               {
-               }
-
-               public HandleCollector (string name, int initialThreshold, int maximumThreshold)
-               {
-                       if (initialThreshold < 0)
-                               throw new ArgumentOutOfRangeException ("initialThreshold", "initialThreshold must not be less than zero");
-                       if (maximumThreshold < 0)
-                               throw new ArgumentOutOfRangeException ("maximumThreshold", "maximumThreshold must not be less than zero");
-                       if (maximumThreshold < initialThreshold)
-                               throw new ArgumentException ("maximumThreshold must not be less than initialThreshold");
-
-                       this.name = name;
-                       init = initialThreshold;
-                       max = maximumThreshold;
-               }
-
-               public int Count {
-                       get { return count; }
-               }
-
-               public int InitialThreshold {
-                       get { return init; }
-               }
-
-               public int MaximumThreshold {
-                       get { return max; }
-               }
-
-               public string Name {
-                       get { return name; }
-               }
-
-               public void Add ()
-               {
-/* NET_3_5
-                       if (++count >= max)
-                               GC.Collect (GC.MaxGeneration, GCCollectionMode.Forced);
-                       else if (count >= init)
-                               GC.Collect (GC.MaxGeneration, GCCollectionMode.Optimized);
-*/
-                       if (++count >= max)
-                               GC.Collect (GC.MaxGeneration);
-                       else if (count >= init && DateTime.Now - previous_collection > TimeSpan.FromSeconds (5)) { // some arbitrary criteria
-                               GC.Collect (GC.MaxGeneration);
-                               previous_collection = DateTime.Now;
-                       }
-               }
-
-               public void Remove ()
-               {
-                       if (count == 0)
-                               throw new InvalidOperationException ("Cannot call Remove method when Count is 0");
-                       count--;
-               }
-       }
-}
-

diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs
index e4f47a5d363dc9a8f593bb3602ad8a577d5caab5..184e586471dd30c167be16eca420d930c5c12bfb 100644 (file)
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs
@@ -61,6 +61,9 @@ namespace System.Security.Cryptography.X509Certificates {
                [DllImport (CoreFoundationLibrary)]
                unsafe extern static IntPtr CFDataCreate (IntPtr allocator, byte *bytes, /* CFIndex */ IntPtr length);
 
+               [DllImport (CoreFoundationLibrary)]
+               extern static void CFRetain (IntPtr handle);
+
                [DllImport (CoreFoundationLibrary)]
                extern static void CFRelease (IntPtr handle);
 
@@ -97,6 +100,18 @@ namespace System.Security.Cryptography.X509Certificates {
                                        IntPtr.Zero);
                        }
                }
+
+               static IntPtr GetCertificate (X509Certificate certificate, out IntPtr dataPtr)
+               {
+                       var handle = certificate.Handle;
+                       if (handle != IntPtr.Zero) {
+                               dataPtr = IntPtr.Zero;
+                               CFRetain (handle);
+                               return handle;
+                       }
+                       dataPtr = MakeCFData (certificate.GetRawCertData ());
+                       return SecCertificateCreateWithData (IntPtr.Zero, dataPtr);
+               }
                
                public static SecTrustResult TrustEvaluateSsl (XX509CertificateCollection certificates, XX509CertificateCollection anchors, string host)
                {
@@ -126,19 +141,14 @@ namespace System.Security.Cryptography.X509Certificates {
                        SecTrustResult result = SecTrustResult.Deny;
 
                        try {
-                               for (int i = 0; i < certCount; i++)
-                                       cfDataPtrs [i] = MakeCFData (certificates [i].GetRawCertData ());
-                               for (int i = 0; i < anchorCount; i++)
-                                       cfDataAnchorPtrs [i] = MakeCFData (anchors [i].GetRawCertData ());
-                               
-                               for (int i = 0; i < certCount; i++){
-                                       secCerts [i] = SecCertificateCreateWithData (IntPtr.Zero, cfDataPtrs [i]);
+                               for (int i = 0; i < certCount; i++) {
+                                       secCerts [i] = GetCertificate (certificates [i], out cfDataPtrs [i]);
                                        if (secCerts [i] == IntPtr.Zero)
                                                return SecTrustResult.Deny;
                                }
 
                                for (int i = 0; i < anchorCount; i++) {
-                                       secCertAnchors [i] = SecCertificateCreateWithData (IntPtr.Zero, cfDataAnchorPtrs [i]);
+                                       secCertAnchors [i] = GetCertificate (anchors [i], out cfDataAnchorPtrs [i]);
                                        if (secCertAnchors [i] == IntPtr.Zero)
                                                return SecTrustResult.Deny;
                                }

diff --git a/mcs/class/System/System.dll.sources b/mcs/class/System/System.dll.sources
index 1f55b8c861d75222f1eb5df76088dc728001c232..369fa12eec82a6ae4db604c60e5770f56f25805a 100644 (file)
--- a/mcs/class/System/System.dll.sources
+++ b/mcs/class/System/System.dll.sources
@@ -222,11 +222,6 @@ System.Net/AuthenticationSchemeSelector.cs
 System.Net/Authorization.cs
 System.Net/BasicClient.cs
 System.Net/BindIPEndPoint.cs
-System.Net.Cache/HttpCacheAgeControl.cs
-System.Net.Cache/HttpRequestCacheLevel.cs
-System.Net.Cache/HttpRequestCachePolicy.cs
-System.Net.Cache/RequestCacheLevel.cs
-System.Net.Cache/RequestCachePolicy.cs
 System.Net/ChunkedInputStream.cs
 System.Net/ChunkStream.cs
 System.Net.Configuration/AuthenticationModuleElementCollection.cs
@@ -553,16 +548,9 @@ System.Threading/ThreadExceptionEventArgs.cs
 System.Threading/ThreadExceptionEventHandler.cs
 System.Timers/ElapsedEventArgs.cs
 System/UriBuilder.cs
-System/UriComponents.cs
 System/Uri.cs
-System/UriFormat.cs
-System/UriFormatException.cs
-System/UriHostNameType.cs
 System/UriHelper.cs
-System/UriIdnScope.cs
-System/UriKind.cs
 System/UriParser.cs
-System/UriPartial.cs
 System/UriTypeConverter.cs
 System/UriElements.cs
 System/UriParseComponents.cs
@@ -570,8 +558,6 @@ System.Web/AspNetHostingPermissionAttribute.cs
 System.Web/AspNetHostingPermission.cs
 System.Web/AspNetHostingPermissionLevel.cs
 
-System.Runtime.InteropServices/DefaultParameterValueAttribute.cs
-System.Runtime.InteropServices/HandleCollector.cs
 System.Runtime.InteropServices/StandardOleMarshalObject.cs
 System.Runtime.InteropServices.ComTypes/ADVF.cs
 System.Runtime.InteropServices.ComTypes/DATADIR.cs
@@ -1017,6 +1003,11 @@ ReferenceSources/_SslStream.cs
 ../../../external/referencesource/System/compmod/system/diagnostics/TypedElement.cs
 ../../../external/referencesource/System/compmod/system/diagnostics/XmlWriterTraceListener.cs
 
+../../../external/referencesource/System/net/System/UriEnumTypes.cs
+../../../external/referencesource/System/net/System/URIFormatException.cs
+../../../external/referencesource/System/net/System/UriHostNameType.cs
+../../../external/referencesource/System/net/System/URIPartial.cs
+
 ../../../external/referencesource/System/net/System/Net/_BufferOffsetSize.cs
 ../../../external/referencesource/System/net/System/Net/_LazyAsyncResult.cs
 ../../../external/referencesource/System/net/System/Net/_LoggingObject.cs
@@ -1035,12 +1026,17 @@ ReferenceSources/_SslStream.cs
 ../../../external/referencesource/System/net/System/Net/WebUtility.cs
 ../../../external/referencesource/System/net/System/Net/WriteStreamClosedEventArgs.cs
 
+../../../external/referencesource/System/net/System/Net/Cache/RequestCachePolicy.cs
+
+../../../external/referencesource/System/net/System/Net/Sockets/IPProtectionLevel.cs
 ../../../external/referencesource/System/net/System/Net/Sockets/NetworkStream.cs
+
 ../../../external/referencesource/System/net/System/Net/NetworkInformation/IPInterfaceStatistics.cs
 ../../../external/referencesource/System/net/System/Net/NetworkInformation/ScopeLevel.cs
 ../../../external/referencesource/System/net/System/Net/NetworkInformation/UnicastIPAddressInformation.cs
 
-../../../external/referencesource/System/net/System/Net/Sockets/IPProtectionLevel.cs
+../../../external/referencesource/System/sys/system/runtime/interopservices/DefaultParameterValueAttribute.cs
+../../../external/referencesource/System/sys/system/runtime/interopservices/handlecollector.cs
 
 ../../../external/referencesource/System/sys/system/runtime/versioning/FrameworkName.cs
 

diff --git a/mcs/class/System/System/UriComponents.cs b/mcs/class/System/System/UriComponents.cs
deleted file mode 100644 (file)
index bc5fe6b..0000000
--- a/mcs/class/System/System/UriComponents.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// System.UriComponents enumeration
-//
-// Author:
-//     Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.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.
-//
-
-namespace System {
-
-       [Flags]
-       public enum UriComponents {
-
-               Scheme = 1,
-               UserInfo = 2,
-               Host = 4,
-               Port = 8,
-               Path = 16,
-               Query = 32,
-               Fragment = 64,
-               StrongPort = 128,
-               NormalizedHost = 256,
-               KeepDelimiter = 0x40000000,
-
-               HostAndPort = Host | StrongPort,
-               StrongAuthority = Host | UserInfo | StrongPort,
-               AbsoluteUri = Scheme | UserInfo | Host | Port | Path | Query | Fragment,
-               PathAndQuery = Path | Query,
-               HttpRequestUrl = Scheme | Port| Host | Path | Query,
-               SchemeAndServer = Scheme | Host | Port,
-               SerializationInfoString = Int32.MinValue
-       }
-}

diff --git a/mcs/class/System/System/UriFormat.cs b/mcs/class/System/System/UriFormat.cs
deleted file mode 100644 (file)
index 67c6eeb..0000000
--- a/mcs/class/System/System/UriFormat.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.UriFormat enumeration
-//
-// Author:
-//     Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.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.
-//
-
-namespace System {
-
-       public  enum UriFormat {
-
-               UriEscaped = 1,
-               Unescaped,
-               SafeUnescaped,
-       }
-}

diff --git a/mcs/class/System/System/UriFormatException.cs b/mcs/class/System/System/UriFormatException.cs
deleted file mode 100644 (file)
index 6860619..0000000
--- a/mcs/class/System/System/UriFormatException.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// System.UriFormatException.cs
-//
-// Author:
-//   Scott Sanders (scott@stonecobra.com)
-//   Duncan Mak (duncan@ximian.com)
-//
-// (C) 2001 Scott Sanders
-// (C) 2002 Ximian, Inc.
-// Copyright (C) 2005, 2008 Novell, Inc (http://www.novell.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.Globalization;
-using System.Runtime.Serialization;
-
-namespace System {
-
-       [Serializable]
-       public class UriFormatException : FormatException, ISerializable
-       {
-
-               // Constructors
-               public UriFormatException ()
-                       : base (Locale.GetText ("Invalid URI format"))
-               {
-               }
-
-               public UriFormatException (string textString)
-                       : base (textString)
-               {
-               }
-
-               public UriFormatException (string textString, Exception e)
-                       : base (textString, e)
-               {
-               }
-               protected UriFormatException (SerializationInfo serializationInfo, StreamingContext streamingContext)
-                       : base (serializationInfo, streamingContext)
-               {
-               }
-
-               // Methods
-
-               // This effectively kills the LinkDemand from Exception.GetObjectData (if someone
-               // use the ISerializable interface to serialize the object). See unit tests.
-               void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)
-               {
-                       base.GetObjectData (info, context);
-               }
-       }
-}

diff --git a/mcs/class/System/System/UriHostNameType.cs b/mcs/class/System/System/UriHostNameType.cs
deleted file mode 100644 (file)
index fb25a1a..0000000
--- a/mcs/class/System/System/UriHostNameType.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// UriHostNameType.cs
-//
-// This code was automatically generated from
-// ECMA CLI XML Library Specification.
-// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
-// Created: Wed, 5 Sep 2001 06:33:14 UTC
-// Source file: AllTypes.xml
-// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
-//
-// (C) 2001 Ximian, Inc.  http://www.ximian.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.
-//
-
-
-namespace System {
-
-
-       /// <summary>
-       /// </summary>
-       public enum UriHostNameType {
-
-               /// <summary>
-               /// </summary>
-               Unknown = 0,
-               
-               /// <summary>
-               /// </summary>
-               Basic = 1,
-
-               /// <summary>
-               /// </summary>
-               Dns = 2,
-
-               /// <summary>
-               /// </summary>
-               IPv4 = 3,
-
-               /// <summary>
-               /// </summary>
-               IPv6 = 4,
-       } // UriHostNameType
-
-} // System

diff --git a/mcs/class/System/System/UriIdnScope.cs b/mcs/class/System/System/UriIdnScope.cs
deleted file mode 100644 (file)
index 6c38567..0000000
--- a/mcs/class/System/System/UriIdnScope.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// UriIdnScope.cs
-//
-// Author:
-//     Atsushi Enomoto  <atsushi@ximian.com>
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.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.
-//
-
-// Net 3.5 type
-namespace System
-{
-       public enum UriIdnScope
-       {
-               None,
-               AllExceptIntranet,
-               All,
-       }
-}
-

diff --git a/mcs/class/System/System/UriKind.cs b/mcs/class/System/System/UriKind.cs
deleted file mode 100644 (file)
index a6ddc2f..0000000
--- a/mcs/class/System/System/UriKind.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.UriKind enumeration
-//
-// Author:
-//     Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.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.
-//
-
-namespace System {
-
-       public enum UriKind {
-
-               RelativeOrAbsolute,
-               Absolute,
-               Relative,
-       }
-}

diff --git a/mcs/class/System/System/UriPartial.cs b/mcs/class/System/System/UriPartial.cs
deleted file mode 100644 (file)
index b4ce130..0000000
--- a/mcs/class/System/System/UriPartial.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// UriPartial.cs
-//
-// This code was automatically generated from
-// ECMA CLI XML Library Specification.
-// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
-// Created: Wed, 5 Sep 2001 06:33:21 UTC
-// Source file: AllTypes.xml
-// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
-//
-// (C) 2001 Ximian, Inc.  http://www.ximian.com
-// Copyright (C) 2005 Novell, Inc (http://www.novell.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.
-//
-
-namespace System {
-
-       public enum UriPartial {
-
-               Scheme = 0,
-               Authority = 1,
-               Path = 2,
-               Query
-       }
-}

diff --git a/mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs b/mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs
index 7b988908317bf3bb26aaff570c3668eeb96832ae..a5899fd28f3ab544f83a1e863f669a3ca5ef3091 100644 (file)
--- a/mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs
+++ b/mcs/class/System/Test/Microsoft.CSharp/CSharpCodeProviderTest.cs
@@ -27,6 +27,9 @@ namespace MonoTests.Microsoft.CSharp
 
                private static readonly string _sourceLibrary1 = "public class Test1 {}";
                private static readonly string _sourceLibrary2 = "public class Test2 {}";
+               private static readonly string _sourceLibrary3 =
+                       @"public class Test3 { public void F() { } }
+                       public class Test4 : Test3 { public void F() { } }";
                private static readonly string _sourceExecutable = "public class Program { static void Main () { } }";
 
                [SetUp]
@@ -547,6 +550,22 @@ namespace MonoTests.Microsoft.CSharp
                        Assert.AreEqual (tempFile, tempFiles[0], "#4");
                }
 
+               [Test]
+               public void MultiLineWarningIsReportedAsOneWarning()
+               {
+                       CompilerParameters options = new CompilerParameters ();
+                       options.GenerateExecutable = false;
+                       options.GenerateInMemory = true;
+                       options.TempFiles = new TempFileCollection (_tempDir);
+
+                       ICodeCompiler compiler = _codeProvider.CreateCompiler ();
+                       CompilerResults results = compiler.CompileAssemblyFromSource (options,
+                               _sourceLibrary3);
+
+                       // verify compilation was successful
+                       AssertCompileResults (results, true);
+               }
+
                private static string CreateTempDirectory ()
                {
                        // create a uniquely named zero-byte file

diff --git a/mcs/class/System/Test/System.Diagnostics/ProcessStartInfoTest.cs b/mcs/class/System/Test/System.Diagnostics/ProcessStartInfoTest.cs
index 53de1f66db4342d6e78e2e942d9beed4d76220b1..7612efae6ccbea26e24cf58f4eaa6d8193444022 100644 (file)
--- a/mcs/class/System/Test/System.Diagnostics/ProcessStartInfoTest.cs
+++ b/mcs/class/System/Test/System.Diagnostics/ProcessStartInfoTest.cs
@@ -8,6 +8,8 @@
 // (c) 2007 Novell, Inc. (http://www.novell.com)
 // 
 
+#if MONO_FEATURE_PROCESS_START
+
 using System;
 using System.Diagnostics;
 using System.Text;
@@ -62,3 +64,5 @@ namespace MonoTests.System.Diagnostics
                }
        }
 }
+
+#endif // MONO_FEATURE_PROCESS_START

diff --git a/mcs/class/System/Test/System.Diagnostics/ProcessTest.cs b/mcs/class/System/Test/System.Diagnostics/ProcessTest.cs
index d4372a1ddddc76083a6022ab54d46aa4212ec533..615b0aed3e694e59c12d6de98f0c83272b707672 100644 (file)
--- a/mcs/class/System/Test/System.Diagnostics/ProcessTest.cs
+++ b/mcs/class/System/Test/System.Diagnostics/ProcessTest.cs
@@ -104,6 +104,7 @@ namespace MonoTests.System.Diagnostics
                        }
                }
 
+#if MONO_FEATURE_PROCESS_START
                [Test] // Start ()
                public void Start1_FileName_Empty ()
                {
@@ -841,7 +842,6 @@ namespace MonoTests.System.Diagnostics
                        Assert.AreEqual (1, exitedCalledCounter);
                }
 
-               
                ProcessStartInfo GetCrossPlatformStartInfo ()
                {
                        if (RunningOnUnix) {
@@ -855,6 +855,7 @@ namespace MonoTests.System.Diagnostics
                        } else
                                return new ProcessStartInfo ("help", "");
                }
+#endif // MONO_FEATURE_PROCESS_START
 
                [Test]
                public void ProcessName_NotStarted ()
@@ -876,6 +877,7 @@ namespace MonoTests.System.Diagnostics
                        Assert.IsNull (e.InnerException, "IOE inner exception should be null");
                }
                
+#if MONO_FEATURE_PROCESS_START
                [Test]
                [NUnit.Framework.Category ("MobileNotWorking")]
                public void ProcessName_AfterExit ()
@@ -906,6 +908,7 @@ namespace MonoTests.System.Diagnostics
                        
                        Assert.IsNull (e.InnerException, "IOE inner exception should be null");
                }
+#endif // MONO_FEATURE_PROCESS_START
 
                [Test]
                public void Handle_ThrowsOnNotStarted ()
@@ -923,6 +926,7 @@ namespace MonoTests.System.Diagnostics
                        Assert.IsFalse (Process.GetCurrentProcess ().HasExited);
                }
 
+#if MONO_FEATURE_PROCESS_START
                [Test]
                [NUnit.Framework.Category ("MobileNotWorking")]
                public void DisposeWithDisposedStreams ()
@@ -952,6 +956,7 @@ namespace MonoTests.System.Diagnostics
                                        p.StandardInput.Write ('x');
                        }
                }
+#endif // MONO_FEATURE_PROCESS_START
 
                [Test]
                public void Modules () {

diff --git a/mcs/class/System/Test/System.Net.Mail/SmtpClientTest.cs b/mcs/class/System/Test/System.Net.Mail/SmtpClientTest.cs
index 8bba21c0bdec4383fceb4d7c5cc11d9fbed2d611..8fa752a4476c8981af260df18a15091fbe5bef54 100644 (file)
--- a/mcs/class/System/Test/System.Net.Mail/SmtpClientTest.cs
+++ b/mcs/class/System/Test/System.Net.Mail/SmtpClientTest.cs
@@ -392,21 +392,48 @@ namespace MonoTests.System.Net.Mail
                [Test]
                public void Deliver_Async ()
                {
-                       var server = new SmtpServer ();
-                       var client = new SmtpClient ("localhost", server.EndPoint.Port);
-                       var msg = new MailMessage ("foo@example.com", "bar@example.com", "hello", "howdydoo\r\n");
-
-                       Thread t = new Thread (server.Run);
-                       t.Start ();
-                       var task = client.SendMailAsync (msg);
-                       t.Join ();
+                       // SmtpClient uses BackgroundWorker and listens for the RunWorkerCompleted
+                       // to mark an async task as completed. The problem is that BackgroundWorker uses
+                       // System.ComponentModel.AsyncOperationManager to get the synchronization
+                       // context, and in monotouch that returns by default a synchronization
+                       // context for the main thread. Since tests are also run on the main thread,
+                       // we'll block the main thread while waiting for the async send to complete,
+                       // while the async completion is waiting for the main thread to process it.
+                       // So instead use a SynchronizationContext that uses the threadpool instead
+                       // of the main thread.
+                       var existing_context = global::System.ComponentModel.AsyncOperationManager.SynchronizationContext;
+                       global::System.ComponentModel.AsyncOperationManager.SynchronizationContext = new ThreadPoolSynchronizationContext ();
+                       try {
+                               var server = new SmtpServer ();
+                               var client = new SmtpClient ("localhost", server.EndPoint.Port);
+                               var msg = new MailMessage ("foo@example.com", "bar@example.com", "hello", "howdydoo\r\n");
+
+                               Thread t = new Thread (server.Run);
+                               t.Start ();
+                               var task = client.SendMailAsync (msg);
+                               t.Join ();
+
+                               Assert.AreEqual ("<foo@example.com>", server.mail_from);
+                               Assert.AreEqual ("<bar@example.com>", server.rcpt_to);
+
+                               Assert.IsTrue (task.Wait (1000));
+                               Assert.IsTrue (task.IsCompleted, "task");
+                       } finally {
+                               global::System.ComponentModel.AsyncOperationManager.SynchronizationContext = existing_context;
+                       }
+               }
 
-                       Assert.AreEqual ("<foo@example.com>", server.mail_from);
-                       Assert.AreEqual ("<bar@example.com>", server.rcpt_to);
+               internal class ThreadPoolSynchronizationContext : SynchronizationContext
+               {
+                       public override void Post (SendOrPostCallback d, object state)
+                       {
+                               ThreadPool.QueueUserWorkItem ((v) => d (state));
+                       }
 
-                       Assert.IsTrue (task.Wait (1000));
-                       Assert.IsTrue (task.IsCompleted, "task");
+                       public override void Send (SendOrPostCallback d, object state)
+                       {
+                               d (state);
+                       }
                }
-
        }
 }

diff --git a/mcs/class/System/Test/System.Net.NetworkInformation/NetworkInterfaceTest.cs b/mcs/class/System/Test/System.Net.NetworkInformation/NetworkInterfaceTest.cs
index f3712dc9f6ebf678866aa7680c522565f29268ca..b124403e0dd833706377a69420a42179de6d24fc 100644 (file)
--- a/mcs/class/System/Test/System.Net.NetworkInformation/NetworkInterfaceTest.cs
+++ b/mcs/class/System/Test/System.Net.NetworkInformation/NetworkInterfaceTest.cs
@@ -9,6 +9,7 @@ using NUnit.Framework;
 using System;
 using System.Linq;
 using System.Net;
+using System.Net.Sockets;
 using System.Net.NetworkInformation;
 
 namespace MonoTests.System.Net.NetworkInformation
@@ -72,6 +73,25 @@ namespace MonoTests.System.Net.NetworkInformation
                        NetworkInterface[] adapters = NetworkInterface.GetAllNetworkInterfaces ();
                        Assert.IsTrue (adapters[0].Speed > 0);
                }
-       
+
+               [Test]
+               public void IPv4Mask ()
+               {
+                       NetworkInterface[] adapters = NetworkInterface.GetAllNetworkInterfaces ();
+                       foreach (NetworkInterface adapter in adapters)
+                       {
+                               if (adapter.Supports (NetworkInterfaceComponent.IPv4))
+                               {
+                                       IPInterfaceProperties adapterProperties = adapter.GetIPProperties ();
+                                       foreach (UnicastIPAddressInformation uni in adapterProperties.UnicastAddresses)
+                                       {
+                                               if (uni.Address.AddressFamily == AddressFamily.InterNetwork)
+                                               {
+                                                       Assert.IsNotNull (uni.IPv4Mask);
+                                               }
+                                       }
+                               }
+                       }
+               }
        }
 }

diff --git a/mcs/class/System/Test/System.Net/SocketResponder.cs b/mcs/class/System/Test/System.Net/SocketResponder.cs
index daa183afa063a8eda52b943fb8ff8c5a7f4f3f5b..af05477fb6bee65d47eff4747392d2376ce00057 100644 (file)
--- a/mcs/class/System/Test/System.Net/SocketResponder.cs
+++ b/mcs/class/System/Test/System.Net/SocketResponder.cs
@@ -131,12 +131,16 @@ namespace MonoTests.System.Net
                                        }
                                } catch (SocketException ex) {
                                        // ignore interruption of blocking call
-                                       if (ex.ErrorCode != SOCKET_CLOSED && ex.ErrorCode != SOCKET_INVALID_ARGS)
+                                       if (ex.ErrorCode != SOCKET_CLOSED && ex.ErrorCode != SOCKET_INVALID_ARGS && _state != STATE_STOPPED)
                                                throw;
                                } catch (ObjectDisposedException ex) {
                                        Console.WriteLine (ex);
                                        if (_state != STATE_STOPPED)
                                                throw;
+#if !MONO_FEATURE_THREAD_ABORT
+                               } catch (ThreadInterruptedException) {
+                                       break;
+#endif
 #if MOBILE
                                } catch (InvalidOperationException ex) {
                                        // This breaks some tests running on Android. The problem is that the stack trace
@@ -146,7 +150,15 @@ namespace MonoTests.System.Net
                                        Console.WriteLine (ex);
 #endif
                                } finally {
+#if MONO_FEATURE_THREAD_ABORT
                                        Thread.Sleep (500);
+#else
+                                       try {
+                                               Thread.Sleep (500);
+                                       } catch (ThreadInterruptedException) {
+                                               // nothing to do
+                                       }
+#endif
                                        if (listenSocket != null)
                                                listenSocket.Close ();
                                }

diff --git a/mcs/class/System/mobile_System.dll.sources b/mcs/class/System/mobile_System.dll.sources
index 2d502c5b7085a731208d67fa7f8d24b4715cdb8a..d0da0f8faffd94b76ec41e83c0ff90b72f0a8d83 100644 (file)
--- a/mcs/class/System/mobile_System.dll.sources
+++ b/mcs/class/System/mobile_System.dll.sources
@@ -28,11 +28,6 @@ System.IO.Compression/DeflateStream.cs
 System.IO.Compression/GZipStream.cs
 System.IO/InternalBufferOverflowException.cs
 System.IO/InvalidDataException.cs
-System.Net.Cache/HttpCacheAgeControl.cs
-System.Net.Cache/HttpRequestCacheLevel.cs
-System.Net.Cache/HttpRequestCachePolicy.cs
-System.Net.Cache/RequestCacheLevel.cs
-System.Net.Cache/RequestCachePolicy.cs
 System.Net.Mail/AlternateView.cs
 System.Net.Mail/AlternateViewCollection.cs
 System.Net.Mail/Attachment.cs
@@ -250,7 +245,6 @@ System.Net.WebSockets/WebSocketException.cs
 System.Net.WebSockets/WebSocketMessageType.cs
 System.Net.WebSockets/WebSocketReceiveResult.cs
 System.Net.WebSockets/WebSocketState.cs
-System.Runtime.InteropServices/DefaultParameterValueAttribute.cs
 System.Security.AccessControl/SemaphoreAccessRule.cs
 System.Security.AccessControl/SemaphoreAuditRule.cs
 System.Security.AccessControl/SemaphoreRights.cs
@@ -331,20 +325,11 @@ System/Platform.cs
 System/SRDescriptionAttribute.cs
 System/Uri.cs
 System/UriBuilder.cs
-System/UriComponents.cs
-System/UriFormat.cs
-System/UriFormatException.cs
 System/UriHelper.cs
-System/UriHostNameType.cs
-System/UriIdnScope.cs
-System/UriKind.cs
 System/UriParser.cs
-System/UriPartial.cs
 System/UriTypeConverter.cs
 System/UriElements.cs
 System/UriParseComponents.cs
-System.Runtime.InteropServices/DefaultParameterValueAttribute.cs
-System.Runtime.InteropServices/HandleCollector.cs
 System.Windows.Input/ICommand.cs
 
 Mono.Net.Security/CallbackHelpers.cs
@@ -729,6 +714,11 @@ ReferenceSources/Win32Exception.cs
 ../../../external/referencesource/System/compmod/system/diagnostics/TraceSwitch.cs
 ../../../external/referencesource/System/compmod/system/diagnostics/traceutils.cs
 
+../../../external/referencesource/System/net/System/UriEnumTypes.cs
+../../../external/referencesource/System/net/System/URIFormatException.cs
+../../../external/referencesource/System/net/System/UriHostNameType.cs
+../../../external/referencesource/System/net/System/URIPartial.cs
+
 ../../../external/referencesource/System/net/System/Net/_BufferOffsetSize.cs
 ../../../external/referencesource/System/net/System/Net/_LazyAsyncResult.cs
 ../../../external/referencesource/System/net/System/Net/_LoggingObject.cs
@@ -747,12 +737,16 @@ ReferenceSources/Win32Exception.cs
 ../../../external/referencesource/System/net/System/Net/WebUtility.cs
 ../../../external/referencesource/System/net/System/Net/WriteStreamClosedEventArgs.cs
 
+../../../external/referencesource/System/net/System/Net/Cache/RequestCachePolicy.cs
+
+../../../external/referencesource/System/net/System/Net/Sockets/IPProtectionLevel.cs
 ../../../external/referencesource/System/net/System/Net/Sockets/NetworkStream.cs
 ../../../external/referencesource/System/net/System/Net/NetworkInformation/IPInterfaceStatistics.cs
 ../../../external/referencesource/System/net/System/Net/NetworkInformation/ScopeLevel.cs
 ../../../external/referencesource/System/net/System/Net/NetworkInformation/UnicastIPAddressInformation.cs
 
-../../../external/referencesource/System/net/System/Net/Sockets/IPProtectionLevel.cs
+../../../external/referencesource/System/sys/system/runtime/interopservices/DefaultParameterValueAttribute.cs
+../../../external/referencesource/System/sys/system/runtime/interopservices/handlecollector.cs
 
 ../../../external/referencesource/System/sys/system/runtime/versioning/FrameworkName.cs
 

diff --git a/mcs/class/System/mobile_static_System.dll.sources b/mcs/class/System/mobile_static_System.dll.sources
index ec41d5d60bdfc569b0ffbbd66f84d4b6b5a6af65..45798be42a0c9eb0dfd605d9dd852778fc8c2b37 100644 (file)
--- a/mcs/class/System/mobile_static_System.dll.sources
+++ b/mcs/class/System/mobile_static_System.dll.sources
@@ -80,7 +80,7 @@ MonoTouch/MonoPInvokeCallbackAttribute.cs
 ../Mono.Security/Mono.Security.Interface/IBufferOffsetSize.cs
 ../Mono.Security/Mono.Security.Interface/IMonoTlsEventSink.cs
 ../Mono.Security/Mono.Security.Interface/IMonoTlsContext.cs
-../Mono.Security/Mono.Security.Interface/MonoSslStream.cs
+../Mono.Security/Mono.Security.Interface/IMonoSslStream.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsConnectionInfo.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsProvider.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.cs

diff --git a/mcs/class/System/monodroid_System.dll.sources b/mcs/class/System/monodroid_System.dll.sources
index 5a0d854cf45f0ede53a39d3fcef60a1afe556db4..83fc05a364035abd1574b885eb25b1a154f528fe 100644 (file)
--- a/mcs/class/System/monodroid_System.dll.sources
+++ b/mcs/class/System/monodroid_System.dll.sources
@@ -77,13 +77,20 @@ System/AndroidPlatform.cs
 ../Mono.Security/Mono.Security.X509.Extensions/NetscapeCertTypeExtension.cs
 ../Mono.Security/Mono.Security.X509.Extensions/SubjectAltNameExtension.cs
 
+../Mono.Security/Mono.Security.Interface/Alert.cs
 ../Mono.Security/Mono.Security.Interface/CertificateValidationHelper.cs
+../Mono.Security/Mono.Security.Interface/CipherAlgorithmType.cs
+../Mono.Security/Mono.Security.Interface/CipherSuiteCode.cs
+../Mono.Security/Mono.Security.Interface/ExchangeAlgorithmType.cs
+../Mono.Security/Mono.Security.Interface/HashAlgorithmType.cs
 ../Mono.Security/Mono.Security.Interface/IBufferOffsetSize.cs
 ../Mono.Security/Mono.Security.Interface/IMonoTlsEventSink.cs
 ../Mono.Security/Mono.Security.Interface/IMonoTlsContext.cs
-../Mono.Security/Mono.Security.Interface/MonoSslStream.cs
+../Mono.Security/Mono.Security.Interface/IMonoSslStream.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsConnectionInfo.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsProvider.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs
+../Mono.Security/Mono.Security.Interface/TlsException.cs
+../Mono.Security/Mono.Security.Interface/TlsProtocolCode.cs
 ../Mono.Security/Mono.Security.Interface/TlsProtocols.cs

diff --git a/mcs/class/System/monotouch_System.dll.sources b/mcs/class/System/monotouch_System.dll.sources
index ec41d5d60bdfc569b0ffbbd66f84d4b6b5a6af65..91f1bd51de6cd52e1e3ea11e2df5288747baf07b 100644 (file)
--- a/mcs/class/System/monotouch_System.dll.sources
+++ b/mcs/class/System/monotouch_System.dll.sources
@@ -76,13 +76,20 @@ MonoTouch/MonoPInvokeCallbackAttribute.cs
 ../Mono.Security/Mono.Security.X509.Extensions/NetscapeCertTypeExtension.cs
 ../Mono.Security/Mono.Security.X509.Extensions/SubjectAltNameExtension.cs
 
+../Mono.Security/Mono.Security.Interface/Alert.cs
 ../Mono.Security/Mono.Security.Interface/CertificateValidationHelper.cs
+../Mono.Security/Mono.Security.Interface/CipherAlgorithmType.cs
+../Mono.Security/Mono.Security.Interface/CipherSuiteCode.cs
+../Mono.Security/Mono.Security.Interface/ExchangeAlgorithmType.cs
+../Mono.Security/Mono.Security.Interface/HashAlgorithmType.cs
 ../Mono.Security/Mono.Security.Interface/IBufferOffsetSize.cs
 ../Mono.Security/Mono.Security.Interface/IMonoTlsEventSink.cs
 ../Mono.Security/Mono.Security.Interface/IMonoTlsContext.cs
-../Mono.Security/Mono.Security.Interface/MonoSslStream.cs
+../Mono.Security/Mono.Security.Interface/IMonoSslStream.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsConnectionInfo.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsProvider.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs
+../Mono.Security/Mono.Security.Interface/TlsException.cs
+../Mono.Security/Mono.Security.Interface/TlsProtocolCode.cs
 ../Mono.Security/Mono.Security.Interface/TlsProtocols.cs

diff --git a/mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_5.csproj b/mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_5.csproj
deleted file mode 100644 (file)
index fc897a2..0000000
--- a/mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_5.csproj
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{337A92C8-EB50-43A9-9435-CB268AC147DC}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>SystemWebTestShim</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="SystemWebTestShim\Adapters.cs" />\r
-    <Compile Include="SystemWebTestShim\BuildManager.cs" />\r
-    <Compile Include="SystemWebTestShim\HttpCapabilitiesBase.cs" />\r
-    <Compile Include="SystemWebTestShim\Page.cs" />\r
-    <Compile Include="SystemWebTestShim\UrlUtils.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
-      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_5.csproj b/mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_5.csproj
deleted file mode 100644 (file)
index 6c2a0af..0000000
--- a/mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_5.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{9732089B-32BB-43FC-BB72-3EE9BBBE796A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>WebMatrix.Data</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="WebMatrix.Data\ConnectionEventArgs.cs" />\r
-    <Compile Include="WebMatrix.Data\Database.cs" />\r
-    <Compile Include="WebMatrix.Data\DynamicRecord.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/WebMatrix.Data/WebMatrix.Data-tests-net_4_5.csproj b/mcs/class/WebMatrix.Data/WebMatrix.Data-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 65ab6fc..0000000
--- a/mcs/class/WebMatrix.Data/WebMatrix.Data-tests-net_4_5.csproj
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{22F06C6F-29E9-48BE-AF9B-066C5607C8F7}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\WebMatrix.Data-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>WebMatrix.Data_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="WebMatrix.Data\DynamicRecord.cs" />\r
-    <Compile Include="Test\WebMatrix.Data\ConnectionEventArgsTests.cs" />\r
-    <Compile Include="Test\WebMatrix.Data\DatabaseTests.cs" />\r
-    <Compile Include="Test\WebMatrix.Data\DynamicRecordTests.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\WebMatrix.Data\WebMatrix.Data-net_4_5.csproj">\r
-      <Project>{9732089B-32BB-43FC-BB72-3EE9BBBE796A}</Project>\r
-      <Name>WebMatrix.Data\WebMatrix.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_5.csproj">\r
-      <Project>{41476FBD-C1CB-4B3C-8078-3281EB1E0EAB}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Microsoft.CSharp\Microsoft.CSharp-net_4_5.csproj">\r
-      <Project>{D554618C-5D38-413A-82BA-7A70B6FC61A3}</Project>\r
-      <Name>Microsoft.CSharp\Microsoft.CSharp-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/WindowsBase/WindowsBase-net_4_5.csproj b/mcs/class/WindowsBase/WindowsBase-net_4_5.csproj
deleted file mode 100644 (file)
index 1f9888b..0000000
--- a/mcs/class/WindowsBase/WindowsBase-net_4_5.csproj
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{8E6ED7D5-3B08-4A83-905E-8FB4CF0C160D}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>WindowsBase</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ObservableCollection.cs" />\r
-    <Compile Include="System.Collections.ObjectModel\ReadOnlyObservableCollection.cs" />\r
-    <Compile Include="System.Collections.Specialized\CollectionChangedEventManager.cs" />\r
-    <Compile Include="System.Collections.Specialized\INotifyCollectionChanged.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedAction.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventArgs.cs" />\r
-    <Compile Include="System.Collections.Specialized\NotifyCollectionChangedEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CurrentChangedEventManager.cs" />\r
-    <Compile Include="System.ComponentModel\CurrentChangingEventArgs.cs" />\r
-    <Compile Include="System.ComponentModel\CurrentChangingEventHandler.cs" />\r
-    <Compile Include="System.ComponentModel\CurrentChangingEventManager.cs" />\r
-    <Compile Include="System.ComponentModel\DependencyPropertyDescriptor.cs" />\r
-    <Compile Include="System.ComponentModel\GroupDescription.cs" />\r
-    <Compile Include="System.ComponentModel\ICollectionView.cs" />\r
-    <Compile Include="System.ComponentModel\ICollectionViewFactory.cs" />\r
-    <Compile Include="System.ComponentModel\IEditableCollectionView.cs" />\r
-    <Compile Include="System.ComponentModel\IEditableCollectionViewAddNewItem.cs" />\r
-    <Compile Include="System.ComponentModel\IItemProperties.cs" />\r
-    <Compile Include="System.ComponentModel\ItemPropertyInfo.cs" />\r
-    <Compile Include="System.ComponentModel\NewItemPlaceholderPosition.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyChangedEventManager.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyFilterAttribute.cs" />\r
-    <Compile Include="System.ComponentModel\PropertyFilterOptions.cs" />\r
-    <Compile Include="System.ComponentModel\SortDescription.cs" />\r
-    <Compile Include="System.ComponentModel\SortDescriptionCollection.cs" />\r
-    <Compile Include="System.Diagnostics\PresentationTraceLevel.cs" />\r
-    <Compile Include="System.Diagnostics\PresentationTraceSources.cs" />\r
-    <Compile Include="System.IO.Packaging\CertificateEmbeddingOption.cs" />\r
-    <Compile Include="System.IO.Packaging\Check.cs" />\r
-    <Compile Include="System.IO.Packaging\CompressionOption.cs" />\r
-    <Compile Include="System.IO.Packaging\EncryptedPackageEnvelope.cs" />\r
-    <Compile Include="System.IO.Packaging\EncryptionOption.cs" />\r
-    <Compile Include="System.IO.Packaging\InvalidSignatureEventHandler.cs" />\r
-    <Compile Include="System.IO.Packaging\Package.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageDigitalSignature.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageDigitalSignatureManager.cs" />\r
-    <Compile Include="System.IO.Packaging\PackagePart.cs" />\r
-    <Compile Include="System.IO.Packaging\PackagePartCollection.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageProperties.cs" />\r
-    <Compile Include="System.IO.Packaging\PackagePropertiesPart.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageRelationship.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageRelationshipCollection.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageRelationshipSelector.cs" />\r
-    <Compile Include="System.IO.Packaging\PackageRelationshipSelectorType.cs" />\r
-    <Compile Include="System.IO.Packaging\PackUriHelper.cs" />\r
-    <Compile Include="System.IO.Packaging\PackUriParser.cs" />\r
-    <Compile Include="System.IO.Packaging\RightsManagementInformation.cs" />\r
-    <Compile Include="System.IO.Packaging\SignatureVerificationEventArgs.cs" />\r
-    <Compile Include="System.IO.Packaging\StorageInfo.cs" />\r
-    <Compile Include="System.IO.Packaging\StreamInfo.cs" />\r
-    <Compile Include="System.IO.Packaging\TargetMode.cs" />\r
-    <Compile Include="System.IO.Packaging\VerifyResult.cs" />\r
-    <Compile Include="System.IO.Packaging\ZipPackage.cs" />\r
-    <Compile Include="System.IO.Packaging\ZipPackagePart.cs" />\r
-    <Compile Include="System.IO.Packaging\ZipPartStream.cs" />\r
-    <Compile Include="System.IO\FileFormatException.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermissionAudio.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermissionImage.cs" />\r
-    <Compile Include="System.Security.Permissions\MediaPermissionVideo.cs" />\r
-    <Compile Include="System.Security.Permissions\WebBrowserPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\WebBrowserPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\WebBrowserPermissionLevel.cs" />\r
-    <Compile Include="System.Security.RightsManagement\AuthenticationType.cs" />\r
-    <Compile Include="System.Security.RightsManagement\ContentGrant.cs" />\r
-    <Compile Include="System.Security.RightsManagement\ContentRight.cs" />\r
-    <Compile Include="System.Security.RightsManagement\ContentUser.cs" />\r
-    <Compile Include="System.Security.RightsManagement\CryptoProvider.cs" />\r
-    <Compile Include="System.Security.RightsManagement\LocalizedNameDescriptionPair.cs" />\r
-    <Compile Include="System.Security.RightsManagement\PublishLicense.cs" />\r
-    <Compile Include="System.Security.RightsManagement\RightsManagementException.cs" />\r
-    <Compile Include="System.Security.RightsManagement\RightsManagementFailureCode.cs" />\r
-    <Compile Include="System.Security.RightsManagement\SecureEnvironment.cs" />\r
-    <Compile Include="System.Security.RightsManagement\UnsignedPublishLicense.cs" />\r
-    <Compile Include="System.Security.RightsManagement\UseLicense.cs" />\r
-    <Compile Include="System.Security.RightsManagement\UserActivationMode.cs" />\r
-    <Compile Include="System.Windows.Converters\Int32RectValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Converters\PointValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Converters\RectValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Converters\SizeValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Converters\VectorValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Data\DataSourceProvider.cs" />\r
-    <Compile Include="System.Windows.Input\FocusNavigationDirection.cs" />\r
-    <Compile Include="System.Windows.Input\Key.cs" />\r
-    <Compile Include="System.Windows.Input\KeyConverter.cs" />\r
-    <Compile Include="System.Windows.Input\KeyInterop.cs" />\r
-    <Compile Include="System.Windows.Input\KeyValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Input\ModifierKeys.cs" />\r
-    <Compile Include="System.Windows.Input\ModifierKeysConverter.cs" />\r
-    <Compile Include="System.Windows.Input\ModifierKeysValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Input\TraversalRequest.cs" />\r
-    <Compile Include="System.Windows.Interop\ComponentDispatcher.cs" />\r
-    <Compile Include="System.Windows.Interop\IKeyboardInputSink.cs" />\r
-    <Compile Include="System.Windows.Interop\IKeyboardInputSite.cs" />\r
-    <Compile Include="System.Windows.Interop\MSG.cs" />\r
-    <Compile Include="System.Windows.Interop\ThreadMessageEventHandler.cs" />\r
-    <Compile Include="System.Windows.Markup.Primitives\MarkupObject.cs" />\r
-    <Compile Include="System.Windows.Markup.Primitives\MarkupProperty.cs" />\r
-    <Compile Include="System.Windows.Markup\AmbientAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ConstructorArgumentAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ContentPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ContentWrapperAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\DateTimeValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Markup\DependsOnAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\DesignerSerializationOptions.cs" />\r
-    <Compile Include="System.Windows.Markup\DesignerSerializationOptionsAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\DictionaryKeyPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\IComponentConnector.cs" />\r
-    <Compile Include="System.Windows.Markup\INameScope.cs" />\r
-    <Compile Include="System.Windows.Markup\InternalTypeHelper.cs" />\r
-    <Compile Include="System.Windows.Markup\IReceiveMarkupExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\IValueSerializerContext.cs" />\r
-    <Compile Include="System.Windows.Markup\IXamlTypeResolver.cs" />\r
-    <Compile Include="System.Windows.Markup\MarkupExtension.cs" />\r
-    <Compile Include="System.Windows.Markup\MarkupExtensionReturnTypeAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\NameScopePropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\RootNamespaceAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\RuntimeNamePropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ServiceProviders.cs" />\r
-    <Compile Include="System.Windows.Markup\TrimSurroundingWhitespaceAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\UidPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\UsableDuringInitializationAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\ValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Markup\ValueSerializerAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\WhitespaceSignificantCollectionAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlLangPropertyAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsCompatibleWithAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsDefinitionAttribute.cs" />\r
-    <Compile Include="System.Windows.Markup\XmlnsPrefixAttribute.cs" />\r
-    <Compile Include="System.Windows.Media.Converters\MatrixValueSerializer.cs" />\r
-    <Compile Include="System.Windows.Media\DisableDpiAwarenessAttribute.cs" />\r
-    <Compile Include="System.Windows.Media\Matrix.cs" />\r
-    <Compile Include="System.Windows.Media\MatrixConverter.cs" />\r
-    <Compile Include="System.Windows.Threading\Dispatcher.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherEventArgs.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherFrame.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherHookEventArgs.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherHookEventHandler.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherHooks.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherObject.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherOperation.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherOperationCallback.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherOperationStatus.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherPriority.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherProcessingDisabled.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherSynchronizationContext.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherTimer.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherUnhandledExceptionEventArgs.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherUnhandledExceptionEventHandler.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherUnhandledExceptionFilterEventArgs.cs" />\r
-    <Compile Include="System.Windows.Threading\DispatcherUnhandledExceptionFilterEventHandler.cs" />\r
-    <Compile Include="System.Windows\AttachedPropertyBrowsableAttribute.cs" />\r
-    <Compile Include="System.Windows\AttachedPropertyBrowsableForTypeAttribute.cs" />\r
-    <Compile Include="System.Windows\AttachedPropertyBrowsableWhenAttributePresentAttribute.cs" />\r
-    <Compile Include="System.Windows\CoerceValueCallback.cs" />\r
-    <Compile Include="System.Windows\DependencyObject.cs" />\r
-    <Compile Include="System.Windows\DependencyObjectType.cs" />\r
-    <Compile Include="System.Windows\DependencyProperty.cs" />\r
-    <Compile Include="System.Windows\DependencyPropertyChangedEventArgs.cs" />\r
-    <Compile Include="System.Windows\DependencyPropertyChangedEventHandler.cs" />\r
-    <Compile Include="System.Windows\DependencyPropertyKey.cs" />\r
-    <Compile Include="System.Windows\Expression.cs" />\r
-    <Compile Include="System.Windows\ExpressionConverter.cs" />\r
-    <Compile Include="System.Windows\Freezable.cs" />\r
-    <Compile Include="System.Windows\Int32Rect.cs" />\r
-    <Compile Include="System.Windows\Int32RectConverter.cs" />\r
-    <Compile Include="System.Windows\IWeakEventListener.cs" />\r
-    <Compile Include="System.Windows\LocalValueEntry.cs" />\r
-    <Compile Include="System.Windows\LocalValueEnumerator.cs" />\r
-    <Compile Include="System.Windows\Point.cs" />\r
-    <Compile Include="System.Windows\PointConverter.cs" />\r
-    <Compile Include="System.Windows\PropertyChangedCallback.cs" />\r
-    <Compile Include="System.Windows\PropertyMetadata.cs" />\r
-    <Compile Include="System.Windows\Rect.cs" />\r
-    <Compile Include="System.Windows\RectConverter.cs" />\r
-    <Compile Include="System.Windows\Size.cs" />\r
-    <Compile Include="System.Windows\SizeConverter.cs" />\r
-    <Compile Include="System.Windows\SplashScreen.cs" />\r
-    <Compile Include="System.Windows\ValidateValueCallback.cs" />\r
-    <Compile Include="System.Windows\Vector.cs" />\r
-    <Compile Include="System.Windows\VectorConverter.cs" />\r
-    <Compile Include="System.Windows\WeakEventManager.cs" />\r
-    <Compile Include="ZipSharp\IOFunctions.cs" />\r
-    <Compile Include="ZipSharp\NativeUnzip.cs" />\r
-    <Compile Include="ZipSharp\NativeZip.cs" />\r
-    <Compile Include="ZipSharp\UnzipArchive.cs" />\r
-    <Compile Include="ZipSharp\UnzipFileInfo.cs" />\r
-    <Compile Include="ZipSharp\UnzipHandle.cs" />\r
-    <Compile Include="ZipSharp\UnzipReadStream.cs" />\r
-    <Compile Include="ZipSharp\ZipArchive.cs" />\r
-    <Compile Include="ZipSharp\ZipFileInfo.cs" />\r
-    <Compile Include="ZipSharp\ZipHandle.cs" />\r
-    <Compile Include="ZipSharp\ZipStream.cs" />\r
-    <Compile Include="ZipSharp\ZipTime.cs" />\r
-    <Compile Include="ZipSharp\ZipWriteStream.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Xaml/System.Xaml-net_4_5.csproj">\r
-      <Project>{F574F9BD-1838-4C13-8722-7D6D33DE1781}</Project>\r
-      <Name>System.Xaml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/WindowsBase/WindowsBase-tests-net_4_5.csproj b/mcs/class/WindowsBase/WindowsBase-tests-net_4_5.csproj
deleted file mode 100644 (file)
index f255d1d..0000000
--- a/mcs/class/WindowsBase/WindowsBase-tests-net_4_5.csproj
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{C1439AE1-8420-4D56-98F1-2F98B221485A}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\WindowsBase-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>WindowsBase_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\System.Collections.ObjectModel\ObservableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\ReadOnlyObservableCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\CollectionChangedEventValidators.cs" />\r
-    <Compile Include="Test\System.Collections.Specialized\NotifyCollectionChangedEventArgsTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\CurrentChangingEventArgsTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\GroupDescriptionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\PropertyFilterAttributeTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\SortDescriptionCollectionTest.cs" />\r
-    <Compile Include="Test\System.ComponentModel\SortDescriptionTest.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakePackage.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakePackagePart.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakePackagePartTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakePackageTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\FakeStream.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackagePartFileTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackagePartStreamTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackagePartTest.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackageRelationshipTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackageTest.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\PackUriHelperTests.cs" />\r
-    <Compile Include="Test\System.IO.Packaging\TestBase.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ConstructorArgumentAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ContentPropertyAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ContentWrapperAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\DateTimeValueSerializerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\DependsOnAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\MarkupExtensionReturnTypeAttributeTest.cs" />\r
-    <Compile Include="Test\System.Windows.Markup\ValueSerializerTest.cs" />\r
-    <Compile Include="Test\System.Windows.Media\MatrixTest.cs" />\r
-    <Compile Include="Test\System.Windows.Threading\DispatcherTest.cs" />\r
-    <Compile Include="Test\System.Windows.Threading\DispatcherTimerTest.cs" />\r
-    <Compile Include="Test\System.Windows\DependencyObjectTest.cs" />\r
-    <Compile Include="Test\System.Windows\DependencyObjectTypeTest.cs" />\r
-    <Compile Include="Test\System.Windows\DependencyPropertyTest.cs" />\r
-    <Compile Include="Test\System.Windows\Int32RectConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\Int32RectTest.cs" />\r
-    <Compile Include="Test\System.Windows\PointConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\PointTest.cs" />\r
-    <Compile Include="Test\System.Windows\PropertyMetadataTest.cs" />\r
-    <Compile Include="Test\System.Windows\RectConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\RectTest.cs" />\r
-    <Compile Include="Test\System.Windows\SizeConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\SizeTest.cs" />\r
-    <Compile Include="Test\System.Windows\VectorConverterTest.cs" />\r
-    <Compile Include="Test\System.Windows\VectorTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\WindowsBase\WindowsBase-net_4_5.csproj">\r
-      <Project>{8E6ED7D5-3B08-4A83-905E-8FB4CF0C160D}</Project>\r
-      <Name>WindowsBase\WindowsBase-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\WindowsBase\WindowsBase-net_4_5.csproj">\r
-      <Project>{8E6ED7D5-3B08-4A83-905E-8FB4CF0C160D}</Project>\r
-      <Name>WindowsBase\WindowsBase-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Xaml\System.Xaml-net_4_5.csproj">\r
-      <Project>{F574F9BD-1838-4C13-8722-7D6D33DE1781}</Project>\r
-      <Name>System.Xaml\System.Xaml-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/corlib/Mono/Runtime.cs b/mcs/class/corlib/Mono/Runtime.cs
index 80e56a559ac900ae0c4779d6a7e7bb66a58b177b..7a5f9887c6334fff01b0f7f9835659b44fac9be3 100644 (file)
--- a/mcs/class/corlib/Mono/Runtime.cs
+++ b/mcs/class/corlib/Mono/Runtime.cs
@@ -59,7 +59,10 @@ namespace Mono {
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                static extern string GetNativeStackTrace (Exception exception);
 
-               [MethodImplAttribute (MethodImplOptions.InternalCall)]
-               public static extern bool SetGCAllowSynchronousMajor (bool flag);
+               public static bool SetGCAllowSynchronousMajor (bool flag)
+               {
+                       // No longer used
+                       return true;
+               }
        }
 }

diff --git a/mcs/class/corlib/ReferenceSources/DefaultBinder.cs b/mcs/class/corlib/ReferenceSources/DefaultBinder.cs
index 9f2a2d68082cdb64d916563fe784f9747dbe845e..074e754b9580c4b8255240414d812fdb347617dd 100644 (file)
--- a/mcs/class/corlib/ReferenceSources/DefaultBinder.cs
+++ b/mcs/class/corlib/ReferenceSources/DefaultBinder.cs
@@ -36,7 +36,10 @@ namespace System
                                return false;
 
                        var from = Type.GetTypeCode (source);
-                       switch (Type.GetTypeCode (target)) {
+                       var to = Type.GetTypeCode (target);
+                       if (from == to && source.IsPrimitive)
+                               return true;
+                       switch (to) {
                        case TypeCode.Char:
                                switch (from) {
                                case TypeCode.Byte:
@@ -146,4 +149,4 @@ namespace System
                        return st == type || CanConvertPrimitive ((RuntimeType) st, type);
                }
        }
-}
\ No newline at end of file
+}

diff --git a/mcs/class/corlib/System.IO/Path.cs b/mcs/class/corlib/System.IO/Path.cs
index 7945d4074065aac872d22a30c6b8f0fb969c77db..9ac0e97545427ada48cdaaadfddd1f60b0eef086 100644 (file)
--- a/mcs/class/corlib/System.IO/Path.cs
+++ b/mcs/class/corlib/System.IO/Path.cs
@@ -289,6 +289,7 @@ namespace System.IO {
                        return fullpath;
                }
 
+#if !MOBILE
                // http://msdn.microsoft.com/en-us/library/windows/desktop/aa364963%28v=vs.85%29.aspx
                [DllImport("Kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
                private static extern int GetFullPathName(string path, int numBufferChars, StringBuilder buffer, ref IntPtr lpFilePartOrNull); 
@@ -341,6 +342,7 @@ namespace System.IO {
                        }
                        return path;
                }
+#endif
 
                // insecure - do not call directly
                internal static string InsecureGetFullPath (string path)
@@ -352,11 +354,11 @@ namespace System.IO {
                                string msg = Locale.GetText ("The specified path is not of a legal form (empty).");
                                throw new ArgumentException (msg);
                        }
-
+#if !MOBILE
                        // adjust for drives, i.e. a special case for windows
                        if (Environment.IsRunningOnWindows)
                                path = WindowsDriveAdjustment (path);
-
+#endif
                        // if the supplied path ends with a separator...
                        char end = path [path.Length - 1];
 

diff --git a/mcs/class/corlib/System.Security.AccessControl/NativeObjectSecurity.cs b/mcs/class/corlib/System.Security.AccessControl/NativeObjectSecurity.cs
index 141d0c9d6cbe46e6e6b7cb34c0c545091f9c1ef0..7e83a6cacf0a297bccf6973c93a0762b405fe84f 100644 (file)
--- a/mcs/class/corlib/System.Security.AccessControl/NativeObjectSecurity.cs
+++ b/mcs/class/corlib/System.Security.AccessControl/NativeObjectSecurity.cs
@@ -203,6 +203,9 @@ namespace System.Security.AccessControl
                internal virtual int InternalGet (SafeHandle handle,
                                                  AccessControlSections includeSections)
                {
+#if MOBILE
+                       throw new PlatformNotSupportedException ();
+#else
                        if (Environment.OSVersion.Platform != PlatformID.Win32NT)
                                throw new PlatformNotSupportedException ();
 
@@ -214,11 +217,15 @@ namespace System.Security.AccessControl
                                                                out owner, out group,
                                                                out dacl, out sacl, out descriptor);
                                }, includeSections);
+#endif
                }
                
                internal virtual int InternalGet (string name,
                                                  AccessControlSections includeSections)
                {
+#if MOBILE
+                       throw new PlatformNotSupportedException ();
+#else
                        if (Environment.OSVersion.Platform != PlatformID.Win32NT)
                                throw new PlatformNotSupportedException ();
 
@@ -230,8 +237,20 @@ namespace System.Security.AccessControl
                                                                     out owner, out group,
                                                                     out dacl, out sacl, out descriptor);
                                }, includeSections);
+#endif
                }
                
+#if MOBILE
+               internal virtual int InternalSet (SafeHandle handle, AccessControlSections includeSections)
+               {
+                       throw new PlatformNotSupportedException ();
+               }
+
+               internal virtual int InternalSet (string name, AccessControlSections includeSections)
+               {
+                       throw new PlatformNotSupportedException ();
+               }
+#else
                internal virtual int InternalSet (SafeHandle handle,
                                                  AccessControlSections includeSections)
                {
@@ -399,6 +418,7 @@ namespace System.Security.AccessControl
                        public IntPtr Owner, Group, Sacl, Dacl;
                }
                #endregion
+#endif
        }
 }
 

diff --git a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Certificate.cs b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Certificate.cs
index f1c27f3309d8a36cc4d0f156f187e58e701890f9..144997e573b63c0cb211a47596cdbb0e676228ac 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Certificate.cs
+++ b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Certificate.cs
@@ -53,42 +53,9 @@ namespace System.Security.Cryptography.X509Certificates {
 #else
        public partial class X509Certificate : IDeserializationCallback, ISerializable {
 #endif
-               // typedef struct _CERT_CONTEXT {
-                //     DWORD                   dwCertEncodingType;
-                //     BYTE                    *pbCertEncoded;
-               //      DWORD                   cbCertEncoded;
-               //      PCERT_INFO              pCertInfo;
-               //      HCERTSTORE              hCertStore;
-               // } CERT_CONTEXT, *PCERT_CONTEXT;
-               // typedef const CERT_CONTEXT *PCCERT_CONTEXT;
-               [StructLayout (LayoutKind.Sequential)]
-               internal struct CertificateContext {
-                       public UInt32 dwCertEncodingType;
-                       public IntPtr pbCertEncoded;
-                       public UInt32 cbCertEncoded;
-                       public IntPtr pCertInfo;
-                       public IntPtr hCertStore;
-               }
-               // NOTE: We only define the CryptoAPI structure (from WINCRYPT.H)
-               // so we don't create any dependencies on Windows DLL in corlib
+               X509CertificateImpl impl;
 
-               private Mono.Security.X509.X509Certificate x509;
                private bool hideDates;
-               private byte[] cachedCertificateHash;
-       
-               // almost every byte[] returning function has a string equivalent
-               // sadly the BitConverter insert dash between bytes :-(
-               private string tostr (byte[] data) 
-               {
-                       if (data != null) {
-                               StringBuilder sb = new StringBuilder ();
-                               for (int i = 0; i < data.Length; i++)
-                                       sb.Append (data[i].ToString ("X2"));
-                               return sb.ToString ();
-                       }
-                       else
-                               return null;
-               }
        
                // static methods
        
@@ -133,44 +100,24 @@ namespace System.Security.Cryptography.X509Certificates {
                public X509Certificate (byte[] data) : this (data, true)
                {
                }
-       
+
                public X509Certificate (IntPtr handle) 
                {
                        if (handle == IntPtr.Zero)
                                throw new ArgumentException ("Invalid handle.");
-#if NET_2_1
-                       // this works on Windows-only so it's of no use for Moonlight
-                       // even more since this ctor is [SecurityCritical]
-                       throw new NotSupportedException ();
-#else
-                       InitFromHandle (handle);
-#endif
-               }
 
-               [SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)]
-               private void InitFromHandle (IntPtr handle)
-               {
-                       if (handle != IntPtr.Zero) {
-                               // both Marshal.PtrToStructure and Marshal.Copy use LinkDemand (so they will always success from here)
-                               CertificateContext cc = (CertificateContext) Marshal.PtrToStructure (handle, typeof (CertificateContext));
-                               byte[] data = new byte [cc.cbCertEncoded];
-                               Marshal.Copy (cc.pbCertEncoded, data, 0, (int)cc.cbCertEncoded);
-                               x509 = new Mono.Security.X509.X509Certificate (data);
-                       }
-                       // for 1.x IntPtr.Zero results in an "empty" certificate instance
+                       impl = X509Helper.InitFromHandle (handle);
                }
-       
+
                public X509Certificate (System.Security.Cryptography.X509Certificates.X509Certificate cert) 
                {
                        if (cert == null)
                                throw new ArgumentNullException ("cert");
 
-                       if (cert != null) {
-                               byte[] data = cert.GetRawCertData ();
-                               if (data != null)
-                                       x509 = new Mono.Security.X509.X509Certificate (data);
-                               hideDates = false;
-                       }
+                       X509Helper.ThrowIfContextInvalid (cert.impl);
+
+                       impl = X509Helper.InitFromCertificate (cert.impl);
+                       hideDates = false;
                }
 
 
@@ -181,53 +128,30 @@ namespace System.Security.Cryptography.X509Certificates {
                        if (other == null) {
                                return false;
                        } else {
-                               if (other.x509 == null) {
-                                       if (x509 == null)
+                               if (!X509Helper.IsValid (other.impl)) {
+                                       if (!X509Helper.IsValid (impl))
                                                return true;
                                        throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
                                }
 
-                               byte[] raw = other.x509.RawData;
-                               if (raw != null) {
-                                       if (x509 == null)
-                                               return false;
-                                       if (x509.RawData == null)
-                                               return false;
-                                       if (raw.Length == x509.RawData.Length) {
-                                               for (int i = 0; i < raw.Length; i++) {
-                                                       if (raw[i] != x509.RawData [i])
-                                                               return false;
-                                               }
-                                               // well no choice must be equals!
-                                               return true;
-                                       }
-                                       else
-                                               return false;
-                               }
+                               return X509CertificateImpl.Equals (impl, other.impl);
                        }
-                       return ((x509 == null) || (x509.RawData == null));
                }
-       
+
                // LAMESPEC: This is the equivalent of the "thumbprint" that can be seen
                // in the certificate viewer of Windows. This is ALWAYS the SHA1 hash of
                // the certificate (i.e. it has nothing to do with the actual hash 
                // algorithm used to sign the certificate).
                public virtual byte[] GetCertHash () 
                {
-                       if (x509 == null)
-                               throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
-                       // we'll hash the cert only once and only if required
-                       if ((cachedCertificateHash == null) && (x509 != null)) {
-                               SHA1 sha = SHA1.Create ();
-                               cachedCertificateHash = sha.ComputeHash (x509.RawData);
-                       }
-                       return cachedCertificateHash;
+                       X509Helper.ThrowIfContextInvalid (impl);
+                       return impl.GetCertHash ();
                }
        
                public virtual string GetCertHashString () 
                {
                        // must call GetCertHash (not variable) or optimization wont work
-                       return tostr (GetCertHash ());
+                       return X509Helper.ToHexString (GetCertHash ());
                }
        
                // strangly there are no DateTime returning function
@@ -235,10 +159,9 @@ namespace System.Security.Cryptography.X509Certificates {
                {
                        if (hideDates)
                                return null;
-                       if (x509 == null)
-                               throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
+                       X509Helper.ThrowIfContextInvalid (impl);
 
-                       return x509.ValidFrom.ToLocalTime ().ToString ();
+                       return impl.GetEffectiveDateString ().ToString ();
                }
        
                // strangly there are no DateTime returning function
@@ -246,10 +169,9 @@ namespace System.Security.Cryptography.X509Certificates {
                {
                        if (hideDates)
                                return null;
-                       if (x509 == null)
-                               throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
+                       X509Helper.ThrowIfContextInvalid (impl);
 
-                       return x509.ValidUntil.ToLocalTime ().ToString ();
+                       return impl.GetExpirationDateString ().ToString ();
                }
        
                // well maybe someday there'll be support for PGP or SPKI ?
@@ -260,41 +182,29 @@ namespace System.Security.Cryptography.X509Certificates {
        
                public override int GetHashCode ()
                {
-                       if (x509 == null)
-                               return 0;
-                       // the cert hash may not be (yet) calculated
-                       if (cachedCertificateHash == null)
-                               GetCertHash();
-               
-                       // return the integer of the first 4 bytes of the cert hash
-                       if ((cachedCertificateHash != null) && (cachedCertificateHash.Length >= 4))
-                               return ((cachedCertificateHash[0] << 24) |(cachedCertificateHash[1] << 16) |
-                                       (cachedCertificateHash[2] << 8) | cachedCertificateHash[3]);
-                       else
+                       if (!X509Helper.IsValid (impl))
                                return 0;
+                       return impl.GetHashCode ();
                }
 
                [Obsolete ("Use the Issuer property.")]
                public virtual string GetIssuerName () 
                {
-                       if (x509 == null)
-                               throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
-                       return x509.IssuerName;
+                       X509Helper.ThrowIfContextInvalid (impl);
+                       return impl.GetIssuerName (true);
                }
        
                public virtual string GetKeyAlgorithm () 
                {
-                       if (x509 == null)
-                               throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
-                       return x509.KeyAlgorithm;
+                       X509Helper.ThrowIfContextInvalid (impl);
+                       return impl.GetKeyAlgorithm ();
                }
        
                public virtual byte[] GetKeyAlgorithmParameters () 
                {
-                       if (x509 == null)
-                               throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
+                       X509Helper.ThrowIfContextInvalid (impl);
 
-                       byte[] kap = x509.KeyAlgorithmParameters;
+                       byte[] kap = impl.GetKeyAlgorithmParameters ();
                        if (kap == null)
                                throw new CryptographicException (Locale.GetText ("Parameters not part of the certificate"));
 
@@ -303,55 +213,50 @@ namespace System.Security.Cryptography.X509Certificates {
        
                public virtual string GetKeyAlgorithmParametersString () 
                {
-                       return tostr (GetKeyAlgorithmParameters ());
+                       return X509Helper.ToHexString (GetKeyAlgorithmParameters ());
                }
        
                [Obsolete ("Use the Subject property.")]
                public virtual string GetName ()
                {
-                       if (x509 == null)
-                               throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
-                       return x509.SubjectName;
+                       X509Helper.ThrowIfContextInvalid (impl);
+                       return impl.GetSubjectName (true);
                }
        
                public virtual byte[] GetPublicKey () 
                {
-                       if (x509 == null)
-                               throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
-                       return x509.PublicKey;
+                       X509Helper.ThrowIfContextInvalid (impl);
+                       return impl.GetPublicKey ();
                }
        
                public virtual string GetPublicKeyString () 
                {
-                       return tostr (GetPublicKey ());
+                       return X509Helper.ToHexString (GetPublicKey ());
                }
        
                public virtual byte[] GetRawCertData () 
                {
-                       if (x509 == null)
-                               throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
-                       return x509.RawData;
+                       X509Helper.ThrowIfContextInvalid (impl);
+                       return impl.GetRawCertData ();
                }
        
                public virtual string GetRawCertDataString () 
                {
-                       if (x509 == null)
-                               throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
-                       return tostr (x509.RawData);
+                       X509Helper.ThrowIfContextInvalid (impl);
+                       return X509Helper.ToHexString (impl.GetRawCertData ());
                }
        
                public virtual byte[] GetSerialNumber () 
                {
-                       if (x509 == null)
-                               throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
-                       return x509.SerialNumber;
+                       X509Helper.ThrowIfContextInvalid (impl);
+                       return impl.GetSerialNumber ();
                }
        
                public virtual string GetSerialNumberString () 
                {
                        byte[] sn = GetSerialNumber ();
                        Array.Reverse (sn);
-                       return tostr (sn);
+                       return X509Helper.ToHexString (sn);
                }
        
                // to please corcompare ;-)
@@ -362,18 +267,10 @@ namespace System.Security.Cryptography.X509Certificates {
        
                public virtual string ToString (bool fVerbose) 
                {
-                       if (!fVerbose || (x509 == null))
+                       if (!fVerbose || !X509Helper.IsValid (impl))
                                return base.ToString ();
 
-                       string nl = Environment.NewLine;
-                       StringBuilder sb = new StringBuilder ();
-                       sb.AppendFormat ("[Subject]{0}  {1}{0}{0}", nl, Subject);
-                       sb.AppendFormat ("[Issuer]{0}  {1}{0}{0}", nl, Issuer);
-                       sb.AppendFormat ("[Not Before]{0}  {1}{0}{0}", nl, GetEffectiveDateString ());
-                       sb.AppendFormat ("[Not After]{0}  {1}{0}{0}", nl, GetExpirationDateString ());
-                       sb.AppendFormat ("[Thumbprint]{0}  {1}{0}", nl, GetCertHashString ());
-                       sb.Append (nl);
-                       return sb.ToString ();
+                       return impl.ToString (true);
                }
 
                protected static string FormatDate (DateTime date)

diff --git a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Certificate20.cs b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Certificate20.cs
index 7d5273ee1105497fcd9aeb89d1f716bc71ab4e49..78a71adbd566033509abeaf17d98c4e6c6fa9acb 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Certificate20.cs
+++ b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Certificate20.cs
@@ -42,7 +42,7 @@ namespace System.Security.Cryptography.X509Certificates {
 
        [ComVisible (true)]
        [MonoTODO ("X509ContentType.SerializedCert isn't supported (anywhere in the class)")]
-       public partial class X509Certificate : IDeserializationCallback, ISerializable {
+       public partial class X509Certificate : IDeserializationCallback, ISerializable, IDisposable {
                private string issuer_name;
                private string subject_name;
 
@@ -110,29 +110,31 @@ namespace System.Security.Cryptography.X509Certificates {
 
                public string Issuer {
                        get {
-                               if (x509 == null)
-                                       throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
+                               X509Helper.ThrowIfContextInvalid (impl);
 
                                if (issuer_name == null)
-                                       issuer_name = X501.ToString (x509.GetIssuerName (), true, ", ", true);
+                                       issuer_name = impl.GetIssuerName (false);
                                return issuer_name;
                        }
                }
 
                public string Subject {
                        get {
-                               if (x509 == null)
-                                       throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
+                               X509Helper.ThrowIfContextInvalid (impl);
 
                                if (subject_name == null)
-                                       subject_name = X501.ToString (x509.GetSubjectName (), true, ", ", true);
+                                       subject_name = impl.GetSubjectName (false);
                                return subject_name;
                        }
                }
 
                [ComVisible (false)]
                public IntPtr Handle {
-                       get { return IntPtr.Zero; }
+                       get {
+                               if (X509Helper.IsValid (impl))
+                                       return impl.Handle;
+                               return IntPtr.Zero;
+                       }
                }
 
 
@@ -169,25 +171,10 @@ namespace System.Security.Cryptography.X509Certificates {
 
                internal byte[] Export (X509ContentType contentType, byte[] password)
                {
-                       if (x509 == null)
-                               throw new CryptographicException (Locale.GetText ("Certificate instance is empty."));
-
                        try {
-                               switch (contentType) {
-                               case X509ContentType.Cert:
-                                       return x509.RawData;
-                               case X509ContentType.Pfx: // this includes Pkcs12
-                                       // TODO
-                                       throw new NotSupportedException ();
-                               case X509ContentType.SerializedCert:
-                                       // TODO
-                                       throw new NotSupportedException ();
-                               default:
-                                       string msg = Locale.GetText ("This certificate format '{0}' cannot be exported.", contentType);
-                                       throw new CryptographicException (msg);
-                               }
-                       }
-                       finally {
+                               X509Helper.ThrowIfContextInvalid (impl);
+                               return impl.Export (contentType, password);
+                       } finally {
                                // protect password
                                if (password != null)
                                        Array.Clear (password, 0, password.Length);
@@ -200,59 +187,12 @@ namespace System.Security.Cryptography.X509Certificates {
                        Import (rawData, (string)null, X509KeyStorageFlags.DefaultKeySet);
                }
 
-               private Mono.Security.X509.X509Certificate ImportPkcs12 (byte[] rawData, string password)
-               {
-                       var pfx = (password == null) ? new Mono.Security.X509.PKCS12 (rawData) : new Mono.Security.X509.PKCS12 (rawData, password);
-                       if (pfx.Certificates.Count == 0) {
-                               // no certificate was found
-                               return null;
-                       } else if (pfx.Keys.Count == 0) {
-                               // no key were found - pick the first certificate
-                               return pfx.Certificates [0];
-                       } else {
-                               // find the certificate that match the first key
-                               var keypair = (pfx.Keys [0] as AsymmetricAlgorithm);
-                               string pubkey = keypair.ToXmlString (false);
-                               foreach (var c in pfx.Certificates) {
-                                       if ((c.RSA != null) && (pubkey == c.RSA.ToXmlString (false)))
-                                               return c;
-                                       if ((c.DSA != null) && (pubkey == c.DSA.ToXmlString (false)))
-                                               return c;
-                               }
-                               return pfx.Certificates [0]; // no match, pick first certificate without keys
-                       }
-               }
-
                [MonoTODO ("missing KeyStorageFlags support")]
                [ComVisible (false)]
                public virtual void Import (byte[] rawData, string password, X509KeyStorageFlags keyStorageFlags)
                {
                        Reset ();
-                       if (password == null) {
-                               try {
-                                       x509 = new Mono.Security.X509.X509Certificate (rawData);
-                               }
-                               catch (Exception e) {
-                                       try {
-                                               x509 = ImportPkcs12 (rawData, null);
-                                       }
-                                       catch {
-                                               string msg = Locale.GetText ("Unable to decode certificate.");
-                                               // inner exception is the original (not second) exception
-                                               throw new CryptographicException (msg, e);
-                                       }
-                               }
-                       } else {
-                               // try PKCS#12
-                               try {
-                                       x509 = ImportPkcs12 (rawData, password);
-                               }
-                               catch {
-                                       // it's possible to supply a (unrequired/unusued) password
-                                       // fix bug #79028
-                                       x509 = new Mono.Security.X509.X509Certificate (rawData);
-                               }
-                       }
+                       impl = X509Helper.Import (rawData, password, keyStorageFlags);
                }
 
                [MonoTODO ("SecureString support is incomplete")]
@@ -289,18 +229,34 @@ namespace System.Security.Cryptography.X509Certificates {
 
                void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)
                {
+                       if (!X509Helper.IsValid (impl))
+                               throw new NullReferenceException ();
                        // will throw a NRE if info is null (just like MS implementation)
-                       info.AddValue ("RawData", x509.RawData);
+                       info.AddValue ("RawData", impl.GetRawCertData ());
+               }
+
+               public void Dispose ()
+               {
+                       Dispose (true);
+               }
+
+               protected virtual void Dispose (bool disposing)
+               {
+                       if (disposing)
+                               Reset ();
                }
 
                [ComVisible (false)]
                public virtual void Reset ()
                {
-                       x509 = null;
+                       if (impl != null) {
+                               impl.Dispose ();
+                               impl = null;
+                       }
+
                        issuer_name = null;
                        subject_name = null;
                        hideDates = false;
-                       cachedCertificateHash = null;
                }
        }
 }

diff --git a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509CertificateImpl.cs b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509CertificateImpl.cs
new file mode 100644 (file)
index 0000000..e3dc5b3
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509CertificateImpl.cs
@@ -0,0 +1,148 @@
+//
+// X509Helpers.cs: X.509 helper and utility functions.
+//
+// Authors:
+//     Martin Baulig  <martin.baulig@xamarin.com>
+//
+// Copyright (C) 2015 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.
+//
+namespace System.Security.Cryptography.X509Certificates
+{
+       internal abstract class X509CertificateImpl : IDisposable
+       {
+               public abstract bool IsValid {
+                       get;
+               }
+
+               public abstract IntPtr Handle {
+                       get;
+               }
+
+               protected void ThrowIfContextInvalid ()
+               {
+                       if (!IsValid)
+                               throw X509Helper.GetInvalidContextException ();
+               }
+
+               public abstract X509CertificateImpl Clone ();
+
+               public abstract string GetSubjectSummary ();
+
+               public abstract string GetIssuerName (bool legacyV1Mode);
+
+               public abstract string GetSubjectName (bool legacyV1Mode);
+
+               public abstract byte[] GetRawCertData ();
+
+               public abstract DateTime GetEffectiveDateString ();
+
+               public abstract DateTime GetExpirationDateString ();
+
+               byte[] cachedCertificateHash;
+
+               public byte[] GetCertHash ()
+               {
+                       ThrowIfContextInvalid ();
+                       if (cachedCertificateHash == null)
+                               cachedCertificateHash = GetCertHash (false);
+                       return cachedCertificateHash;
+               }
+
+               protected abstract byte[] GetCertHash (bool lazy);
+
+               public override int GetHashCode ()
+               {
+                       if (!IsValid)
+                               return 0;
+                       if (cachedCertificateHash == null)
+                               cachedCertificateHash = GetCertHash (true);
+                       // return the integer of the first 4 bytes of the cert hash
+                       if ((cachedCertificateHash != null) && (cachedCertificateHash.Length >= 4))
+                               return ((cachedCertificateHash [0] << 24) | (cachedCertificateHash [1] << 16) |
+                                       (cachedCertificateHash [2] << 8) | cachedCertificateHash [3]);
+                       else
+                               return 0;
+               }
+
+               public abstract bool Equals (X509CertificateImpl other, out bool result);
+
+               public abstract string GetKeyAlgorithm ();
+
+               public abstract byte[] GetKeyAlgorithmParameters ();
+
+               public abstract byte[] GetPublicKey ();
+
+               public abstract byte[] GetSerialNumber ();
+
+               public abstract byte[] Export (X509ContentType contentType, byte[] password);
+
+               public abstract string ToString (bool full);
+
+               public override bool Equals (object obj)
+               {
+                       var other = obj as X509CertificateImpl;
+                       if (other == null)
+                               return false;
+
+                       if (!IsValid || !other.IsValid)
+                               return false;
+
+                       bool result;
+                       if (Equals (other, out result))
+                               return result;
+
+                       var ourRaw = GetRawCertData ();
+                       var theirRaw = other.GetRawCertData ();
+
+                       if (ourRaw == null)
+                               return theirRaw == null;
+                       else if (theirRaw == null)
+                               return false;
+
+                       if (ourRaw.Length != theirRaw.Length)
+                               return false;
+
+                       for (int i = 0; i < ourRaw.Length; i++) {
+                               if (ourRaw [i] != theirRaw [i])
+                                       return false;
+                       }
+
+                       return true;
+               }
+
+               public void Dispose ()
+               {
+                       Dispose (true);
+                       GC.SuppressFinalize (this);
+               }
+
+               protected virtual void Dispose (bool disposing)
+               {
+                       cachedCertificateHash = null;
+               }
+
+               ~X509CertificateImpl ()
+               {
+                       Dispose (false);
+               }
+       }
+}

diff --git a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509CertificateImplMono.cs b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509CertificateImplMono.cs
new file mode 100644 (file)
index 0000000..85985c5
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509CertificateImplMono.cs
@@ -0,0 +1,179 @@
+//
+// X509CertificateImplMono.cs: X.509 implementation using Mono.Security.X509.
+//
+// Authors:
+//     Sebastien Pouliot  <sebastien@ximian.com>
+//     Martin Baulig  <martin.baulig@xamarin.com>
+//
+// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004-2006 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2015 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.Text;
+using MX = Mono.Security.X509;
+
+namespace System.Security.Cryptography.X509Certificates
+{
+       class X509CertificateImplMono : X509CertificateImpl
+       {
+               MX.X509Certificate x509;
+
+               public X509CertificateImplMono (MX.X509Certificate x509)
+               {
+                       this.x509 = x509;
+               }
+
+               public override bool IsValid {
+                       get { return x509 != null; }
+               }
+
+               public override IntPtr Handle {
+                       get { return IntPtr.Zero; }
+               }
+
+               public override X509CertificateImpl Clone ()
+               {
+                       ThrowIfContextInvalid ();
+                       return new X509CertificateImplMono (x509);
+               }
+
+               public override string GetIssuerName (bool legacyV1Mode)
+               {
+                       ThrowIfContextInvalid ();
+                       if (legacyV1Mode)
+                               return x509.IssuerName;
+                       else
+                               return MX.X501.ToString (x509.GetIssuerName (), true, ", ", true);
+               }
+
+               public override string GetSubjectSummary ()
+               {
+                       ThrowIfContextInvalid ();
+                       return x509.SubjectName;
+               }
+
+               public override string GetSubjectName (bool legacyV1Mode)
+               {
+                       ThrowIfContextInvalid ();
+                       if (legacyV1Mode)
+                               return x509.SubjectName;
+                       else
+                               return MX.X501.ToString (x509.GetSubjectName (), true, ", ", true);
+               }
+
+               public override byte[] GetRawCertData ()
+               {
+                       ThrowIfContextInvalid ();
+                       return x509.RawData;
+               }
+
+               protected override byte[] GetCertHash (bool lazy)
+               {
+                       ThrowIfContextInvalid ();
+                       SHA1 sha = SHA1.Create ();
+                       return sha.ComputeHash (x509.RawData);
+               }
+
+               public override DateTime GetEffectiveDateString ()
+               {
+                       ThrowIfContextInvalid ();
+                       return x509.ValidFrom.ToLocalTime ();
+               }
+
+               public override DateTime GetExpirationDateString ()
+               {
+                       ThrowIfContextInvalid ();
+                       return x509.ValidUntil.ToLocalTime ();
+               }
+
+               public override bool Equals (X509CertificateImpl other, out bool result)
+               {
+                       // Use default implementation
+                       result = false;
+                       return false;
+               }
+
+               public override string GetKeyAlgorithm () 
+               {
+                       ThrowIfContextInvalid ();
+                       return x509.KeyAlgorithm;
+               }
+
+               public override byte[] GetKeyAlgorithmParameters () 
+               {
+                       ThrowIfContextInvalid ();
+                       return x509.KeyAlgorithmParameters;
+               }
+
+               public override byte[] GetPublicKey ()
+               {
+                       ThrowIfContextInvalid ();
+                       return x509.PublicKey;
+               }
+
+               public override byte[] GetSerialNumber ()
+               {
+                       ThrowIfContextInvalid ();
+                       return x509.SerialNumber;
+               }
+
+               public override byte[] Export (X509ContentType contentType, byte[] password)
+               {
+                       ThrowIfContextInvalid ();
+
+                       switch (contentType) {
+                       case X509ContentType.Cert:
+                               return GetRawCertData ();
+                       case X509ContentType.Pfx: // this includes Pkcs12
+                               // TODO
+                               throw new NotSupportedException ();
+                       case X509ContentType.SerializedCert:
+                               // TODO
+                               throw new NotSupportedException ();
+                       default:
+                               string msg = Locale.GetText ("This certificate format '{0}' cannot be exported.", contentType);
+                               throw new CryptographicException (msg);
+                       }
+               }
+
+               public override string ToString (bool full)
+               {
+                       ThrowIfContextInvalid ();
+
+                       string nl = Environment.NewLine;
+                       StringBuilder sb = new StringBuilder ();
+                       sb.AppendFormat ("[Subject]{0}  {1}{0}{0}", nl, GetSubjectName (false));
+                       sb.AppendFormat ("[Issuer]{0}  {1}{0}{0}", nl, GetIssuerName (false));
+                       sb.AppendFormat ("[Not Before]{0}  {1}{0}{0}", nl, GetEffectiveDateString ());
+                       sb.AppendFormat ("[Not After]{0}  {1}{0}{0}", nl, GetExpirationDateString ());
+                       sb.AppendFormat ("[Thumbprint]{0}  {1}{0}", nl, X509Helper.ToHexString (GetCertHash ()));
+                       sb.Append (nl);
+                       return sb.ToString ();
+               }
+
+               protected override void Dispose (bool disposing)
+               {
+                       x509 = null;
+               }
+       }
+}

diff --git a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Helper.cs b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Helper.cs
new file mode 100644 (file)
index 0000000..dc73f5a
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Helper.cs
@@ -0,0 +1,214 @@
+//
+// X509Helpers.cs: X.509 helper and utility functions.
+//
+// Authors:
+//     Sebastien Pouliot  <sebastien@ximian.com>
+//     Martin Baulig  <martin.baulig@xamarin.com>
+//
+// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004-2006 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2015 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.Text;
+using System.Runtime.InteropServices;
+#if !NET_2_1
+using System.Security.Permissions;
+#endif
+using MX = Mono.Security.X509;
+
+namespace System.Security.Cryptography.X509Certificates
+{
+       static partial class X509Helper
+       {
+#if !NET_2_1
+               // typedef struct _CERT_CONTEXT {
+               //      DWORD                   dwCertEncodingType;
+               //      BYTE                    *pbCertEncoded;
+               //      DWORD                   cbCertEncoded;
+               //      PCERT_INFO              pCertInfo;
+               //      HCERTSTORE              hCertStore;
+               // } CERT_CONTEXT, *PCERT_CONTEXT;
+               // typedef const CERT_CONTEXT *PCCERT_CONTEXT;
+               [StructLayout (LayoutKind.Sequential)]
+               internal struct CertificateContext {
+                       public UInt32 dwCertEncodingType;
+                       public IntPtr pbCertEncoded;
+                       public UInt32 cbCertEncoded;
+                       public IntPtr pCertInfo;
+                       public IntPtr hCertStore;
+               }
+               // NOTE: We only define the CryptoAPI structure (from WINCRYPT.H)
+               // so we don't create any dependencies on Windows DLL in corlib
+
+               [SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)]
+               public static X509CertificateImpl InitFromHandle (IntPtr handle)
+               {
+                       // both Marshal.PtrToStructure and Marshal.Copy use LinkDemand (so they will always success from here)
+                       CertificateContext cc = (CertificateContext) Marshal.PtrToStructure (handle, typeof (CertificateContext));
+                       byte[] data = new byte [cc.cbCertEncoded];
+                       Marshal.Copy (cc.pbCertEncoded, data, 0, (int)cc.cbCertEncoded);
+                       var x509 = new MX.X509Certificate (data);
+                       return new X509CertificateImplMono (x509);
+               }
+#elif !MONOTOUCH && !XAMMAC
+               public static X509CertificateImpl InitFromHandle (IntPtr handle)
+               {
+                       throw new NotSupportedException ();
+               }
+#endif
+
+               public static X509CertificateImpl InitFromCertificate (X509CertificateImpl impl)
+               {
+                       ThrowIfContextInvalid (impl);
+                       var copy = impl.Clone ();
+                       if (copy != null)
+                               return copy;
+
+                       var data = impl.GetRawCertData ();
+                       if (data == null)
+                               return null;
+
+                       var x509 = new MX.X509Certificate (data);
+                       return new X509CertificateImplMono (x509);
+               }
+
+               public static bool IsValid (X509CertificateImpl impl)
+               {
+                       return impl != null && impl.IsValid;
+               }
+
+               internal static void ThrowIfContextInvalid (X509CertificateImpl impl)
+               {
+                       if (!IsValid (impl))
+                               throw GetInvalidContextException ();
+               }
+
+               internal static Exception GetInvalidContextException ()
+               {
+                       return new CryptographicException (Locale.GetText ("Certificate instance is empty."));
+               }
+
+               internal static MX.X509Certificate ImportPkcs12 (byte[] rawData, string password)
+               {
+                       var pfx = (password == null) ? new MX.PKCS12 (rawData) : new MX.PKCS12 (rawData, password);
+                       if (pfx.Certificates.Count == 0) {
+                               // no certificate was found
+                               return null;
+                       } else if (pfx.Keys.Count == 0) {
+                               // no key were found - pick the first certificate
+                               return pfx.Certificates [0];
+                       } else {
+                               // find the certificate that match the first key
+                               var keypair = (pfx.Keys [0] as AsymmetricAlgorithm);
+                               string pubkey = keypair.ToXmlString (false);
+                               foreach (var c in pfx.Certificates) {
+                                       if ((c.RSA != null) && (pubkey == c.RSA.ToXmlString (false)))
+                                               return c;
+                                       if ((c.DSA != null) && (pubkey == c.DSA.ToXmlString (false)))
+                                               return c;
+                               }
+                               return pfx.Certificates [0]; // no match, pick first certificate without keys
+                       }
+               }
+
+#if !MONOTOUCH && !XAMMAC
+               public static X509CertificateImpl Import (byte[] rawData, string password, X509KeyStorageFlags keyStorageFlags)
+               {
+                       MX.X509Certificate x509;
+                       if (password == null) {
+                               try {
+                                       x509 = new MX.X509Certificate (rawData);
+                               } catch (Exception e) {
+                                       try {
+                                               x509 = ImportPkcs12 (rawData, null);
+                                       } catch {
+                                               string msg = Locale.GetText ("Unable to decode certificate.");
+                                               // inner exception is the original (not second) exception
+                                               throw new CryptographicException (msg, e);
+                                       }
+                               }
+                       } else {
+                               // try PKCS#12
+                               try {
+                                       x509 = ImportPkcs12 (rawData, password);
+                               }
+                               catch {
+                                       // it's possible to supply a (unrequired/unusued) password
+                                       // fix bug #79028
+                                       x509 = new MX.X509Certificate (rawData);
+                               }
+                       }
+
+                       return new X509CertificateImplMono (x509);
+               }
+#endif
+
+               public static byte[] Export (X509CertificateImpl impl, X509ContentType contentType, byte[] password)
+               {
+                       ThrowIfContextInvalid (impl);
+                       return impl.Export (contentType, password);
+               }
+
+               public static bool Equals (X509CertificateImpl first, X509CertificateImpl second)
+               {
+                       if (!IsValid (first) || !IsValid (second))
+                               return false;
+
+                       bool result;
+                       if (first.Equals (second, out result))
+                               return result;
+
+                       var firstRaw = first.GetRawCertData ();
+                       var secondRaw = second.GetRawCertData ();
+
+                       if (firstRaw == null)
+                               return secondRaw == null;
+                       else if (secondRaw == null)
+                               return false;
+
+                       if (firstRaw.Length != secondRaw.Length)
+                               return false;
+
+                       for (int i = 0; i < firstRaw.Length; i++) {
+                               if (firstRaw [i] != secondRaw [i])
+                                       return false;
+                       }
+
+                       return true;
+               }
+
+               // almost every byte[] returning function has a string equivalent
+               // sadly the BitConverter insert dash between bytes :-(
+               public static string ToHexString (byte[] data)
+               {
+                       if (data != null) {
+                               StringBuilder sb = new StringBuilder ();
+                               for (int i = 0; i < data.Length; i++)
+                                       sb.Append (data[i].ToString ("X2"));
+                               return sb.ToString ();
+                       }
+                       else
+                               return null;
+               }
+       }
+}

diff --git a/mcs/class/corlib/System.Threading/Thread.cs b/mcs/class/corlib/System.Threading/Thread.cs
index a2e3f5b685de58f6e2dec02ebb8b92511d5907b2..7dcb5431760352cf6c2fee9bd2f5a0cafb235903 100644 (file)
--- a/mcs/class/corlib/System.Threading/Thread.cs
+++ b/mcs/class/corlib/System.Threading/Thread.cs
@@ -489,6 +489,24 @@ namespace System.Threading {
                void ClearAbortReason ()
                {
                }
+#else
+               [Obsolete ("Thread.Abort is not supported on the current platform.", true)]
+               public void Abort ()
+               {
+                       throw new PlatformNotSupportedException ("Thread.Abort is not supported on the current platform.");
+               }
+
+               [Obsolete ("Thread.Abort is not supported on the current platform.", true)]
+               public void Abort (object stateInfo)
+               {
+                       throw new PlatformNotSupportedException ("Thread.Abort is not supported on the current platform.");
+               }
+
+               [Obsolete ("Thread.ResetAbort is not supported on the current platform.", true)]
+               public static void ResetAbort ()
+               {
+                       throw new PlatformNotSupportedException ("Thread.ResetAbort is not supported on the current platform.");
+               }
 #endif // MONO_FEATURE_THREAD_ABORT
 
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
@@ -724,5 +742,19 @@ namespace System.Threading {
                                res [threads [i]] = new StackTrace ((StackFrame[])stack_frames [i]);
                        return res;
                }
+
+#if !MONO_FEATURE_THREAD_SUSPEND_RESUME
+               [Obsolete ("Thread.Suspend is not supported on the current platform.", true)]
+               public void Suspend ()
+               {
+                       throw new PlatformNotSupportedException ("Thread.Suspend is not supported on the current platform.");
+               }
+
+               [Obsolete ("Thread.Resume is not supported on the current platform.", true)]
+               public void Resume ()
+               {
+                       throw new PlatformNotSupportedException ("Thread.Resume is not supported on the current platform.");
+               }
+#endif
        }
 }

diff --git a/mcs/class/corlib/System/Delegate.cs b/mcs/class/corlib/System/Delegate.cs
index 91eecdccb93919fae0197c20c93d12783945347d..3f6555655945257c194c4a48fc88a3f7fb8f6288 100644 (file)
--- a/mcs/class/corlib/System/Delegate.cs
+++ b/mcs/class/corlib/System/Delegate.cs
@@ -102,17 +102,7 @@ namespace System
 
                public MethodInfo Method {
                        get {
-                               if (method_info != null) {
-                                       return method_info;
-                               } else {
-                                       if (method != IntPtr.Zero) {
-                                               if (!method_is_virtual)
-                                                       method_info = (MethodInfo)MethodBase.GetMethodFromHandleNoGenericCheck (new RuntimeMethodHandle (method));
-                                               else
-                                                       method_info = GetVirtualMethod_internal ();
-                                       }
-                                       return method_info;
-                               }
+                               return GetMethodImpl ();
                        }
                }
 
@@ -511,7 +501,17 @@ namespace System
 
                protected virtual MethodInfo GetMethodImpl ()
                {
-                       return Method;
+                       if (method_info != null) {
+                               return method_info;
+                       } else {
+                               if (method != IntPtr.Zero) {
+                                       if (!method_is_virtual)
+                                               method_info = (MethodInfo)MethodBase.GetMethodFromHandleNoGenericCheck (new RuntimeMethodHandle (method));
+                                       else
+                                               method_info = GetVirtualMethod_internal ();
+                               }
+                               return method_info;
+                       }
                }
 
                // This is from ISerializable

diff --git a/mcs/class/corlib/System/MulticastDelegate.cs b/mcs/class/corlib/System/MulticastDelegate.cs
index 795593d28ceb603aa1854a90247b1442db68c3ca..6a67652037b656481b74236c8faedce449d88a74 100644 (file)
--- a/mcs/class/corlib/System/MulticastDelegate.cs
+++ b/mcs/class/corlib/System/MulticastDelegate.cs
@@ -33,6 +33,7 @@
 
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Runtime.Serialization;
 using System.Runtime.InteropServices;
 
@@ -125,6 +126,14 @@ namespace System
                        return base.GetHashCode ();
                }
 
+               protected override MethodInfo GetMethodImpl ()
+               {
+                       if (delegates != null)
+                               return delegates [delegates.Length - 1].Method;
+
+                       return base.GetMethodImpl ();
+               }
+
                // <summary>
                //   Return, in order of invocation, the invocation list
                //   of a MulticastDelegate
@@ -174,6 +183,32 @@ namespace System
                        return ret;
                }
 
+               /* Based on the Boyer–Moore string search algorithm */
+               int LastIndexOf (Delegate[] haystack, Delegate[] needle)
+               {
+                       if (haystack.Length < needle.Length)
+                               return -1;
+
+                       if (haystack.Length == needle.Length) {
+                               for (int i = 0; i < haystack.Length; ++i)
+                                       if (!haystack [i].Equals (needle [i]))
+                                               return -1;
+
+                               return 0;
+                       }
+
+                       for (int i = haystack.Length - needle.Length, j; i >= 0;) {
+                               for (j = 0; needle [j].Equals (haystack [i]); ++i, ++j) {
+                                       if (j == needle.Length - 1)
+                                               return i - j;
+                               }
+
+                               i -= j + 1;
+                       }
+
+                       return -1;
+               }
+
                protected sealed override Delegate RemoveImpl (Delegate value)
                {
                        if (value == null)
@@ -214,42 +249,23 @@ namespace System
                                return ret;
                        } else {
                                /* wild case : remove MulticastDelegate from MulticastDelegate
-                                * complexity is O(m * n), with n the number of elements in
+                                * complexity is O(m + n), with n the number of elements in
                                 * this.delegates and m the number of elements in other.delegates */
-                               MulticastDelegate ret = AllocDelegateLike_internal (this);
-                               ret.delegates = new Delegate [delegates.Length];
-
-                               /* we should use a set with O(1) lookup complexity
-                                * but HashSet is implemented in System.Core.dll */
-                               List<Delegate> other_delegates = new List<Delegate> ();
-                               for (int i = 0; i < other.delegates.Length; ++i)
-                                       other_delegates.Add (other.delegates [i]);
 
-                               int idx = delegates.Length;
+                               if (delegates.Equals (other.delegates))
+                                       return null;
 
                                /* we need to remove elements from the end to the beginning, as
                                 * the addition and removal of delegates behaves like a stack */
-                               for (int i = delegates.Length - 1; i >= 0; --i) {
-                                       /* if delegates[i] is not in other_delegates,
-                                        * then we can safely add it to ret.delegates
-                                        * otherwise we remove it from other_delegates */
-                                       if (!other_delegates.Remove (delegates [i]))
-                                               ret.delegates [--idx] = delegates [i];
-                               }
-
-                               /* the elements are at the end of the array, we
-                                * need to move them back to the beginning of it */
-                               int count = delegates.Length - idx;
-                               Array.Copy (ret.delegates, idx, ret.delegates, 0, count);
-
-                               if (count == 0)
-                                       return null;
+                               int idx = LastIndexOf (delegates, other.delegates);
+                               if (idx == -1)
+                                       return this;
 
-                               if (count == 1)
-                                       return ret.delegates [0];
+                               MulticastDelegate ret = AllocDelegateLike_internal (this);
+                               ret.delegates = new Delegate [delegates.Length - other.delegates.Length];
 
-                               if (count != delegates.Length)
-                                       Array.Resize (ref ret.delegates, count);
+                               Array.Copy (delegates, ret.delegates, idx);
+                               Array.Copy (delegates, idx + other.delegates.Length, ret.delegates, idx, delegates.Length - idx - other.delegates.Length);
 
                                return ret;
                        }

diff --git a/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs b/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
index b8a9de2b3c59a7908974d880877fdf8d4bcd2fb3..71119b1673a7308b2bc7bf692771aad259bfdca3 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
@@ -3,9 +3,11 @@
 //
 // Authors:
 //  Zoltan Varga (vargaz@gmail.com)
+//  Aleksey Kliger (aleksey@xamarin.com)
 //
 // (c) 2003 Ximian, Inc. (http://www.ximian.com)
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2015 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
@@ -52,7 +54,12 @@ namespace MonoTests.System.Reflection
        [TestFixture]
        public class MethodInfoTest
        {
+#if MONOTOUCH
+               // use an existing symbol - so we can build without dlsym. It does not matter that the signature does not match for the test
+               [DllImport ("libc", EntryPoint="readlink", CharSet=CharSet.Unicode, ExactSpelling=false, PreserveSig=true, SetLastError=true, BestFitMapping=true, ThrowOnUnmappableChar=true)]
+#else
                [DllImport ("libfoo", EntryPoint="foo", CharSet=CharSet.Unicode, ExactSpelling=false, PreserveSig=true, SetLastError=true, BestFitMapping=true, ThrowOnUnmappableChar=true)]
+#endif
                public static extern void dllImportMethod ();
                [MethodImplAttribute(MethodImplOptions.PreserveSig)]
                public void preserveSigMethod ()
@@ -108,8 +115,13 @@ namespace MonoTests.System.Reflection
                        DllImportAttribute attr = (DllImportAttribute)((t.GetMethod ("dllImportMethod").GetCustomAttributes (typeof (DllImportAttribute), true)) [0]);
 
                        Assert.AreEqual (CallingConvention.Winapi, attr.CallingConvention, "#1");
+#if MONOTOUCH
+                       Assert.AreEqual ("readlink", attr.EntryPoint, "#2");
+                       Assert.AreEqual ("libc", attr.Value, "#3");
+#else
                        Assert.AreEqual ("foo", attr.EntryPoint, "#2");
                        Assert.AreEqual ("libfoo", attr.Value, "#3");
+#endif
                        Assert.AreEqual (CharSet.Unicode, attr.CharSet, "#4");
                        Assert.AreEqual (false, attr.ExactSpelling, "#5");
                        Assert.AreEqual (true, attr.PreserveSig, "#6");
@@ -283,6 +295,35 @@ namespace MonoTests.System.Reflection
                        Assert.AreEqual (typeof (GBD_D), typeof (GBD_E).GetMethod ("f").GetBaseDefinition ().DeclaringType);
                }
 
+               class GenericBase<T,H> {
+                       public virtual void f2 () { }
+               }
+
+               class GenericMid<T, U> : GenericBase<T, Action<U>> {
+                       public virtual T f1 () { return default (T); }
+               }
+
+               class GenericChild<T> : GenericMid<T, int> {
+                       public override T f1 () { return default (T); }
+                       public override void f2 () { }
+               }
+
+               [Test]
+               public void GetBaseDefinition_OpenConstructedBaseType () // 36305
+               {
+                       var t = typeof (GenericChild<string>);
+
+                       var mi1 = t.GetMethod ("f1");
+                       var mi1_base = mi1.GetBaseDefinition ();
+
+                       Assert.AreEqual (typeof (GenericMid<string, int>), mi1_base.DeclaringType, "#1");
+
+                       var mi2 = t.GetMethod ("f2");
+                       var mi2_base = mi2.GetBaseDefinition ();
+
+                       Assert.AreEqual (typeof (GenericBase<string, Action<int>>), mi2_base.DeclaringType, "#2");
+               }
+
                class TestInheritedMethodA {
                        private void TestMethod ()
                        {

diff --git a/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs b/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs
index 92675b00f7c5750c04f019b47b6484ff6c3b4219..4c38e08ed56fe67b422dce6c7714467301f738c9 100644 (file)
--- a/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs
@@ -805,6 +805,7 @@ namespace MonoTests.System.Runtime.InteropServices
                        }
                }
 
+#if !MOBILE
                [DllImport ("kernel32.dll", SetLastError = true)]
                [PreserveSig]
                static extern uint GetModuleFileName (
@@ -816,6 +817,7 @@ namespace MonoTests.System.Runtime.InteropServices
                        [MarshalAs (UnmanagedType.U4)]
                        int nSize
                );
+#endif
        }
 #if !NET_2_1
        [ComImport()]

diff --git a/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CapiTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CapiTest.cs
index 50dfe0e157df65b0feb65022d4502a02f092a5f1..328bbb54a50487b7c5d48879374476d27d145da3 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CapiTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CapiTest.cs
@@ -72,6 +72,7 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
                        File.Delete("temp.b64");
                }
 
+#if !MOBILE
                public IntPtr GetHandleEx (byte[] certificate) 
                {
                        CertificateContext cc = new CertificateContext ();
@@ -151,6 +152,7 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
                        Assert.AreEqual (serial, x509.GetSerialNumber (), "GetSerialNumber");
                        Assert.AreEqual ("02720006E8", x509.GetSerialNumberString (), "GetSerialNumberString");
                }
+#endif
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]

diff --git a/mcs/class/corlib/Test/System.Threading/ThreadPoolTest.cs b/mcs/class/corlib/Test/System.Threading/ThreadPoolTest.cs
index 888b90c9b411eaf19fe7acd0492c09553940fbed..98c939312eadb5c37dea947046bf681ae0ae4459 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading/ThreadPoolTest.cs
+++ b/mcs/class/corlib/Test/System.Threading/ThreadPoolTest.cs
@@ -35,6 +35,25 @@ namespace MonoTests.System.Threading
        [TestFixture]
        public class ThreadPoolTests
        {
+               int minWorkerThreads;
+               int minCompletionPortThreads;
+               int maxWorkerThreads;
+               int maxCompletionPortThreads;
+
+               [SetUp]
+               public void SetUp ()
+               {
+                       ThreadPool.GetMinThreads (out minWorkerThreads, out minCompletionPortThreads);
+                       ThreadPool.GetMaxThreads (out maxWorkerThreads, out maxCompletionPortThreads);
+               }
+
+               [TearDown]
+               public void TearDown ()
+               {
+                       ThreadPool.SetMinThreads (minWorkerThreads, minCompletionPortThreads);
+                       ThreadPool.SetMaxThreads (maxWorkerThreads, maxCompletionPortThreads);
+               }
+
                [Test]
                public void RegisterWaitForSingleObject_InvalidArguments ()
                {
@@ -97,5 +116,87 @@ namespace MonoTests.System.Threading
                        ThreadPool.UnsafeQueueUserWorkItem (e, null);
                        Assert.IsTrue (ev.Wait (3000));
                }
+
+               [Test]
+               public void SetAndGetMinThreads ()
+               {
+                       int workerThreads, completionPortThreads;
+                       int workerThreads_new, completionPortThreads_new;
+
+                       ThreadPool.GetMinThreads (out workerThreads, out completionPortThreads);
+                       Assert.IsTrue (workerThreads > 0, "#1");
+                       Assert.IsTrue (completionPortThreads > 0, "#2");
+
+                       workerThreads_new = workerThreads == 1 ? 2 : 1;
+                       completionPortThreads_new = completionPortThreads == 1 ? 2 : 1;
+                       ThreadPool.SetMinThreads (workerThreads_new, completionPortThreads_new);
+
+                       ThreadPool.GetMinThreads (out workerThreads, out completionPortThreads);
+                       Assert.IsTrue (workerThreads == workerThreads_new, "#3");
+                       Assert.IsTrue (completionPortThreads == completionPortThreads_new, "#4");
+               }
+
+               [Test]
+               public void SetAndGetMaxThreads ()
+               {
+                       int cpuCount = Environment.ProcessorCount;
+                       int workerThreads, completionPortThreads;
+                       int workerThreads_new, completionPortThreads_new;
+
+                       ThreadPool.GetMaxThreads (out workerThreads, out completionPortThreads);
+                       Assert.IsTrue (workerThreads > 0, "#1");
+                       Assert.IsTrue (completionPortThreads > 0, "#2");
+
+                       workerThreads_new = workerThreads == cpuCount ? cpuCount + 1 : cpuCount;
+                       completionPortThreads_new = completionPortThreads == cpuCount ? cpuCount + 1 : cpuCount;
+                       ThreadPool.SetMaxThreads (workerThreads_new, completionPortThreads_new);
+
+                       ThreadPool.GetMaxThreads (out workerThreads, out completionPortThreads);
+                       Assert.IsTrue (workerThreads == workerThreads_new, "#3");
+                       Assert.IsTrue (completionPortThreads == completionPortThreads_new, "#4");
+               }
+
+               [Test]
+               public void GetAvailableThreads ()
+               {
+                       ManualResetEvent mre = new ManualResetEvent (false);
+                       DateTime start = DateTime.Now;
+                       int i, workerThreads, completionPortThreads;
+
+                       try {
+                               Assert.IsTrue (ThreadPool.SetMaxThreads (Environment.ProcessorCount, Environment.ProcessorCount));
+
+                               while (true) {
+                                       ThreadPool.GetAvailableThreads (out workerThreads, out completionPortThreads);
+                                       if (workerThreads == 0)
+                                               break;
+
+                                       Console.WriteLine ("workerThreads = {0}, completionPortThreads = {1}", workerThreads, completionPortThreads);
+
+                                       if ((DateTime.Now - start).TotalSeconds >= 10)
+                                               Assert.Fail ("did not reach 0 available threads");
+
+                                       ThreadPool.QueueUserWorkItem (GetAvailableThreads_Callback, mre);
+                                       Thread.Sleep (1);
+                               }
+                       } finally {
+                               mre.Set ();
+                       }
+               }
+
+               void GetAvailableThreads_Callback (object state)
+               {
+                       ManualResetEvent mre = (ManualResetEvent) state;
+
+                       if (mre.WaitOne (0))
+                               return;
+
+                       ThreadPool.QueueUserWorkItem (GetAvailableThreads_Callback, mre);
+                       ThreadPool.QueueUserWorkItem (GetAvailableThreads_Callback, mre);
+                       ThreadPool.QueueUserWorkItem (GetAvailableThreads_Callback, mre);
+                       ThreadPool.QueueUserWorkItem (GetAvailableThreads_Callback, mre);
+
+                       mre.WaitOne ();
+               }
        }
 }
\ No newline at end of file

diff --git a/mcs/class/corlib/Test/System/StringComparerTest.cs b/mcs/class/corlib/Test/System/StringComparerTest.cs
index ce028bc12afdb847d8f9f77484c0144e5076c176..97c8153bfd57fa5e94fd32117d344a6b0e418411 100644 (file)
--- a/mcs/class/corlib/Test/System/StringComparerTest.cs
+++ b/mcs/class/corlib/Test/System/StringComparerTest.cs
@@ -215,6 +215,20 @@ namespace MonoTests.System
                        StringComparer.Ordinal.GetHashCode (null);
                }
 
+               [Test]
+               [SetCulture("en-us")]
+               public void OrdinarCultureSwitch ()
+               {
+                       var cmp1 = StringComparer.OrdinalIgnoreCase;
+                       var h1 = cmp1.GetHashCode ("w");
+
+                       global::System.Threading.Thread.CurrentThread.CurrentCulture = new global::System.Globalization.CultureInfo ("fi");
+
+                       var cmp2 = StringComparer.OrdinalIgnoreCase;
+                       var h2 = cmp2.GetHashCode ("w");
+                       Assert.AreEqual (h1, h2);
+               }
+
                private static readonly byte [] _serializedCurrentCulture = new byte [] {
                        0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00,
                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00, 0x00,

diff --git a/mcs/class/corlib/Test/System/StringTest.cs b/mcs/class/corlib/Test/System/StringTest.cs
index 293479eb851d41f9a6c6a9e89f083f3743b88257..7119236c8aab2bb638ec9916a2191e761088ed7c 100644 (file)
--- a/mcs/class/corlib/Test/System/StringTest.cs
+++ b/mcs/class/corlib/Test/System/StringTest.cs
@@ -92,6 +92,21 @@ public class StringTest
                }
        }
 
+       [Test] // ctor (Char, Int32)
+       public void Constructor4_LargeString ()
+       {
+               try {
+                       var x = new String ('A', int.MaxValue);
+                       if (Environment.Is64BitProcess) {
+                               Assert.AreEqual ('A', x[0]);
+                               Assert.AreEqual ('A', x[int.MaxValue - 1]);
+                       }
+                       else
+                               Assert.Fail ("Expected OutOfMemoryException.");
+               } catch (OutOfMemoryException) {
+               }
+       }
+
        [Test] // ctor (Char [], Int32, Int32)
        public void Constructor6 ()
        {
@@ -2993,10 +3008,16 @@ public class StringTest
        }
 
        [Test]
-       public void PadLeft_Overflow ()
+       public void PadLeft_LargeString ()
        {
                try {
-                       "x".PadLeft (int.MaxValue, '-');
+                       var x = "x".PadLeft (int.MaxValue, '-');
+                       if (Environment.Is64BitProcess) {
+                               Assert.AreEqual ('-', x[0]);
+                               Assert.AreEqual ('x', x[int.MaxValue - 1]);
+                       }
+                       else
+                               Assert.Fail ("Expected OutOfMemoryException.");
                } catch (OutOfMemoryException) {
                }
        }
@@ -3043,10 +3064,16 @@ public class StringTest
        }
 
        [Test]
-       public void PadRight_Overflow ()
+       public void PadRight_LargeString ()
        {
                try {
-                       "x".PadRight (int.MaxValue, '-');
+                       var x = "x".PadRight (int.MaxValue, '-');
+                       if (Environment.Is64BitProcess) {
+                               Assert.AreEqual ('x', x[0]);
+                               Assert.AreEqual ('-', x[int.MaxValue - 1]);
+                       }
+                       else
+                               Assert.Fail ("Expected OutOfMemoryException.");
                } catch (OutOfMemoryException) {
                }
        }

diff --git a/mcs/class/corlib/Test/System/TypeTest.cs b/mcs/class/corlib/Test/System/TypeTest.cs
index 61a71406dd6557aaf08fd5bf0d8c28cdd1cff922..19dbff4804c0ea37f0033f0911c3674f4bf65b90 100644 (file)
--- a/mcs/class/corlib/Test/System/TypeTest.cs
+++ b/mcs/class/corlib/Test/System/TypeTest.cs
@@ -212,6 +212,16 @@ namespace MonoTests.System
                }
        }
 
+       public class GenericIndexers<T, U>
+       {
+               // This class has two indexers that take different
+               // arguments.  GetProperties on all instances of this
+               // generic type should still have 2 properties, even
+               // if T and U are instantiated with the same types.
+               public T this[T t] { get { return t; } }
+               public U this[U u] { get { return u; } }
+       }
+
        public class FirstMethodBinder : Binder
        {
                public override MethodBase BindToMethod (BindingFlags bindingAttr, MethodBase [] match, ref object [] args,
@@ -425,8 +435,25 @@ namespace MonoTests.System
                public void GetProperties ()
                {
                        // Test hide-by-name-and-signature
-                       Assert.AreEqual (1, typeof (Derived2).GetProperties ().Length);
-                       Assert.AreEqual (typeof (Derived2), typeof (Derived2).GetProperties ()[0].DeclaringType);
+                       Assert.AreEqual (1, typeof (Derived2).GetProperties ().Length, "#1");
+                       Assert.AreEqual (typeof (Derived2), typeof (Derived2).GetProperties ()[0].DeclaringType, "#2");
+
+                       // For generics, hide-by-name-and-signature works on the unexpanded types. The
+                       // GenericIndexers<T,U> class has two indexers that take different arguments.
+                       // GetProperties on all instances of this generic type should still have 2 properties,
+                       // even if T and U are instantiated with the same types.
+
+                       var ps = typeof (GenericIndexers<int,int>).GetProperties ();
+                       Assert.AreEqual (2, ps.Length, "#3");
+                       for (int i = 0; i < ps.Length; i++) {
+                               var p = ps[i];
+
+                               var getterResultType = p.GetGetMethod ().ReturnType;
+
+                               var msg = String.Format ("#4-{0}", i);
+                               Assert.AreEqual (typeof (int), getterResultType, msg);
+                       }
+
                }
 
                [Test] // GetProperties (BindingFlags)
@@ -1527,6 +1554,27 @@ namespace MonoTests.System
                                                            typeof (long), new Type[0], null), "#2");
                }
 
+               [Test]
+               public void GetProperty9_Indexers ()
+               {
+
+                       var bindingFlags = BindingFlags.Public | BindingFlags.Instance;
+
+                       Type type1 = typeof (List<byte>);
+                       var p1 = type1.GetProperty ("Item", bindingFlags, null, typeof (byte), new Type[] { typeof (int) }, null);
+                       Assert.IsNotNull (p1, "#1");
+
+                       Type type2 = typeof (List<string>);
+                       var p2 = type2.GetProperty ("Item", bindingFlags, null, typeof (string), new Type[] { typeof (int) }, null);
+                       Assert.IsNotNull (p2, "#2");
+
+                       Type type3 = typeof (List<Type>);
+                       // result type not convertible, make sure we fail.
+                       var p3 = type3.GetProperty ("Item", bindingFlags, null, typeof (string) /*!*/,
+                                                   new Type[] { typeof (int) }, null);
+                       Assert.IsNull (p3, "#3");
+               }
+
                [StructLayout(LayoutKind.Explicit, Pack = 4, Size = 64)]
                public class Class1
                {

diff --git a/mcs/class/corlib/corlib-net_4_5.csproj b/mcs/class/corlib/corlib-net_4_5.csproj
deleted file mode 100644 (file)
index 82e3ed5..0000000
--- a/mcs/class/corlib/corlib-net_4_5.csproj
+++ /dev/null
@@ -1,1645 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>612,618,1699</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>mscorlib</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>612,618,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>612,618,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\\system\runtime\reliability\criticalfinalizerobject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\\system\runtime\reliability\prepreparemethodattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\\system\runtime\reliability\reliabilitycontractattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\microsoft\win32\safehandles\safefilehandle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\microsoft\win32\safehandles\saferegistryhandle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\microsoft\win32\safehandles\safewaithandle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\microsoft\win32\safehandles\win32safehandles.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\__filters.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\__hresults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\_localdatastore.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\_localdatastoremgr.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\accessviolationexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\action.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\activator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\AggregateException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\appdomainattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\appdomainunloadedexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\applicationexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\applicationid.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\argumentexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\argumentnullexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\argumentoutofrangeexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\arithmeticexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\arraysegment.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\arraytypemismatchexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\asynccallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\attribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\attributetargets.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\attributeusageattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\badimageformatexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\bitconverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\boolean.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\buffer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\byte.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\cannotunloadappdomainexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\char.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\charenumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\clscompliantattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\arraylist.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\bitarray.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\caseinsensitivecomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\caseinsensitivehashcodeprovider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\collectionbase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\comparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\compatiblecomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\Concurrent\ConcurrentDictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\Concurrent\ConcurrentQueue.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\Concurrent\ConcurrentStack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\Concurrent\IProducerConsumerCollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\Concurrent\OrderablePartitioner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\Concurrent\Partitioner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\Concurrent\PartitionerStatic.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\dictionarybase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\dictionaryentry.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\emptyreadonlydictionaryinternal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\comparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\debugview.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\dictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\equalitycomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\icollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\icomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\idictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\ienumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\ienumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\iequalitycomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\ilist.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\ireadonlycollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\ireadonlydictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\ireadonlylist.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\keynotfoundexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\keyvaluepair.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\generic\list.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\hashtable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\icollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\icomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\idictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\idictionaryenumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\ienumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\ienumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\iequalitycomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\ihashcodeprovider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\ilist.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\istructuralcomparable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\istructuralequatable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\keyvaluepairs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\listdictionaryinternal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\objectmodel\collection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\objectmodel\keyedcollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\objectmodel\readonlycollection.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\objectmodel\readonlydictionary.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\queue.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\readonlycollectionbase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\sortedlist.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\stack.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\collections\structuralcomparisons.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\consolecanceleventargs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\consolecolor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\consolekey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\consolekeyinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\consolemodifiers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\consolespecialkey.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\contextboundobject.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\contextmarshalexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\contextstaticattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\convert.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\datamisalignedexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\datetime.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\datetimekind.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\datetimeoffset.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\dayofweek.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\dbnull.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\decimal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\defaultbinder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\assert.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\assertfilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\assertfilters.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\codeanalysis\suppressmessageattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\conditionalattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\contracts\contracts.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\contracts\contractsbcl.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\diagnostics\debuggerattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\dividebyzeroexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\dllnotfoundexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\double.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\duplicatewaitobjectexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\empty.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\entrypointnotfoundexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\enum.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\eventargs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\eventhandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\executionengineexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\fieldaccessexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\flagsattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\formatexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\bidicategory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\calendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\calendaralgorithmtype.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\calendardata.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\calendarweekrule.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\charunicodeinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\chineselunisolarcalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\compareinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\culturenotfoundexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\culturetypes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\datetimeformat.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\datetimeformatinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\datetimeformatinfoscanner.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\datetimeparse.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\datetimestyles.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\daylighttime.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\digitshapes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\eastasianlunisolarcalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\globalizationassembly.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\gregoriancalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\gregoriancalendarhelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\gregoriancalendartypes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\hebrewcalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\hebrewnumber.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\hijricalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\japanesecalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\japaneselunisolarcalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\juliancalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\koreancalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\koreanlunisolarcalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\numberformatinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\numberstyles.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\Persiancalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\sortversion.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\stringinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\taiwancalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\taiwanlunisolarcalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\textelementenumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\textinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\thaibuddhistcalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\timespanformat.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\timespanparse.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\umalquracalendar.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\unicodecategory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\guid.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iappdomain.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iappdomainsetup.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iasyncresult.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\icloneable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\icomparable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iconvertible.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\icustomformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\idisposable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iequatable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iformatprovider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iformattable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\indexoutofrangeexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\insufficientexecutionstackexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\insufficientmemoryexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\int16.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\int32.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\int64.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\invalidcastexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\invalidoperationexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\invalidprogramexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\invalidtimezoneexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\__error.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\__hresults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\binaryreader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\binarywriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\bufferedstream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\directorynotfoundexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\drivenotfoundexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\endofstreamexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\fileloadexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\filenotfoundexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\ioexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\memorystream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\pathtoolongexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\pinnedbuffermemorystream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\stream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\streamreader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\streamwriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\stringreader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\stringwriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\textreader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\textwriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\unmanagedmemoryaccessor.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\unmanagedmemorystream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\io\unmanagedmemorystreamwrapper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iobservable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iobserver.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iprogress.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\iserviceobjectprovider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\Lazy.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\memberaccessexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\methodaccessexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\midpointrounding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\missingfieldexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\missingmemberexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\missingmethodexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\multicastnotsupportedexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\nonserializedattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\notfinitenumberexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\notimplementedexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\notsupportedexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\nullreferenceexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\number.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\objectdisposedexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\obsoleteattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\operationcanceledexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\outofmemoryexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\overflowexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\paramarrayattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\platformnotsupportedexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\progress.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\random.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\rankexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\ambiguousmatchexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\assemblyattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\assemblynameflags.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\assemblynameproxy.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\binder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\bindingflags.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\callingconventions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\CustomAttributeExtensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\defaultmemberattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\eventattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\fieldattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\genericparameterattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\icustomattributeprovider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\interfacemapping.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\introspectionextensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\invalidfiltercriteriaexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\ireflect.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\ireflectabletype.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\manifestresourceinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\mdimport.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\memberfilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\memberinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\memberinfoserializationholder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\membertypes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\methodattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\methodbase.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\methodimplattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\missing.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\obfuscateassemblyattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\obfuscationattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\parameterattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\parametermodifier.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\pointer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\propertyattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\reflectioncontext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\resourceattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\RuntimeReflectionExtensions.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\typeattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\typedelegator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\typefilter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\reflection\typeinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resid.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\__fastresourcecomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\__hresults.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\filebasedresourcegroveler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\iresourcegroveler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\iresourcereader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\iresourcewriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\looselylinkedresourcereference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\manifestbasedresourcegroveler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\missingmanifestresourceexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\missingsatelliteassemblyexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\neutralresourceslanguageattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\resourcefallbackmanager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\resourcemanager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\resourcereader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\resourceset.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\resourcetypecode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\resourcewriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\runtimeresourceset.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\satellitecontractversionattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\resources\ultimateresourcefallbacklocation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\rttype.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\accessedthroughpropertyattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\assemblyattributesgohere.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\assemblysettingattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\AsyncMethodBuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\AsyncStateMachineAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\CallerFilePathAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\CallerLineNumberAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\CallerMemberNameAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\callingconvention.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\compilationrelaxations.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\compilergeneratedattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\compilerglobalscopeattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\compilermarshaloverride.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\customconstantattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\datetimeconstantattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\decimalconstantattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\decoratednameattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\discardableattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\extensionattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\fixedaddressvaluetypeattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\fixedbufferattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\hascopysemanticsattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\IAsyncStateMachine.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\idispatchconstantattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\indexernameattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\INotifyCompletion.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\internalsvisibletoattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isboxed.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isbyvalue.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isconst.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\iscopyconstructed.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isexplicitlydereferenced.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isimplicitlydereferenced.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isjitintrinsic.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\islong.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\ispinned.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\issignunspecifiedbyte.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isudtreturn.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\isvolatile.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\IteratorStateMachineAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\iunknownconstantattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\methodimplattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\nativecppclassattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\ReferenceAssemblyAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\requiredattributeattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\RuntimeCompatibilityAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\RuntimeWrappedException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\scopelessenumattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\specialnameattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\StateMachineAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\suppressildasmattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\suppressmergecheckattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\TaskAwaiter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\typedependencyattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\TypeForwardedFromAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\TypeForwardedToAttribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\unsafevaluetypeattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\compilerservices\YieldAwaitable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\exceptionservices\corruptingexceptioncommon.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\exceptionservices\exceptionnotification.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\exceptionservices\exceptionservicescommon.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\attributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ibindctx.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\iconnectionpoint.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\iconnectionpointcontainer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumconnectionpoints.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumconnections.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumerable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienummoniker.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumstring.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ienumvariant.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\iexpando.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\imoniker.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ipersistfile.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ireflect.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\irunningobjecttable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\istream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypecomp.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypeinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypeinfo2.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypelib.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypelib2.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\expando\iexpando.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\safehandle.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\interopservices\ucomienumconnections.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\NgenServicingAttributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\remoting\callcontext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\deserializationeventhandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatterconverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binarycommonclasses.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryconverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryenums.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryformatterwriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binarymethodmessage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryobjectinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryobjectreader.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryobjectwriter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryparser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\binary\binaryutilclasses.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\commonenums.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\ifieldinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\isoapmessage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\sertrace.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\soapfault.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatters\soapmessage.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\formatterservices.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\ideserializationcallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\iformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\iformatterconverter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\iobjectreference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\iserializable.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\iserializationsurrogate.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\isurrogateselector.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\memberholder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\objectclonehelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\objectidgenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\objectmanager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\safeserializationmanager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationbinder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationeventscache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationfieldinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationinfoenumerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\serializationobjectmanager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\streamingcontext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\surrogateselector.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\serialization\valuetypefixupinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\binarycompatibility.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\componentguaranteesattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\multitargetinghelpers.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\resourceattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\targetframeworkattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\targetframeworkid.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\sbyte.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\attributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\claims\Claim.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\claims\ClaimsIdentity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\claims\ClaimsPrincipal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\claims\ClaimTypes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\claims\ClaimValueTypes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\claims\RoleClaimProvider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\aes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\asymmetricalgorithm.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\asymmetrickeyexchangedeformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\asymmetrickeyexchangeformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\asymmetricsignaturedeformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\asymmetricsignatureformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\base64transforms.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\crypto.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\cryptoapitransform.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\cryptostream.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\derivebytes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\des.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\descryptoserviceprovider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\dsa.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\dsasignaturedeformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\dsasignatureformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hashalgorithm.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmac.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmacmd5.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmacripemd160.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmacsha1.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmacsha256.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmacsha384.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmacsha512.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\icryptotransform.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\keyedhashalgorithm.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\mactripledes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\maskgenerationmethod.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\md5.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\passwordderivebytes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\pkcs1maskgenerationmethod.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\randomnumbergenerator.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rc2.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rc2cryptoserviceprovider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rfc2898derivebytes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rijndael.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rijndaelmanaged.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rijndaelmanagedtransform.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\ripemd160.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\ripemd160managed.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsa.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsaoaepkeyexchangedeformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsaoaepkeyexchangeformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsapkcs1keyexchangedeformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsapkcs1keyexchangeformatter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha1.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha1managed.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha256.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha256managed.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha384.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha512.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\signaturedescription.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\symmetricalgorithm.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\tripledes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\utils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\x509certificates\x509utils.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\principal\genericidentity.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\securitycontext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\securitydocument.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\util\hex.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\util\parser.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\util\tokenizer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\serializableattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\single.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\stackoverflowexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\string.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\stringcomparer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\stringfreezingattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\systemexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\asciiencoding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\codepageencoding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\decoder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\decoderbestfitfallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\decoderexceptionfallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\decoderfallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\decodernls.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\decoderreplacementfallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encoder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encoderbestfitfallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encoderexceptionfallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encoderfallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encodernls.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encoderreplacementfallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encoding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\encodinginfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\mlangcodepageencoding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\stringbuilder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\stringbuildercache.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\surrogateencoder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\unicodeencoding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\utf32encoding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\utf7encoding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\text\utf8encoding.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threadattributes.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\abandonedmutexexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\apartmentstate.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\autoresetevent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\CancellationToken.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\CancellationTokenRegistration.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\CancellationTokenSource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\CountdownEvent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\eventresetmode.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\executioncontext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\LazyInitializer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\lockrecursionexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\manualresetevent.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\ManualResetEventSlim.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\parameterizedthreadstart.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\semaphorefullexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\SemaphoreSlim.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\sendorpostcallback.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\SpinLock.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\SpinWait.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\synchronizationcontext.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\synchronizationlockexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\BeginEndAwaitableAdapter.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\ConcurrentExclusiveSchedulerPair.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\Future.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\FutureFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\Parallel.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\ParallelLoopState.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\ParallelRangeManager.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\ProducerConsumerQueues.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\Task.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskCanceledException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskCompletionSource.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskContinuation.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskExceptionHolder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskFactory.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskScheduler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskSchedulerException.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\TaskToApm.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\ThreadPoolTaskScheduler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\thread.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadabortexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadinterruptedexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\ThreadLocal.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadpool.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadpriority.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadstart.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadstartexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadstate.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\threadstateexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\timeout.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\waithandlecannotbeopenedexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threadstaticattribute.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\throwhelper.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\timeoutexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\timespan.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\timezoneinfo.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\timezonenotfoundexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\tuple.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\type.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\typeaccessexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\typedreference.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\typeinitializationexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\typeloadexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\typeunloadedexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\uint16.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\uint32.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\uint64.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\unauthorizedaccessexception.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\unhandledexceptioneventargs.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\unhandledexceptioneventhandler.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\unityserializationholder.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\unsafecharbuffer.cs" />\r
-    <Compile Include="..\..\..\external\referencesource\mscorlib\system\version.cs" />\r
-    <Compile Include="..\..\build\common\Consts.cs" />\r
-    <Compile Include="..\..\build\common\Locale.cs" />\r
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
-    <Compile Include="..\Mono.Parallel\Mono.Threading\AtomicBoolean.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\NextPrimeFinder.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\PrimeGeneratorBase.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime.Generator\SequentialSearchPrimeGeneratorBase.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime\ConfidenceFactor.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math.Prime\PrimalityTests.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Math\BigInteger.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Authenticode\AuthenticodeBase.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Authenticode\AuthenticodeDeformatter.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\CryptoConvert.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\CryptoTools.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\KeyPairPersistence.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\PKCS1.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\PKCS8.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\RC4.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\RSAManaged.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\SymmetricTransform.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\BasicConstraintsExtension.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\KeyUsageExtension.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtension.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\PKCS12.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X501Name.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Certificate.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509CertificateCollection.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Chain.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509ChainStatusFlags.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509CRL.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Extension.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Extensions.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Store.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509StoreManager.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509Stores.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X520Attributes.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\ASN1.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\ASN1Convert.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\BitConverterLE.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\PKCS7.cs" />\r
-    <Compile Include="..\Mono.Security\Mono.Security\StrongName.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Microsoft.Win32\IRegistryApi.cs" />\r
-    <Compile Include="Microsoft.Win32\Registry.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryHive.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryKey.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryKeyPermissionCheck.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryOptions.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryValueKind.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryValueOptions.cs" />\r
-    <Compile Include="Microsoft.Win32\RegistryView.cs" />\r
-    <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />\r
-    <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />\r
-    <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\CodePointIndexer.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\MSCompatUnicodeTable.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\MSCompatUnicodeTableUtil.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\Normalization.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\NormalizationTableUtil.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\SortKey.cs" />\r
-    <Compile Include="Mono.Globalization.Unicode\SortKeyBuffer.cs" />\r
-    <Compile Include="Mono.Interop\ComInteropProxy.cs" />\r
-    <Compile Include="Mono.Interop\IDispatch.cs" />\r
-    <Compile Include="Mono.Interop\IUnknown.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\DSAManaged.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\HMACAlgorithm.cs" />\r
-    <Compile Include="Mono.Security.Cryptography\MACAlgorithm.cs" />\r
-    <Compile Include="Mono.Security\StrongNameManager.cs" />\r
-    <Compile Include="Mono.Security\Uri.cs" />\r
-    <Compile Include="Mono.Xml\SecurityParser.cs" />\r
-    <Compile Include="Mono.Xml\SmallXmlParser.cs" />\r
-    <Compile Include="Mono\DataConverter.cs" />\r
-    <Compile Include="Mono\Runtime.cs" />\r
-    <Compile Include="ReferenceSources\__ConsoleStream.cs" />\r
-    <Compile Include="ReferenceSources\AppDomain.cs" />\r
-    <Compile Include="ReferenceSources\Array.cs" />\r
-    <Compile Include="ReferenceSources\BCLDebug.cs" />\r
-    <Compile Include="ReferenceSources\Buffer.cs" />\r
-    <Compile Include="ReferenceSources\CalendarData.cs" />\r
-    <Compile Include="ReferenceSources\CLRConfig.cs" />\r
-    <Compile Include="ReferenceSources\CompareInfo.cs" />\r
-    <Compile Include="ReferenceSources\CompatibilitySwitches.cs" />\r
-    <Compile Include="ReferenceSources\CultureData.cs" />\r
-    <Compile Include="ReferenceSources\DefaultBinder.cs" />\r
-    <Compile Include="ReferenceSources\EncodingDataItem.cs" />\r
-    <Compile Include="ReferenceSources\EncodingTable.cs" />\r
-    <Compile Include="ReferenceSources\Environment.cs" />\r
-    <Compile Include="ReferenceSources\HashHelpers.cs" />\r
-    <Compile Include="ReferenceSources\JitHelpers.cs" />\r
-    <Compile Include="ReferenceSources\MethodBase.cs" />\r
-    <Compile Include="ReferenceSources\ParseNumbers.cs" />\r
-    <Compile Include="ReferenceSources\RemotingFieldCachedData.cs" />\r
-    <Compile Include="ReferenceSources\RuntimeHandles.cs" />\r
-    <Compile Include="ReferenceSources\RuntimeType.cs" />\r
-    <Compile Include="ReferenceSources\SecurityContext.cs" />\r
-    <Compile Include="ReferenceSources\SharedStatics.cs" />\r
-    <Compile Include="ReferenceSources\String.cs" />\r
-    <Compile Include="ReferenceSources\TextInfo.cs" />\r
-    <Compile Include="ReferenceSources\Type.cs" />\r
-    <Compile Include="ReferenceSources\TypeBuilderInstantiation.cs" />\r
-    <Compile Include="ReferenceSources\TypeNameParser.cs" />\r
-    <Compile Include="ReferenceSources\win32native.cs" />\r
-    <Compile Include="System.Configuration.Assemblies\AssemblyHash.cs" />\r
-    <Compile Include="System.Configuration.Assemblies\AssemblyHashAlgorithm.cs" />\r
-    <Compile Include="System.Configuration.Assemblies\AssemblyVersionCompatibility.cs" />\r
-    <Compile Include="System.Configuration.Assemblies\ProcessorID.cs" />\r
-    <Compile Include="System.Deployment.Internal\InternalActivationContextHelper.cs" />\r
-    <Compile Include="System.Deployment.Internal\InternalApplicationIdentityHelper.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolBinder.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolBinder1.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolDocument.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolDocumentWriter.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolMethod.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolNamespace.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolReader.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolScope.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolVariable.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\ISymbolWriter.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymAddressKind.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymbolToken.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymDocumentType.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymLanguageType.cs" />\r
-    <Compile Include="System.Diagnostics.SymbolStore\SymLanguageVendor.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventCommand.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventCommandEventArgs.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventKeywords.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventLevel.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventSource.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\EventSourceAttribute.cs" />\r
-    <Compile Include="System.Diagnostics.Tracing\NonEventAttribute.cs" />\r
-    <Compile Include="System.Diagnostics\Debugger.cs" />\r
-    <Compile Include="System.Diagnostics\StackFrame.cs" />\r
-    <Compile Include="System.Diagnostics\StackTrace.cs" />\r
-    <Compile Include="System.Globalization\CultureInfo.cs" />\r
-    <Compile Include="System.Globalization\IdnMapping.cs" />\r
-    <Compile Include="System.Globalization\RegionInfo.cs" />\r
-    <Compile Include="System.Globalization\RegionInfo.MonoTouch.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\INormalizeForIsolatedStorage.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorage.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageException.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFile.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFileEnumerator.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageFileStream.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageScope.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageSecurityOptions.cs" />\r
-    <Compile Include="System.IO.IsolatedStorage\IsolatedStorageSecurityState.cs" />\r
-    <Compile Include="System.IO\Directory.cs" />\r
-    <Compile Include="System.IO\DirectoryInfo.cs" />\r
-    <Compile Include="System.IO\DriveInfo.cs" />\r
-    <Compile Include="System.IO\DriveType.cs" />\r
-    <Compile Include="System.IO\File.cs" />\r
-    <Compile Include="System.IO\FileAccess.cs" />\r
-    <Compile Include="System.IO\FileAttributes.cs" />\r
-    <Compile Include="System.IO\FileInfo.cs" />\r
-    <Compile Include="System.IO\FileMode.cs" />\r
-    <Compile Include="System.IO\FileOptions.cs" />\r
-    <Compile Include="System.IO\FileShare.cs" />\r
-    <Compile Include="System.IO\FileStream.cs" />\r
-    <Compile Include="System.IO\FileStreamAsyncResult.cs" />\r
-    <Compile Include="System.IO\FileSystemInfo.cs" />\r
-    <Compile Include="System.IO\HGlobalUnmanagedMemoryStream.cs" />\r
-    <Compile Include="System.IO\LogcatTextWriter.cs" />\r
-    <Compile Include="System.IO\MonoFileType.cs" />\r
-    <Compile Include="System.IO\MonoIO.cs" />\r
-    <Compile Include="System.IO\MonoIOError.cs" />\r
-    <Compile Include="System.IO\MonoIOStat.cs" />\r
-    <Compile Include="System.IO\Path.cs" />\r
-    <Compile Include="System.IO\SearchOption.cs" />\r
-    <Compile Include="System.IO\SearchPattern.cs" />\r
-    <Compile Include="System.IO\SeekOrigin.cs" />\r
-    <Compile Include="System.IO\UnexceptionalStreamReader.cs" />\r
-    <Compile Include="System.IO\UnexceptionalStreamWriter.cs" />\r
-    <Compile Include="System.Reflection.Emit\AssemblyBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\AssemblyBuilderAccess.cs" />\r
-    <Compile Include="System.Reflection.Emit\ConstructorBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\ConstructorOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\CustomAttributeBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\DerivedTypes.cs" />\r
-    <Compile Include="System.Reflection.Emit\DynamicILInfo.cs" />\r
-    <Compile Include="System.Reflection.Emit\DynamicMethod.cs" />\r
-    <Compile Include="System.Reflection.Emit\EnumBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\EventBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\EventOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\EventToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\FieldBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\FieldOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\FieldToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\FlowControl.cs" />\r
-    <Compile Include="System.Reflection.Emit\GenericTypeParameterBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\ILGenerator.cs" />\r
-    <Compile Include="System.Reflection.Emit\Label.cs" />\r
-    <Compile Include="System.Reflection.Emit\LocalBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\MethodBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\MethodOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\MethodRental.cs" />\r
-    <Compile Include="System.Reflection.Emit\MethodToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\ModuleBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\MonoArrayMethod.cs" />\r
-    <Compile Include="System.Reflection.Emit\OpCode.cs" />\r
-    <Compile Include="System.Reflection.Emit\OpCodeNames.cs" />\r
-    <Compile Include="System.Reflection.Emit\OpCodes.cs" />\r
-    <Compile Include="System.Reflection.Emit\OpCodeType.cs" />\r
-    <Compile Include="System.Reflection.Emit\OperandType.cs" />\r
-    <Compile Include="System.Reflection.Emit\PackingSize.cs" />\r
-    <Compile Include="System.Reflection.Emit\ParameterBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\ParameterToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\PEFileKinds.cs" />\r
-    <Compile Include="System.Reflection.Emit\PropertyBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\PropertyOnTypeBuilderInst.cs" />\r
-    <Compile Include="System.Reflection.Emit\PropertyToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\SignatureHelper.cs" />\r
-    <Compile Include="System.Reflection.Emit\SignatureToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\StackBehaviour.cs" />\r
-    <Compile Include="System.Reflection.Emit\StringToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\TypeBuilder.cs" />\r
-    <Compile Include="System.Reflection.Emit\TypeToken.cs" />\r
-    <Compile Include="System.Reflection.Emit\UnmanagedMarshal.cs" />\r
-    <Compile Include="System.Reflection\Assembly.cs" />\r
-    <Compile Include="System.Reflection\AssemblyName.cs" />\r
-    <Compile Include="System.Reflection\ConstructorInfo.cs" />\r
-    <Compile Include="System.Reflection\CustomAttributeData.cs" />\r
-    <Compile Include="System.Reflection\CustomAttributeFormatException.cs" />\r
-    <Compile Include="System.Reflection\CustomAttributeNamedArgument.cs" />\r
-    <Compile Include="System.Reflection\CustomAttributeTypedArgument.cs" />\r
-    <Compile Include="System.Reflection\EventInfo.cs" />\r
-    <Compile Include="System.Reflection\ExceptionHandlingClause.cs" />\r
-    <Compile Include="System.Reflection\ExceptionHandlingClauseOptions.cs" />\r
-    <Compile Include="System.Reflection\FieldInfo.cs" />\r
-    <Compile Include="System.Reflection\ImageFileMachine.cs" />\r
-    <Compile Include="System.Reflection\LocalVariableInfo.cs" />\r
-    <Compile Include="System.Reflection\MethodBody.cs" />\r
-    <Compile Include="System.Reflection\MethodInfo.cs" />\r
-    <Compile Include="System.Reflection\Module.cs" />\r
-    <Compile Include="System.Reflection\ModuleResolveEventHandler.cs" />\r
-    <Compile Include="System.Reflection\MonoAssembly.cs" />\r
-    <Compile Include="System.Reflection\MonoEvent.cs" />\r
-    <Compile Include="System.Reflection\MonoField.cs" />\r
-    <Compile Include="System.Reflection\MonoGenericClass.cs" />\r
-    <Compile Include="System.Reflection\MonoGenericMethod.cs" />\r
-    <Compile Include="System.Reflection\MonoMethod.cs" />\r
-    <Compile Include="System.Reflection\MonoModule.cs" />\r
-    <Compile Include="System.Reflection\MonoParameterInfo.cs" />\r
-    <Compile Include="System.Reflection\MonoProperty.cs" />\r
-    <Compile Include="System.Reflection\ParameterInfo.cs" />\r
-    <Compile Include="System.Reflection\PortableExecutableKinds.cs" />\r
-    <Compile Include="System.Reflection\PropertyInfo.cs" />\r
-    <Compile Include="System.Reflection\ReflectionTypeLoadException.cs" />\r
-    <Compile Include="System.Reflection\StrongNameKeyPair.cs" />\r
-    <Compile Include="System.Reflection\TargetException.cs" />\r
-    <Compile Include="System.Reflection\TargetInvocationException.cs" />\r
-    <Compile Include="System.Reflection\TargetParameterCountException.cs" />\r
-    <Compile Include="System.Resources\Win32Resources.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\ConditionalWeakTable.cs" />\r
-    <Compile Include="System.Runtime.CompilerServices\RuntimeHelpers.cs" />\r
-    <Compile Include="System.Runtime.Hosting\ActivationArguments.cs" />\r
-    <Compile Include="System.Runtime.Hosting\ApplicationActivator.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\DefaultInterfaceAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\DesignerNamespaceResolveEventArgs.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\EventRegistrationToken.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\EventRegistrationTokenTable.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\IActivationFactory.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\InterfaceImplementedInVersionAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\NamespaceResolveEventArgs.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\ReadOnlyArrayAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\ReturnValueNameAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WindowsRuntimeMarshal.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WindowsRuntimeMetadata.cs" />\r
-    <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WriteOnlyArrayAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Activator.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Assembly.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_AssemblyBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_AssemblyName.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Attribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ConstructorBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ConstructorInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_CustomAttributeBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_EnumBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_EventBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_EventInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Exception.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_FieldBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_FieldInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ILGenerator.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_LocalBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MemberInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MethodBase.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MethodBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MethodInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_MethodRental.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Module.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ModuleBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ParameterBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_ParameterInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_PropertyBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_PropertyInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_SignatureHelper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Thread.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_Type.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\_TypeBuilder.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ArrayWithOffset.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\AssemblyRegistrationFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\BIND_OPTS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\BINDPTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\BStrWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CALLCONV.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CallingConvention.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CharSet.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\COMException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ComMemberType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CriticalHandle.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\CurrencyWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DESCKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DispatchWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\DISPPARAMS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ELEMDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ErrorWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\EXCEPINFO.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ExporterEventKind.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ExtensibleClassFactory.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ExternalException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\FILETIME.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\FUNCDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\FUNCFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\FUNCKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\GCHandle.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\GCHandleType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\HandleRef.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ICustomAdapter.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ICustomFactory.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ICustomMarshaler.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IDLDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IDLFLAG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IErrorInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IMPLTYPEFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ImporterEventKind.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\InvalidComObjectException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\InvalidOleVariantTypeException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\INVOKEKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\IRegistrationServices.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ITypeLibConverter.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNameProvider.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNotifySink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ITypeLibImporterNotifySink.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\LayoutKind.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\LIBFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ManagedErrorInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\Marshal.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\MarshalAsAttribute.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\MarshalDirectiveException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\ObjectCreationDelegate.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\PARAMDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\PARAMFLAG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\RegistrationClassContext.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\RegistrationConnectionType.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\RegistrationServices.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\RuntimeEnvironment.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SafeArrayRankMismatchException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SafeArrayTypeMismatchException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SafeBuffer.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SafeHandle.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SEHException.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\STATSTG.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\SYSKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPEATTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPEDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPEFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPEKIND.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TYPELIBATTR.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibConverter.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibExporterFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\TypeLibImporterFlags.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIBindCtx.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIConnectionPoint.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIConnectionPointContainer.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumConnectionPoints.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumMoniker.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumString.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIEnumVARIANT.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIMoniker.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIPersistFile.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIRunningObjectTable.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMIStream.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeComp.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeInfo.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeLib.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\UnknownWrapper.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\VARDESC.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\VARFLAGS.cs" />\r
-    <Compile Include="System.Runtime.InteropServices\VariantWrapper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\ActivationServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\ActivatorLevel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\AppDomainLevelActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\ConstructionLevelActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\ContextLevelActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\IActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\IConstructionCallMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\IConstructionReturnMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\RemoteActivationAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\RemoteActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Activation\UrlAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\AggregateDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelObjectWithProperties.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelSinkWithProperties.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\BaseChannelWithProperties.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelDataStore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ChannelSinkStackEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ClientChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\CrossAppDomainChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelDataStore.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelReceiver.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelReceiverHook.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelSender.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IChannelSinkBase.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientFormatterSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IClientResponseChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ISecurableChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerFormatterSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\IServerResponseChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ITransportHeaders.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ServerChannelSinkStack.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ServerDispatchSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ServerDispatchSinkProvider.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\ServerProcessing.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\SinkProviderData.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Channels\TransportHeaders.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\Context.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\ContextAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\ContextProperty.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\CrossContextChannel.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\CrossContextDelegate.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextProperty.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContextPropertyActivator.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeClientContextSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeDynamicSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeEnvoySink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeObjectSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IContributeServerContextSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IDynamicMessageSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\IDynamicProperty.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Contexts\SynchronizationAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\ClientSponsor.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\ILease.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\ISponsor.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\Lease.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseManager.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\LeaseState.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Lifetime\LifetimeServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ArgInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\AsyncResult.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\CADMessages.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ClientContextTerminatorSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionCall.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionCallDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ConstructionResponse.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\EnvoyTerminatorSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ErrorMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\Header.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\HeaderHandler.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IInternalMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessageCtrl.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMessageSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodCallMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IMethodReturnMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\InternalMessageWrapper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\IRemotingFormatter.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ISerializationRootObject.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MessageSurrogateFilter.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCall.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCallDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodCallMessageWrapper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodResponse.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodReturnDictionary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MethodReturnMessageWrapper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\MonoMethodMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\OneWayAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\RemotingSurrogate.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\RemotingSurrogateSelector.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ReturnMessage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ServerContextTerminatorSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\ServerObjectTerminatorSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Messaging\StackBuilderSink.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\ISoapXsd.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapAnyUri.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapBase64Binary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDate.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDateTime.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDay.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapDuration.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapEntities.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapEntity.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapHelper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapHexBinary.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapId.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapIdref.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapIdrefs.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapLanguage.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapMonth.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapMonthDay.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapName.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNcName.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNegativeInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNmtoken.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNmtokens.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNonNegativeInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNonPositiveInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNormalizedString.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapNotation.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapPositiveInteger.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapQName.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapTime.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapToken.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapYear.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata.W3cXsd2001\SoapYearMonth.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapFieldAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapMethodAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapOption.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapParameterAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\SoapTypeAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Metadata\XmlFieldOrderOption.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Proxies\ProxyAttribute.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Proxies\RealProxy.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Proxies\RemotingProxy.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\EnterpriseServicesHelper.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\ITrackingHandler.cs" />\r
-    <Compile Include="System.Runtime.Remoting.Services\TrackingServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ActivatedClientTypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ActivatedServiceTypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting\CustomErrorsModes.cs" />\r
-    <Compile Include="System.Runtime.Remoting\EnvoyInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\IChannelInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\Identity.cs" />\r
-    <Compile Include="System.Runtime.Remoting\IEnvoyInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\InternalRemotingServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting\IObjectHandle.cs" />\r
-    <Compile Include="System.Runtime.Remoting\IRemotingTypeInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ObjectHandle.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ObjRef.cs" />\r
-    <Compile Include="System.Runtime.Remoting\RemotingConfiguration.cs" />\r
-    <Compile Include="System.Runtime.Remoting\RemotingException.cs" />\r
-    <Compile Include="System.Runtime.Remoting\RemotingServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting\RemotingTimeoutException.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ServerException.cs" />\r
-    <Compile Include="System.Runtime.Remoting\ServerIdentity.cs" />\r
-    <Compile Include="System.Runtime.Remoting\SoapServices.cs" />\r
-    <Compile Include="System.Runtime.Remoting\TypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting\TypeInfo.cs" />\r
-    <Compile Include="System.Runtime.Remoting\WellKnownClientTypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Remoting\WellKnownObjectMode.cs" />\r
-    <Compile Include="System.Runtime.Remoting\WellKnownServiceTypeEntry.cs" />\r
-    <Compile Include="System.Runtime.Versioning\CompatibilitySwitch.cs" />\r
-    <Compile Include="System.Runtime\GCLargeObjectHeapCompactionMode.cs" />\r
-    <Compile Include="System.Runtime\GCLatencyMode.cs" />\r
-    <Compile Include="System.Runtime\GCSettings.cs" />\r
-    <Compile Include="System.Runtime\MemoryFailPoint.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessControlActions.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessControlModification.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessControlSections.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessControlType.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\AccessRule_T.cs" />\r
-    <Compile Include="System.Security.AccessControl\AceEnumerator.cs" />\r
-    <Compile Include="System.Security.AccessControl\AceFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\AceQualifier.cs" />\r
-    <Compile Include="System.Security.AccessControl\AceType.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuditFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuditRule_T.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuthorizationRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\AuthorizationRuleCollection.cs" />\r
-    <Compile Include="System.Security.AccessControl\CommonAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\CommonAcl.cs" />\r
-    <Compile Include="System.Security.AccessControl\CommonObjectSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\CommonSecurityDescriptor.cs" />\r
-    <Compile Include="System.Security.AccessControl\CompoundAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\CompoundAceType.cs" />\r
-    <Compile Include="System.Security.AccessControl\ControlFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\CryptoKeyAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\CryptoKeyAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\CryptoKeyRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\CryptoKeySecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\CustomAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\DirectoryObjectSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\DirectorySecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\DiscretionaryAcl.cs" />\r
-    <Compile Include="System.Security.AccessControl\EventWaitHandleAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\EventWaitHandleAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\EventWaitHandleRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\EventWaitHandleSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSystemAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSystemAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSystemRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\FileSystemSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\GenericAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\GenericAcl.cs" />\r
-    <Compile Include="System.Security.AccessControl\GenericSecurityDescriptor.cs" />\r
-    <Compile Include="System.Security.AccessControl\InheritanceFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\KnownAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\MutexAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\MutexAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\MutexRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\MutexSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\NativeObjectSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectAceFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectSecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\ObjectSecurity_T.cs" />\r
-    <Compile Include="System.Security.AccessControl\PrivilegeNotHeldException.cs" />\r
-    <Compile Include="System.Security.AccessControl\PropagationFlags.cs" />\r
-    <Compile Include="System.Security.AccessControl\QualifiedAce.cs" />\r
-    <Compile Include="System.Security.AccessControl\RawAcl.cs" />\r
-    <Compile Include="System.Security.AccessControl\RawSecurityDescriptor.cs" />\r
-    <Compile Include="System.Security.AccessControl\RegistryAccessRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\RegistryAuditRule.cs" />\r
-    <Compile Include="System.Security.AccessControl\RegistryRights.cs" />\r
-    <Compile Include="System.Security.AccessControl\RegistrySecurity.cs" />\r
-    <Compile Include="System.Security.AccessControl\ResourceType.cs" />\r
-    <Compile Include="System.Security.AccessControl\SddlAccessRight.cs" />\r
-    <Compile Include="System.Security.AccessControl\SecurityInfos.cs" />\r
-    <Compile Include="System.Security.AccessControl\SystemAcl.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate20.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509ContentType.cs" />\r
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509KeyStorageFlags.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoAPITransform.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoConfig.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoConfig.fullaot.cs" />\r
-    <Compile Include="System.Security.Cryptography\CryptoConfig_2_1.cs" />\r
-    <Compile Include="System.Security.Cryptography\CspKeyContainerInfo.cs" />\r
-    <Compile Include="System.Security.Cryptography\DESCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\DSACryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\ICspAsymmetricAlgorithm.cs" />\r
-    <Compile Include="System.Security.Cryptography\KeyNumber.cs" />\r
-    <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\RC2CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSACryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAPKCS1SignatureDeformatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\RSAPKCS1SignatureFormatter.cs" />\r
-    <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Cryptography\TripleDESCryptoServiceProvider.cs" />\r
-    <Compile Include="System.Security.Permissions\CodeAccessSecurityAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\EnvironmentPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\EnvironmentPermissionAccess.cs" />\r
-    <Compile Include="System.Security.Permissions\EnvironmentPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\FileDialogPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\FileDialogPermissionAccess.cs" />\r
-    <Compile Include="System.Security.Permissions\FileDialogPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\FileIOPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\FileIOPermissionAccess.cs" />\r
-    <Compile Include="System.Security.Permissions\FileIOPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\GacIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\GacIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\HostProtectionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\HostProtectionPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\HostProtectionResource.cs" />\r
-    <Compile Include="System.Security.Permissions\IBuiltInPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStorageContainment.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStorageFilePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStorageFilePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStoragePermission.cs" />\r
-    <Compile Include="System.Security.Permissions\IsolatedStoragePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\IUnrestrictedPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntry.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntryCollection.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntryEnumerator.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\KeyContainerPermissionFlags.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionSetAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\PermissionState.cs" />\r
-    <Compile Include="System.Security.Permissions\PrincipalPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\PrincipalPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\PublisherIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\PublisherIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\ReflectionPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\ReflectionPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\ReflectionPermissionFlag.cs" />\r
-    <Compile Include="System.Security.Permissions\RegistryPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\RegistryPermissionAccess.cs" />\r
-    <Compile Include="System.Security.Permissions\RegistryPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityAction.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\SecurityPermissionFlag.cs" />\r
-    <Compile Include="System.Security.Permissions\SiteIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\SiteIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StrongNameIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\StrongNamePermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\StrongNamePublicKeyBlob.cs" />\r
-    <Compile Include="System.Security.Permissions\UIPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\UIPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\UIPermissionClipboard.cs" />\r
-    <Compile Include="System.Security.Permissions\UIPermissionWindow.cs" />\r
-    <Compile Include="System.Security.Permissions\UrlIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\UrlIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Permissions\ZoneIdentityPermission.cs" />\r
-    <Compile Include="System.Security.Permissions\ZoneIdentityPermissionAttribute.cs" />\r
-    <Compile Include="System.Security.Policy\AllMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationDirectory.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationDirectoryMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationSecurityInfo.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationSecurityManager.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationTrust.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationTrustCollection.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationTrustEnumerator.cs" />\r
-    <Compile Include="System.Security.Policy\ApplicationVersionMatch.cs" />\r
-    <Compile Include="System.Security.Policy\CodeConnectAccess.cs" />\r
-    <Compile Include="System.Security.Policy\CodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\DefaultPolicies.cs" />\r
-    <Compile Include="System.Security.Policy\Evidence.cs" />\r
-    <Compile Include="System.Security.Policy\EvidenceBase.cs" />\r
-    <Compile Include="System.Security.Policy\FileCodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\FirstMatchCodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\Gac.cs" />\r
-    <Compile Include="System.Security.Policy\GacMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\Hash.cs" />\r
-    <Compile Include="System.Security.Policy\HashMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\IApplicationTrustManager.cs" />\r
-    <Compile Include="System.Security.Policy\IBuiltInEvidence.cs" />\r
-    <Compile Include="System.Security.Policy\IConstantMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\IIdentityPermissionFactory.cs" />\r
-    <Compile Include="System.Security.Policy\IMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\MembershipConditionHelper.cs" />\r
-    <Compile Include="System.Security.Policy\MonoTrustManager.cs" />\r
-    <Compile Include="System.Security.Policy\NetCodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\PermissionRequestEvidence.cs" />\r
-    <Compile Include="System.Security.Policy\PolicyException.cs" />\r
-    <Compile Include="System.Security.Policy\PolicyLevel.cs" />\r
-    <Compile Include="System.Security.Policy\PolicyStatement.cs" />\r
-    <Compile Include="System.Security.Policy\PolicyStatementAttribute.cs" />\r
-    <Compile Include="System.Security.Policy\Publisher.cs" />\r
-    <Compile Include="System.Security.Policy\PublisherMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\Site.cs" />\r
-    <Compile Include="System.Security.Policy\SiteMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\StrongName.cs" />\r
-    <Compile Include="System.Security.Policy\StrongNameMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\TrustManagerContext.cs" />\r
-    <Compile Include="System.Security.Policy\TrustManagerUIContext.cs" />\r
-    <Compile Include="System.Security.Policy\UnionCodeGroup.cs" />\r
-    <Compile Include="System.Security.Policy\Url.cs" />\r
-    <Compile Include="System.Security.Policy\UrlMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Policy\Zone.cs" />\r
-    <Compile Include="System.Security.Policy\ZoneMembershipCondition.cs" />\r
-    <Compile Include="System.Security.Principal\GenericPrincipal.cs" />\r
-    <Compile Include="System.Security.Principal\IdentityNotMappedException.cs" />\r
-    <Compile Include="System.Security.Principal\IdentityReference.cs" />\r
-    <Compile Include="System.Security.Principal\IdentityReferenceCollection.cs" />\r
-    <Compile Include="System.Security.Principal\IIdentity.cs" />\r
-    <Compile Include="System.Security.Principal\IPrincipal.cs" />\r
-    <Compile Include="System.Security.Principal\NTAccount.cs" />\r
-    <Compile Include="System.Security.Principal\PrincipalPolicy.cs" />\r
-    <Compile Include="System.Security.Principal\SecurityIdentifier.cs" />\r
-    <Compile Include="System.Security.Principal\TokenAccessLevels.cs" />\r
-    <Compile Include="System.Security.Principal\TokenImpersonationLevel.cs" />\r
-    <Compile Include="System.Security.Principal\WellKnownAccount.cs" />\r
-    <Compile Include="System.Security.Principal\WellKnownSidType.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsAccountType.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsBuiltInRole.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsIdentity.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsImpersonationContext.cs" />\r
-    <Compile Include="System.Security.Principal\WindowsPrincipal.cs" />\r
-    <Compile Include="System.Security\CodeAccessPermission.cs" />\r
-    <Compile Include="System.Security\HostProtectionException.cs" />\r
-    <Compile Include="System.Security\HostSecurityManager.cs" />\r
-    <Compile Include="System.Security\HostSecurityManagerFlags.cs" />\r
-    <Compile Include="System.Security\IEvidenceFactory.cs" />\r
-    <Compile Include="System.Security\IPermission.cs" />\r
-    <Compile Include="System.Security\ISecurityEncodable.cs" />\r
-    <Compile Include="System.Security\ISecurityPolicyEncodable.cs" />\r
-    <Compile Include="System.Security\IStackWalk.cs" />\r
-    <Compile Include="System.Security\NamedPermissionSet.cs" />\r
-    <Compile Include="System.Security\PermissionBuilder.cs" />\r
-    <Compile Include="System.Security\PermissionSet.cs" />\r
-    <Compile Include="System.Security\PolicyLevelType.cs" />\r
-    <Compile Include="System.Security\SecureString.cs" />\r
-    <Compile Include="System.Security\SecurityElement.cs" />\r
-    <Compile Include="System.Security\SecurityException.cs" />\r
-    <Compile Include="System.Security\SecurityFrame.cs" />\r
-    <Compile Include="System.Security\SecurityManager.cs" />\r
-    <Compile Include="System.Security\SecurityManager_mobile.cs" />\r
-    <Compile Include="System.Security\SecurityState.cs" />\r
-    <Compile Include="System.Security\SecurityZone.cs" />\r
-    <Compile Include="System.Security\VerificationException.cs" />\r
-    <Compile Include="System.Security\XmlSyntaxException.cs" />\r
-    <Compile Include="System.Text\EncodingHelper.cs" />\r
-    <Compile Include="System.Text\Latin1Encoding.cs" />\r
-    <Compile Include="System.Text\NormalizationForm.cs" />\r
-    <Compile Include="System.Threading.Tasks\DecoupledTask.cs" />\r
-    <Compile Include="System.Threading\CompressedStack.cs" />\r
-    <Compile Include="System.Threading\EventWaitHandle.cs" />\r
-    <Compile Include="System.Threading\HostExecutionContext.cs" />\r
-    <Compile Include="System.Threading\HostExecutionContextManager.cs" />\r
-    <Compile Include="System.Threading\Interlocked.cs" />\r
-    <Compile Include="System.Threading\LockCookie.cs" />\r
-    <Compile Include="System.Threading\LockQueue.cs" />\r
-    <Compile Include="System.Threading\Monitor.cs" />\r
-    <Compile Include="System.Threading\Mutex.cs" />\r
-    <Compile Include="System.Threading\NativeEventCalls.cs" />\r
-    <Compile Include="System.Threading\NativeOverlapped.cs" />\r
-    <Compile Include="System.Threading\Overlapped.cs" />\r
-    <Compile Include="System.Threading\ReaderWriterLock.cs" />\r
-    <Compile Include="System.Threading\RegisteredWaitHandle.cs" />\r
-    <Compile Include="System.Threading\Thread.cs" />\r
-    <Compile Include="System.Threading\ThreadPool.cs" />\r
-    <Compile Include="System.Threading\Timer.cs" />\r
-    <Compile Include="System.Threading\TimerCallback.cs" />\r
-    <Compile Include="System.Threading\Volatile.cs" />\r
-    <Compile Include="System.Threading\WaitHandle.cs" />\r
-    <Compile Include="System\__ComObject.cs" />\r
-    <Compile Include="System\ActivationContext.cs" />\r
-    <Compile Include="System\AndroidPlatform.cs" />\r
-    <Compile Include="System\AppDomain.cs" />\r
-    <Compile Include="System\AppDomainInitializer.cs" />\r
-    <Compile Include="System\AppDomainManager.cs" />\r
-    <Compile Include="System\AppDomainSetup.cs" />\r
-    <Compile Include="System\ApplicationIdentity.cs" />\r
-    <Compile Include="System\ArgIterator.cs" />\r
-    <Compile Include="System\Array.cs" />\r
-    <Compile Include="System\AssemblyLoadEventArgs.cs" />\r
-    <Compile Include="System\AssemblyLoadEventHandler.cs" />\r
-    <Compile Include="System\Console.cs" />\r
-    <Compile Include="System\Console.iOS.cs" />\r
-    <Compile Include="System\ConsoleDriver.cs" />\r
-    <Compile Include="System\ControlCharacters.cs" />\r
-    <Compile Include="System\CrossAppDomainDelegate.cs" />\r
-    <Compile Include="System\CStreamReader.cs" />\r
-    <Compile Include="System\CStreamWriter.cs" />\r
-    <Compile Include="System\Delegate.cs" />\r
-    <Compile Include="System\DelegateSerializationHolder.cs" />\r
-    <Compile Include="System\DomainManagerInitializationFlags.cs" />\r
-    <Compile Include="System\EmptyArray.cs" />\r
-    <Compile Include="System\Environment.cs" />\r
-    <Compile Include="System\EnvironmentVariableTarget.cs" />\r
-    <Compile Include="System\Exception.cs" />\r
-    <Compile Include="System\GC.cs" />\r
-    <Compile Include="System\GCCollectionMode.cs" />\r
-    <Compile Include="System\GCNotificationStatus.cs" />\r
-    <Compile Include="System\Guid.cs" />\r
-    <Compile Include="System\Guid.MonoTouch.cs" />\r
-    <Compile Include="System\IConsoleDriver.cs" />\r
-    <Compile Include="System\IntPtr.cs" />\r
-    <Compile Include="System\KnownTerminals.cs" />\r
-    <Compile Include="System\MarshalByRefObject.cs" />\r
-    <Compile Include="System\Math.cs" />\r
-    <Compile Include="System\ModuleHandle.cs" />\r
-    <Compile Include="System\MonoAsyncCall.cs" />\r
-    <Compile Include="System\MonoCQItem.cs" />\r
-    <Compile Include="System\MonoCustomAttrs.cs" />\r
-    <Compile Include="System\MonoListItem.cs" />\r
-    <Compile Include="System\MonoTouchAOTHelper.cs" />\r
-    <Compile Include="System\MonoType.cs" />\r
-    <Compile Include="System\MulticastDelegate.cs" />\r
-    <Compile Include="System\Nullable.cs" />\r
-    <Compile Include="System\NullConsoleDriver.cs" />\r
-    <Compile Include="System\NumberFormatter.cs" />\r
-    <Compile Include="System\Object.cs" />\r
-    <Compile Include="System\OperatingSystem.cs" />\r
-    <Compile Include="System\PlatformID.cs" />\r
-    <Compile Include="System\ResolveEventArgs.cs" />\r
-    <Compile Include="System\ResolveEventHandler.cs" />\r
-    <Compile Include="System\RuntimeArgumentHandle.cs" />\r
-    <Compile Include="System\RuntimeFieldHandle.cs" />\r
-    <Compile Include="System\RuntimeMethodHandle.cs" />\r
-    <Compile Include="System\RuntimeTypeHandle.cs" />\r
-    <Compile Include="System\StringComparison.cs" />\r
-    <Compile Include="System\TermInfoBooleans.cs" />\r
-    <Compile Include="System\TermInfoDriver.cs" />\r
-    <Compile Include="System\TermInfoNumbers.cs" />\r
-    <Compile Include="System\TermInfoReader.cs" />\r
-    <Compile Include="System\TermInfoStrings.cs" />\r
-    <Compile Include="System\TimeZone.cs" />\r
-    <Compile Include="System\TimeZoneInfo.Android.cs" />\r
-    <Compile Include="System\TimeZoneInfo.cs" />\r
-    <Compile Include="System\TimeZoneInfo.MonoTouch.cs" />\r
-    <Compile Include="System\TimeZoneInfo.Serialization.cs" />\r
-    <Compile Include="System\TypeCode.cs" />\r
-    <Compile Include="System\TypeIdentifier.cs" />\r
-    <Compile Include="System\TypeSpec.cs" />\r
-    <Compile Include="System\UIntPtr.cs" />\r
-    <Compile Include="System\ValueType.cs" />\r
-    <Compile Include="System\Variant.cs" />\r
-    <Compile Include="System\Void.cs" />\r
-    <Compile Include="System\WeakReference.cs" />\r
-    <Compile Include="System\WeakReference_T.cs" />\r
-    <Compile Include="System\WindowsConsoleDriver.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="resources/charinfo.nlp">\r
-      <LogicalName>charinfo.nlp</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.core.bin">\r
-      <LogicalName>collation.core.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.tailoring.bin">\r
-      <LogicalName>collation.tailoring.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkCHS.bin">\r
-      <LogicalName>collation.cjkCHS.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkCHT.bin">\r
-      <LogicalName>collation.cjkCHT.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkJA.bin">\r
-      <LogicalName>collation.cjkJA.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkKO.bin">\r
-      <LogicalName>collation.cjkKO.bin</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="resources/collation.cjkKOlv2.bin">\r
-      <LogicalName>collation.cjkKOlv2.bin</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/corlib/corlib-net_4_x.csproj b/mcs/class/corlib/corlib-net_4_x.csproj
index 201dd817e1d9202b754178e416b79106ca3099af..ddb4b98b3e0b48579b2ce22d84dcbfda99898883 100644 (file)
--- a/mcs/class/corlib/corlib-net_4_x.csproj
+++ b/mcs/class/corlib/corlib-net_4_x.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>\r
     <NoWarn>612,618,1635,1699</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>TRACE;INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY</DefineConstants>\r
+    <DefineConstants>TRACE;INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -33,7 +33,7 @@
     <DebugType>pdbonly</DebugType>\r
     <NoWarn>612,618,1635,1699</NoWarn>\r
     <Optimize>true</Optimize>\r
-    <DefineConstants>INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY</DefineConstants>\r
+    <DefineConstants>INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -184,6 +184,7 @@
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\calendaralgorithmtype.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\calendardata.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\calendarweekrule.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\CalendricalCalculationsHelper.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\charunicodeinfo.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\chineselunisolarcalendar.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\globalization\compareinfo.cs" />\r
@@ -294,6 +295,7 @@
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\outofmemoryexception.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\overflowexception.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\paramarrayattribute.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\mscorlib\system\paramsarray.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\platformnotsupportedexception.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\progress.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\random.cs" />\r
@@ -498,6 +500,7 @@
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\binarycompatibility.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\componentguaranteesattribute.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\multitargetinghelpers.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\NonVersionableAttribute.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\resourceattributes.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\targetframeworkattribute.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\runtime\versioning\targetframeworkid.cs" />\r
@@ -526,6 +529,7 @@
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\dsasignaturedeformatter.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\dsasignatureformatter.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hashalgorithm.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\HashAlgorithmName.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmac.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmacmd5.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\hmacripemd160.cs" />\r
@@ -550,10 +554,14 @@
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\ripemd160.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\ripemd160managed.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsa.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\RSAEncryptionPadding.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\RSAEncryptionPaddingMode.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsaoaepkeyexchangedeformatter.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsaoaepkeyexchangeformatter.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsapkcs1keyexchangedeformatter.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\rsapkcs1keyexchangeformatter.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\RSASignaturePadding.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\RSASignaturePaddingMode.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha1.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha1managed.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\security\cryptography\sha256.cs" />\r
@@ -627,6 +635,7 @@
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\SpinWait.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\synchronizationcontext.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\synchronizationlockexception.cs" />\r
+    <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\AsyncCausalityTracer.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\BeginEndAwaitableAdapter.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\ConcurrentExclusiveSchedulerPair.cs" />\r
     <Compile Include="..\..\..\external\referencesource\mscorlib\system\threading\Tasks\Future.cs" />\r
@@ -765,6 +774,7 @@
     <Compile Include="Mono\DataConverter.cs" />\r
     <Compile Include="Mono\Runtime.cs" />\r
     <Compile Include="ReferenceSources\__ConsoleStream.cs" />\r
+    <Compile Include="ReferenceSources\AppContextSwitches.cs" />\r
     <Compile Include="ReferenceSources\AppDomain.cs" />\r
     <Compile Include="ReferenceSources\Array.cs" />\r
     <Compile Include="ReferenceSources\BCLDebug.cs" />\r

diff --git a/mcs/class/corlib/corlib-tests-net_4_5.csproj b/mcs/class/corlib/corlib-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 0757959..0000000
--- a/mcs/class/corlib/corlib-tests-net_4_5.csproj
+++ /dev/null
@@ -1,588 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{DCF26FDD-81D3-463B-B80D-3111DDFFE2D5}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>612,618,1699,168,219,618,672</NoWarn>\r
-    <OutputPath>bin\Debug\corlib-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>corlib_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>612,618,1699,168,219,618,672</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;INSIDE_CORLIB;LIBC;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>612,618,1699,168,219,618,672</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>INSIDE_CORLIB;LIBC;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Mono\DataConverter.cs" />\r
-    <Compile Include="Test\Microsoft.Win32\RegistryKeyTest.cs" />\r
-    <Compile Include="Test\Mono\DataConvertTest.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\CollectionStressTestHelper.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ConcurrentDictionaryTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ConcurrentQueueTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ConcurrentStackTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ParallelConcurrentQueueTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\ParallelConcurrentStackTests.cs" />\r
-    <Compile Include="Test\System.Collections.Concurrent\PartitionerTests.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\ComparerTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\DictionaryTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\EqualityComparerTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\IListTest.cs" />\r
-    <Compile Include="Test\System.Collections.Generic\ListTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\CollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\KeyedCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections.ObjectModel\ReadOnlyCollectionTest.cs" />\r
-    <Compile Include="Test\System.Collections\ArrayListTest.cs" />\r
-    <Compile Include="Test\System.Collections\BitArrayTest.cs" />\r
-    <Compile Include="Test\System.Collections\CaseInsensitiveComparerTest.cs" />\r
-    <Compile Include="Test\System.Collections\CaseInsensitiveHashCodeProviderTest.cs" />\r
-    <Compile Include="Test\System.Collections\CollectionBaseTest.cs" />\r
-    <Compile Include="Test\System.Collections\ComparerTest.cs" />\r
-    <Compile Include="Test\System.Collections\DictionaryBaseTest.cs" />\r
-    <Compile Include="Test\System.Collections\DictionaryEntryTest.cs" />\r
-    <Compile Include="Test\System.Collections\HashtableTest.cs" />\r
-    <Compile Include="Test\System.Collections\NewArrayListTest.cs" />\r
-    <Compile Include="Test\System.Collections\QueueTest.cs" />\r
-    <Compile Include="Test\System.Collections\ReadOnlyCollectionBaseTest.cs" />\r
-    <Compile Include="Test\System.Collections\SortedListTest.cs" />\r
-    <Compile Include="Test\System.Collections\StackTest.cs" />\r
-    <Compile Include="Test\System.Collections\StructuralComparisonsTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractAssertTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractAssumeTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractCollectionMethodsTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractHelperTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractMarkerMethodsTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\ContractMustUseRewriterTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\Helpers\RunAgainstReferenceAttribute.cs" />\r
-    <Compile Include="Test\System.Diagnostics.Contracts\Helpers\TestContractBase.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DebuggerDisplayAttributeTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\DebuggerTypeProxyAttribute.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StackFrameCas.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StackFrameTest.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StackTraceCas.cs" />\r
-    <Compile Include="Test\System.Diagnostics\StackTraceTest.cs" />\r
-    <Compile Include="Test\System.Globalization\CalendarTest.cs" />\r
-    <Compile Include="Test\System.Globalization\CompareInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\CultureInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\DateTimeFormatInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\DaylightTimeTest.cs" />\r
-    <Compile Include="Test\System.Globalization\EastAsianLunisolarCalendarTest.cs" />\r
-    <Compile Include="Test\System.Globalization\IdnMappingTest.cs" />\r
-    <Compile Include="Test\System.Globalization\NumberFormatInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\RegionInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\SortKeyTest.cs" />\r
-    <Compile Include="Test\System.Globalization\StringInfoTest.cs" />\r
-    <Compile Include="Test\System.Globalization\TextInfoTest.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageFileCas.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageFileStreamCas.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageFileStreamTest.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageFileTest.cs" />\r
-    <Compile Include="Test\System.IO.IsolatedStorage\IsolatedStorageTest.cs" />\r
-    <Compile Include="Test\System.IO\BinaryReaderTest.cs" />\r
-    <Compile Include="Test\System.IO\BinaryWriterTest.cs" />\r
-    <Compile Include="Test\System.IO\BufferedStreamTest.cs" />\r
-    <Compile Include="Test\System.IO\DirectoryCas.cs" />\r
-    <Compile Include="Test\System.IO\DirectoryInfoTest.cs" />\r
-    <Compile Include="Test\System.IO\DirectoryTest.cs" />\r
-    <Compile Include="Test\System.IO\FileInfoTest.cs" />\r
-    <Compile Include="Test\System.IO\FileLoadExceptionCas.cs" />\r
-    <Compile Include="Test\System.IO\FileNotFoundExceptionCas.cs" />\r
-    <Compile Include="Test\System.IO\FileNotFoundExceptionTest.cs" />\r
-    <Compile Include="Test\System.IO\FileStreamCas.cs" />\r
-    <Compile Include="Test\System.IO\FileStreamTest.cs" />\r
-    <Compile Include="Test\System.IO\FileSystemInfoTest.cs" />\r
-    <Compile Include="Test\System.IO\FileTest.cs" />\r
-    <Compile Include="Test\System.IO\MemoryStreamTest.cs" />\r
-    <Compile Include="Test\System.IO\PathCas.cs" />\r
-    <Compile Include="Test\System.IO\PathTest.cs" />\r
-    <Compile Include="Test\System.IO\StreamCas.cs" />\r
-    <Compile Include="Test\System.IO\StreamHelperTest.cs" />\r
-    <Compile Include="Test\System.IO\StreamReaderTest.cs" />\r
-    <Compile Include="Test\System.IO\StreamTest.cs" />\r
-    <Compile Include="Test\System.IO\StreamWriterTest.cs" />\r
-    <Compile Include="Test\System.IO\StringReaderTest.cs" />\r
-    <Compile Include="Test\System.IO\StringWriterTest.cs" />\r
-    <Compile Include="Test\System.IO\TextReaderTest.cs" />\r
-    <Compile Include="Test\System.IO\TextWriterTest.cs" />\r
-    <Compile Include="Test\System.IO\UnmanagedMemoryStreamTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\AssemblyBuilderAccessTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\AssemblyBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ConstructorBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ConstructorOnTypeBuilderInstTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\CustomAttributeBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\DerivedTypesTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\DynamicILInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\DynamicMethodTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\EnumBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\EventBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\FieldBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\GenericTypeParameterBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ILGeneratorTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\MethodBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\MethodOnTypeBuilderInstTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\MethodRentalCas.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\MethodRentalTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ModuleBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\ParameterBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\PropertyBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\SignatureHelperTest.cs" />\r
-    <Compile Include="Test\System.Reflection.Emit\TypeBuilderTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyAlgorithmIdAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyCas.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyConfigurationAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyCopyrightAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyCultureAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyDelaySignAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyDescriptionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyFileVersionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyInformationalVersionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyNameCas.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyNameTest.cs" />\r
-    <Compile Include="Test\System.Reflection\AssemblyTest.cs" />\r
-    <Compile Include="Test\System.Reflection\BinderTests.cs" />\r
-    <Compile Include="Test\System.Reflection\ConstructorInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\CustomAttributeDataTest.cs" />\r
-    <Compile Include="Test\System.Reflection\EventInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\FieldInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\IntrospectionExtensionsTest.cs" />\r
-    <Compile Include="Test\System.Reflection\MethodBaseTest.cs" />\r
-    <Compile Include="Test\System.Reflection\MethodInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\ModuleCas.cs" />\r
-    <Compile Include="Test\System.Reflection\ModuleTest.cs" />\r
-    <Compile Include="Test\System.Reflection\MonoGenericClassTest.cs" />\r
-    <Compile Include="Test\System.Reflection\ParameterInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\PropertyInfoTest.cs" />\r
-    <Compile Include="Test\System.Reflection\ReflectedTypeTest.cs" />\r
-    <Compile Include="Test\System.Reflection\StrongNameKeyPairCas.cs" />\r
-    <Compile Include="Test\System.Reflection\StrongNameKeyPairTest.cs" />\r
-    <Compile Include="Test\System.Reflection\TypeDelegatorTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceManagerTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceReaderCas.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceReaderTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceSetCas.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceSetTest.cs" />\r
-    <Compile Include="Test\System.Resources\ResourceWriterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\AsyncVoidMethodBuilderTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\ConditionalWeakTableTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\InternalsVisibleToAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\RuntimeHelpersTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\RuntimeWrappedExceptionCas.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\RuntimeWrappedExceptionTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\TaskAwaiterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\TaskAwaiterTest_T.cs" />\r
-    <Compile Include="Test\System.Runtime.CompilerServices\YieldAwaitableTest.cs" />\r
-    <Compile Include="Test\System.Runtime.ExceptionServices\ExceptionDispatchInfoTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\ExternalExceptionTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\GCHandleTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\MarshalTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\RuntimeEnvironmentCas.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\RuntimeEnvironmentTest.cs" />\r
-    <Compile Include="Test\System.Runtime.InteropServices\SafeHandleTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Channels\ChannelServicesTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Contexts\SynchronizationAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Messaging\CallContextTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting.Metadata.W3cXsd2001\SoapHexBinaryTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting\ContextTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting\SoapServicesTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Remoting\SynchronizationAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization.Formatters.Binary\BinaryFormatterCas.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization.Formatters.Binary\BinaryFormatterTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\ArraySerializationTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\FormatterServicesTests.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\ObjectIDGeneratorTests.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\ObjectManagerTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationBinderTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationCallbackTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationInfoTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Serialization\SerializationTest2.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\ResourceConsumptionAttributeCas.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\ResourceConsumptionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\ResourceExposureAttributeCas.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\ResourceExposureAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\TargetFrameworkAttributeTest.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\VersioningHelperCas.cs" />\r
-    <Compile Include="Test\System.Runtime.Versioning\VersioningHelperTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\AuthorizationRuleTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CommonAceTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CommonAclTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CommonObjectSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CommonSecurityDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\CryptoKeyAccessRuleTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\DirectoryObjectSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\DirectorySecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\DiscretionaryAclTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\EventWaitHandleSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\FileSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\MutexAccessRuleTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\MutexSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\ObjectAceTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\ObjectSecurity_TTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\ObjectSecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\RawAclTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\RawSecurityDescriptorTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\RegistrySecurityTest.cs" />\r
-    <Compile Include="Test\System.Security.AccessControl\SystemAclTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CapiTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CertificateCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509CertificateTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography.X509Certificates\X509SpcTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AesCfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AllTests2.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\AsymmetricAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CipherModeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptoAPITransformCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptoConfigCas.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptoConfigTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CryptoStreamTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\CspProviderFlagsTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DesCfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DESCryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DESTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DSACryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DSASignatureDeformatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DSASignatureFormatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\DSATest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\FromBase64Transform.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HashAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACMD5Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACRIPEMD160Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACSHA1Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACSHA256Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACSHA384Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\HMACSHA512Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\KeyedHashAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\MACTripleDESTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\MD5Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\PaddingModeTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\PasswordDeriveBytesTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\PKCS1MaskGenerationMethodTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RandomNumberGeneratorTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\Rc2CfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RC2CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RC2Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\Rfc2898DeriveBytesTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RijndaelCfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RijndaelManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RijndaelTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RIPEMD160ManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RIPEMD160Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RNGCryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSACryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAOAEPKeyExchangeDeformatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAOAEPKeyExchangeFormatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAPKCS1KeyExchangeDeformatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAPKCS1KeyExchangeFormatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAPKCS1SignatureDeformatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSAPKCS1SignatureFormatterTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\RSATest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA1CryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA1Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA256ManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA256Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA384ManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA384Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA512ManagedTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SHA512Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SignatureDescriptionTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SymmetricAlgorithm2Test.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SymmetricAlgorithmTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\SymmetricAlgorithmTransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\ToBase64TransformTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\TripleDesCfbTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\TripleDESCryptoServiceProviderTest.cs" />\r
-    <Compile Include="Test\System.Security.Cryptography\TripleDESTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\CodeAccessSecurityAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\EnvironmentPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\EnvironmentPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\FileDialogPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\FileDialogPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\FileIOPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\FileIOPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\GacIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\GacIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\HostProtectionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\IBuiltInPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\IsolatedStorageFilePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\IsolatedStorageFilePermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\IsolatedStoragePermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\KeyContainerPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PermissionSetAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PrincipalPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PrincipalPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PublisherIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\PublisherIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ReflectionPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ReflectionPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\RegistryPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\RegistryPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\SecurityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\SecurityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\SiteIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\SiteIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StrongNameIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StrongNameIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\StrongNamePublicKeyBlobTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\UIPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\UIPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\UrlIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\UrlIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ZoneIdentityPermissionAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security.Permissions\ZoneIdentityPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\AllMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationDirectoryMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationDirectoryTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationSecurityManagerCas.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationSecurityManagerTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ApplicationTrustTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\CodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\EvidenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\FileCodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\FirstMatchCodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\GacMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\GacTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\HashMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\HashTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\IBuiltInEvidenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\NetCodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PermissionRequestEvidenceTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PolicyLevelTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PolicyStatementTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PublisherMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\PublisherTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\SiteMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\SiteTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\StrongNameMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\StrongNameTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\UnionCodeGroupTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\UrlMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\UrlTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ZoneMembershipConditionTest.cs" />\r
-    <Compile Include="Test\System.Security.Policy\ZoneTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\GenericIdentityTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\GenericPrincipalTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\NTAccountTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\SecurityIdentifierTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\WindowsIdentityTest.cs" />\r
-    <Compile Include="Test\System.Security.Principal\WindowsPrincipalTest.cs" />\r
-    <Compile Include="Test\System.Security\CodeAccessPermissionCas.cs" />\r
-    <Compile Include="Test\System.Security\CodeAccessPermissionTest.cs" />\r
-    <Compile Include="Test\System.Security\HostSecurityManagerTest.cs" />\r
-    <Compile Include="Test\System.Security\NamedPermissionSetTest.cs" />\r
-    <Compile Include="Test\System.Security\PermissionSetCas.cs" />\r
-    <Compile Include="Test\System.Security\PermissionSetTest.cs" />\r
-    <Compile Include="Test\System.Security\SecureStringCas.cs" />\r
-    <Compile Include="Test\System.Security\SecureStringTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityContextCas.cs" />\r
-    <Compile Include="Test\System.Security\SecurityContextTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityCriticalAttributeTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityElementTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityExceptionCas.cs" />\r
-    <Compile Include="Test\System.Security\SecurityExceptionTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityManagerCas.cs" />\r
-    <Compile Include="Test\System.Security\SecurityManagerTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityStateTest.cs" />\r
-    <Compile Include="Test\System.Security\SecurityTransparentAttributeTest.cs" />\r
-    <Compile Include="Test\System.Text\ASCIIEncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\DecoderReplacementFallbackBufferTest.cs" />\r
-    <Compile Include="Test\System.Text\DecoderReplacementFallbackTest.cs" />\r
-    <Compile Include="Test\System.Text\DecoderTest.cs" />\r
-    <Compile Include="Test\System.Text\EncoderReplacementFallbackBufferTest.cs" />\r
-    <Compile Include="Test\System.Text\EncoderReplacementFallbackTest.cs" />\r
-    <Compile Include="Test\System.Text\EncoderTest.cs" />\r
-    <Compile Include="Test\System.Text\EncodingInfoTest.cs" />\r
-    <Compile Include="Test\System.Text\EncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\StringBuilderTest.cs" />\r
-    <Compile Include="Test\System.Text\TestEncoding.cs" />\r
-    <Compile Include="Test\System.Text\UnicodeEncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\UTF32EncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\UTF7EncodingTest.cs" />\r
-    <Compile Include="Test\System.Text\UTF8EncodingTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\ConcurrentExclusiveSchedulerPairTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\ParallelTestHelper.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\ParallelTests.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\Task_T_Test.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskCompletionSourceTests.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskFactoryTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskFactoryTest_T.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskSchedulerTest.cs" />\r
-    <Compile Include="Test\System.Threading.Tasks\TaskTest.cs" />\r
-    <Compile Include="Test\System.Threading\AutoResetEventTest.cs" />\r
-    <Compile Include="Test\System.Threading\CancellationTokenSourceTest.cs" />\r
-    <Compile Include="Test\System.Threading\CancellationTokenTests.cs" />\r
-    <Compile Include="Test\System.Threading\CompressedStackCas.cs" />\r
-    <Compile Include="Test\System.Threading\CompressedStackTest.cs" />\r
-    <Compile Include="Test\System.Threading\CountdownEventTests.cs" />\r
-    <Compile Include="Test\System.Threading\EventWaitHandleTest.cs" />\r
-    <Compile Include="Test\System.Threading\ExecutionContextCas.cs" />\r
-    <Compile Include="Test\System.Threading\ExecutionContextTest.cs" />\r
-    <Compile Include="Test\System.Threading\InterlockedTest.cs" />\r
-    <Compile Include="Test\System.Threading\LazyInitializerTest.cs" />\r
-    <Compile Include="Test\System.Threading\ManualResetEventSlimTests.cs" />\r
-    <Compile Include="Test\System.Threading\MonitorTest.cs" />\r
-    <Compile Include="Test\System.Threading\MutexCas.cs" />\r
-    <Compile Include="Test\System.Threading\MutexTest.cs" />\r
-    <Compile Include="Test\System.Threading\ReaderWriterLockTest.cs" />\r
-    <Compile Include="Test\System.Threading\SemaphoreSlimTests.cs" />\r
-    <Compile Include="Test\System.Threading\SpinLockTests.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadCas.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadLocalTests.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadPoolTest.cs" />\r
-    <Compile Include="Test\System.Threading\ThreadTest.cs" />\r
-    <Compile Include="Test\System.Threading\TimerTest.cs" />\r
-    <Compile Include="Test\System.Threading\VolatileTest.cs" />\r
-    <Compile Include="Test\System.Threading\WaitHandleCas.cs" />\r
-    <Compile Include="Test\System.Threading\WaitHandleTest.cs" />\r
-    <Compile Include="Test\System\ActivatorCas.cs" />\r
-    <Compile Include="Test\System\ActivatorTest.cs" />\r
-    <Compile Include="Test\System\AggregateExceptionTests.cs" />\r
-    <Compile Include="Test\System\AppDomainCas.cs" />\r
-    <Compile Include="Test\System\AppDomainManagerTest.cs" />\r
-    <Compile Include="Test\System\AppDomainSetupTest.cs" />\r
-    <Compile Include="Test\System\AppDomainTest.cs" />\r
-    <Compile Include="Test\System\ApplicationIdentityTest.cs" />\r
-    <Compile Include="Test\System\ApplicationIdTest.cs" />\r
-    <Compile Include="Test\System\ArgumentExceptionTest.cs" />\r
-    <Compile Include="Test\System\ArraySegmentTest.cs" />\r
-    <Compile Include="Test\System\ArraySortArgChecks.cs" />\r
-    <Compile Include="Test\System\ArrayTest.cs" />\r
-    <Compile Include="Test\System\AttributeTest.cs" />\r
-    <Compile Include="Test\System\BadImageFormatExceptionCas.cs" />\r
-    <Compile Include="Test\System\BadImageFormatExceptionTest.cs" />\r
-    <Compile Include="Test\System\BitConverterTest.cs" />\r
-    <Compile Include="Test\System\BooleanTest.cs" />\r
-    <Compile Include="Test\System\BufferTest.cs" />\r
-    <Compile Include="Test\System\ByteTest.cs" />\r
-    <Compile Include="Test\System\CharCategoryTest.cs" />\r
-    <Compile Include="Test\System\CharEnumeratorTest.cs" />\r
-    <Compile Include="Test\System\CharTest.cs" />\r
-    <Compile Include="Test\System\ConsoleCas.cs" />\r
-    <Compile Include="Test\System\ConsoleTest.cs" />\r
-    <Compile Include="Test\System\ConvertTest.cs" />\r
-    <Compile Include="Test\System\DateTimeOffsetTest.cs" />\r
-    <Compile Include="Test\System\DateTimeTest.cs" />\r
-    <Compile Include="Test\System\DecimalFormatterTest.cs" />\r
-    <Compile Include="Test\System\DecimalTest.cs" />\r
-    <Compile Include="Test\System\DecimalTest2.cs" />\r
-    <Compile Include="Test\System\DelegateTest.cs" />\r
-    <Compile Include="Test\System\DoubleFormatterTest.cs" />\r
-    <Compile Include="Test\System\DoubleTest.cs" />\r
-    <Compile Include="Test\System\EnumTest.cs" />\r
-    <Compile Include="Test\System\EnvironmentCas.cs" />\r
-    <Compile Include="Test\System\EnvironmentTest.cs" />\r
-    <Compile Include="Test\System\ExceptionCas.cs" />\r
-    <Compile Include="Test\System\ExceptionTest.cs" />\r
-    <Compile Include="Test\System\FloatingPointFormatterTest.cs" />\r
-    <Compile Include="Test\System\GuidTest.cs" />\r
-    <Compile Include="Test\System\Int16Test.cs" />\r
-    <Compile Include="Test\System\Int32Test.cs" />\r
-    <Compile Include="Test\System\Int64Test.cs" />\r
-    <Compile Include="Test\System\IntegerFormatterTest.cs" />\r
-    <Compile Include="Test\System\IntegerTryParse.cs" />\r
-    <Compile Include="Test\System\IntPtrTest.cs" />\r
-    <Compile Include="Test\System\LazyTest.cs" />\r
-    <Compile Include="Test\System\MarshalByRefObjectCas.cs" />\r
-    <Compile Include="Test\System\MathTest.cs" />\r
-    <Compile Include="Test\System\ModuleHandleTest.cs" />\r
-    <Compile Include="Test\System\MulticastDelegate.cs" />\r
-    <Compile Include="Test\System\NullableTest.cs" />\r
-    <Compile Include="Test\System\NumberFormatterTest.cs" />\r
-    <Compile Include="Test\System\ObjectTest.cs" />\r
-    <Compile Include="Test\System\ObsoleteAttributeTest.cs" />\r
-    <Compile Include="Test\System\RandomTest.cs" />\r
-    <Compile Include="Test\System\ResolveEventArgsTest.cs" />\r
-    <Compile Include="Test\System\RuntimeFieldHandleTest.cs" />\r
-    <Compile Include="Test\System\RuntimeMethodHandleCas.cs" />\r
-    <Compile Include="Test\System\RuntimeMethodHandleTest.cs" />\r
-    <Compile Include="Test\System\RuntimeTypeHandleTest.cs" />\r
-    <Compile Include="Test\System\SByteTest.cs" />\r
-    <Compile Include="Test\System\SingleFormatterTest.cs" />\r
-    <Compile Include="Test\System\SingleTest.cs" />\r
-    <Compile Include="Test\System\StringComparerTest.cs" />\r
-    <Compile Include="Test\System\StringTest.cs" />\r
-    <Compile Include="Test\System\TimeSpanTest.cs" />\r
-    <Compile Include="Test\System\TimeZoneTest.cs" />\r
-    <Compile Include="Test\System\TupleTest.cs" />\r
-    <Compile Include="Test\System\TypedReferenceCas.cs" />\r
-    <Compile Include="Test\System\TypeTest.cs" />\r
-    <Compile Include="Test\System\UInt16Test.cs" />\r
-    <Compile Include="Test\System\UInt32Test.cs" />\r
-    <Compile Include="Test\System\UInt64Test.cs" />\r
-    <Compile Include="Test\System\UIntPtrTest.cs" />\r
-    <Compile Include="Test\System\ValueTypeTest.cs" />\r
-    <Compile Include="Test\System\VersionTest.cs" />\r
-    <Compile Include="Test\System\WeakReferenceTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\Mono.Posix\Mono.Posix-net_4_0.csproj">\r
-      <Project>{E9A655D1-EE99-467A-8F4B-CAC80E0E65BE}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_0</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">\r
-      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>\r
-      <Name>System.Core\System.Core-net_4_0</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="Test/resources/Resources.resources">\r
-      <LogicalName>Resources.resources</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index 136fc0b6312a38d51dc6507f69a4c27c72e73f88..89f9fc965b4ce7dc4a3f816c73b011b25b513cc2 100644 (file)
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -732,6 +732,9 @@ System.Security.Cryptography/SHA1CryptoServiceProvider.cs
 System.Security.Cryptography/TripleDESCryptoServiceProvider.cs
 System.Security.Cryptography.X509Certificates/X509Certificate.cs
 System.Security.Cryptography.X509Certificates/X509Certificate20.cs
+System.Security.Cryptography.X509Certificates/X509CertificateImpl.cs
+System.Security.Cryptography.X509Certificates/X509CertificateImplMono.cs
+System.Security.Cryptography.X509Certificates/X509Helper.cs
 System.Security.Cryptography.X509Certificates/X509ContentType.cs
 System.Security.Cryptography.X509Certificates/X509KeyStorageFlags.cs
 System.Security.Permissions/CodeAccessSecurityAttribute.cs

diff --git a/mcs/class/monodoc/monodoc-net_4_5.csproj b/mcs/class/monodoc/monodoc-net_4_5.csproj
deleted file mode 100644 (file)
index d228f88..0000000
--- a/mcs/class/monodoc/monodoc-net_4_5.csproj
+++ /dev/null
@@ -1,759 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{141D4A4E-C16C-4FF6-9E35-54AF58BE6080}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>618,612,672,809,1699,169,164,162,168,219,618,612</NoWarn>\r
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>True</NoConfig>\r
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>monodoc</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  \r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>618,612,672,809,1699,169,164,162,168,219,618,612</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;LEGACY_MODE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>618,612,672,809,1699,169,164,162,168,219,618,612</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>LEGACY_MODE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Analyzer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\ASCIIFoldingFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\BaseCharFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\CachingTokenFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\CharArraySet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\CharFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\CharReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\CharStream.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\CharTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\ISOLatin1AccentFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\KeywordAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\KeywordTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\LengthFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\LetterTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\LowerCaseFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\LowerCaseTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\MappingCharFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\NormalizeCharMap.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\NumericTokenStream.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\PerFieldAnalyzerWrapper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\PorterStemFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\PorterStemmer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\SimpleAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Standard\StandardAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Standard\StandardFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Standard\StandardTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Standard\StandardTokenizerImpl.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\StopAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\StopFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\TeeSinkTokenFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Token.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\FlagsAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\IFlagsAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\IOffsetAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\IPayloadAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\IPositionIncrementAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\ITermAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\ITypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\OffsetAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\PayloadAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\PositionIncrementAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\TermAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenattributes\TypeAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\TokenFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\Tokenizer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\TokenStream.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\WhitespaceAnalyzer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\WhitespaceTokenizer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Analysis\WordlistLoader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\AbstractField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\CompressionTools.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\DateField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\DateTools.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\Document.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\Field.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\Fieldable.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\FieldSelector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\FieldSelectorResult.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\LoadFirstFieldSelector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\MapFieldSelector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\NumberTools.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\NumericField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Document\SetBasedFieldSelector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\AbstractAllTermDocs.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\AllTermDocs.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\BufferedDeletes.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ByteBlockPool.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ByteSliceReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ByteSliceWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\CharBlockPool.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\CheckIndex.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\CompoundFileReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\CompoundFileWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ConcurrentMergeScheduler.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\CorruptIndexException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DefaultSkipListReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DefaultSkipListWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DirectoryReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocConsumerPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldConsumerPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldConsumerPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldConsumers.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldConsumersPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldConsumersPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldProcessor.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldProcessorPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocFieldProcessorPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocInverter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocInverterPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocInverterPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocumentsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\DocumentsWriterThreadState.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FieldInfo.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FieldInfos.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FieldInvertState.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FieldReaderException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FieldSortedTermVectorMapper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FieldsReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FieldsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FilterIndexReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsDocsConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsDocsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsFieldsConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsFieldsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsPositionsConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsPositionsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsTermsConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FormatPostingsTermsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FreqProxFieldMergeState.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FreqProxTermsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FreqProxTermsWriterPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\FreqProxTermsWriterPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IndexCommit.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IndexDeletionPolicy.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IndexFileDeleter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IndexFileNameFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IndexFileNames.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IndexReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IndexWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\IntBlockPool.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\InvertedDocConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\InvertedDocConsumerPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\InvertedDocConsumerPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\InvertedDocEndConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\InvertedDocEndConsumerPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\InvertedDocEndConsumerPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\KeepOnlyLastCommitDeletionPolicy.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\LogByteSizeMergePolicy.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\LogDocMergePolicy.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\LogMergePolicy.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\MergeDocIDRemapper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\MergePolicy.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\MergeScheduler.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\MultiLevelSkipListReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\MultiLevelSkipListWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\MultipleTermPositions.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\MultiReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\NormsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\NormsWriterPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\NormsWriterPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ParallelReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\Payload.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\PositionBasedTermVectorMapper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\RawPostingList.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ReadOnlyDirectoryReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ReadOnlySegmentReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\ReusableStringReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentInfo.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentInfos.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentMergeInfo.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentMergeQueue.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentMerger.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentTermDocs.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentTermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentTermPositions.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentTermPositionVector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentTermVector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SegmentWriteState.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SerialMergeScheduler.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SnapshotDeletionPolicy.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\SortedTermVectorMapper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\StaleReaderException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\StoredFieldsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\StoredFieldsWriterPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\Term.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermBuffer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermDocs.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermFreqVector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermInfo.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermInfosReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermInfosWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermPositions.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermPositionVector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermsHash.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermsHashConsumer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermsHashConsumerPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermsHashConsumerPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermsHashPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermsHashPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorEntry.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorEntryFreqSortedComparator.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorMapper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorOffsetInfo.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorsReader.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorsTermsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorsTermsWriterPerField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorsTermsWriterPerThread.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Index\TermVectorsWriter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\LucenePackage.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\LZOCompressor.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Messages\INLSException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Messages\Message.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Messages\MessageImpl.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Messages\NLS.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\CharStream.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\FastCharStream.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\MultiFieldQueryParser.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\ParseException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\QueryParser.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\QueryParserConstants.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\QueryParserTokenManager.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\Token.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\QueryParser\TokenMgrError.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\BooleanClause.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\BooleanQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\BooleanScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\BooleanScorer2.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\CachingSpanFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\CachingWrapperFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Collector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ComplexExplanation.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ConjunctionScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ConstantScoreQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\DefaultSimilarity.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\DisjunctionMaxQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\DisjunctionMaxScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\DisjunctionSumScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\DocIdSet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\DocIdSetIterator.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ExactPhraseScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Explanation.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldCache.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldCacheImpl.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldCacheRangeFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldCacheTermsFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldComparator.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldComparatorSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldDoc.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldDocSortedHitQueue.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FieldValueHitQueue.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Filter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FilteredDocIdSet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FilteredDocIdSetIterator.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FilteredQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FilteredTermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FilterManager.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\ByteFieldSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\CustomScoreProvider.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\CustomScoreQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\DocValues.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\FieldCacheSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\FieldScoreQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\FloatFieldSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\IntFieldSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\OrdFieldSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\ReverseOrdFieldSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\ShortFieldSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\ValueSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Function\ValueSourceQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FuzzyQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\FuzzyTermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\HitQueue.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\IndexSearcher.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\MatchAllDocsQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\MultiPhraseQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\MultiSearcher.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\MultiTermQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\MultiTermQueryWrapperFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\NumericRangeFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\NumericRangeQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ParallelMultiSearcher.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Payloads\AveragePayloadFunction.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Payloads\MaxPayloadFunction.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Payloads\MinPayloadFunction.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Payloads\PayloadFunction.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Payloads\PayloadNearQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Payloads\PayloadSpanUtil.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Payloads\PayloadTermQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PhrasePositions.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PhraseQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PhraseQueue.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PhraseScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PositiveScoresOnlyCollector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PrefixFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PrefixQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\PrefixTermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Query.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\QueryTermVector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\QueryWrapperFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ReqExclScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ReqOptSumScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ScoreCachingWrappingScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\ScoreDoc.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Scorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Searchable.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Searcher.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Similarity.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\SimilarityDelegator.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\SingleTermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\SloppyPhraseScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Sort.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\SortField.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\SpanFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\SpanFilterResult.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\SpanQueryFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\FieldMaskingSpanQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\NearSpansOrdered.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\NearSpansUnordered.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanFirstQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanNearQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanNotQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanOrQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\Spans.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanTermQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\SpanWeight.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Spans\TermSpans.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TermQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TermRangeFilter.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TermRangeQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TermRangeTermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TermScorer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TimeLimitingCollector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TopDocs.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TopDocsCollector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TopFieldCollector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TopFieldDocs.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\TopScoreDocCollector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\Weight.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\WildcardQuery.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Search\WildcardTermEnum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\AlreadyClosedException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\BufferedIndexInput.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\BufferedIndexOutput.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\CheckSumIndexInput.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\CheckSumIndexOutput.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\Directory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\FileSwitchDirectory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\FSDirectory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\FSLockFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\IndexInput.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\IndexOutput.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\Lock.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\LockFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\LockObtainFailedException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\LockReleaseFailedException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\LockStressTest.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\LockVerifyServer.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\MMapDirectory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\NativeFSLockFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\NIOFSDirectory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\NoLockFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\NoSuchDirectoryException.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\RAMDirectory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\RAMFile.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\RAMInputStream.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\RAMOutputStream.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\SimpleFSDirectory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\SimpleFSLockFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\SingleInstanceLockFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Store\VerifyingLockFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\AppSettings.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\AttributeImplItem.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\BitSetSupport.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\BuildType.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Character.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\CloseableThreadLocalProfiler.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\CollectionsHelper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compare.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compatibility\ConcurrentDictionary.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compatibility\Func.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compatibility\ISet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compatibility\SetFactory.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compatibility\SortedSet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compatibility\ThreadLocal.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Compatibility\WrappedHashSet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\CRC32.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Cryptography.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Deflater.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Double.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\EquatableList.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\FileSupport.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\GeneralKeyedCollection.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\HashMap.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\IChecksum.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Inflater.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\IThreadRunnable.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Number.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\OS.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\SharpZipLib.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\Single.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\TextSupport.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\ThreadClass.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\ThreadLock.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Support\WeakDictionary.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\ArrayUtil.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\Attribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\AttributeSource.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\AverageGuessMemoryModel.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\BitUtil.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\BitVector.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\Cache\Cache.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\Cache\SimpleLRUCache.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\Cache\SimpleMapCache.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\CloseableThreadLocal.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\Constants.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\DocIdBitSet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\FieldCacheSanityChecker.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\IAttribute.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\IdentityDictionary.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\IndexableBinaryStringTools.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\MapOfSets.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\MemoryModel.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\NumericUtils.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\OpenBitSet.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\OpenBitSetDISI.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\OpenBitSetIterator.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\PriorityQueue.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\RamUsageEstimator.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\ReaderUtil.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\ScorerDocQueue.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\SimpleStringInterner.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\SmallFloat.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\SortedVIntList.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\SorterTemplate.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\StringHelper.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\StringInterner.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\ToStringUtils.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\UnicodeUtil.cs" />\r
-    <Compile Include="..\..\..\external\Lucene.Net\src\core\Util\Version.cs" />\r
-    <Compile Include="Assembly\AssemblyInfo.cs" />\r
-    <Compile Include="Mono.Documentation\ManifestResourceResolver.cs" />\r
-    <Compile Include="Mono.Documentation\XmlDocUtils.cs" />\r
-    <Compile Include="Mono.Utilities\colorizer.cs" />\r
-    <Compile Include="Mono.Utilities\LRUCache.cs" />\r
-    <Compile Include="Monodoc.Ecma\EcmaDesc.cs" />\r
-    <Compile Include="Monodoc.Ecma\EcmaUrlParser.cs" />\r
-    <Compile Include="Monodoc.Ecma\EcmaUrlTokenizer.cs" />\r
-    <Compile Include="Monodoc\cache.cs" />\r
-    <Compile Include="Monodoc\caches\FileCache.cs" />\r
-    <Compile Include="Monodoc\caches\NullCache.cs" />\r
-    <Compile Include="Monodoc\generator.cs" />\r
-    <Compile Include="Monodoc\generators\html\Addin2Html.cs" />\r
-    <Compile Include="Monodoc\generators\html\Ecma2Html.cs" />\r
-    <Compile Include="Monodoc\generators\html\Ecmaspec2Html.cs" />\r
-    <Compile Include="Monodoc\generators\html\Error2Html.cs" />\r
-    <Compile Include="Monodoc\generators\html\Idem.cs" />\r
-    <Compile Include="Monodoc\generators\html\Man2Html.cs" />\r
-    <Compile Include="Monodoc\generators\html\MonoBook2Html.cs" />\r
-    <Compile Include="Monodoc\generators\html\Toc2Html.cs" />\r
-    <Compile Include="Monodoc\generators\HtmlGenerator.cs" />\r
-    <Compile Include="Monodoc\generators\RawGenerator.cs" />\r
-    <Compile Include="Monodoc\HelpSource.cs" />\r
-    <Compile Include="Monodoc\HelpSource_Legacy.cs" />\r
-    <Compile Include="Monodoc\index.cs" />\r
-    <Compile Include="Monodoc\Node.cs" />\r
-    <Compile Include="Monodoc\Node_Legacy.cs" />\r
-    <Compile Include="Monodoc\Provider.cs" />\r
-    <Compile Include="Monodoc\providers\addins-provider.cs" />\r
-    <Compile Include="Monodoc\providers\EcmaDoc.cs" />\r
-    <Compile Include="Monodoc\providers\ecma-provider.cs" />\r
-    <Compile Include="Monodoc\providers\ecmaspec-provider.cs" />\r
-    <Compile Include="Monodoc\providers\ecmauncompiled-provider.cs" />\r
-    <Compile Include="Monodoc\providers\error-provider.cs" />\r
-    <Compile Include="Monodoc\providers\man-provider.cs" />\r
-    <Compile Include="Monodoc\providers\xhtml-provider.cs" />\r
-    <Compile Include="Monodoc\RootTree.cs" />\r
-    <Compile Include="Monodoc\RootTree_Legacy.cs" />\r
-    <Compile Include="Monodoc\SearchableDocument.cs" />\r
-    <Compile Include="Monodoc\SearchableIndex.cs" />\r
-    <Compile Include="Monodoc\settings.cs" />\r
-    <Compile Include="Monodoc\settings_Legacy.cs" />\r
-    <Compile Include="Monodoc\storage.cs" />\r
-    <Compile Include="Monodoc\storage\NullStorage.cs" />\r
-    <Compile Include="Monodoc\storage\UncompiledDocStorage.cs" />\r
-    <Compile Include="Monodoc\storage\ZipStorage.cs" />\r
-    <Compile Include="Monodoc\Tree.cs" />\r
-    <Compile Include="Monodoc\TypeUtils.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
-\r
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_5.csproj">\r
-      <Project>{0B587DBA-BA92-4B92-821A-AA200C612A7E}</Project>\r
-      <Name>ICSharpCode.SharpZipLib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System/System-net_4_5.csproj">\r
-      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
-      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.Xml-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
-      <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
-      <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="../../docs/monodoc.xml">\r
-      <LogicalName>monodoc.xml</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/base.css">\r
-      <LogicalName>base.css</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/ecmaspec-html-css.xsl">\r
-      <LogicalName>ecmaspec-html-css.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/ecmaspec-html.xsl">\r
-      <LogicalName>ecmaspec-html.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/ecmaspec.css">\r
-      <LogicalName>ecmaspec.css</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/helper.js">\r
-      <LogicalName>helper.js</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/home.html">\r
-      <LogicalName>home.html</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/Lminus.gif">\r
-      <LogicalName>Lminus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/Lplus.gif">\r
-      <LogicalName>Lplus.gif</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/creativecommons.png">\r
-      <LogicalName>creativecommons.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mdoc-html-format.xsl">\r
-      <LogicalName>mdoc-html-format.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mdoc-html-utils.xsl">\r
-      <LogicalName>mdoc-html-utils.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mdoc-sections-css.xsl">\r
-      <LogicalName>mdoc-sections-css.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mdoc-sections.xsl">\r
-      <LogicalName>mdoc-sections.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mono-ecma-css.xsl">\r
-      <LogicalName>mono-ecma-css.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mono-ecma-impl.xsl">\r
-      <LogicalName>mono-ecma-impl.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mono-ecma.css">\r
-      <LogicalName>mono-ecma.css</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/mono-ecma.xsl">\r
-      <LogicalName>mono-ecma.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/toc-html.xsl">\r
-      <LogicalName>toc-html.xsl</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/bc_bg.png">\r
-      <LogicalName>bc_bg.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/bc_separator.png">\r
-      <LogicalName>bc_separator.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/error.png">\r
-      <LogicalName>error.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/hatch.png">\r
-      <LogicalName>hatch.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/headerbg.png">\r
-      <LogicalName>headerbg.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/help.png">\r
-      <LogicalName>help.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/house.png">\r
-      <LogicalName>house.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/members.png">\r
-      <LogicalName>members.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/namespace.png">\r
-      <LogicalName>namespace.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privclass.png">\r
-      <LogicalName>privclass.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privdelegate.png">\r
-      <LogicalName>privdelegate.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privenumeration.png">\r
-      <LogicalName>privenumeration.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privevent.png">\r
-      <LogicalName>privevent.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privextension.png">\r
-      <LogicalName>privextension.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privfield.png">\r
-      <LogicalName>privfield.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privinterface.png">\r
-      <LogicalName>privinterface.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privmethod.png">\r
-      <LogicalName>privmethod.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privproperty.png">\r
-      <LogicalName>privproperty.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/privstructure.png">\r
-      <LogicalName>privstructure.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protclass.png">\r
-      <LogicalName>protclass.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protdelegate.png">\r
-      <LogicalName>protdelegate.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protenumeration.png">\r
-      <LogicalName>protenumeration.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protevent.png">\r
-      <LogicalName>protevent.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protextension.png">\r
-      <LogicalName>protextension.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protfield.png">\r
-      <LogicalName>protfield.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protinterface.png">\r
-      <LogicalName>protinterface.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protmethod.png">\r
-      <LogicalName>protmethod.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protproperty.png">\r
-      <LogicalName>protproperty.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/protstructure.png">\r
-      <LogicalName>protstructure.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubclass.png">\r
-      <LogicalName>pubclass.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubdelegate.png">\r
-      <LogicalName>pubdelegate.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubenumeration.png">\r
-      <LogicalName>pubenumeration.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubevent.png">\r
-      <LogicalName>pubevent.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubextension.png">\r
-      <LogicalName>pubextension.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubfield.png">\r
-      <LogicalName>pubfield.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubinterface.png">\r
-      <LogicalName>pubinterface.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubmethod.png">\r
-      <LogicalName>pubmethod.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubproperty.png">\r
-      <LogicalName>pubproperty.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/pubstructure.png">\r
-      <LogicalName>pubstructure.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/reference.png">\r
-      <LogicalName>reference.png</LogicalName>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources/images/treebg.png">\r
-      <LogicalName>treebg.png</LogicalName>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/class/monodoc/monodoc-tests-net_4_5.csproj b/mcs/class/monodoc/monodoc-tests-net_4_5.csproj
deleted file mode 100644 (file)
index 33d3f5a..0000000
--- a/mcs/class/monodoc/monodoc-tests-net_4_5.csproj
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{57ABF26A-1779-4FFD-85BB-79F5DBDA2AA6}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <NoWarn>618,612,672,809,1699</NoWarn>\r
-    <OutputPath>bin\Debug\monodoc-tests-net_4_5</OutputPath>\r
-    <NoStdLib>True</NoStdLib>\r
-    <NoConfig>False</NoConfig>\r
-    \r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>\r
-    </RootNamespace>\r
-    <AssemblyName>monodoc_test_net_4_5</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <NoWarn>618,612,672,809,1699</NoWarn>\r
-    <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;LEGACY_MODE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <NoWarn>618,612,672,809,1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>LEGACY_MODE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
-  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
-  is a problem to compile the Mono mscorlib.dll -->\r
-  <PropertyGroup>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-  </PropertyGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <ItemGroup>\r
-    <Compile Include="Test\Monodoc.Ecma\EcmaUrlTests.cs" />\r
-    <Compile Include="Test\Monodoc.Generators\AvoidCDataTextReaderTests.cs" />\r
-    <Compile Include="Test\Monodoc.Generators\RawGeneratorTests.cs" />\r
-    <Compile Include="Test\Monodoc\EcmaDocTests.cs" />\r
-    <Compile Include="Test\Monodoc\HelpSourceTests.cs" />\r
-    <Compile Include="Test\Monodoc\NodeTest.cs" />\r
-    <Compile Include="Test\Monodoc\RootTreeTest.cs" />\r
-    <Compile Include="Test\Monodoc\SettingsTest.cs" />\r
-    <Compile Include="Test\Monodoc\TreeTest.cs" />\r  </ItemGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <PreBuildEvent>\r
-\r
-    </PreBuildEvent>\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PostBuildEvent>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\monodoc\monodoc-net_4_5.csproj">\r
-      <Project>{141D4A4E-C16C-4FF6-9E35-54AF58BE6080}</Project>\r
-      <Name>monodoc\monodoc-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
-</Project>\r
-

diff --git a/mcs/docs/Makefile b/mcs/docs/Makefile
index b808123cbac44fc1048795815e9aeb8a7ee37653..88bddb6626860eadb0ed7e749f781be2aaeabbe5 100644 (file)
--- a/mcs/docs/Makefile
+++ b/mcs/docs/Makefile
@@ -85,12 +85,17 @@ NETDOCS_DIRS = \
        $(classdir)/System.Design/$(doc_en)                                 \
        $(classdir)/System.DirectoryServices/$(doc_en)                      \
        $(classdir)/System.Drawing/$(doc_en)                                \
+       $(classdir)/System.Json/$(doc_en)                                   \
+       $(classdir)/System.Net.Http/$(doc_en)                               \
        $(classdir)/System.Runtime.Remoting/$(doc_en)                       \
+       $(classdir)/System.Runtime.Serialization/$(doc_en)                  \
        $(classdir)/System.Runtime.Serialization.Formatters.Soap/$(doc_en)  \
        $(classdir)/System.Security/$(doc_en)                               \
+       $(classdir)/System.ServiceModel/$(doc_en)                           \
        $(classdir)/System.Web.Services/$(doc_en)                           \
        $(classdir)/System.Web/$(doc_en)                                    \
        $(classdir)/System.XML/$(doc_en)                                    \
+       $(classdir)/System.Xml.Linq/$(doc_en)                               \
        $(classdir)/System/$(doc_en) 
 
 MONO_DIRS = \

diff --git a/mcs/mcs/Makefile b/mcs/mcs/Makefile
index ef4f3e3c9172875db2711161333e38856f372bad..8b93d720fa1dca32835d6eb4b0480b222eb91bac 100644 (file)
--- a/mcs/mcs/Makefile
+++ b/mcs/mcs/Makefile
@@ -30,6 +30,10 @@ ifndef NO_THREAD_ABORT
 REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_THREAD_ABORT
 endif
 
+ifndef NO_PROCESS_START
+REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_PROCESS_START
+endif
+
 LOCAL_MCS_FLAGS += $(REFERENCE_SOURCES_FLAGS)
 
 PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/4.5

diff --git a/mcs/mcs/driver.cs b/mcs/mcs/driver.cs
index 994fdb8afd54bae3e36c1a69098dec28ce132305..0a11914328ae79629b356b78bd879de1942f3b69 100644 (file)
--- a/mcs/mcs/driver.cs
+++ b/mcs/mcs/driver.cs
@@ -201,6 +201,7 @@ namespace Mono.CSharp
 
                public static string GetPackageFlags (string packages, Report report)
                {
+#if MONO_FEATURE_PROCESS_START
                        ProcessStartInfo pi = new ProcessStartInfo ();
                        pi.FileName = "pkg-config";
                        pi.RedirectStandardOutput = true;
@@ -239,6 +240,9 @@ namespace Mono.CSharp
 
                        p.Close ();
                        return pkgout;
+#else
+                       throw new NotSupportedException ("Process.Start is not supported on this platform.");
+#endif // MONO_FEATURE_PROCESS_START
                }
 
                //

diff --git a/mcs/mcs/ecore.cs b/mcs/mcs/ecore.cs
index ab1d51dbbc95f1194ca8a0f288af4cde11b336d0..08bce8a9d7088311dba4b18733f8a39c5e73001d 100644 (file)
--- a/mcs/mcs/ecore.cs
+++ b/mcs/mcs/ecore.cs
@@ -4740,6 +4740,7 @@ namespace Mono.CSharp {
                        //
                        // We have not reached end of parameters list due to params or used default parameters
                        //
+                       bool defaults_ambiguity = false;
                        while (j < candidate_pd.Count && j < best_pd.Count) {
                                var cand_param = candidate_pd.FixedParameters [j];
                                var best_param = best_pd.FixedParameters [j];
@@ -4747,6 +4748,7 @@ namespace Mono.CSharp {
                                if (cand_param.HasDefaultValue != best_param.HasDefaultValue)
                                        return cand_param.HasDefaultValue;
 
+                               defaults_ambiguity = true;
                                if (candidate_pd.Count == best_pd.Count) {
                                        //
                                        // LAMESPEC:
@@ -4754,27 +4756,30 @@ namespace Mono.CSharp {
                                        // void Foo (int i = 0) is better than void Foo (params int[]) for Foo ()
                                        // void Foo (string[] s, string value = null) is better than Foo (string s, params string[]) for Foo (null) or Foo ()
                                        //
-
                                        if (cand_param.HasDefaultValue) {
                                                ++j;
                                                continue;
                                        }
-                               } else {
-                                       //
-                                       // Neither is better when not all arguments are provided
-                                       //
-                                       // void Foo (string s, int i = 0) <-> Foo (string s, int i = 0, int i2 = 0)
-                                       // void Foo (string s, int i = 0) <-> Foo (string s, byte i = 0)
-                                       // void Foo (string s, params int[]) <-> Foo (string s, params byte[])
-                                       //
-                                       return false;
+
+                                       break;
                                }
 
-                               break;
+                               //
+                               // Neither is better when not all arguments are provided
+                               //
+                               // void Foo (string s, int i = 0) <-> Foo (string s, int i = 0, int i2 = 0)
+                               // void Foo (string s, int i = 0) <-> Foo (string s, byte i = 0)
+                               // void Foo (string s, params int[]) <-> Foo (string s, params byte[])
+                               //
+                               ++j;
                        }
 
-                       if (candidate_pd.Count != best_pd.Count)
+                       if (candidate_pd.Count != best_pd.Count) {
+                               if (defaults_ambiguity && best_pd.Count - 1 == j)
+                                       return best_pd.HasParams;
+
                                return candidate_pd.Count < best_pd.Count;
+                       }
 
                        //
                        // One is a non-generic method and second is a generic method, then non-generic is better

diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index 53e1f1b707b1b3f5a153025fd774a6b1937b6aa8..5192cc102a3fb290bae7cafc60269ae20e9f72c0 100644 (file)
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -101,33 +101,17 @@ namespace Mono.CSharp
 
        public class ParenthesizedExpression : ShimExpression
        {
-               bool conditional_access_receiver;
-
                public ParenthesizedExpression (Expression expr, Location loc)
                        : base (expr)
                {
                        this.loc = loc;
                }
 
-               void ResolveConditionalAccessReceiver (ResolveContext rc)
-               {
-                       if (!rc.HasSet (ResolveContext.Options.DontSetConditionalAccessReceiver) && expr.HasConditionalAccess ()) {
-                               conditional_access_receiver = true;
-                       }                       
-               }
-
                protected override Expression DoResolve (ResolveContext rc)
                {
                        Expression res = null;
 
-                       ResolveConditionalAccessReceiver (rc);
-                       if (conditional_access_receiver) {
-                               using (rc.Set (ResolveContext.Options.DontSetConditionalAccessReceiver)) {
-                                       res = expr.Resolve (rc);
-                               }
-                       } else {
-                               res = expr.Resolve (rc);
-                       }
+                       res = expr.Resolve (rc);
 
                        var constant = res as Constant;
                        if (constant != null && constant.IsLiteral) {
@@ -137,13 +121,6 @@ namespace Mono.CSharp
                                return Constant.CreateConstantFromValue (res.Type, constant.GetValue (), expr.Location);
                        }
 
-                       if (conditional_access_receiver) {
-                               expr = res;
-                               type = LiftMemberType (rc, res.Type);
-                               eclass = expr.eclass;
-                               return this;
-                       }
-
                        return res;
                }
 
@@ -157,18 +134,6 @@ namespace Mono.CSharp
                        return visitor.Visit (this);
                }
 
-               public override void Emit (EmitContext ec)
-               {
-                       if (!conditional_access_receiver)
-                               base.Emit (ec);
-
-                       var prev = ec.ConditionalAccess;
-                       ec.ConditionalAccess = new ConditionalAccessContext (type, ec.DefineLabel ());
-                       expr.Emit (ec);
-                       ec.CloseConditionalAccess (type.IsNullableType ? type : null);
-                       ec.ConditionalAccess = prev;
-               }
-
                public override bool HasConditionalAccess ()
                {
                        return false;
@@ -2953,11 +2918,11 @@ namespace Mono.CSharp
                                        }
 
                                        lifted.Left = b.left.IsNull ?
-                                               b.left :
+                                               Nullable.LiftedNull.Create (ltype, b.left.Location) :
                                                Convert.ImplicitConversion (rc, lifted.UnwrapLeft ?? b.left, ltype, b.left.Location);
 
                                        lifted.Right = b.right.IsNull ?
-                                               b.right :
+                                               Nullable.LiftedNull.Create (rtype, b.right.Location) :
                                                Convert.ImplicitConversion (rc, lifted.UnwrapRight ?? b.right, rtype, b.right.Location);
 
                                        return lifted.Resolve (rc);
@@ -6048,16 +6013,19 @@ namespace Mono.CSharp
                                }
 
                                right.Emit (ec);
-                               switch (rtype.BuiltinType) {
-                               case BuiltinTypeSpec.Type.SByte:
-                               case BuiltinTypeSpec.Type.Byte:
-                               case BuiltinTypeSpec.Type.Short:
-                               case BuiltinTypeSpec.Type.UShort:
-                                       ec.Emit (OpCodes.Conv_I);
-                                       break;
-                               case BuiltinTypeSpec.Type.UInt:
-                                       ec.Emit (OpCodes.Conv_U);
-                                       break;
+                               if (right_const == null) {
+                                       switch (rtype.BuiltinType) {
+                                       case BuiltinTypeSpec.Type.SByte:
+                                       case BuiltinTypeSpec.Type.Byte:
+                                       case BuiltinTypeSpec.Type.Short:
+                                       case BuiltinTypeSpec.Type.UShort:
+                                       case BuiltinTypeSpec.Type.Int:
+                                               ec.Emit (OpCodes.Conv_I);
+                                               break;
+                                       case BuiltinTypeSpec.Type.UInt:
+                                               ec.Emit (OpCodes.Conv_U);
+                                               break;
+                                       }
                                }
 
                                if (right_const == null && size != 1){
@@ -12598,6 +12566,15 @@ namespace Mono.CSharp
                        ca.Emit (ec, best, arguments, loc);
                }
 
+               public override void FlowAnalysis (FlowAnalysisContext fc)
+               {
+                       if (interpolations != null) {
+                               foreach (var expr in interpolations) {
+                                       expr.FlowAnalysis (fc);
+                               }
+                       }
+               }
+
                MethodSpec ResolveBestFormatOverload (ResolveContext rc)
                {
                        var members = MemberCache.FindMembers (rc.BuiltinTypes.String, "Format", true);
@@ -12637,6 +12614,11 @@ namespace Mono.CSharp
                        return Convert.ImplicitConversionRequired (rc, expr, rc.BuiltinTypes.Object, expr.Location);
                }
 
+               public override void FlowAnalysis (FlowAnalysisContext fc)
+               {
+                       Child.FlowAnalysis (fc);
+               }
+
                public int? ResolveAligment (ResolveContext rc)
                {
                        var c = Alignment.ResolveLabelConstant (rc);

diff --git a/mcs/mcs/nullable.cs b/mcs/mcs/nullable.cs
index 210f5cb8ca6b9e7675e014ed079f6296bafd12e3..dbfc6b0648da0b095787be343dc632f572e14ffe 100644 (file)
--- a/mcs/mcs/nullable.cs
+++ b/mcs/mcs/nullable.cs
@@ -795,7 +795,7 @@ namespace Mono.CSharp.Nullable
                        //
                        // Both operands are bool? types
                        //
-                       if (UnwrapLeft != null && UnwrapRight != null) {
+                       if ((UnwrapLeft != null && !Left.IsNull) && (UnwrapRight != null && !Right.IsNull)) {
                                if (ec.HasSet (BuilderContext.Options.AsyncBody) && Binary.Right.ContainsEmitWithAwait ()) {
                                        Left = Left.EmitToField (ec);
                                        Right = Right.EmitToField (ec);
@@ -861,6 +861,8 @@ namespace Mono.CSharp.Nullable
                                        LiftedNull.Create (type, loc).Emit (ec);
                                } else {
                                        Left.Emit (ec);
+                                       UnwrapRight.Store (ec);
+
                                        ec.Emit (or ? OpCodes.Brfalse_S : OpCodes.Brtrue_S, load_right);
 
                                        ec.EmitInt (or ? 1 : 0);
@@ -869,7 +871,7 @@ namespace Mono.CSharp.Nullable
                                        ec.Emit (OpCodes.Br_S, end_label);
 
                                        ec.MarkLabel (load_right);
-                                       UnwrapRight.Original.Emit (ec);
+                                       UnwrapRight.Load (ec);
                                }
                        } else {
                                //
@@ -897,14 +899,14 @@ namespace Mono.CSharp.Nullable
                                        LiftedNull.Create (type, loc).Emit (ec);
                                } else {
                                        Right.Emit (ec);
-                                       ec.Emit (or ? OpCodes.Brfalse_S : OpCodes.Brtrue_S, load_right);
+                                       ec.Emit (or ? OpCodes.Brfalse_S : OpCodes.Brtrue_S, load_left);
 
                                        ec.EmitInt (or ? 1 : 0);
                                        ec.Emit (OpCodes.Newobj, NullableInfo.GetConstructor (type));
 
                                        ec.Emit (OpCodes.Br_S, end_label);
 
-                                       ec.MarkLabel (load_right);
+                                       ec.MarkLabel (load_left);
 
                                        UnwrapLeft.Load (ec);
                                }
@@ -1073,6 +1075,7 @@ namespace Mono.CSharp.Nullable
        {
                Expression left, right;
                Unwrap unwrap;
+               bool user_conversion_left;
 
                public NullCoalescingOperator (Expression left, Expression right)
                {
@@ -1220,6 +1223,7 @@ namespace Mono.CSharp.Nullable
                                return ReducedExpression.Create (right, this, false).Resolve (ec);
 
                        left = Convert.ImplicitConversion (ec, unwrap ?? left, rtype, loc);
+                       user_conversion_left = left is UserCast;
                        type = rtype;
                        return this;
                }
@@ -1283,10 +1287,14 @@ namespace Mono.CSharp.Nullable
                        // Null check is done on original expression not after expression is converted to
                        // result type. This is in most cases same but when user conversion is involved
                        // we can end up in situation when user operator does the null handling which is
-                       // not what the operator is supposed to do
+                       // not what the operator is supposed to do.
+                       // There is tricky case where cast of left expression is meant to be cast of
+                       // whole source expression (null check is done on it) and cast from right-to-left
+                       // conversion needs to do null check on unconverted source expression.
                        //
-                       var op_expr = left as UserCast;
-                       if (op_expr != null) {
+                       if (user_conversion_left) {
+                               var op_expr = (UserCast) left;
+
                                op_expr.Source.Emit (ec);
                                LocalTemporary temp;
 

diff --git a/mcs/nunit24/ConsoleRunner/nunit-console/ConsoleUi.cs b/mcs/nunit24/ConsoleRunner/nunit-console/ConsoleUi.cs
index e89d705e83c32e0d5cff7b929c38995ea8a9baf3..072b1efc9c10be25dbb63461f06feebc60d51845 100644 (file)
--- a/mcs/nunit24/ConsoleRunner/nunit-console/ConsoleUi.cs
+++ b/mcs/nunit24/ConsoleRunner/nunit-console/ConsoleUi.cs
@@ -158,7 +158,7 @@ namespace NUnit.ConsoleRunner
                                //if ( testRunner != null )\r
                                //    testRunner.Unload();\r
 \r
-                               if ( collector.HasExceptions )\r
+                               if ( result == null || collector.HasExceptions )\r
                                {\r
                                        collector.WriteExceptions();\r
                                        return UNEXPECTED_ERROR;\r

diff --git a/mcs/tests/gtest-540.cs b/mcs/tests/gtest-540.cs
index 7596032d16fcf14d71e45222d72469f2d00056f5..61c94270ef5d24a2da181b2555956df0b949e6ab 100644 (file)
--- a/mcs/tests/gtest-540.cs
+++ b/mcs/tests/gtest-540.cs
@@ -85,6 +85,19 @@ class C
                
                if ((true | a) != true)
                        return 65;
+
+               var b4 = true;
+               if ((b4 & null) != null)
+                       return 100;
+
+               if ((null & b4) != null)
+                       return 101;
+
+               if ((b4 | null) != true)
+                       return 102;
+
+               if ((null | b4) != true)
+                       return 103;
                
                return 0;
        }

diff --git a/mcs/tests/gtest-636.cs b/mcs/tests/gtest-636.cs
new file mode 100644 (file)
index 0000000..9c44fdf
--- /dev/null
+++ b/mcs/tests/gtest-636.cs
@@ -0,0 +1,37 @@
+using System;
+
+class MainClass
+{
+       public static int Main ()
+       {
+               var res = XX () | YY();
+               if (!res.Value)
+                       return 1;
+
+               if (xx != 1)
+                       return 2;
+
+               if (yy != 1)
+                       return 2;
+
+               return 0;
+       }
+
+       static int xx;
+       static bool XX ()
+       {
+               ++xx;
+               Console.WriteLine ("XX");
+               return true;
+       }       
+
+       static int yy;
+       static bool? YY ()
+       {
+               if (xx == 1)
+                       ++yy;
+                       
+               Console.WriteLine ("YY");
+               return true;
+       }       
+}

diff --git a/mcs/tests/test-643.cs b/mcs/tests/test-643.cs
index f7204392ff0f28660a209d17185bcab900ead40d..c88ac8885e5c075d882071ae3aa485b599ff5091 100644 (file)
--- a/mcs/tests/test-643.cs
+++ b/mcs/tests/test-643.cs
@@ -11,7 +11,10 @@ class PointerArithmeticTest
                } catch (System.OverflowException) {}
                
                try {
-                       return CheckSub((short*)(-1), int.MaxValue);
+                       if (IntPtr.Size <= 4)
+                               return CheckSub((short*)(-1), int.MaxValue);
+                       else
+                               return CheckSub((short*)(-1), long.MaxValue);
                } catch (System.OverflowException) {}
                
                CheckSub2((short*)(-1), int.MaxValue);
@@ -44,6 +47,14 @@ class PointerArithmeticTest
                return 102;
        }
 
+       unsafe static int CheckSub(short* ptr, long offset)
+       {
+               if (checked(ptr - offset < ptr))
+                       return 2;
+
+               return 102;
+       }
+
        unsafe static int CheckSub2(short* ptr, int offset)
        {
                short* b = ptr + offset;

diff --git a/mcs/tests/test-931.cs b/mcs/tests/test-931.cs
new file mode 100644 (file)
index 0000000..7a1f7be
--- /dev/null
+++ b/mcs/tests/test-931.cs
@@ -0,0 +1,20 @@
+using System;
+
+class MainClass
+{
+       public static implicit operator string (MainClass src)
+       {
+               return null;
+       }
+
+       public static int Main ()
+       {
+               var obj = new MainClass ();
+               var s = "x";
+               var res = (string) obj ?? s;
+               if (res != "x")
+                       return 1;
+
+               return 0;
+       }
+}

diff --git a/mcs/tests/test-932.cs b/mcs/tests/test-932.cs
new file mode 100644 (file)
index 0000000..bd5f48e
--- /dev/null
+++ b/mcs/tests/test-932.cs
@@ -0,0 +1,18 @@
+using System;
+
+class X
+{
+       static void Main ()
+       {
+               new X().WriteLine("some text");
+       }
+
+       public void WriteLine(string format, ConsoleColor foreColor = ConsoleColor.White, ConsoleColor backColor = ConsoleColor.Black, params object[] args)
+       {
+               throw new ApplicationException ();
+       }
+
+       public void WriteLine(string line, ConsoleColor foreColor = ConsoleColor.White, ConsoleColor backColor = ConsoleColor.Black)
+       {
+       }
+}

diff --git a/mcs/tests/test-async-81.cs b/mcs/tests/test-async-81.cs
new file mode 100644 (file)
index 0000000..591711c
--- /dev/null
+++ b/mcs/tests/test-async-81.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Threading.Tasks;
+
+class MainClass
+{
+       public static void Main ()
+       {
+               new MainClass ().Foo ().Wait ();
+       }
+
+       private async Task<int> Foo() 
+       {
+               await Task.Delay(1);
+               return 42;
+       }
+
+       private async Task Bar()
+       {
+               Console.WriteLine($"Something {await Foo()}");
+       }
+}

diff --git a/mcs/tests/test-null-operator-21.cs b/mcs/tests/test-null-operator-21.cs
new file mode 100644 (file)
index 0000000..bb4d04e
--- /dev/null
+++ b/mcs/tests/test-null-operator-21.cs
@@ -0,0 +1,17 @@
+class X
+{
+       public object MyChildObject;
+}
+
+interface ISomeInterface
+{
+}
+
+class MainClass
+{
+       public static void Main ()
+       {
+               X myObject = null;
+               var x = (myObject?.MyChildObject is ISomeInterface);
+       }
+}

diff --git a/mcs/tests/ver-il-net_4_x.xml b/mcs/tests/ver-il-net_4_x.xml
index 7c3e7dc6e5c44cb4fbd5025715336e7f6ab21dbd..d543f197bd739480536eee24d8b2eb034351d025 100644 (file)
--- a/mcs/tests/ver-il-net_4_x.xml
+++ b/mcs/tests/ver-il-net_4_x.xml
@@ -17434,7 +17434,7 @@
   <test name="gtest-540.cs">
     <type name="C">
       <method name="Int32 Main()" attrs="150">
-        <size>762</size>
+        <size>1025</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
@@ -19756,6 +19756,22 @@
       </method>
     </type>
   </test>
+  <test name="gtest-636.cs">
+    <type name="MainClass">
+      <method name="Int32 Main()" attrs="150">
+        <size>88</size>
+      </method>
+      <method name="Boolean XX()" attrs="145">
+        <size>32</size>
+      </method>
+      <method name="System.Nullable`1[System.Boolean] YY()" attrs="145">
+        <size>48</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="gtest-anontype-01.cs">
     <type name="Test">
       <method name="Int32 Main()" attrs="150">
@@ -23832,7 +23848,7 @@
   <test name="gtest-fixedbuffer-05.cs">
     <type name="S2">
       <method name="Void Test()" attrs="134">
-        <size>42</size>
+        <size>43</size>
       </method>
       <method name="Void Main()" attrs="150">
         <size>17</size>
@@ -40265,7 +40281,7 @@
   <test name="test-401.cs">
     <type name="X">
       <method name="Int32 Main()" attrs="150">
-        <size>206</size>
+        <size>209</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
@@ -40352,7 +40368,7 @@
   <test name="test-408.cs">
     <type name="T">
       <method name="Int32 Main()" attrs="150">
-        <size>59</size>
+        <size>60</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
@@ -45668,23 +45684,26 @@
   <test name="test-643.cs">
     <type name="PointerArithmeticTest">
       <method name="Int32 Main()" attrs="150">
-        <size>137</size>
+        <size>170</size>
       </method>
       <method name="Int32* Conversions(Int64)" attrs="145">
         <size>11</size>
       </method>
       <method name="Int32 CheckAdd(Byte*, Int32)" attrs="145">
-        <size>27</size>
+        <size>28</size>
       </method>
       <method name="Int32 CheckSub(Int16*, Int32)" attrs="145">
-        <size>29</size>
+        <size>30</size>
       </method>
       <method name="Int32 CheckSub2(Int16*, Int32)" attrs="145">
-        <size>36</size>
+        <size>37</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Int32 CheckSub(Int16*, Int64)" attrs="145">
+        <size>31</size>
+      </method>
     </type>
   </test>
   <test name="test-644.cs">
@@ -45879,7 +45898,7 @@
         <size>33</size>
       </method>
       <method name="Void Test2(SByte, Int16, Int32, Int64, UInt64)" attrs="145">
-        <size>40</size>
+        <size>43</size>
       </method>
       <method name="Int32 Main()" attrs="150">
         <size>54</size>
@@ -46186,7 +46205,7 @@
   <test name="test-670.cs">
     <type name="C">
       <method name="Void Main()" attrs="150">
-        <size>15</size>
+        <size>17</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
@@ -47031,7 +47050,7 @@
         <size>7</size>
       </method>
       <method name="Void CopyTo(Int32, Char[], Int32, Int32)" attrs="145">
-        <size>71</size>
+        <size>73</size>
       </method>
     </type>
   </test>
@@ -51840,6 +51859,35 @@
       </method>
     </type>
   </test>
+  <test name="test-931.cs">
+    <type name="MainClass">
+      <method name="System.String op_Implicit(MainClass)" attrs="2198">
+        <size>10</size>
+      </method>
+      <method name="Int32 Main()" attrs="150">
+        <size>60</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
+  <test name="test-932.cs">
+    <type name="X">
+      <method name="Void Main()" attrs="145">
+        <size>20</size>
+      </method>
+      <method name="Void WriteLine(System.String, System.ConsoleColor, System.ConsoleColor, System.Object[])" attrs="134">
+        <size>7</size>
+      </method>
+      <method name="Void WriteLine(System.String, System.ConsoleColor, System.ConsoleColor)" attrs="134">
+        <size>2</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="test-94.cs">
     <type name="Base">
       <method name="Int32 IVehicle.Start()" attrs="481">
@@ -65477,6 +65525,38 @@
       </method>
     </type>
   </test>
+  <test name="test-async-81.cs">
+    <type name="MainClass">
+      <method name="Void Main()" attrs="150">
+        <size>17</size>
+      </method>
+      <method name="System.Threading.Tasks.Task`1[System.Int32] Foo()" attrs="129">
+        <size>33</size>
+      </method>
+      <method name="System.Threading.Tasks.Task Bar()" attrs="129">
+        <size>41</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="MainClass+&lt;Foo&gt;c__async0">
+      <method name="Void MoveNext()" attrs="486">
+        <size>166</size>
+      </method>
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="MainClass+&lt;Bar&gt;c__async1">
+      <method name="Void MoveNext()" attrs="486">
+        <size>224</size>
+      </method>
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+  </test>
   <test name="test-cls-00.cs">
     <type name="CLSCLass_6">
       <method name="Void add_Disposed(Delegate)" attrs="2182">
@@ -69570,6 +69650,21 @@
       </method>
     </type>
   </test>
+  <test name="test-null-operator-21.cs">
+    <type name="X">
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="MainClass">
+      <method name="Void Main()" attrs="150">
+        <size>28</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="test-partial-01.cs">
     <type name="Foo.Hello">
       <method name="Void .ctor()" attrs="6278">

diff --git a/mcs/tools/mdoc/Makefile b/mcs/tools/mdoc/Makefile
index 26e6087462d01344c2cbf9b15af0041b16c64cab..9e4538fec1f7dff5a5f45bee0aecb2aa5ba3c2fc 100644 (file)
--- a/mcs/tools/mdoc/Makefile
+++ b/mcs/tools/mdoc/Makefile
@@ -195,6 +195,24 @@ check-monodocer-dropns-multi: $(PROGRAM)
        
        diff --exclude=.svn -rup Test/en.expected-dropns-multi Test/en.actual
 
+
+check-monodocer-dropns-multi-withexisting: $(PROGRAM)
+       -rm -Rf Test/en.actual
+       $(MAKE) Test/DocTest-DropNS-classic.dll
+       $(MAKE) Test/DocTest-DropNS-unified.dll
+       $(MAKE) Test/DocTest-DropNS-classic-multitest.dll
+       $(MAKE) Test/DocTest-DropNS-unified-multitest.dll
+
+       # mdoc update to show a pre-existing set of documents
+       $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-DropNS-classic.dll
+       $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-DropNS-unified.dll --dropns Test/DocTest-DropNS-unified.dll=MyFramework 
+       
+       # mdoc update for both classic and unified
+       $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-CLASSIC) -multiassembly
+       $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-UNIFIED) --dropns Test/DocTest-DropNS-unified.dll=MyFramework --dropns Test/DocTest-DropNS-unified-multitest.dll=MyFramework -multiassembly
+       
+       diff --exclude=.svn -rup Test/en.expected-dropns-multi-withexisting Test/en.actual
+
 check-monodocer-dropns-delete: $(PROGRAM)
        -rm -Rf Test/en.actual
        rm -Rf Test/DocTest-DropNS-classic-deletetest.dll
@@ -399,7 +417,8 @@ check-doc-tools: check-monodocer-since \
        check-monodocer-dropns-delete \
        check-monodocer-internal-interface \
        check-monodocer-enumerations \
-       check-monodocer-dropns-multi
+       check-monodocer-dropns-multi \
+       check-monodocer-dropns-multi-withexisting
 
 check-doc-tools-update: check-monodocer-since-update \
        check-monodocer-importecmadoc-update \

diff --git a/mcs/tools/mdoc/Mono.Documentation/monodocer.cs b/mcs/tools/mdoc/Mono.Documentation/monodocer.cs
index 20ab1e69abf6ffa628e684cccee3248bea0a3084..0a031767cce7e042b9df3374caacd271d33391f8 100644 (file)
--- a/mcs/tools/mdoc/Mono.Documentation/monodocer.cs
+++ b/mcs/tools/mdoc/Mono.Documentation/monodocer.cs
@@ -1668,7 +1668,11 @@ class MDocUpdater : MDocCommand
        /// <returns>The assembly that was either added, or was already present</returns>
        static XmlElement AddAssemblyNameToNode (XmlElement root, ModuleDefinition module)
        {
-               Func<XmlElement, bool> assemblyFilter = x => x.SelectSingleNode ("AssemblyName").InnerText == module.Assembly.Name.Name;
+               Func<XmlElement, bool> assemblyFilter = x => {
+                       var existingName = x.SelectSingleNode ("AssemblyName");
+                       return existingName != null && existingName.InnerText == module.Assembly.Name.Name;
+               };
+               
                return AddAssemblyXmlNode (
                        root.SelectNodes ("AssemblyInfo").Cast<XmlElement> ().ToArray (), 
                        assemblyFilter, x => WriteElementText (x, "AssemblyName", module.Assembly.Name.Name), 

diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/MyFramework.MyNamespace/MyClass.xml b/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/MyFramework.MyNamespace/MyClass.xml
new file mode 100644 (file)
index 0000000..bca840f
--- /dev/null
+++ b/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/MyFramework.MyNamespace/MyClass.xml
@@ -0,0 +1,136 @@
+<Type Name="MyClass" FullName="MyFramework.MyNamespace.MyClass">
+  <TypeSignature Language="C#" Value="public class MyClass" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit MyClass extends System.Object" />
+  <AssemblyInfo apistyle="classic">
+    <AssemblyName>DocTest-DropNS-classic</AssemblyName>
+    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+  </AssemblyInfo>
+  <AssemblyInfo apistyle="unified">
+    <AssemblyName>DocTest-DropNS-unified</AssemblyName>
+    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+  </AssemblyInfo>
+  <AssemblyInfo apistyle="classic">
+    <AssemblyName>DocTest-DropNS-classic-multitest</AssemblyName>
+    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+  </AssemblyInfo>
+  <AssemblyInfo apistyle="unified">
+    <AssemblyName>DocTest-DropNS-unified-multitest</AssemblyName>
+    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+  </AssemblyInfo>
+  <Base>
+    <BaseTypeName>System.Object</BaseTypeName>
+  </Base>
+  <Interfaces />
+  <Docs>
+    <summary>To be added.</summary>
+    <remarks>To be added.</remarks>
+  </Docs>
+  <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public MyClass ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo apistyle="classic">
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="unified">
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="classic">
+        <AssemblyName>DocTest-DropNS-classic</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="classic">
+        <AssemblyName>DocTest-DropNS-classic-multitest</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="unified">
+        <AssemblyName>DocTest-DropNS-unified</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="unified">
+        <AssemblyName>DocTest-DropNS-unified-multitest</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Hello">
+      <MemberSignature Language="C#" Value="public float Hello (int value);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance float32 Hello(int32 value) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo apistyle="classic">
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="unified">
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="classic">
+        <AssemblyName>DocTest-DropNS-classic</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="classic">
+        <AssemblyName>DocTest-DropNS-classic-multitest</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="unified">
+        <AssemblyName>DocTest-DropNS-unified</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="unified">
+        <AssemblyName>DocTest-DropNS-unified-multitest</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Single</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Int32" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="MyProperty">
+      <MemberSignature Language="C#" Value="public string MyProperty { get; set; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance string MyProperty" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo apistyle="classic">
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="unified">
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="classic">
+        <AssemblyName>DocTest-DropNS-classic</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="classic">
+        <AssemblyName>DocTest-DropNS-classic-multitest</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="unified">
+        <AssemblyName>DocTest-DropNS-unified</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="unified">
+        <AssemblyName>DocTest-DropNS-unified-multitest</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.String</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+  </Members>
+</Type>

diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/MyFramework.MyNamespace/OnlyInMulti.xml b/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/MyFramework.MyNamespace/OnlyInMulti.xml
new file mode 100644 (file)
index 0000000..dbcf130
--- /dev/null
+++ b/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/MyFramework.MyNamespace/OnlyInMulti.xml
@@ -0,0 +1,40 @@
+<Type Name="OnlyInMulti" FullName="MyFramework.MyNamespace.OnlyInMulti">
+  <TypeSignature Language="C#" Value="public class OnlyInMulti" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit OnlyInMulti extends System.Object" />
+  <AssemblyInfo apistyle="classic">
+    <AssemblyName>DocTest-DropNS-classic-multitest</AssemblyName>
+    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+  </AssemblyInfo>
+  <AssemblyInfo apistyle="unified">
+    <AssemblyName>DocTest-DropNS-unified-multitest</AssemblyName>
+    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+  </AssemblyInfo>
+  <Base>
+    <BaseTypeName>System.Object</BaseTypeName>
+  </Base>
+  <Interfaces />
+  <Docs>
+    <summary>To be added.</summary>
+    <remarks>To be added.</remarks>
+  </Docs>
+  <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public OnlyInMulti ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo apistyle="classic">
+        <AssemblyName>DocTest-DropNS-classic-multitest</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <AssemblyInfo apistyle="unified">
+        <AssemblyName>DocTest-DropNS-unified-multitest</AssemblyName>
+        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+  </Members>
+</Type>

diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/index.xml b/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/index.xml
new file mode 100644 (file)
index 0000000..6b5124a
--- /dev/null
+++ b/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/index.xml
@@ -0,0 +1,53 @@
+<Overview>
+  <Assemblies>
+    <Assembly Name="DocTest-DropNS-classic" Version="0.0.0.0">
+      <Attributes>
+        <Attribute>
+          <AttributeName>System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints)</AttributeName>
+        </Attribute>
+        <Attribute>
+          <AttributeName>System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true)</AttributeName>
+        </Attribute>
+      </Attributes>
+    </Assembly>
+    <Assembly Name="DocTest-DropNS-classic-multitest" Version="0.0.0.0">
+      <Attributes>
+        <Attribute>
+          <AttributeName>System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints)</AttributeName>
+        </Attribute>
+        <Attribute>
+          <AttributeName>System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true)</AttributeName>
+        </Attribute>
+      </Attributes>
+    </Assembly>
+    <Assembly Name="DocTest-DropNS-unified" Version="0.0.0.0">
+      <Attributes>
+        <Attribute>
+          <AttributeName>System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints)</AttributeName>
+        </Attribute>
+        <Attribute>
+          <AttributeName>System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true)</AttributeName>
+        </Attribute>
+      </Attributes>
+    </Assembly>
+    <Assembly Name="DocTest-DropNS-unified-multitest" Version="0.0.0.0">
+      <Attributes>
+        <Attribute>
+          <AttributeName>System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints)</AttributeName>
+        </Attribute>
+        <Attribute>
+          <AttributeName>System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true)</AttributeName>
+        </Attribute>
+      </Attributes>
+    </Assembly>
+  </Assemblies>
+  <Remarks>To be added.</Remarks>
+  <Copyright>To be added.</Copyright>
+  <Types>
+    <Namespace Name="MyFramework.MyNamespace">
+      <Type Name="MyClass" Kind="Class" />
+      <Type Name="OnlyInMulti" Kind="Class" />
+    </Namespace>
+  </Types>
+  <Title>DocTest-DropNS-classic</Title>
+</Overview>

diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/ns-MyFramework.MyNamespace.xml b/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/ns-MyFramework.MyNamespace.xml
new file mode 100644 (file)
index 0000000..74df75a
--- /dev/null
+++ b/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/ns-MyFramework.MyNamespace.xml
@@ -0,0 +1,6 @@
+<Namespace Name="MyFramework.MyNamespace">
+  <Docs>
+    <summary>To be added.</summary>
+    <remarks>To be added.</remarks>
+  </Docs>
+</Namespace>

diff --git a/mcs/tools/mkbundle/mkbundle.cs b/mcs/tools/mkbundle/mkbundle.cs
index 4611bf698423f9fbcbee43e1d4e881336f755735..3b3774c5725b08b9f6a15f4b0fb66fa01ac9ab64 100755 (executable)
--- a/mcs/tools/mkbundle/mkbundle.cs
+++ b/mcs/tools/mkbundle/mkbundle.cs
@@ -751,6 +751,7 @@ void          mono_register_config_for_assembly (const char* assembly_name, cons
                        {
                                Error(String.Format("[Fail] {0}", ret));
                        }
+                       return;
                }
 
                // on Windows, we have to pipe the output of a

diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile
index 5575d4461fccba102de1a5c1cb171674be112b65..383d2f53057a1026fa4623b8614934a2fe79bd24 100644 (file)
--- a/mcs/tools/xbuild/Makefile
+++ b/mcs/tools/xbuild/Makefile
@@ -55,6 +55,10 @@ install-frameworks:
        $(INSTALL_DATA) frameworks/net_4.5.1.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.5.1/RedistList/FrameworkList.xml
        $(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.5.2/RedistList
        $(INSTALL_DATA) frameworks/net_4.5.2.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.5.2/RedistList/FrameworkList.xml
+       $(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.6/RedistList
+       $(INSTALL_DATA) frameworks/net_4.6.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.6/RedistList/FrameworkList.xml
+       $(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.6.1/RedistList
+       $(INSTALL_DATA) frameworks/net_4.6.1.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.6.1/RedistList/FrameworkList.xml
 
 install-pcl-targets:
        $(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.0
@@ -110,6 +114,8 @@ EXTRA_DISTFILES = \
        frameworks/net_4.5.xml \
        frameworks/net_4.5.1.xml \
        frameworks/net_4.5.2.xml \
+       frameworks/net_4.6.xml \
+       frameworks/net_4.6.1.xml \
        targets/Microsoft.Portable.CSharp_4.0.targets \
        targets/Microsoft.Portable.CSharp_4.5.targets \
        targets/Microsoft.Portable.VisualBasic_4.0.targets \

diff --git a/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets
index 3c27732bf4f26f682aeedbbe4394285df23edb76..e478140691bfd60cd34f58972a5dcfee4419fb05 100644 (file)
--- a/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets
@@ -328,13 +328,13 @@
                <AssignProjectConfiguration
                        ProjectReferences = "@(ProjectReference)"
                        SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)"
-                       Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'">
+                       Condition="$(CurrentSolutionConfigurationContents) != '' and ('$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true')">
 
                        <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/>
                </AssignProjectConfiguration>
 
                <!-- Else, just -->
-               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'">
+               <CreateItem Include="@(ProjectReference)" Condition="$(CurrentSolutionConfigurationContents) == '' or ('$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true')">
                        <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/>
                </CreateItem>
 

diff --git a/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets
index 094a1383bb7b51ec99373e2640d5cfffe5b25bc0..5ce879ae236f9b05c26e5efb7111e1278f4766a0 100644 (file)
--- a/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets
@@ -314,13 +314,13 @@
                <AssignProjectConfiguration
                        ProjectReferences = "@(ProjectReference)"
                        SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)"
-                       Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'">
+                       Condition="$(CurrentSolutionConfigurationContents) != '' and ('$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true')">
 
                        <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/>
                </AssignProjectConfiguration>
 
                <!-- Else, just -->
-               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'">
+               <CreateItem Include="@(ProjectReference)" Condition="$(CurrentSolutionConfigurationContents) == '' or ('$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true')">
                        <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/>
                </CreateItem>
 

diff --git a/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets
index 079b8e092a2e4154871b7bfec7e714eb7dce598d..74c1a9d6d709125245e0af0f0f662761cd4eb4d1 100644 (file)
--- a/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets
@@ -194,13 +194,13 @@
                <AssignProjectConfiguration
                        ProjectReferences = "@(ProjectReference)"
                        SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)"
-                       Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'">
+                       Condition="$(CurrentSolutionConfigurationContents) != '' and ('$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true')">
 
                        <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/>
                </AssignProjectConfiguration>
 
                <!-- Else, just -->
-               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'">
+               <CreateItem Include="@(ProjectReference)" Condition="$(CurrentSolutionConfigurationContents) == '' or ('$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true')">
                        <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/>
                </CreateItem>
 

diff --git a/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets b/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets
index c3f560a5f0e6191049df0eddd3bcdab4e1dcd6af..9ffa41d923366bd582b9556d491268df854f11c0 100644 (file)
--- a/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets
@@ -224,13 +224,13 @@
                <AssignProjectConfiguration
                        ProjectReferences = "@(ProjectReference)"
                        SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)"
-                       Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'">
+                       Condition="$(CurrentSolutionConfigurationContents) != '' and ('$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true')">
 
                        <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/>
                </AssignProjectConfiguration>
 
                <!-- Else, just -->
-               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'">
+               <CreateItem Include="@(ProjectReference)" Condition="$(CurrentSolutionConfigurationContents) == '' or ('$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true')">
                        <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/>
                </CreateItem>
 

diff --git a/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets
index 47b6b7f36e068e0631f374b4545c9853de7d9e93..39bc73e41d068e35e01358360c93d391d7806da4 100644 (file)
--- a/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets
@@ -328,13 +328,13 @@
                <AssignProjectConfiguration
                        ProjectReferences = "@(ProjectReference)"
                        SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)"
-                       Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'">
+                       Condition="$(CurrentSolutionConfigurationContents) != '' and ('$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true')">
 
                        <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/>
                </AssignProjectConfiguration>
 
                <!-- Else, just -->
-               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'">
+               <CreateItem Include="@(ProjectReference)" Condition="$(CurrentSolutionConfigurationContents) == '' or ('$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true')">
                        <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/>
                </CreateItem>
 

diff --git a/mcs/tools/xbuild/frameworks/net_4.6.1.xml b/mcs/tools/xbuild/frameworks/net_4.6.1.xml
new file mode 100644 (file)
index 0000000..9fa1fda
--- /dev/null
+++ b/mcs/tools/xbuild/frameworks/net_4.6.1.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FileList  Name=".NET Framework 4.6.1" TargetFrameworkDirectory="..\..\..\..\4.5">
+</FileList>

diff --git a/mcs/tools/xbuild/frameworks/net_4.6.xml b/mcs/tools/xbuild/frameworks/net_4.6.xml
new file mode 100644 (file)
index 0000000..a2ba03d
--- /dev/null
+++ b/mcs/tools/xbuild/frameworks/net_4.6.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FileList  Name=".NET Framework 4.6" TargetFrameworkDirectory="..\..\..\..\4.5">
+</FileList>

diff --git a/mono/dis/dis-cil.c b/mono/dis/dis-cil.c
index 79f68fb8b24db80ffa61417741c6cabc999e1efb..bc40414ba48f77883ff9131dc48957191e247403 100755 (executable)
--- a/mono/dis/dis-cil.c
+++ b/mono/dis/dis-cil.c
@@ -56,7 +56,7 @@ disassemble_cil (MonoImage *m, MonoMethodHeader *mh, MonoGenericContainer *conta
 #endif
 
        if (mh->num_clauses) {
-              trys = g_malloc0 (sizeof (gboolean) * mh->num_clauses);
+              trys = (gboolean *)g_malloc0 (sizeof (gboolean) * mh->num_clauses);
               trys [0] = 1;
               for (i=1; i < mh->num_clauses; ++i) {
 #define jcl mh->clauses [j]    

diff --git a/mono/dis/dump.c b/mono/dis/dump.c
index db55cef8ef1675381648ccd0f651d3ae726d89c4..d54e382434c290a15b940fc81cb63f38f30c16c8 100755 (executable)
--- a/mono/dis/dump.c
+++ b/mono/dis/dump.c
@@ -661,14 +661,14 @@ dump_table_methodimpl (MonoImage *m)
 
        for (i = 1; i <= t->rows; i++){
                guint32 cols [MONO_METHODIMPL_SIZE];
-               char *class, *impl, *decl;
+               char *klass, *impl, *decl;
 
                mono_metadata_decode_row (t, i - 1, cols, MONO_METHODIMPL_SIZE);
-               class = get_typedef (m, cols [MONO_METHODIMPL_CLASS]);
+               klass = get_typedef (m, cols [MONO_METHODIMPL_CLASS]);
                impl = get_method (m, method_dor_to_token (cols [MONO_METHODIMPL_BODY]), NULL);
                decl = get_method (m, method_dor_to_token (cols [MONO_METHODIMPL_DECLARATION]), NULL);
-               fprintf (output, "%d: %s\n\tdecl: %s\n\timpl: %s\n", i, class, decl, impl);
-               g_free (class);
+               fprintf (output, "%d: %s\n\tdecl: %s\n\timpl: %s\n", i, klass, decl, impl);
+               g_free (klass);
                g_free (impl);
                g_free (decl);
        }

diff --git a/mono/dis/get.c b/mono/dis/get.c
index c034e8fc71bd09996e397f8bce965ffeeecf054d..de99c35081dcc99cba3815b5d8562b57ec664c28 100755 (executable)
--- a/mono/dis/get.c
+++ b/mono/dis/get.c
@@ -2222,7 +2222,7 @@ get_encoded_user_string_or_bytearray (const unsigned char *ptr, int len)
        char *res, *eres, *result;
        int i;
 
-       res = g_malloc ((len >> 1) + 1);
+       res = (char *)g_malloc ((len >> 1) + 1);
 
        /*
         * I should really use some kind of libunicode here
@@ -3137,7 +3137,7 @@ check_ambiguous_genparams (MonoGenericContainer *container)
        for (i = 0; i < container->type_argc; i++) {
                MonoGenericParam *param = mono_generic_container_get_param (container, i);
 
-               if ((p = g_hash_table_lookup (table, mono_generic_param_info (param)->name)))
+               if ((p = (gpointer *)g_hash_table_lookup (table, mono_generic_param_info (param)->name)))
                        dup_list = g_slist_prepend (g_slist_prepend (dup_list, GUINT_TO_POINTER (i + 1)), p);
                else
                        g_hash_table_insert (table, (char*)mono_generic_param_info (param)->name, GUINT_TO_POINTER (i + 1));

diff --git a/mono/dis/main.c b/mono/dis/main.c
index 4d4a51cd8e77fedf3e286e921b33e2cb2adb4e17..6a96e4329e1c85db0164f0e0263b2c15791aeb06 100644 (file)
--- a/mono/dis/main.c
+++ b/mono/dis/main.c
@@ -301,7 +301,7 @@ dis_directive_moduleref (MonoImage *m)
 static void
 dis_nt_header (MonoImage *m)
 {
-       MonoCLIImageInfo *image_info = m->image_info;
+       MonoCLIImageInfo *image_info = (MonoCLIImageInfo *)m->image_info;
        if (image_info && image_info->cli_header.nt.pe_stack_reserve != 0x100000)
                fprintf (output, ".stackreserve 0x%x\n", image_info->cli_header.nt.pe_stack_reserve);
 }
@@ -493,7 +493,7 @@ dis_field_list (MonoImage *m, guint32 start, guint32 end, MonoGenericContainer *
                        
                        if ((crow = mono_metadata_get_constant_index (m, MONO_TOKEN_FIELD_DEF | (i+1), 0))) {
                                mono_metadata_decode_row (&m->tables [MONO_TABLE_CONSTANT], crow-1, const_cols, MONO_CONSTANT_SIZE);
-                               lit = get_constant (m, const_cols [MONO_CONSTANT_TYPE], const_cols [MONO_CONSTANT_VALUE]);
+                               lit = get_constant (m, (MonoTypeEnum)const_cols [MONO_CONSTANT_TYPE], const_cols [MONO_CONSTANT_VALUE]);
                        } else {
                                lit = g_strdup ("not found");
                        }
@@ -800,7 +800,7 @@ dump_cattrs_for_method_params (MonoImage *m, guint32 midx, MonoMethodSignature *
                        if ((crow = mono_metadata_get_constant_index(m, MONO_TOKEN_PARAM_DEF | i, 0))) {
                                guint32 const_cols [MONO_CONSTANT_SIZE];
                                mono_metadata_decode_row( &m->tables[MONO_TABLE_CONSTANT], crow-1, const_cols, MONO_CONSTANT_SIZE);
-                               lit = get_constant(m, const_cols [MONO_CONSTANT_TYPE], const_cols [MONO_CONSTANT_VALUE]);
+                               lit = get_constant (m, (MonoTypeEnum)const_cols [MONO_CONSTANT_TYPE], const_cols [MONO_CONSTANT_VALUE]);
                        }
                        else {
                                lit = g_strdup ("not found");
@@ -1664,7 +1664,7 @@ setup_filter (MonoImage *image)
        const char *name = mono_image_get_name (image);
 
        for (item = filter_list; item; item = item->next) {
-               ifilter = item->data;
+               ifilter = (ImageFilter *)item->data;
                if (strcmp (ifilter->name, name) == 0) {
                        cur_filter = ifilter;
                        return;
@@ -1676,8 +1676,8 @@ setup_filter (MonoImage *image)
 static int
 int_cmp (const void *e1, const void *e2)
 {
-       const int *i1 = e1;
-       const int *i2 = e2;
+       const int *i1 = (const int *)e1;
+       const int *i2 = (const int *)e2;
        return *i1 - *i2;
 }
 
@@ -1720,7 +1720,7 @@ add_filter (const char *name)
        GList *item;
 
        for (item = filter_list; item; item = item->next) {
-               ifilter = item->data;
+               ifilter = (ImageFilter *)item->data;
                if (strcmp (ifilter->name, name) == 0)
                        return ifilter;
        }
@@ -1736,10 +1736,10 @@ add_item (TableFilter *tf, int val)
        if (tf->count >= tf->size) {
                if (!tf->size) {
                        tf->size = 8;
-                       tf->elems = g_malloc (sizeof (int) * tf->size);
+                       tf->elems = (int *)g_malloc (sizeof (int) * tf->size);
                } else {
                        tf->size *= 2;
-                       tf->elems = g_realloc (tf->elems, sizeof (int) * tf->size);
+                       tf->elems = (int *)g_realloc (tf->elems, sizeof (int) * tf->size);
                }
        }
        tf->elems [tf->count++] = val;
@@ -1752,7 +1752,7 @@ sort_filter_elems (void)
        GList *item;
 
        for (item = filter_list; item; item = item->next) {
-               ifilter = item->data;
+               ifilter = (ImageFilter *)item->data;
                qsort (ifilter->types.elems, ifilter->types.count, sizeof (int), int_cmp);
                qsort (ifilter->fields.elems, ifilter->fields.count, sizeof (int), int_cmp);
                qsort (ifilter->methods.elems, ifilter->methods.count, sizeof (int), int_cmp);
@@ -1913,7 +1913,7 @@ monodis_assembly_search_hook (MonoAssemblyName *aname, gpointer user_data)
         GList *tmp;
 
        for (tmp = loaded_assemblies; tmp; tmp = tmp->next) {
-               MonoAssembly *ass = tmp->data;
+               MonoAssembly *ass = (MonoAssembly *)tmp->data;
                if (mono_assembly_names_equal (aname, &ass->aname))
                       return ass;
        }
@@ -2000,7 +2000,7 @@ main (int argc, char *argv [])
         * If we just have one file, use the corlib version it requires.
         */
        if (!input_files->next) {
-               char *filename = input_files->data;
+               char *filename = (char *)input_files->data;
 
                mono_init_from_assembly (argv [0], filename);
 
@@ -2011,7 +2011,7 @@ main (int argc, char *argv [])
                mono_init (argv [0]);
 
                for (l = input_files; l; l = l->next)
-                       disassemble_file (l->data);
+                       disassemble_file ((const char *)l->data);
        }
 
        return 0;

diff --git a/mono/io-layer/Makefile.am b/mono/io-layer/Makefile.am
index 47e31071494b9df89ae82ae2fea109eaa4ab91ee..b963eb6a053a15d5d108e3b3af96fe011c93fa32 100644 (file)
--- a/mono/io-layer/Makefile.am
+++ b/mono/io-layer/Makefile.am
@@ -12,7 +12,6 @@ libwapiincludedir = $(includedir)/mono-$(API_VER)/mono/io-layer
 
 OTHER_H = \
        access.h        \
-       collection.h    \
        context.h       \
        error.h         \
        events.h        \
@@ -39,8 +38,6 @@ OTHER_H = \
 
 OTHER_SRC = \
        access.h                \
-       collection.c            \
-       collection.h            \
        context.c               \
        context.h               \
        error.c                 \
@@ -61,8 +58,6 @@ OTHER_SRC = \
        macros.h                \
        messages.c              \
        messages.h              \
-       misc.c                  \
-       misc-private.h          \
        mutexes.c               \
        mutexes.h               \
        mutex-private.h         \

diff --git a/mono/io-layer/collection.c b/mono/io-layer/collection.c
deleted file mode 100644 (file)
index e731590..0000000
--- a/mono/io-layer/collection.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * collection.c:  Garbage collection for handles
- *
- * Author:
- *     Dick Porter (dick@ximian.com)
- *
- * (C) 2004-2006 Novell, Inc.
- */
-
-#include <config.h>
-#include <glib.h>
-#include <pthread.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <mono/io-layer/wapi.h>
-#include <mono/io-layer/collection.h>
-#include <mono/io-layer/handles-private.h>
-#include <mono/utils/atomic.h>
-
-#if 0
-// #define DEBUG(...) g_message(__VA_ARGS__)
-#else
-#define DEBUG(...)
-#endif
-
-static pthread_t collection_thread_id;
-
-static gpointer collection_thread (gpointer unused G_GNUC_UNUSED)
-{
-       struct timespec sleepytime;
-
-       sleepytime.tv_sec = _WAPI_HANDLE_COLLECTION_UPDATE_INTERVAL;
-       sleepytime.tv_nsec = 0;
-
-       while (_wapi_has_shut_down == FALSE) {
-               nanosleep (&sleepytime, NULL);
-
-               //_wapi_handle_dump ();
-               _wapi_handle_update_refs ();
-       }
-
-       pthread_exit (NULL);
-
-       return(NULL);
-}
-
-void _wapi_collection_init (void)
-{
-       pthread_attr_t attr;
-       int ret;
-        int set_stacksize = 0;
-
- retry:
-        ret = pthread_attr_init (&attr);
-        g_assert (ret == 0);
-
-#if defined(HAVE_PTHREAD_ATTR_SETSTACKSIZE)
-        if (set_stacksize == 0) {
-                       ret = pthread_attr_setstacksize (&attr, MAX (65536, PTHREAD_STACK_MIN));
-                       g_assert (ret == 0);
-        } else if (set_stacksize == 1) {
-                       ret = pthread_attr_setstacksize (&attr, 131072);
-                       g_assert (ret == 0);
-        }
-#endif
-
-        ret = pthread_create (&collection_thread_id, &attr, collection_thread,
-                              NULL);
-        if (ret != 0 && set_stacksize < 2) {
-                set_stacksize++;
-                goto retry;
-        }
-       if (ret != 0) {
-               g_error ("%s: Couldn't create handle collection thread: %s",
-                        __func__, g_strerror (ret));
-       }
-}
-
-void _wapi_handle_collect (void)
-{
-       guint32 count = _wapi_shared_layout->collection_count;
-       int i, thr_ret;
-
-       if (!_wapi_shm_enabled ())
-               return;
-       
-       DEBUG ("%s: (%d) Starting a collection", __func__, _wapi_getpid ());
-
-       /* Become the collection master */
-       thr_ret = _wapi_handle_lock_shared_handles ();
-       g_assert (thr_ret == 0);
-       
-       thr_ret = _wapi_shm_sem_lock (_WAPI_SHARED_SEM_FILESHARE);
-       g_assert (thr_ret == 0);
-       
-       DEBUG ("%s: (%d) Master set", __func__, _wapi_getpid ());
-       
-       /* If count has changed, someone else jumped in as master */
-       if (count == _wapi_shared_layout->collection_count) {
-               guint32 too_old = (guint32)(time(NULL) & 0xFFFFFFFF) - _WAPI_HANDLE_COLLECTION_EXPIRED_INTERVAL;
-
-               for (i = 0; i < _WAPI_HANDLE_INITIAL_COUNT; i++) {
-                       struct _WapiHandleShared *data;
-                       
-                       data = &_wapi_shared_layout->handles[i];
-                       if (data->timestamp < too_old) {
-                               DEBUG ("%s: (%d) Deleting handle 0x%x", __func__, _wapi_getpid (), i);
-                               memset (&_wapi_shared_layout->handles[i], '\0', sizeof(struct _WapiHandleShared));
-                       }
-               }
-
-               for (i = 0; i < _wapi_fileshare_layout->hwm; i++) {
-                       struct _WapiFileShare *file_share = &_wapi_fileshare_layout->share_info[i];
-                       
-                       if (file_share->timestamp < too_old) {
-                               memset (file_share, '\0',
-                                       sizeof(struct _WapiFileShare));
-                       }
-               }
-
-               InterlockedIncrement ((gint32 *)&_wapi_shared_layout->collection_count);
-       }
-       
-       thr_ret = _wapi_shm_sem_unlock (_WAPI_SHARED_SEM_FILESHARE);
-       g_assert (thr_ret == 0);
-        
-       _wapi_handle_unlock_shared_handles ();
-
-       DEBUG ("%s: (%d) Collection done", __func__, _wapi_getpid ());
-}

diff --git a/mono/io-layer/collection.h b/mono/io-layer/collection.h
deleted file mode 100644 (file)
index 95831d3..0000000
--- a/mono/io-layer/collection.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * collection.h:  Garbage collection for handles
- *
- * Author:
- *     Dick Porter (dick@ximian.com)
- *
- * (C) 2004 Novell, Inc.
- */
-
-#ifndef _WAPI_COLLECTION_H_
-#define _WAPI_COLLECTION_H_
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#define _WAPI_HANDLE_COLLECTION_UPDATE_INTERVAL                10
-#define _WAPI_HANDLE_COLLECTION_EXPIRED_INTERVAL       60
-
-#include <mono/io-layer/shared.h>
-
-extern void _wapi_collection_init (void);
-extern void _wapi_handle_collect (void);
-
-G_END_DECLS
-
-#endif /* _WAPI_COLLECTION_H_ */

diff --git a/mono/io-layer/error.c b/mono/io-layer/error.c
index e45fff4bcdda3efa2f323e8b5f72240d22b18683..6d40dd3b5cc2a7d37bb0f7ef91a40412fd701f1c 100644 (file)
--- a/mono/io-layer/error.c
+++ b/mono/io-layer/error.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 
 #include "mono/io-layer/wapi.h"
+#include "mono/utils/mono-once.h"
 
 static pthread_key_t error_key;
 static mono_once_t error_key_once=MONO_ONCE_INIT;

diff --git a/mono/io-layer/event-private.h b/mono/io-layer/event-private.h
index 5b3ec44b193410d51fe8ebd500e2035ba0c1b56a..25df9111656ffc62227021b5aa8f01884a41935c 100644 (file)
--- a/mono/io-layer/event-private.h
+++ b/mono/io-layer/event-private.h
@@ -14,8 +14,6 @@
 #include <glib.h>
 #include <pthread.h>
 
-#include <mono/utils/mono-mutex.h>
-
 extern struct _WapiHandleOps _wapi_event_ops;
 extern struct _WapiHandleOps _wapi_namedevent_ops;
 

diff --git a/mono/io-layer/events.c b/mono/io-layer/events.c
index ac8068d41a472696b34584307a22d514cfe4f6b8..3ad606bcebc95ebdf277e88344cc714b93237138 100644 (file)
--- a/mono/io-layer/events.c
+++ b/mono/io-layer/events.c
@@ -15,11 +15,9 @@
 #include <mono/io-layer/wapi.h>
 #include <mono/io-layer/wapi-private.h>
 #include <mono/io-layer/handles-private.h>
-#include <mono/io-layer/misc-private.h>
-
 #include <mono/io-layer/event-private.h>
+#include <mono/utils/mono-once.h>
 
-#include <mono/utils/mono-mutex.h>
 #if 0
 #define DEBUG(...) g_message(__VA_ARGS__)
 #else
@@ -90,11 +88,9 @@ static mono_once_t event_ops_once=MONO_ONCE_INIT;
 static void event_ops_init (void)
 {
        _wapi_handle_register_capabilities (WAPI_HANDLE_EVENT,
-                                           WAPI_HANDLE_CAP_WAIT |
-                                           WAPI_HANDLE_CAP_SIGNAL);
+               (WapiHandleCapability)(WAPI_HANDLE_CAP_WAIT | WAPI_HANDLE_CAP_SIGNAL));
        _wapi_handle_register_capabilities (WAPI_HANDLE_NAMEDEVENT,
-                                           WAPI_HANDLE_CAP_WAIT |
-                                           WAPI_HANDLE_CAP_SIGNAL);
+               (WapiHandleCapability)(WAPI_HANDLE_CAP_WAIT | WAPI_HANDLE_CAP_SIGNAL));
 }
 
 static void event_signal(gpointer handle)

diff --git a/mono/io-layer/handles-private.h b/mono/io-layer/handles-private.h
index c5d4fbeb70e94f400e7824cc1db1373a6f465094..4f20de02d411248bec7f67f5b4dc256d084696f1 100644 (file)
--- a/mono/io-layer/handles-private.h
+++ b/mono/io-layer/handles-private.h
@@ -17,8 +17,6 @@
 #include <sys/types.h>
 
 #include <mono/io-layer/wapi-private.h>
-#include <mono/io-layer/misc-private.h>
-#include <mono/io-layer/collection.h>
 #include <mono/io-layer/shared.h>
 #include <mono/utils/atomic.h>
 
@@ -32,7 +30,6 @@
 
 extern struct _WapiHandleUnshared *_wapi_private_handles [];
 extern struct _WapiHandleSharedLayout *_wapi_shared_layout;
-extern struct _WapiFileShareLayout *_wapi_fileshare_layout;
 
 extern guint32 _wapi_fd_reserve;
 extern mono_mutex_t *_wapi_global_signal_mutex;
@@ -79,8 +76,8 @@ extern gboolean _wapi_handle_count_signalled_handles (guint32 numhandles,
                                                      guint32 *lowest);
 extern void _wapi_handle_unlock_handles (guint32 numhandles,
                                         gpointer *handles);
-extern int _wapi_handle_timedwait_signal (struct timespec *timeout, gboolean poll, gboolean *alerted);
-extern int _wapi_handle_timedwait_signal_handle (gpointer handle, struct timespec *timeout, gboolean alertable, gboolean poll, gboolean *alerted);
+extern int _wapi_handle_timedwait_signal (guint32 timeout, gboolean poll, gboolean *alerted);
+extern int _wapi_handle_timedwait_signal_handle (gpointer handle, guint32 timeout, gboolean alertable, gboolean poll, gboolean *alerted);
 extern gboolean _wapi_handle_get_or_set_share (guint64 device, guint64 inode,
                                               guint32 new_sharemode,
                                               guint32 new_access,
@@ -90,7 +87,6 @@ extern gboolean _wapi_handle_get_or_set_share (guint64 device, guint64 inode,
 extern void _wapi_handle_check_share (struct _WapiFileShare *share_info,
                                      int fd);
 extern void _wapi_handle_dump (void);
-extern void _wapi_handle_update_refs (void);
 extern void _wapi_handle_foreach (WapiHandleType type,
                                        gboolean (*on_each)(gpointer test, gpointer user),
                                        gpointer user_data);
@@ -141,9 +137,9 @@ static inline void _wapi_handle_set_signal_state (gpointer handle,
                /* The condition the global signal cond is waiting on is the signalling of
                 * _any_ handle. So lock it before setting the signalled state.
                 */
-               thr_ret = mono_mutex_lock (_wapi_global_signal_mutex);
+               thr_ret = mono_os_mutex_lock (_wapi_global_signal_mutex);
                if (thr_ret != 0)
-                       g_warning ("Bad call to mono_mutex_lock result %d for global signal mutex", thr_ret);
+                       g_warning ("Bad call to mono_os_mutex_lock result %d for global signal mutex", thr_ret);
                g_assert (thr_ret == 0);
 
                /* This function _must_ be called with
@@ -171,9 +167,9 @@ static inline void _wapi_handle_set_signal_state (gpointer handle,
                        g_warning ("Bad call to pthread_cond_broadcast result %d for handle %p", thr_ret, handle);
                g_assert (thr_ret == 0);
                        
-               thr_ret = mono_mutex_unlock (_wapi_global_signal_mutex);
+               thr_ret = mono_os_mutex_unlock (_wapi_global_signal_mutex);
                if (thr_ret != 0)
-                       g_warning ("Bad call to mono_mutex_unlock result %d for global signal mutex", thr_ret);
+                       g_warning ("Bad call to mono_os_mutex_unlock result %d for global signal mutex", thr_ret);
                g_assert (thr_ret == 0);
        } else {
                handle_data->signalled=state;
@@ -227,7 +223,7 @@ static inline int _wapi_handle_lock_signal_mutex (void)
        g_message ("%s: lock global signal mutex", __func__);
 #endif
 
-       return(mono_mutex_lock (_wapi_global_signal_mutex));
+       return(mono_os_mutex_lock (_wapi_global_signal_mutex));
 }
 
 /* the parameter makes it easier to call from a pthread cleanup handler */
@@ -237,7 +233,7 @@ static inline int _wapi_handle_unlock_signal_mutex (void *unused)
        g_message ("%s: unlock global signal mutex", __func__);
 #endif
 
-       return(mono_mutex_unlock (_wapi_global_signal_mutex));
+       return(mono_os_mutex_unlock (_wapi_global_signal_mutex));
 }
 
 static inline int _wapi_handle_lock_handle (gpointer handle)
@@ -258,7 +254,7 @@ static inline int _wapi_handle_lock_handle (gpointer handle)
                return(0);
        }
        
-       return(mono_mutex_lock (&_WAPI_PRIVATE_HANDLES(idx).signal_mutex));
+       return(mono_os_mutex_lock (&_WAPI_PRIVATE_HANDLES(idx).signal_mutex));
 }
 
 static inline int _wapi_handle_trylock_handle (gpointer handle)
@@ -280,7 +276,7 @@ static inline int _wapi_handle_trylock_handle (gpointer handle)
                return(0);
        }
 
-       ret = mono_mutex_trylock (&_WAPI_PRIVATE_HANDLES(idx).signal_mutex);
+       ret = mono_os_mutex_trylock (&_WAPI_PRIVATE_HANDLES(idx).signal_mutex);
        if (ret != 0) {
                _wapi_handle_unref (handle);
        }
@@ -306,7 +302,7 @@ static inline int _wapi_handle_unlock_handle (gpointer handle)
                return(0);
        }
        
-       ret = mono_mutex_unlock (&_WAPI_PRIVATE_HANDLES(idx).signal_mutex);
+       ret = mono_os_mutex_unlock (&_WAPI_PRIVATE_HANDLES(idx).signal_mutex);
 
        _wapi_handle_unref (handle);
        

diff --git a/mono/io-layer/handles.c b/mono/io-layer/handles.c
index 14fa71c9a74e909f64710bc0ed272c783e448acb..f92b6566d8c4886f5e88bd1f40facfc4e44c8bf9 100644 (file)
--- a/mono/io-layer/handles.c
+++ b/mono/io-layer/handles.c
@@ -38,14 +38,13 @@
 #include <mono/io-layer/wapi.h>
 #include <mono/io-layer/wapi-private.h>
 #include <mono/io-layer/handles-private.h>
-#include <mono/io-layer/misc-private.h>
 #include <mono/io-layer/shared.h>
-#include <mono/io-layer/collection.h>
 #include <mono/io-layer/process-private.h>
 
-#include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-os-mutex.h>
 #include <mono/utils/mono-proclib.h>
 #include <mono/utils/mono-threads.h>
+#include <mono/utils/mono-once.h>
 #undef DEBUG_REFS
 
 #if 0
@@ -56,7 +55,7 @@
 
 static void (*_wapi_handle_ops_get_close_func (WapiHandleType type))(gpointer, gpointer);
 
-static WapiHandleCapability handle_caps[WAPI_HANDLE_COUNT]={0};
+static WapiHandleCapability handle_caps[WAPI_HANDLE_COUNT] = { (WapiHandleCapability)0 };
 static struct _WapiHandleOps *handle_ops[WAPI_HANDLE_COUNT]={
        NULL,
        &_wapi_file_ops,
@@ -126,11 +125,6 @@ static guint32 _wapi_private_handle_slot_count = 0;
 
 struct _WapiHandleSharedLayout *_wapi_shared_layout = NULL;
 
-/*
- * If SHM is enabled, this will point to shared memory, otherwise it will be NULL.
- */
-struct _WapiFileShareLayout *_wapi_fileshare_layout = NULL;
-
 /*
  * If SHM is disabled, this will point to a hash of _WapiFileShare structures, otherwise
  * it will be NULL. We use this instead of _wapi_fileshare_layout to avoid allocating a
@@ -139,8 +133,8 @@ struct _WapiFileShareLayout *_wapi_fileshare_layout = NULL;
 static GHashTable *file_share_hash;
 static mono_mutex_t file_share_hash_mutex;
 
-#define file_share_hash_lock() mono_mutex_lock (&file_share_hash_mutex)
-#define file_share_hash_unlock() mono_mutex_unlock (&file_share_hash_mutex)
+#define file_share_hash_lock() mono_os_mutex_lock (&file_share_hash_mutex)
+#define file_share_hash_unlock() mono_os_mutex_unlock (&file_share_hash_mutex)
 
 guint32 _wapi_fd_reserve;
 
@@ -208,12 +202,11 @@ static void handle_cleanup (void)
        
        _wapi_shm_semaphores_remove ();
 
-       _wapi_shm_detach (WAPI_SHM_DATA);
-       _wapi_shm_detach (WAPI_SHM_FILESHARE);
+       g_free (_wapi_shared_layout);
 
        if (file_share_hash) {
                g_hash_table_destroy (file_share_hash);
-               mono_mutex_destroy (&file_share_hash_mutex);
+               mono_os_mutex_destroy (&file_share_hash_mutex);
        }
 
        for (i = 0; i < _WAPI_PRIVATE_MAX_SLOTS; ++i)
@@ -257,22 +250,12 @@ wapi_init (void)
        } while(_wapi_fd_reserve > _wapi_private_handle_count);
 
        _wapi_shm_semaphores_init ();
-       
-       _wapi_shared_layout = _wapi_shm_attach (WAPI_SHM_DATA);
+
+       _wapi_shared_layout = (_WapiHandleSharedLayout *)g_malloc0 (sizeof (_WapiHandleSharedLayout));
        g_assert (_wapi_shared_layout != NULL);
-       
-       if (_wapi_shm_enabled ()) {
-               /* This allocates a 4mb array, so do it only if SHM is enabled */
-               _wapi_fileshare_layout = _wapi_shm_attach (WAPI_SHM_FILESHARE);
-               g_assert (_wapi_fileshare_layout != NULL);
-       }
-       
-#if !defined (DISABLE_SHARED_HANDLES)
-       if (_wapi_shm_enabled ())
-               _wapi_collection_init ();
-#endif
+
        _wapi_io_init ();
-       mono_mutex_init (&scan_mutex);
+       mono_os_mutex_init (&scan_mutex);
 
        _wapi_global_signal_handle = _wapi_handle_new (WAPI_HANDLE_EVENT, NULL);
 
@@ -373,7 +356,7 @@ static void _wapi_handle_init (struct _WapiHandleUnshared *handle,
                thr_ret = pthread_cond_init (&handle->signal_cond, NULL);
                g_assert (thr_ret == 0);
                                
-               thr_ret = mono_mutex_init (&handle->signal_mutex);
+               thr_ret = mono_os_mutex_init (&handle->signal_mutex);
                g_assert (thr_ret == 0);
 
                if (handle_specific != NULL) {
@@ -505,7 +488,7 @@ _wapi_handle_new (WapiHandleType type, gpointer handle_specific)
 
        g_assert(!_WAPI_FD_HANDLE(type));
        
-       thr_ret = mono_mutex_lock (&scan_mutex);
+       thr_ret = mono_os_mutex_lock (&scan_mutex);
        g_assert (thr_ret == 0);
                
        while ((handle_idx = _wapi_handle_new_internal (type, handle_specific)) == 0) {
@@ -522,7 +505,7 @@ _wapi_handle_new (WapiHandleType type, gpointer handle_specific)
                _wapi_private_handle_slot_count ++;
        }
        
-       thr_ret = mono_mutex_unlock (&scan_mutex);
+       thr_ret = mono_os_mutex_unlock (&scan_mutex);
        g_assert (thr_ret == 0);
 
        if (handle_idx == 0) {
@@ -544,7 +527,6 @@ _wapi_handle_new (WapiHandleType type, gpointer handle_specific)
                
                ref = _wapi_handle_new_shared (type, handle_specific);
                if (ref == 0) {
-                       _wapi_handle_collect ();
                        ref = _wapi_handle_new_shared (type, handle_specific);
                        if (ref == 0) {
                                /* FIXME: grow the arrays */
@@ -586,7 +568,7 @@ gpointer _wapi_handle_new_from_offset (WapiHandleType type, guint32 offset,
                InterlockedExchange ((gint32 *)&shared->timestamp, now);
        }
                
-       thr_ret = mono_mutex_lock (&scan_mutex);
+       thr_ret = mono_os_mutex_lock (&scan_mutex);
        g_assert (thr_ret == 0);
 
        for (i = SLOT_INDEX (0); i < _wapi_private_handle_slot_count; i++) {
@@ -604,7 +586,7 @@ gpointer _wapi_handle_new_from_offset (WapiHandleType type, guint32 offset,
        }
 
 first_pass_done:
-       thr_ret = mono_mutex_unlock (&scan_mutex);
+       thr_ret = mono_os_mutex_unlock (&scan_mutex);
        g_assert (thr_ret == 0);
 
        if (handle != INVALID_HANDLE_VALUE) {
@@ -633,7 +615,7 @@ first_pass_done:
                goto done;
        }
        
-       thr_ret = mono_mutex_lock (&scan_mutex);
+       thr_ret = mono_os_mutex_lock (&scan_mutex);
        g_assert (thr_ret == 0);
        
        while ((handle_idx = _wapi_handle_new_internal (type, NULL)) == 0) {
@@ -646,7 +628,7 @@ first_pass_done:
                _wapi_private_handle_slot_count ++;
        }
                
-       thr_ret = mono_mutex_unlock (&scan_mutex);
+       thr_ret = mono_os_mutex_unlock (&scan_mutex);
        g_assert (thr_ret == 0);
                
        /* Make sure we left the space for fd mappings */
@@ -670,7 +652,7 @@ init_handles_slot (int idx)
 {
        int thr_ret;
 
-       thr_ret = mono_mutex_lock (&scan_mutex);
+       thr_ret = mono_os_mutex_lock (&scan_mutex);
        g_assert (thr_ret == 0);
 
        if (_wapi_private_handles [idx] == NULL) {
@@ -679,7 +661,7 @@ init_handles_slot (int idx)
                g_assert (_wapi_private_handles [idx]);
        }
 
-       thr_ret = mono_mutex_unlock (&scan_mutex);
+       thr_ret = mono_os_mutex_unlock (&scan_mutex);
        g_assert (thr_ret == 0);
 }
 
@@ -786,7 +768,7 @@ _wapi_handle_foreach (WapiHandleType type,
        guint32 i, k;
        int thr_ret;
 
-       thr_ret = mono_mutex_lock (&scan_mutex);
+       thr_ret = mono_os_mutex_lock (&scan_mutex);
        g_assert (thr_ret == 0);
 
        for (i = SLOT_INDEX (0); i < _wapi_private_handle_slot_count; i++) {
@@ -803,7 +785,7 @@ _wapi_handle_foreach (WapiHandleType type,
                }
        }
 
-       thr_ret = mono_mutex_unlock (&scan_mutex);
+       thr_ret = mono_os_mutex_unlock (&scan_mutex);
        g_assert (thr_ret == 0);
 }
 
@@ -828,7 +810,7 @@ gpointer _wapi_search_handle (WapiHandleType type,
        gboolean found = FALSE;
        int thr_ret;
 
-       thr_ret = mono_mutex_lock (&scan_mutex);
+       thr_ret = mono_os_mutex_lock (&scan_mutex);
        g_assert (thr_ret == 0);
        
        for (i = SLOT_INDEX (0); !found && i < _wapi_private_handle_slot_count; i++) {
@@ -853,7 +835,7 @@ gpointer _wapi_search_handle (WapiHandleType type,
                }
        }
 
-       thr_ret = mono_mutex_unlock (&scan_mutex);
+       thr_ret = mono_os_mutex_unlock (&scan_mutex);
        g_assert (thr_ret == 0);
 
        if (!found && search_shared && _WAPI_SHARED_HANDLE (type)) {
@@ -959,11 +941,6 @@ gint32 _wapi_search_handle_namespace (WapiHandleType type,
        DEBUG ("%s: Lookup for handle named [%s] type %s", __func__,
                   utf8_name, _wapi_handle_typename[type]);
 
-       /* Do a handle collection before starting to look, so that any
-        * stale cruft gets removed
-        */
-       _wapi_handle_collect ();
-       
        thr_ret = _wapi_handle_lock_shared_handles ();
        g_assert (thr_ret == 0);
        
@@ -1097,7 +1074,7 @@ static void _wapi_handle_unref_full (gpointer handle, gboolean ignore_private_bu
                        g_assert (thr_ret == 0);
                }
                
-               thr_ret = mono_mutex_lock (&scan_mutex);
+               thr_ret = mono_os_mutex_lock (&scan_mutex);
 
                DEBUG ("%s: Destroying handle %p", __func__, handle);
                
@@ -1115,7 +1092,7 @@ static void _wapi_handle_unref_full (gpointer handle, gboolean ignore_private_bu
                         * now, but pthreads doesn't have a
                         * "unlock_and_destroy" atomic function.
                         */
-                       thr_ret = mono_mutex_destroy (&_WAPI_PRIVATE_HANDLES(idx).signal_mutex);
+                       thr_ret = mono_os_mutex_destroy (&_WAPI_PRIVATE_HANDLES(idx).signal_mutex);
                        /*WARNING gross hack to make cleanup not crash when exiting without the whole runtime teardown.*/
                        if (thr_ret == EBUSY && ignore_private_busy_handles) {
                                early_exit = TRUE;
@@ -1150,7 +1127,7 @@ static void _wapi_handle_unref_full (gpointer handle, gboolean ignore_private_bu
                        }
                }
 
-               thr_ret = mono_mutex_unlock (&scan_mutex);
+               thr_ret = mono_os_mutex_unlock (&scan_mutex);
                g_assert (thr_ret == 0);
 
                if (early_exit)
@@ -1498,48 +1475,8 @@ void _wapi_handle_unlock_handles (guint32 numhandles, gpointer *handles)
        }
 }
 
-static int timedwait_signal_poll_cond (pthread_cond_t *cond, mono_mutex_t *mutex, struct timespec *timeout, gboolean alertable)
-{
-       struct timespec fake_timeout;
-       int ret;
-
-       if (!alertable) {
-               /*
-                * pthread_cond_(timed)wait() can return 0 even if the condition was not
-                * signalled.  This happens at least on Darwin.  We surface this, i.e., we
-                * get spurious wake-ups.
-                *
-                * http://pubs.opengroup.org/onlinepubs/007908775/xsh/pthread_cond_wait.html
-                */
-               if (timeout)
-                       ret=mono_cond_timedwait (cond, mutex, timeout);
-               else
-                       ret=mono_cond_wait (cond, mutex);
-       } else {
-               _wapi_calc_timeout (&fake_timeout, 100);
-       
-               if (timeout != NULL && ((fake_timeout.tv_sec > timeout->tv_sec) ||
-                                                               (fake_timeout.tv_sec == timeout->tv_sec &&
-                                                                fake_timeout.tv_nsec > timeout->tv_nsec))) {
-                       /* Real timeout is less than 100ms time */
-                       ret=mono_cond_timedwait (cond, mutex, timeout);
-               } else {
-                       ret=mono_cond_timedwait (cond, mutex, &fake_timeout);
-
-                       /* Mask the fake timeout, this will cause
-                        * another poll if the cond was not really signaled
-                        */
-                       if (ret==ETIMEDOUT) {
-                               ret=0;
-                       }
-               }
-       }
-       
-       return(ret);
-}
-
 int
-_wapi_handle_timedwait_signal (struct timespec *timeout, gboolean poll, gboolean *alerted)
+_wapi_handle_timedwait_signal (guint32 timeout, gboolean poll, gboolean *alerted)
 {
        return _wapi_handle_timedwait_signal_handle (_wapi_global_signal_handle, timeout, TRUE, poll, alerted);
 }
@@ -1562,16 +1499,15 @@ signal_handle_and_unref (gpointer handle)
        cond = &_WAPI_PRIVATE_HANDLES (idx).signal_cond;
        mutex = &_WAPI_PRIVATE_HANDLES (idx).signal_mutex;
 
-       mono_mutex_lock (mutex);
-       mono_cond_broadcast (cond);
-       mono_mutex_unlock (mutex);
+       mono_os_mutex_lock (mutex);
+       mono_os_cond_broadcast (cond);
+       mono_os_mutex_unlock (mutex);
 
        _wapi_handle_unref (handle);
 }
 
 int
-_wapi_handle_timedwait_signal_handle (gpointer handle, struct timespec *timeout,
-               gboolean alertable, gboolean poll, gboolean *alerted)
+_wapi_handle_timedwait_signal_handle (gpointer handle, guint32 timeout, gboolean alertable, gboolean poll, gboolean *alerted)
 {
        DEBUG ("%s: waiting for %p (type %s)", __func__, handle,
                   _wapi_handle_typename[_wapi_handle_type (handle)]);
@@ -1586,13 +1522,8 @@ _wapi_handle_timedwait_signal_handle (gpointer handle, struct timespec *timeout,
                if (WAPI_SHARED_HANDLE_DATA(handle).signalled == TRUE) {
                        return (0);
                }
-               if (timeout != NULL) {
-                       struct timespec fake_timeout;
-                       _wapi_calc_timeout (&fake_timeout, 100);
-               
-                       if ((fake_timeout.tv_sec > timeout->tv_sec) ||
-                               (fake_timeout.tv_sec == timeout->tv_sec &&
-                                fake_timeout.tv_nsec > timeout->tv_nsec)) {
+               if (timeout != INFINITE) {
+                       if (timeout < 100) {
                                /* FIXME: Real timeout is less than
                                 * 100ms time, but is it really worth
                                 * calculating to the exact ms?
@@ -1625,14 +1556,33 @@ _wapi_handle_timedwait_signal_handle (gpointer handle, struct timespec *timeout,
                cond = &_WAPI_PRIVATE_HANDLES (idx).signal_cond;
                mutex = &_WAPI_PRIVATE_HANDLES (idx).signal_mutex;
 
-               if (poll) {
-                       /* This is needed when waiting for process handles */
-                       res = timedwait_signal_poll_cond (cond, mutex, timeout, alertable);
+               if (!poll) {
+                       res = mono_os_cond_timedwait (cond, mutex, timeout);
                } else {
-                       if (timeout)
-                               res = mono_cond_timedwait (cond, mutex, timeout);
-                       else
-                               res = mono_cond_wait (cond, mutex);
+                       /* This is needed when waiting for process handles */
+                       if (!alertable) {
+                               /*
+                                * pthread_cond_(timed)wait() can return 0 even if the condition was not
+                                * signalled.  This happens at least on Darwin.  We surface this, i.e., we
+                                * get spurious wake-ups.
+                                *
+                                * http://pubs.opengroup.org/onlinepubs/007908775/xsh/pthread_cond_wait.html
+                                */
+                               res = mono_os_cond_timedwait (cond, mutex, timeout);
+                       } else {
+                               if (timeout < 100) {
+                                       /* Real timeout is less than 100ms time */
+                                       res = mono_os_cond_timedwait (cond, mutex, timeout);
+                               } else {
+                                       res = mono_os_cond_timedwait (cond, mutex, 100);
+
+                                       /* Mask the fake timeout, this will cause
+                                        * another poll if the cond was not really signaled
+                                        */
+                                       if (res == ETIMEDOUT)
+                                               res = 0;
+                               }
+                       }
                }
 
                if (alertable) {
@@ -1650,21 +1600,17 @@ _wapi_handle_timedwait_signal_handle (gpointer handle, struct timespec *timeout,
 void
 _wapi_free_share_info (_WapiFileShare *share_info)
 {
-       if (!_wapi_shm_enabled ()) {
-               file_share_hash_lock ();
-               g_hash_table_remove (file_share_hash, share_info);
-               file_share_hash_unlock ();
-               /* The hashtable dtor frees share_info */
-       } else {
-               memset (share_info, '\0', sizeof(struct _WapiFileShare));
-       }
+       file_share_hash_lock ();
+       g_hash_table_remove (file_share_hash, share_info);
+       file_share_hash_unlock ();
+       /* The hashtable dtor frees share_info */
 }
 
 static gint
 wapi_share_info_equal (gconstpointer ka, gconstpointer kb)
 {
-       const _WapiFileShare *s1 = ka;
-       const _WapiFileShare *s2 = kb;
+       const _WapiFileShare *s1 = (const _WapiFileShare *)ka;
+       const _WapiFileShare *s2 = (const _WapiFileShare *)kb;
 
        return (s1->device == s2->device && s1->inode == s2->inode) ? 1 : 0;
 }
@@ -1672,7 +1618,7 @@ wapi_share_info_equal (gconstpointer ka, gconstpointer kb)
 static guint
 wapi_share_info_hash (gconstpointer data)
 {
-       const _WapiFileShare *s = data;
+       const _WapiFileShare *s = (const _WapiFileShare *)data;
 
        return s->inode;
 }
@@ -1685,8 +1631,7 @@ gboolean _wapi_handle_get_or_set_share (guint64 device, guint64 inode,
                                        struct _WapiFileShare **share_info)
 {
        struct _WapiFileShare *file_share;
-       guint32 now = (guint32)(time(NULL) & 0xFFFFFFFF);
-       int thr_ret, i, first_unused = -1;
+       int thr_ret;
        gboolean exists = FALSE;
 
        /* Prevents entries from expiring under us as we search
@@ -1698,110 +1643,46 @@ gboolean _wapi_handle_get_or_set_share (guint64 device, guint64 inode,
        thr_ret = _wapi_shm_sem_lock (_WAPI_SHARED_SEM_FILESHARE);
        g_assert (thr_ret == 0);
 
-       if (!_wapi_shm_enabled ()) {
-               _WapiFileShare tmp;
+       _WapiFileShare tmp;
 
-               /*
-                * Instead of allocating a 4MB array, we use a hash table to keep track of this
-                * info. This is needed even if SHM is disabled, to track sharing inside
-                * the current process.
-                */
-               if (!file_share_hash) {
-                       file_share_hash = g_hash_table_new_full (wapi_share_info_hash, wapi_share_info_equal, NULL, g_free);
-                       mono_mutex_init_recursive (&file_share_hash_mutex);
-               }
-                       
-               tmp.device = device;
-               tmp.inode = inode;
+       /*
+        * Instead of allocating a 4MB array, we use a hash table to keep track of this
+        * info. This is needed even if SHM is disabled, to track sharing inside
+        * the current process.
+        */
+       if (!file_share_hash) {
+               file_share_hash = g_hash_table_new_full (wapi_share_info_hash, wapi_share_info_equal, NULL, g_free);
+               mono_os_mutex_init_recursive (&file_share_hash_mutex);
+       }
 
-               file_share_hash_lock ();
+       tmp.device = device;
+       tmp.inode = inode;
 
-               file_share = g_hash_table_lookup (file_share_hash, &tmp);
-               if (file_share) {
-                       *old_sharemode = file_share->sharemode;
-                       *old_access = file_share->access;
-                       *share_info = file_share;
-                       
-                       InterlockedIncrement ((gint32 *)&file_share->handle_refs);
-                       exists = TRUE;
-               } else {
-                       file_share = g_new0 (_WapiFileShare, 1);
-
-                       file_share->device = device;
-                       file_share->inode = inode;
-                       file_share->opened_by_pid = _wapi_getpid ();
-                       file_share->sharemode = new_sharemode;
-                       file_share->access = new_access;
-                       file_share->handle_refs = 1;
-                       *share_info = file_share;
+       file_share_hash_lock ();
 
-                       g_hash_table_insert (file_share_hash, file_share, file_share);
-               }
+       file_share = (_WapiFileShare *)g_hash_table_lookup (file_share_hash, &tmp);
+       if (file_share) {
+               *old_sharemode = file_share->sharemode;
+               *old_access = file_share->access;
+               *share_info = file_share;
 
-               file_share_hash_unlock ();
+               InterlockedIncrement ((gint32 *)&file_share->handle_refs);
+               exists = TRUE;
        } else {
-               /* If a linear scan gets too slow we'll have to fit a hash
-                * table onto the shared mem backing store
-                */
-               *share_info = NULL;
-               for (i = 0; i <= _wapi_fileshare_layout->hwm; i++) {
-                       file_share = &_wapi_fileshare_layout->share_info[i];
+               file_share = g_new0 (_WapiFileShare, 1);
 
-                       /* Make a note of an unused slot, in case we need to
-                        * store share info
-                        */
-                       if (first_unused == -1 && file_share->handle_refs == 0) {
-                               first_unused = i;
-                               continue;
-                       }
-               
-                       if (file_share->handle_refs == 0) {
-                               continue;
-                       }
-               
-                       if (file_share->device == device &&
-                               file_share->inode == inode) {
-                               *old_sharemode = file_share->sharemode;
-                               *old_access = file_share->access;
-                               *share_info = file_share;
-                       
-                               /* Increment the reference count while we
-                                * still have sole access to the shared area.
-                                * This makes the increment atomic wrt
-                                * collections
-                                */
-                               InterlockedIncrement ((gint32 *)&file_share->handle_refs);
-                       
-                               exists = TRUE;
-                               break;
-                       }
-               }
-       
-               if (!exists) {
-                       if (i == _WAPI_FILESHARE_SIZE && first_unused == -1) {
-                               /* No more space */
-                       } else {
-                               if (first_unused == -1) {
-                                       file_share = &_wapi_fileshare_layout->share_info[++i];
-                                       _wapi_fileshare_layout->hwm = i;
-                               } else {
-                                       file_share = &_wapi_fileshare_layout->share_info[first_unused];
-                               }
-                       
-                               file_share->device = device;
-                               file_share->inode = inode;
-                               file_share->opened_by_pid = _wapi_getpid ();
-                               file_share->sharemode = new_sharemode;
-                               file_share->access = new_access;
-                               file_share->handle_refs = 1;
-                               *share_info = file_share;
-                       }
-               }
+               file_share->device = device;
+               file_share->inode = inode;
+               file_share->opened_by_pid = _wapi_getpid ();
+               file_share->sharemode = new_sharemode;
+               file_share->access = new_access;
+               file_share->handle_refs = 1;
+               *share_info = file_share;
 
-               if (*share_info != NULL) {
-                       InterlockedExchange ((gint32 *)&(*share_info)->timestamp, now);
-               }
+               g_hash_table_insert (file_share_hash, file_share, file_share);
        }
+
+       file_share_hash_unlock ();
        
        thr_ret = _wapi_shm_sem_unlock (_WAPI_SHARED_SEM_FILESHARE);
 
@@ -1928,7 +1809,7 @@ void _wapi_handle_dump (void)
        guint32 i, k;
        int thr_ret;
        
-       thr_ret = mono_mutex_lock (&scan_mutex);
+       thr_ret = mono_os_mutex_lock (&scan_mutex);
        g_assert (thr_ret == 0);
        
        for(i = SLOT_INDEX (0); i < _wapi_private_handle_slot_count; i++) {
@@ -1952,7 +1833,7 @@ void _wapi_handle_dump (void)
                }
        }
 
-       thr_ret = mono_mutex_unlock (&scan_mutex);
+       thr_ret = mono_os_mutex_unlock (&scan_mutex);
        g_assert (thr_ret == 0);
 }
 
@@ -1962,57 +1843,3 @@ static void _wapi_shared_details (gpointer handle_info)
        
        g_print ("offset: 0x%x", shared->offset);
 }
-
-void _wapi_handle_update_refs (void)
-{
-       guint32 i, k;
-       int thr_ret;
-       guint32 now = (guint32)(time (NULL) & 0xFFFFFFFF);
-       
-       thr_ret = _wapi_handle_lock_shared_handles ();
-       g_assert (thr_ret == 0);
-
-       /* Prevent file share entries racing with us */
-       thr_ret = _wapi_shm_sem_lock (_WAPI_SHARED_SEM_FILESHARE);
-       g_assert(thr_ret == 0);
-
-       thr_ret = mono_mutex_lock (&scan_mutex);
-       
-       for(i = SLOT_INDEX (0); i < _wapi_private_handle_slot_count; i++) {
-               if (_wapi_private_handles [i]) {
-                       for (k = SLOT_OFFSET (0); k < _WAPI_HANDLE_INITIAL_COUNT; k++) {
-                               struct _WapiHandleUnshared *handle = &_wapi_private_handles [i][k];
-
-                               if (_WAPI_SHARED_HANDLE(handle->type)) {
-                                       struct _WapiHandleShared *shared_data;
-                               
-                                       DEBUG ("%s: (%d) handle 0x%x is SHARED (%s)", __func__, _wapi_getpid (), i * _WAPI_HANDLE_INITIAL_COUNT + k, _wapi_handle_typename[handle->type]);
-
-                                       shared_data = &_wapi_shared_layout->handles[handle->u.shared.offset];
-
-                                       DEBUG ("%s: (%d) Updating timestamp of handle 0x%x", __func__, _wapi_getpid (), handle->u.shared.offset);
-
-                                       InterlockedExchange ((gint32 *)&shared_data->timestamp, now);
-                               } else if (handle->type == WAPI_HANDLE_FILE) {
-                                       struct _WapiHandle_file *file_handle = &handle->u.file;
-                               
-                                       DEBUG ("%s: (%d) handle 0x%x is FILE", __func__, _wapi_getpid (), i * _WAPI_HANDLE_INITIAL_COUNT + k);
-                               
-                                       g_assert (file_handle->share_info != NULL);
-
-                                       DEBUG ("%s: (%d) Inc refs on fileshare 0x%x", __func__, _wapi_getpid (), (file_handle->share_info - &_wapi_fileshare_layout->share_info[0]) / sizeof(struct _WapiFileShare));
-
-                                       InterlockedExchange ((gint32 *)&file_handle->share_info->timestamp, now);
-                               }
-                       }
-               }
-       }
-
-       thr_ret = mono_mutex_unlock (&scan_mutex);
-       g_assert (thr_ret == 0);
-       
-       thr_ret = _wapi_shm_sem_unlock (_WAPI_SHARED_SEM_FILESHARE);
-
-       _wapi_handle_unlock_shared_handles ();
-}
-

diff --git a/mono/io-layer/io-portability.c b/mono/io-layer/io-portability.c
index b9674955380f25eadf513556862ec3e54f9ea919..8838c304e9c35577a0eaed9f9bf4f12c79adcdab 100644 (file)
--- a/mono/io-layer/io-portability.c
+++ b/mono/io-layer/io-portability.c
@@ -30,8 +30,6 @@
 #include <mono/io-layer/io-portability.h>
 #include <mono/utils/mono-io-portability.h>
 
-#include <mono/utils/mono-mutex.h>
-
 #undef DEBUG
 
 int _wapi_open (const char *pathname, int flags, mode_t mode)

diff --git a/mono/io-layer/io.c b/mono/io-layer/io.c
index 685a822749100c2215ded9dd302e080a1d8f5106..e06a61aa9d514437d02dae2e7f62b8199b8dca63 100644 (file)
--- a/mono/io-layer/io.c
+++ b/mono/io-layer/io.c
@@ -43,6 +43,7 @@
 #include <mono/io-layer/thread-private.h>
 #include <mono/io-layer/io-portability.h>
 #include <mono/utils/strenc.h>
+#include <mono/utils/mono-once.h>
 
 #if 0
 #define DEBUG(...) g_message(__VA_ARGS__)
@@ -1453,14 +1454,6 @@ static gboolean share_check (struct stat *statbuf, guint32 sharemode,
                               share_info) == TRUE) {
                return (TRUE);
        }
-       
-       /* Still violating.  It's possible that a process crashed
-        * while still holding a file handle, and that a non-mono
-        * process has the file open.  (For example, C-c mcs while
-        * editing a source file.)  As a last resort, run a handle
-        * collection, which will remove stale share entries.
-        */
-       _wapi_handle_collect ();
 
        return(share_allows_open (statbuf, sharemode, fileaccess, share_info));
 }
@@ -1493,7 +1486,7 @@ static gboolean share_check (struct stat *statbuf, guint32 sharemode,
 gpointer CreateFile(const gunichar2 *name, guint32 fileaccess,
                    guint32 sharemode, WapiSecurityAttributes *security,
                    guint32 createmode, guint32 attrs,
-                   gpointer template G_GNUC_UNUSED)
+                   gpointer template_ G_GNUC_UNUSED)
 {
        struct _WapiHandle_file file_handle = {0};
        gpointer handle;
@@ -1507,7 +1500,7 @@ gpointer CreateFile(const gunichar2 *name, guint32 fileaccess,
        mode_t perms=0666;
        gchar *filename;
        int fd, ret;
-       int handle_type;
+       WapiHandleType handle_type;
        struct stat statbuf;
        
        mono_once (&io_ops_once, io_ops_init);
@@ -2178,7 +2171,7 @@ gpointer GetStdHandle(WapiStdHandle stdhandle)
 
        handle = GINT_TO_POINTER (fd);
 
-       thr_ret = mono_mutex_lock (&stdhandle_mutex);
+       thr_ret = mono_os_mutex_lock (&stdhandle_mutex);
        g_assert (thr_ret == 0);
 
        ok = _wapi_lookup_handle (handle, WAPI_HANDLE_CONSOLE,
@@ -2197,7 +2190,7 @@ gpointer GetStdHandle(WapiStdHandle stdhandle)
        }
        
   done:
-       thr_ret = mono_mutex_unlock (&stdhandle_mutex);
+       thr_ret = mono_os_mutex_unlock (&stdhandle_mutex);
        g_assert (thr_ret == 0);
        
        return(handle);
@@ -3705,7 +3698,7 @@ append_to_mountpoint (LinuxMountInfoParseState *state)
        if (state->mountpoint_allocated) {
                if (state->mountpoint_index >= state->allocated_size) {
                        guint32 newsize = (state->allocated_size << 1) + 1;
-                       gchar *newbuf = g_malloc0 (newsize * sizeof (gchar));
+                       gchar *newbuf = (gchar *)g_malloc0 (newsize * sizeof (gchar));
 
                        memcpy (newbuf, state->mountpoint_allocated, state->mountpoint_index);
                        g_free (state->mountpoint_allocated);
@@ -3716,7 +3709,7 @@ append_to_mountpoint (LinuxMountInfoParseState *state)
        } else {
                if (state->mountpoint_index >= GET_LOGICAL_DRIVE_STRINGS_MOUNTPOINT_BUFFER) {
                        state->allocated_size = (state->mountpoint_index << 1) + 1;
-                       state->mountpoint_allocated = g_malloc0 (state->allocated_size * sizeof (gchar));
+                       state->mountpoint_allocated = (gchar *)g_malloc0 (state->allocated_size * sizeof (gchar));
                        memcpy (state->mountpoint_allocated, state->mountpoint, state->mountpoint_index);
                        state->mountpoint_allocated [state->mountpoint_index++] = ch;
                } else
@@ -4282,5 +4275,5 @@ GetVolumeInformation (const gunichar2 *path, gunichar2 *volumename, int volumesi
 void
 _wapi_io_init (void)
 {
-       mono_mutex_init (&stdhandle_mutex);
+       mono_os_mutex_init (&stdhandle_mutex);
 }

diff --git a/mono/io-layer/io.h b/mono/io-layer/io.h
index 12a1310d96784cf7bb40bb5a1c8c6789ebc6b145..4c5a492b95b004db8c46322334e0bea5310ebe01 100644 (file)
--- a/mono/io-layer/io.h
+++ b/mono/io-layer/io.h
@@ -177,7 +177,7 @@ extern gboolean WriteFile(gpointer handle, gconstpointer buffer,
 extern gboolean FlushFileBuffers(gpointer handle);
 extern gboolean SetEndOfFile(gpointer handle);
 extern guint32 SetFilePointer(gpointer handle, gint32 movedistance,
-                             gint32 *highmovedistance, WapiSeekMethod method);
+                             gint32 *highmovedistance, guint32 method);
 extern WapiFileType GetFileType(gpointer handle);
 extern guint32 GetFileSize(gpointer handle, guint32 *highsize);
 extern gboolean GetFileTime(gpointer handle, WapiFileTime *create_time,

diff --git a/mono/io-layer/messages.c b/mono/io-layer/messages.c
index 1b052dbaca7762a9091872067680eabe8634faa0..9c5bd31e06a5307d2e910290ea58cdf3a8f5f296 100644 (file)
--- a/mono/io-layer/messages.c
+++ b/mono/io-layer/messages.c
@@ -15,7 +15,6 @@
 
 #include <mono/io-layer/wapi.h>
 #include <mono/io-layer/wapi-private.h>
-#include <mono/io-layer/misc-private.h>
 #include <mono/io-layer/messages.h>
 #include <mono/utils/bsearch.h>
 
@@ -1831,7 +1830,7 @@ find_msg (guint32 id, ErrorDesc *base, int n)
        ErrorDesc d, *result;
        d.id = id;
        
-       result = mono_binary_search (&d, base, n, sizeof (ErrorDesc), msg_compare);
+       result = (ErrorDesc *)mono_binary_search (&d, base, n, sizeof (ErrorDesc), msg_compare);
        if (result == NULL)
                return NULL;
        return result->txt;

diff --git a/mono/io-layer/misc-private.h b/mono/io-layer/misc-private.h
deleted file mode 100644 (file)
index 60e8cd8..0000000
--- a/mono/io-layer/misc-private.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * misc-private.h:  Miscellaneous internal support functions
- *
- * Author:
- *     Dick Porter (dick@ximian.com)
- *
- * (C) 2002 Ximian, Inc.
- */
-
-#ifndef _WAPI_MISC_PRIVATE_H_
-#define _WAPI_MISC_PRIVATE_H_
-
-#include <glib.h>
-#include <sys/time.h>
-#include <time.h>
-
-extern void _wapi_calc_timeout(struct timespec *timeout, guint32 ms);
-
-#endif /* _WAPI_MISC_PRIVATE_H_ */

diff --git a/mono/io-layer/misc.c b/mono/io-layer/misc.c
deleted file mode 100644 (file)
index 82835cc..0000000
--- a/mono/io-layer/misc.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * misc.c:  Miscellaneous internal support functions
- *
- * Author:
- *     Dick Porter (dick@ximian.com)
- *
- * (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include <glib.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "misc-private.h"
-
-void _wapi_calc_timeout(struct timespec *timeout, guint32 ms)
-{
-       struct timeval now;
-       div_t ms_divvy, overflow_divvy;
-       
-       gettimeofday (&now, NULL);
-
-       ms_divvy = div (ms, 1000);
-       overflow_divvy = div ((now.tv_usec / 1000) + ms_divvy.rem, 1000);
-               
-       timeout->tv_sec = now.tv_sec + ms_divvy.quot + overflow_divvy.quot;
-       timeout->tv_nsec = overflow_divvy.rem * 1000000;
-}

diff --git a/mono/io-layer/mutexes.c b/mono/io-layer/mutexes.c
index 56bd23a3f944734d41d6d0657f996c5920bee99d..e1a4539a0b193ee513c6cc553bb9855df6a736ff 100644 (file)
--- a/mono/io-layer/mutexes.c
+++ b/mono/io-layer/mutexes.c
@@ -15,10 +15,9 @@
 
 #include <mono/io-layer/wapi.h>
 #include <mono/io-layer/wapi-private.h>
-#include <mono/io-layer/misc-private.h>
 #include <mono/io-layer/handles-private.h>
 #include <mono/io-layer/mutex-private.h>
-#include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-once.h>
 
 #if 0
 #define DEBUG(...) g_message(__VA_ARGS__)
@@ -92,13 +91,9 @@ static mono_once_t mutex_ops_once=MONO_ONCE_INIT;
 static void mutex_ops_init (void)
 {
        _wapi_handle_register_capabilities (WAPI_HANDLE_MUTEX,
-                                           WAPI_HANDLE_CAP_WAIT |
-                                           WAPI_HANDLE_CAP_SIGNAL |
-                                           WAPI_HANDLE_CAP_OWN);
+               (WapiHandleCapability)(WAPI_HANDLE_CAP_WAIT | WAPI_HANDLE_CAP_SIGNAL | WAPI_HANDLE_CAP_OWN));
        _wapi_handle_register_capabilities (WAPI_HANDLE_NAMEDMUTEX,
-                                           WAPI_HANDLE_CAP_WAIT |
-                                           WAPI_HANDLE_CAP_SIGNAL |
-                                           WAPI_HANDLE_CAP_OWN);
+               (WapiHandleCapability)(WAPI_HANDLE_CAP_WAIT | WAPI_HANDLE_CAP_SIGNAL | WAPI_HANDLE_CAP_OWN));
 }
 
 static void mutex_signal(gpointer handle)

diff --git a/mono/io-layer/process-private.h b/mono/io-layer/process-private.h
index 86a8cf3137d4f9aeaec10bc943c681243d2787da..ddd6e863f36623426672ab8244c2fdf9f7ae216b 100644 (file)
--- a/mono/io-layer/process-private.h
+++ b/mono/io-layer/process-private.h
@@ -13,6 +13,8 @@
 #include <config.h>
 #include <glib.h>
 
+#include <mono/utils/mono-os-semaphore.h>
+
 /* There doesn't seem to be a defined symbol for this */
 #define _WAPI_PROCESS_CURRENT (gpointer)0xFFFFFFFF
 

diff --git a/mono/io-layer/processes.c b/mono/io-layer/processes.c
index 96e72675c6acfb4ee1ce40c83136c8b0a6d9da67..851ffaffb6eb1b6f2712a38daca9cec9d7c59cea 100644 (file)
--- a/mono/io-layer/processes.c
+++ b/mono/io-layer/processes.c
@@ -83,7 +83,6 @@
 #include <mono/io-layer/wapi.h>
 #include <mono/io-layer/wapi-private.h>
 #include <mono/io-layer/handles-private.h>
-#include <mono/io-layer/misc-private.h>
 #include <mono/io-layer/process-private.h>
 #include <mono/io-layer/threads.h>
 #include <mono/utils/strenc.h>
@@ -91,9 +90,10 @@
 #include <mono/io-layer/timefuncs-private.h>
 #include <mono/utils/mono-time.h>
 #include <mono/utils/mono-membar.h>
-#include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-os-mutex.h>
 #include <mono/utils/mono-signal-handler.h>
 #include <mono/utils/mono-proclib.h>
+#include <mono/utils/mono-once.h>
 
 /* The process' environment strings */
 #if defined(__APPLE__)
@@ -1037,7 +1037,7 @@ gboolean CreateProcess (const gunichar2 *appname, const gunichar2 *cmdline,
        mono_process = (struct MonoProcess *) g_malloc0 (sizeof (struct MonoProcess));
        mono_process->pid = pid;
        mono_process->handle_count = 1;
-       if (MONO_SEM_INIT (&mono_process->exit_sem, 0) != 0) {
+       if (mono_os_sem_init (&mono_process->exit_sem, 0) != 0) {
                /* If we can't create the exit semaphore, we just don't add anything
                 * to our list of mono processes. Waiting on the process will return 
                 * immediately. */
@@ -1051,10 +1051,10 @@ gboolean CreateProcess (const gunichar2 *appname, const gunichar2 *cmdline,
 
                process_handle_data->mono_process = mono_process;
 
-               mono_mutex_lock (&mono_processes_mutex);
+               mono_os_mutex_lock (&mono_processes_mutex);
                mono_process->next = mono_processes;
                mono_processes = mono_process;
-               mono_mutex_unlock (&mono_processes_mutex);
+               mono_os_mutex_unlock (&mono_processes_mutex);
        }
        
        if (process_info != NULL) {
@@ -1137,8 +1137,7 @@ wapi_processes_init (void)
        WapiHandle_process process_handle = {0};
 
        _wapi_handle_register_capabilities (WAPI_HANDLE_PROCESS,
-                                           WAPI_HANDLE_CAP_WAIT |
-                                           WAPI_HANDLE_CAP_SPECIAL_WAIT);
+               (WapiHandleCapability)(WAPI_HANDLE_CAP_WAIT | WAPI_HANDLE_CAP_SPECIAL_WAIT));
        
        process_handle.id = pid;
 
@@ -1148,6 +1147,8 @@ wapi_processes_init (void)
        current_process = _wapi_handle_new (WAPI_HANDLE_PROCESS,
                                            &process_handle);
        g_assert (current_process);
+
+       mono_os_mutex_init (&mono_processes_mutex);
 }
 
 gpointer
@@ -1829,7 +1830,7 @@ gboolean EnumProcessModules (gpointer process, gpointer *modules,
        }
                
        for (i = 0; i < count; i++) {
-               free_procmodule (g_slist_nth_data (mods, i));
+               free_procmodule ((WapiProcModule *)g_slist_nth_data (mods, i));
        }
        g_slist_free (mods);
        g_free (proc_name);
@@ -2585,10 +2586,10 @@ mono_processes_cleanup (void)
                if (mp->pid == 0 && mp->handle) {
                        /* This process has exited and we need to remove the artifical ref
                         * on the handle */
-                       mono_mutex_lock (&mono_processes_mutex);
+                       mono_os_mutex_lock (&mono_processes_mutex);
                        unref_handle = mp->handle;
                        mp->handle = NULL;
-                       mono_mutex_unlock (&mono_processes_mutex);
+                       mono_os_mutex_unlock (&mono_processes_mutex);
                        if (unref_handle)
                                _wapi_handle_unref (unref_handle);
                }
@@ -2600,7 +2601,7 @@ mono_processes_cleanup (void)
         * asynchronously. The handler requires that the mono_processes list
         * remain valid.
         */
-       mono_mutex_lock (&mono_processes_mutex);
+       mono_os_mutex_lock (&mono_processes_mutex);
 
        mp = mono_processes;
        while (mp) {
@@ -2631,13 +2632,13 @@ mono_processes_cleanup (void)
                 * they have the 'finished' flag set, which means the sigchld handler is done
                 * accessing them.
                 */
-               mp = l->data;
-               MONO_SEM_DESTROY (&mp->exit_sem);
+               mp = (MonoProcess *)l->data;
+               mono_os_sem_destroy (&mp->exit_sem);
                g_free (mp);
        }
        g_slist_free (finished);
 
-       mono_mutex_unlock (&mono_processes_mutex);
+       mono_os_mutex_unlock (&mono_processes_mutex);
 
        DEBUG ("%s done", __func__);
 
@@ -2689,7 +2690,7 @@ MONO_SIGNAL_HANDLER_FUNC (static, mono_sigchld_signal_handler, (int _dummy, sigi
                if (p) {
                        p->pid = 0; /* this pid doesn't exist anymore, clear it */
                        p->status = status;
-                       MONO_SEM_POST (&p->exit_sem);
+                       mono_os_sem_post (&p->exit_sem);
                        mono_memory_barrier ();
                        /* Mark this as freeable, the pointer becomes invalid afterwards */
                        p->freeable = TRUE;
@@ -2759,12 +2760,11 @@ process_wait (gpointer handle, guint32 timeout, gboolean alertable)
                if (timeout != INFINITE) {
                        DEBUG ("%s (%p, %u): waiting on semaphore for %li ms...", 
                                   __func__, handle, timeout, (timeout - (now - start)));
-
-                       ret = MONO_SEM_TIMEDWAIT_ALERTABLE (&mp->exit_sem, (timeout - (now - start)), alertable);
+                       ret = mono_os_sem_timedwait (&mp->exit_sem, (timeout - (now - start)), alertable ? MONO_SEM_FLAGS_ALERTABLE : MONO_SEM_FLAGS_NONE);
                } else {
                        DEBUG ("%s (%p, %u): waiting on semaphore forever...", 
                                   __func__, handle, timeout);
-                       ret = MONO_SEM_WAIT_ALERTABLE (&mp->exit_sem, alertable);
+                       ret = mono_os_sem_wait (&mp->exit_sem, alertable ? MONO_SEM_FLAGS_ALERTABLE : MONO_SEM_FLAGS_NONE);
                }
 
                if (ret == -1 && errno != EINTR && errno != ETIMEDOUT) {
@@ -2775,7 +2775,7 @@ process_wait (gpointer handle, guint32 timeout, gboolean alertable)
 
                if (ret == 0) {
                        /* Success, process has exited */
-                       MONO_SEM_POST (&mp->exit_sem);
+                       mono_os_sem_post (&mp->exit_sem);
                        break;
                }
 

diff --git a/mono/io-layer/processes.h b/mono/io-layer/processes.h
index c2b78d44387dbc11d3b0bd6105170b2bc74a07ec..a5ff917f4dfb392ce2941f152b600cce216163f8 100644 (file)
--- a/mono/io-layer/processes.h
+++ b/mono/io-layer/processes.h
@@ -107,13 +107,13 @@ typedef struct _WapiShellExecuteInfo WapiShellExecuteInfo;
 struct _WapiShellExecuteInfo
 {
        guint32 cbSize;
-       WapiShellExecuteInfoFlags fMask;
+       gulong fMask;
        gpointer hwnd;
        const gunichar2 *lpVerb;
        const gunichar2 *lpFile;
        const gunichar2 *lpParameters;
        const gunichar2 *lpDirectory;
-       WapiShellExecuteShowFlags nShow;
+       gulong nShow;
        gpointer hInstApp;
        gpointer lpIDList;
        const gunichar2 *lpClass;

diff --git a/mono/io-layer/semaphores.c b/mono/io-layer/semaphores.c
index 445183046320e0f98f4d173bc01c3a93da154875..01179f4d18244f0e3469aeecc5d6a1a0a90de149 100644 (file)
--- a/mono/io-layer/semaphores.c
+++ b/mono/io-layer/semaphores.c
@@ -19,11 +19,9 @@
 
 #include <mono/io-layer/wapi.h>
 #include <mono/io-layer/wapi-private.h>
-#include <mono/io-layer/misc-private.h>
 #include <mono/io-layer/handles-private.h>
 #include <mono/io-layer/semaphore-private.h>
-
-#include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-once.h>
 
 #if 0
 #define DEBUG(...) g_message(__VA_ARGS__)
@@ -89,11 +87,9 @@ static mono_once_t sem_ops_once=MONO_ONCE_INIT;
 static void sem_ops_init (void)
 {
        _wapi_handle_register_capabilities (WAPI_HANDLE_SEM,
-                                           WAPI_HANDLE_CAP_WAIT |
-                                           WAPI_HANDLE_CAP_SIGNAL);
+               (WapiHandleCapability)(WAPI_HANDLE_CAP_WAIT | WAPI_HANDLE_CAP_SIGNAL));
        _wapi_handle_register_capabilities (WAPI_HANDLE_NAMEDSEM,
-                                           WAPI_HANDLE_CAP_WAIT |
-                                           WAPI_HANDLE_CAP_SIGNAL);
+               (WapiHandleCapability)(WAPI_HANDLE_CAP_WAIT | WAPI_HANDLE_CAP_SIGNAL));
 }
 
 static void sema_signal(gpointer handle)

diff --git a/mono/io-layer/shared.c b/mono/io-layer/shared.c
index f8539039cad103441bc63f977c3331251ff5df2c..64a8b330d4400934a3c8bb5667fa2fc3cc6d5fdb 100644 (file)
--- a/mono/io-layer/shared.c
+++ b/mono/io-layer/shared.c
@@ -7,879 +7,49 @@
  * (C) 2002-2006 Novell, Inc.
  */
 
-
 #include <config.h>
 #include <glib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#if defined(HAVE_SYS_SEM_H) && !(defined(__native_client__) && defined(__GLIBC__))
-#  include <sys/sem.h>
-#else
-#  define DISABLE_SHARED_HANDLES
-#endif
-
-#ifndef DISABLE_SHARED_HANDLES
-#  include <sys/mman.h>
-#  include <sys/ipc.h>
-#  ifdef HAVE_SYS_UTSNAME_H
-#    include <sys/utsname.h>
-#  endif
-#endif
 
-#include <mono/io-layer/wapi.h>
 #include <mono/io-layer/wapi-private.h>
 #include <mono/io-layer/shared.h>
-#include <mono/io-layer/handles-private.h>
+#include <mono/utils/mono-os-mutex.h>
 
 #define DEBUGLOG(...)
 //#define DEBUGLOG(...) g_message(__VA_ARGS__);
 
-// Semaphores used when no-shared-memory use is in use
-
 static mono_mutex_t noshm_sems[_WAPI_SHARED_SEM_COUNT];
 
-static gpointer wapi_storage [16];
-
-static void
-noshm_semaphores_init (void)
-{
-       int i;
-
-       for (i = 0; i < _WAPI_SHARED_SEM_COUNT; i++) 
-               mono_mutex_init (&noshm_sems [i]);
-}
-
-static int
-noshm_sem_lock (int sem)
-{
-       int ret;
-       
-       DEBUGLOG ("%s: locking nosem %d", __func__, sem);
-       
-       ret = mono_mutex_lock (&noshm_sems[sem]);
-       
-       return ret;
-}
-
-static int
-noshm_sem_trylock (int sem)
-{
-       int ret;
-       
-       DEBUGLOG ("%s: trying to lock nosem %d", __func__, sem);
-       
-       ret = mono_mutex_trylock (&noshm_sems[sem]);
-       
-       return ret;
-}
-
-static int
-noshm_sem_unlock (int sem)
-{
-       int ret;
-       
-       DEBUGLOG ("%s: unlocking nosem %d", __func__, sem);
-       
-       ret = mono_mutex_unlock (&noshm_sems[sem]);
-       
-       return ret;
-}
-
-#ifdef DISABLE_SHARED_HANDLES
 void
 _wapi_shm_semaphores_init (void)
 {
-       noshm_semaphores_init ();
-}
-
-void
-_wapi_shm_semaphores_remove (void)
-{
-       /* Nothing */
-}
-
-int
-_wapi_shm_sem_lock (int sem)
-{
-       return noshm_sem_lock (sem);
-}
-
-int
-_wapi_shm_sem_trylock (int sem)
-{
-       return noshm_sem_trylock (sem);
-}
-
-int
-_wapi_shm_sem_unlock (int sem)
-{
-       return noshm_sem_unlock (sem);
-}
-
-gpointer
-_wapi_shm_attach (_wapi_shm_t type)
-{
-       gpointer res;
-
-       switch(type) {
-       case WAPI_SHM_DATA:
-               res = g_malloc0 (sizeof(struct _WapiHandleSharedLayout));
-               break;
-       case WAPI_SHM_FILESHARE:
-               res = g_malloc0 (sizeof(struct _WapiFileShareLayout));
-               break;
-       default:
-               g_error ("Invalid type in _wapi_shm_attach ()");
-               return NULL;
-       }
-
-       wapi_storage [type] = res;
-       return res;
-}
-
-void
-_wapi_shm_detach (_wapi_shm_t type)
-{
-       g_free (wapi_storage [type]);
-}
-
-gboolean
-_wapi_shm_enabled_internal (void)
-{
-       return FALSE;
-}
-
-#else /* DISABLE_SHARED_HANDLES */
-
-/*
- * Use POSIX shared memory if possible, it is simpler, and it has the advantage that 
- * writes to the shared area does not need to be written to disk, avoiding spinning up 
- * the disk every x secs on laptops.
- */
-#ifdef HAVE_SHM_OPEN
-#define USE_SHM 1
-#endif
-
-static gboolean _wapi_shm_disabled = TRUE;
-
-static gchar *
-_wapi_shm_base_name (_wapi_shm_t type)
-{
-       gchar *name = NULL;
-       gchar machine_name[256];
-       const gchar *fake_name;
-       struct utsname ubuf;
-       int ret;
-       int len;
-       
-       ret = uname (&ubuf);
-       if (ret == -1) {
-               ubuf.machine[0] = '\0';
-               ubuf.sysname[0] = '\0';
-       } else {
-               g_strdelimit (ubuf.sysname, "/", '_');
-               g_strdelimit (ubuf.machine, "/", '_');
-       }
-
-       fake_name = g_getenv ("MONO_SHARED_HOSTNAME");
-       if (fake_name == NULL) {
-               if (gethostname(machine_name, sizeof(machine_name)) != 0)
-                       machine_name[0] = '\0';
-       } else {
-               len = MIN (strlen (fake_name), sizeof (machine_name) - 1);
-               strncpy (machine_name, fake_name, len);
-               machine_name [len] = '\0';
-       }
-       
-       switch (type) {
-       case WAPI_SHM_DATA:
-               name = g_strdup_printf ("shared_data-%s-%s-%s-%d-%d-%d",
-                                       machine_name, ubuf.sysname,
-                                       ubuf.machine,
-                                       (int) sizeof(struct _WapiHandleShared),
-                                       _WAPI_HANDLE_VERSION, 0);
-               break;
-               
-       case WAPI_SHM_FILESHARE:
-               name = g_strdup_printf ("shared_fileshare-%s-%s-%s-%d-%d-%d",
-                                       machine_name, ubuf.sysname,
-                                       ubuf.machine,
-                                       (int) sizeof(struct _WapiFileShare),
-                                       _WAPI_HANDLE_VERSION, 0);
-               break;
-       }
-
-       return name;
-}
-
-#ifdef USE_SHM
-
-static gchar *_wapi_shm_shm_name (_wapi_shm_t type)
-{
-       char *base_name = _wapi_shm_base_name (type);
-
-       /* Also add the uid to avoid permission problems */
-       char *res = g_strdup_printf ("/mono-shared-%d-%s", getuid (), base_name);
-
-       g_free (base_name);
-
-       return res;
-}
-
-static int
-_wapi_shm_open (const char *filename, int size)
-{
-       int fd;
-
-       fd = shm_open (filename, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR|S_IRGRP);
-       if (fd == -1)
-               /* Maybe /dev/shm is not mounted */
-               return -1;
-       if (ftruncate (fd, size) != 0) {
-               perror ("_wapi_shm_open (): ftruncate ()");
-               g_assert_not_reached ();
-       }
-
-       return fd;
-}
-
-#endif
-
-static gchar *
-_wapi_shm_file (_wapi_shm_t type)
-{
-       static gchar file[_POSIX_PATH_MAX];
-       gchar *name = NULL, *filename;
-       const gchar *wapi_dir;
-
-       name = _wapi_shm_base_name (type);
-
-       /* I don't know how nfs affects mmap.  If mmap() of files on
-        * nfs mounts breaks, then there should be an option to set
-        * the directory.
-        */
-       wapi_dir = g_getenv ("MONO_SHARED_DIR");
-       if (wapi_dir == NULL) {
-               filename = g_build_filename (g_get_home_dir (), ".wapi", name,
-                                            NULL);
-       } else {
-               filename = g_build_filename (wapi_dir, ".wapi", name, NULL);
-       }
-       g_free (name);
-
-       g_snprintf (file, _POSIX_PATH_MAX, "%s", filename);
-       g_free (filename);
-       
-       return file;
-}
-
-static int
-_wapi_shm_file_open (const gchar *filename, guint32 wanted_size)
-{
-       int fd;
-       struct stat statbuf;
-       int ret, tries = 0;
-       gboolean created = FALSE;
-       mode_t oldmask;
-       gchar *dir;
-               
-       /* No need to check if the dir already exists or check
-        * mkdir() errors, because on any error the open() call will
-        * report the problem.
-        */
-       dir = g_path_get_dirname (filename);
-       mkdir (dir, 0755);
-       g_free (dir);
-
-try_again:
-       if (tries++ > 10) {
-               /* Just give up */
-               return (-1);
-       } else if (tries > 5) {
-               /* Break out of a loop */
-               unlink (filename);
-       }
-       
-       /* Make sure future processes can open the shared data files */
-       oldmask = umask (066);
-
-       /* No O_CREAT yet, because we need to initialise the file if
-        * we have to create it.
-        */
-       fd = open (filename, O_RDWR, 0600);
-       umask (oldmask);
-       
-       if (fd == -1 && errno == ENOENT) {
-               /* OK, its up to us to create it.  O_EXCL to avoid a
-                * race condition where two processes can
-                * simultaneously try and create the file
-                */
-               oldmask = umask (066);
-               fd = open (filename, O_CREAT|O_EXCL|O_RDWR, 0600);
-               umask (oldmask);
-               
-               if (fd == -1 && errno == EEXIST) {
-                       /* It's possible that the file was created in
-                        * between finding it didn't exist, and trying
-                        * to create it.  Just try opening it again
-                        */
-                       goto try_again;
-               } else if (fd == -1) {
-                       g_critical ("%s: shared file [%s] open error: %s",
-                                   __func__, filename, g_strerror (errno));
-                       return -1;
-               } else {
-                       /* We created the file, so we need to expand
-                        * the file.
-                        *
-                        * (wanted_size-1, because we're about to
-                        * write the other byte to actually expand the
-                        * file.)
-                        */
-                       if (lseek (fd, wanted_size-1, SEEK_SET) == -1) {
-                               g_critical ("%s: shared file [%s] lseek error: %s", __func__, filename, g_strerror (errno));
-                               close (fd);
-                               unlink (filename);
-                               return -1;
-                       }
-                       
-                       do {
-                               ret = write (fd, "", 1);
-                       } while (ret == -1 && errno == EINTR);
-                               
-                       if (ret == -1) {
-                               g_critical ("%s: shared file [%s] write error: %s", __func__, filename, g_strerror (errno));
-                               close (fd);
-                               unlink (filename);
-                               return -1;
-                       }
-                       
-                       created = TRUE;
-
-                       /* The contents of the file is set to all
-                        * zero, because it is opened up with lseek,
-                        * so we don't need to do any more
-                        * initialisation here
-                        */
-               }
-       } else if (fd == -1) {
-               g_critical ("%s: shared file [%s] open error: %s", __func__,
-                           filename, g_strerror (errno));
-               return -1;
-       }
-       
-       /* Use stat to find the file size (instead of hard coding it)
-        * because we can expand the file later if needed (for more
-        * handles or scratch space.)
-        */
-       if (fstat (fd, &statbuf) == -1) {
-               g_critical ("%s: fstat error: %s", __func__,
-                           g_strerror (errno));
-               if (created == TRUE) {
-                       unlink (filename);
-               }
-               close (fd);
-               return -1;
-       }
-
-       if (statbuf.st_size < wanted_size) {
-               close (fd);
-               if (created == TRUE) {
-                       g_critical ("%s: shared file [%s] is not big enough! (found %ld, need %d bytes)", __func__, filename, (long)statbuf.st_size, wanted_size);
-                       unlink (filename);
-                       return -1;
-               } else {
-                       /* We didn't create it, so just try opening it again */
-                       _wapi_handle_spin (100);
-                       goto try_again;
-               }
-       }
-       
-       return fd;
-}
-
-gboolean
-_wapi_shm_enabled_internal (void)
-{
-       static gboolean env_checked;
-
-       if (!env_checked) {
-               if (g_getenv ("MONO_ENABLE_SHM"))
-                       _wapi_shm_disabled = FALSE;
-               env_checked = TRUE;
-       }
-
-       return !_wapi_shm_disabled;
-}
-
-/*
- * _wapi_shm_attach:
- * @success: Was it a success
- *
- * Attach to the shared memory file or create it if it did not exist.
- * Returns the memory area the file was mmapped to.
- */
-gpointer
-_wapi_shm_attach (_wapi_shm_t type)
-{
-       gpointer shm_seg;
-       int fd;
-       struct stat statbuf;
-       gchar *filename = _wapi_shm_file (type), *shm_name;
-       guint32 size;
-       
-       switch(type) {
-       case WAPI_SHM_DATA:
-               size = sizeof(struct _WapiHandleSharedLayout);
-               break;
-               
-       case WAPI_SHM_FILESHARE:
-               size = sizeof(struct _WapiFileShareLayout);
-               break;
-       default:
-               g_error ("Invalid type in _wapi_shm_attach ()");
-               return NULL;
-       }
-
-       if (!_wapi_shm_enabled ()) {
-               wapi_storage [type] = g_malloc0 (size);
-               return wapi_storage [type];
-       }
-
-#ifdef USE_SHM
-       shm_name = _wapi_shm_shm_name (type);
-       fd = _wapi_shm_open (shm_name, size);
-       g_free (shm_name);
-#else
-       fd = -1;
-#endif
-
-       /* Fall back to files if POSIX shm fails (for example, because /dev/shm is not mounted */
-       if (fd == -1)
-               fd = _wapi_shm_file_open (filename, size);
-       if (fd == -1) {
-               g_critical ("%s: shared file [%s] open error", __func__,
-                           filename);
-               return NULL;
-       }
-
-       if (fstat (fd, &statbuf)==-1) {
-               g_critical ("%s: fstat error: %s", __func__,
-                           g_strerror (errno));
-               close (fd);
-               return NULL;
-       }
-       
-       shm_seg = mmap (NULL, statbuf.st_size, PROT_READ|PROT_WRITE,
-                       MAP_SHARED, fd, 0);
-       if (shm_seg == MAP_FAILED) {
-               shm_seg = mmap (NULL, statbuf.st_size, PROT_READ|PROT_WRITE,
-                       MAP_PRIVATE, fd, 0);
-               if (shm_seg == MAP_FAILED) {
-                       g_critical ("%s: mmap error: %s", __func__, g_strerror (errno));
-                       close (fd);
-                       return NULL;
-               }
-       }
-               
-       close (fd);
-       return shm_seg;
-}
-
-void
-_wapi_shm_detach (_wapi_shm_t type)
-{
-       if (!_wapi_shm_enabled ())
-               g_free (wapi_storage [type]);
-}
-
-static void
-shm_semaphores_init (void)
-{
-       key_t key;
-       key_t oldkey;
-       int thr_ret;
-       struct _WapiHandleSharedLayout *tmp_shared;
-       gchar *ftmp;
-       gchar *filename;
-       
-       /*
-        * Yet more barmy API - this union is a well-defined parameter
-        * in a syscall, yet I still have to define it here as it
-        * doesn't appear in a header
-        */
-       union semun {
-               int val;
-               struct semid_ds *buf;
-               ushort *array;
-       } defs;
-       ushort def_vals[_WAPI_SHARED_SEM_COUNT];
        int i;
-       int retries = 0;
-       
-       for (i = 0; i < _WAPI_SHARED_SEM_COUNT; i++) {
-               def_vals[i] = 1;
-       }
-
-       /*
-        * Process count must start at '0' - the 1 for all the others
-        * sets the semaphore to "unlocked"
-        */
-       def_vals[_WAPI_SHARED_SEM_PROCESS_COUNT] = 0;
-       
-       defs.array = def_vals;
-       
-       /*
-        *Temporarily attach the shared data so we can read the
-        * semaphore key.  We release this mapping and attach again
-        * after getting the semaphores to avoid a race condition
-        * where a terminating process can delete the shared files
-        * between a new process attaching the file and getting access
-        * to the semaphores (which increments the process count,
-        * preventing destruction of the shared data...)
-        */
-       tmp_shared = _wapi_shm_attach (WAPI_SHM_DATA);
-       g_assert (tmp_shared != NULL);
-       
-#ifdef USE_SHM
-       ftmp=_wapi_shm_shm_name (WAPI_SHM_DATA);
-       filename = g_build_filename ("/dev/shm", ftmp, NULL);
-       g_assert (filename!=NULL);
-       key = ftok (filename, 'M');
-       g_free (ftmp);
-       g_free (filename);
-#else
-       key = ftok ( _wapi_shm_file (WAPI_SHM_DATA), 'M');
-#endif
-
-again:
-       retries++;
-       oldkey = tmp_shared->sem_key;
-
-       if (oldkey == 0) {
-               DEBUGLOG ("%s: Creating with new key (0x%x)", __func__, key);
-
-               /*
-                * The while loop attempts to make some sense of the
-                * bonkers 'think of a random number' method of
-                * picking a key without collision with other
-                * applications
-                */
-               while ((_wapi_sem_id = semget (key, _WAPI_SHARED_SEM_COUNT,
-                                              IPC_CREAT | IPC_EXCL | 0600)) == -1) {
-                       if (errno == ENOMEM) {
-                               g_error ("%s: semget error: %s", __func__,
-                                           g_strerror (errno));
-                       } else if (errno == ENOSPC) {
-                               g_error ("%s: semget error: %s.  Try deleting some semaphores with ipcs and ipcrm\nor increase the maximum number of semaphore in the system.", __func__, g_strerror (errno));
-                       } else if (errno != EEXIST) {
-                               if (retries > 3)
-                                       g_warning ("%s: semget error: %s key 0x%x - trying again", __func__,
-                                                       g_strerror (errno), key);
-                       }
-                       
-                       key++;
-                       DEBUGLOG ("%s: Got (%s), trying with new key (0x%x)", __func__, g_strerror (errno), key);
-               }
-               /*
-                * Got a semaphore array, so initialise it and install
-                * the key into the shared memory
-                */
-               
-               if (semctl (_wapi_sem_id, 0, SETALL, defs) == -1) {
-                       if (retries > 3)
-                               g_warning ("%s: semctl init error: %s - trying again", __func__, g_strerror (errno));
-
-                       /*
-                        * Something went horribly wrong, so try
-                        * getting a new set from scratch
-                        */
-                       semctl (_wapi_sem_id, 0, IPC_RMID);
-                       goto again;
-               }
-
-               if (InterlockedCompareExchange (&tmp_shared->sem_key,
-                                               key, 0) != 0) {
-                       /*
-                        * Someone else created one and installed the
-                        * key while we were working, so delete the
-                        * array we created and fall through to the
-                        * 'key already known' case.
-                        */
-                       semctl (_wapi_sem_id, 0, IPC_RMID);
-                       oldkey = tmp_shared->sem_key;
-               } else {
-                       /*
-                        * We've installed this semaphore set's key into
-                        * the shared memory
-                        */
-                       goto done;
-               }
-       }
-       
-       DEBUGLOG ("%s: Trying with old key 0x%x", __func__, oldkey);
-
-       _wapi_sem_id = semget (oldkey, _WAPI_SHARED_SEM_COUNT, 0600);
-       if (_wapi_sem_id == -1) {
-               if (retries > 3)
-                       g_warning ("%s: semget error opening old key 0x%x (%s) - trying again",
-                                       __func__, oldkey,g_strerror (errno));
-
-               /*
-                * Someone must have deleted the semaphore set, so
-                * blow away the bad key and try again
-                */
-               InterlockedCompareExchange (&tmp_shared->sem_key, 0, oldkey);
-               
-               goto again;
-       }
-
-  done:
-       /* Increment the usage count of this semaphore set */
-       thr_ret = _wapi_shm_sem_lock (_WAPI_SHARED_SEM_PROCESS_COUNT_LOCK);
-       g_assert (thr_ret == 0);
-       
-       DEBUGLOG ("%s: Incrementing the process count (%d)", __func__, _wapi_getpid ());
-
-       /*
-        * We only ever _unlock_ this semaphore, letting the kernel
-        * restore (ie decrement) this unlock when this process exits.
-        * We lock another semaphore around it so we can serialise
-        * access when we're testing the value of this semaphore when
-        * we exit cleanly, so we can delete the whole semaphore set.
-        */
-       _wapi_shm_sem_unlock (_WAPI_SHARED_SEM_PROCESS_COUNT);
-
-       DEBUGLOG ("%s: Process count is now %d (%d)", __func__, semctl (_wapi_sem_id, _WAPI_SHARED_SEM_PROCESS_COUNT, GETVAL), _wapi_getpid ());
-       
-       _wapi_shm_sem_unlock (_WAPI_SHARED_SEM_PROCESS_COUNT_LOCK);
-
-       if (_wapi_shm_disabled)
-               g_free (tmp_shared);
-       else
-               munmap (tmp_shared, sizeof(struct _WapiHandleSharedLayout));
-}
-
-static void
-shm_semaphores_remove (void)
-{
-       int thr_ret;
-       int proc_count;
-       gchar *shm_name;
-       
-       DEBUGLOG ("%s: Checking process count (%d)", __func__, _wapi_getpid ());
-       
-       thr_ret = _wapi_shm_sem_lock (_WAPI_SHARED_SEM_PROCESS_COUNT_LOCK);
-       g_assert (thr_ret == 0);
-       
-       proc_count = semctl (_wapi_sem_id, _WAPI_SHARED_SEM_PROCESS_COUNT,
-                            GETVAL);
-
-       g_assert (proc_count > 0);
-       if (proc_count == 1) {
-               /*
-                * Just us, so blow away the semaphores and the shared
-                * files
-                */
-               DEBUGLOG ("%s: Removing semaphores! (%d)", __func__, _wapi_getpid ());
-
-               semctl (_wapi_sem_id, 0, IPC_RMID);
-#ifdef USE_SHM
-               shm_name = _wapi_shm_shm_name (WAPI_SHM_DATA);
-               shm_unlink (shm_name);
-               g_free (shm_name);
-
-               shm_name = _wapi_shm_shm_name (WAPI_SHM_FILESHARE);
-               shm_unlink (shm_name);
-               g_free (shm_name);
-#endif
-               unlink (_wapi_shm_file (WAPI_SHM_DATA));
-               unlink (_wapi_shm_file (WAPI_SHM_FILESHARE));
-       } else {
-               /*
-                * "else" clause, because there's no point unlocking
-                * the semaphore if we've just blown it away...
-                */
-               _wapi_shm_sem_unlock (_WAPI_SHARED_SEM_PROCESS_COUNT_LOCK);
-       }
-}
-
-static int
-shm_sem_lock (int sem)
-{
-       struct sembuf ops;
-       int ret;
-       
-       DEBUGLOG ("%s: locking sem %d", __func__, sem);
-
-       ops.sem_num = sem;
-       ops.sem_op = -1;
-       ops.sem_flg = SEM_UNDO;
-       
-  retry:
-       do {
-               ret = semop (_wapi_sem_id, &ops, 1);
-       } while (ret == -1 && errno == EINTR);
-
-       if (ret == -1) {
-               /*
-                * EINVAL covers the case when the semaphore was
-                * deleted before we started the semop
-                */
-               if (errno == EIDRM || errno == EINVAL) {
-                       /*
-                        * Someone blew away this semaphore set, so
-                        * get a new one and try again
-                        */
-                       DEBUGLOG ("%s: Reinitialising the semaphores!", __func__);
-
-                       _wapi_shm_semaphores_init ();
-                       goto retry;
-               }
-               
-               /* Turn this into a pthreads-style return value */
-               ret = errno;
-       }
-       
-       DEBUGLOG ("%s: returning %d (%s)", __func__, ret, g_strerror (ret));
-       
-       return ret;
-}
-
-static int
-shm_sem_trylock (int sem)
-{
-       struct sembuf ops;
-       int ret;
-       
-       DEBUGLOG ("%s: trying to lock sem %d", __func__, sem);
-       
-       ops.sem_num = sem;
-       ops.sem_op = -1;
-       ops.sem_flg = IPC_NOWAIT | SEM_UNDO;
-       
-  retry:
-       do {
-               ret = semop (_wapi_sem_id, &ops, 1);
-       } while (ret == -1 && errno == EINTR);
-
-       if (ret == -1) {
-               /*
-                * EINVAL covers the case when the semaphore was
-                * deleted before we started the semop
-                */
-               if (errno == EIDRM || errno == EINVAL) {
-                       /*
-                        * Someone blew away this semaphore set, so
-                        * get a new one and try again
-                        */
-                       DEBUGLOG ("%s: Reinitialising the semaphores!", __func__);
-
-                       _wapi_shm_semaphores_init ();
-                       goto retry;
-               }
-               
-               /* Turn this into a pthreads-style return value */
-               ret = errno;
-       }
-       
-       if (ret == EAGAIN) {
-               /* But pthreads uses this code instead */
-               ret = EBUSY;
-       }
-       
-       DEBUGLOG ("%s: returning %d (%s)", __func__, ret, g_strerror (ret));
-       
-       return ret;
-}
-
-static int
-shm_sem_unlock (int sem)
-{
-       struct sembuf ops;
-       int ret;
-       
-       DEBUGLOG ("%s: unlocking sem %d", __func__, sem);
-       
-       ops.sem_num = sem;
-       ops.sem_op = 1;
-       ops.sem_flg = SEM_UNDO;
-       
-  retry:
-       do {
-               ret = semop (_wapi_sem_id, &ops, 1);
-       } while (ret == -1 && errno == EINTR);
-
-       if (ret == -1) {
-               /* EINVAL covers the case when the semaphore was
-                * deleted before we started the semop
-                */
-               if (errno == EIDRM || errno == EINVAL) {
-                       /* Someone blew away this semaphore set, so
-                        * get a new one and try again (we can't just
-                        * assume that the semaphore is now unlocked)
-                        */
-                       DEBUGLOG ("%s: Reinitialising the semaphores!", __func__);
-
-                       _wapi_shm_semaphores_init ();
-                       goto retry;
-               }
-               
-               /* Turn this into a pthreads-style return value */
-               ret = errno;
-       }
-       
-       DEBUGLOG ("%s: returning %d (%s)", __func__, ret, g_strerror (ret));
-
-       return ret;
-}
-
-void
-_wapi_shm_semaphores_init (void)
-{
-       if (!_wapi_shm_enabled ())
-               noshm_semaphores_init ();
-       else
-               shm_semaphores_init ();
+       for (i = 0; i < _WAPI_SHARED_SEM_COUNT; i++) 
+               mono_os_mutex_init (&noshm_sems [i]);
 }
 
 void
 _wapi_shm_semaphores_remove (void)
 {
-       if (!_wapi_shm_disabled) 
-               shm_semaphores_remove ();
+       /* Nothing */
 }
 
 int
 _wapi_shm_sem_lock (int sem)
 {
-       if (_wapi_shm_disabled) 
-               return noshm_sem_lock (sem);
-       else
-               return shm_sem_lock (sem);
+       DEBUGLOG ("%s: locking nosem %d", __func__, sem);
+       return mono_os_mutex_lock (&noshm_sems[sem]);
 }
 
 int
 _wapi_shm_sem_trylock (int sem)
 {
-       if (_wapi_shm_disabled) 
-               return noshm_sem_trylock (sem);
-       else 
-               return shm_sem_trylock (sem);
+       DEBUGLOG ("%s: trying to lock nosem %d", __func__, sem);
+       return mono_os_mutex_trylock (&noshm_sems[sem]);
 }
 
 int
 _wapi_shm_sem_unlock (int sem)
 {
-       if (_wapi_shm_disabled) 
-               return noshm_sem_unlock (sem);
-       else 
-               return shm_sem_unlock (sem);
+       DEBUGLOG ("%s: unlocking nosem %d", __func__, sem);
+       return mono_os_mutex_unlock (&noshm_sems[sem]);
 }
-#endif /* !DISABLE_SHARED_HANDLES */

diff --git a/mono/io-layer/shared.h b/mono/io-layer/shared.h
index 5f66a732e6d680d5dcbb4d36c220b500bc48a5d3..4807adc5a8e8af2567b97cf6e1b514d88eefe1e9 100644 (file)
--- a/mono/io-layer/shared.h
+++ b/mono/io-layer/shared.h
@@ -10,30 +10,10 @@
 #ifndef _WAPI_SHARED_H_
 #define _WAPI_SHARED_H_
 
-#include <mono/io-layer/wapi-private.h>
-
-typedef enum {
-       WAPI_SHM_DATA,
-       WAPI_SHM_FILESHARE
-} _wapi_shm_t;
-
-extern gpointer _wapi_shm_attach (_wapi_shm_t type);
-extern void _wapi_shm_detach (_wapi_shm_t type);
-extern gboolean _wapi_shm_enabled_internal (void);
 extern void _wapi_shm_semaphores_init (void);
 extern void _wapi_shm_semaphores_remove (void);
 extern int _wapi_shm_sem_lock (int sem);
 extern int _wapi_shm_sem_trylock (int sem);
 extern int _wapi_shm_sem_unlock (int sem);
 
-static inline gboolean
-_wapi_shm_enabled (void)
-{
-#ifdef DISABLE_SHARED_HANDLES
-       return FALSE;
-#else
-       return _wapi_shm_enabled_internal ();
-#endif
-}
-
 #endif /* _WAPI_SHARED_H_ */

diff --git a/mono/io-layer/sockets.c b/mono/io-layer/sockets.c
index c5279448570c77be44ca5c6f15b97ede95151c8e..54c8798637c27a71cae21ba763b3dea7cd9a06a9 100644 (file)
--- a/mono/io-layer/sockets.c
+++ b/mono/io-layer/sockets.c
@@ -42,6 +42,7 @@
 #include <mono/io-layer/handles-private.h>
 #include <mono/io-layer/socket-wrappers.h>
 #include <mono/utils/mono-poll.h>
+#include <mono/utils/mono-once.h>
 
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -840,10 +841,10 @@ guint32 _wapi_socket(int domain, int type, int protocol, void *unused,
         * https://bugzilla.novell.com/show_bug.cgi?id=MONO53992
         */
        {
-               int ret, true = 1;
+               int ret, true_ = 1;
        
-               ret = setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &true,
-                                 sizeof (true));
+               ret = setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &true_,
+                                 sizeof (true_));
                if (ret == -1) {
                        int errnum = errno;
 
@@ -1164,7 +1165,7 @@ WSAIoctl (guint32 fd, gint32 command,
        }
 
        if (i_len > 0) {
-               buffer = g_memdup (input, i_len);
+               buffer = (char *)g_memdup (input, i_len);
        }
 
        ret = ioctl (fd, command, buffer);

diff --git a/mono/io-layer/sockets.h b/mono/io-layer/sockets.h
index 13ae9961477eae4bfac003d9fd64f6caba15e507..d634ae956ec8f1beb980e440f5261e52bf55ea71 100644 (file)
--- a/mono/io-layer/sockets.h
+++ b/mono/io-layer/sockets.h
@@ -72,7 +72,7 @@ typedef struct
 #define SIO_KEEPALIVE_VALS 0x98000004
 
 typedef gboolean (*WapiDisconnectExFn)(guint32, WapiOverlapped *, guint32,
-                                       WapiTransmitFileFlags);
+                                       guint32);
 typedef gboolean (*WapiTransmitFileFn)(guint32, gpointer, guint32, guint32,
                                        WapiOverlapped *,
                                        WapiTransmitFileBuffers *,

diff --git a/mono/io-layer/thread-private.h b/mono/io-layer/thread-private.h
index 3ea1af1197884f7efaa31af5c52d7e52b970c7d5..3cf5535c5b821492f971a9c347cc1144a4f0ba28 100644 (file)
--- a/mono/io-layer/thread-private.h
+++ b/mono/io-layer/thread-private.h
@@ -13,7 +13,6 @@
 #include <config.h>
 #include <glib.h>
 #include <pthread.h>
-#include <mono/utils/mono-semaphore.h>
 
 /* There doesn't seem to be a defined symbol for this */
 #define _WAPI_THREAD_CURRENT (gpointer)0xFFFFFFFE

diff --git a/mono/io-layer/versioninfo.c b/mono/io-layer/versioninfo.c
index 2dc95f326156918a028873d82738fb35d6cbb933..8a147e1f2e46c0a9fd9124814a548df3ccd2c1ec 100644 (file)
--- a/mono/io-layer/versioninfo.c
+++ b/mono/io-layer/versioninfo.c
@@ -901,7 +901,7 @@ VerQueryValue (gconstpointer datablock, const gunichar2 *subblock, gpointer *buf
                                            string_value != NULL &&
                                            string_value_len != 0) {
                                                *buffer = string_value;
-                                               *len = unicode_chars (string_value) + 1; /* Include trailing null */
+                                               *len = unicode_chars ((const gunichar2 *)string_value) + 1; /* Include trailing null */
                                                ret = TRUE;
                                                goto done;
                                        }

diff --git a/mono/io-layer/wait.c b/mono/io-layer/wait.c
index 42fc96fe4fb6ad14bdeb451437b48b1bc0b0ac53..2d94e91d4fdf7955bfe7d7cd9e164ba5552a02fa 100644 (file)
--- a/mono/io-layer/wait.c
+++ b/mono/io-layer/wait.c
@@ -15,9 +15,6 @@
 #include <mono/io-layer/wapi.h>
 #include <mono/io-layer/handles-private.h>
 #include <mono/io-layer/wapi-private.h>
-#include <mono/io-layer/misc-private.h>
-
-#include <mono/utils/mono-mutex.h>
 
 #if 0
 #define DEBUG(...) g_message(__VA_ARGS__)
@@ -92,7 +89,6 @@ guint32 WaitForSingleObjectEx(gpointer handle, guint32 timeout,
                              gboolean alertable)
 {
        guint32 ret, waited;
-       struct timespec abstime;
        int thr_ret;
        gboolean apc_pending = FALSE;
        gpointer current_thread = wapi_get_current_thread_handle ();
@@ -164,10 +160,6 @@ guint32 WaitForSingleObjectEx(gpointer handle, guint32 timeout,
                ret = WAIT_TIMEOUT;
                goto done;
        }
-       /* Have to wait for it */
-       if (timeout != INFINITE) {
-               _wapi_calc_timeout (&abstime, timeout);
-       }
        
        do {
                /* Check before waiting on the condition, just in case
@@ -182,7 +174,7 @@ guint32 WaitForSingleObjectEx(gpointer handle, guint32 timeout,
                        goto done;
                }
 
-               waited = _wapi_handle_timedwait_signal_handle (handle, timeout == INFINITE ? NULL : &abstime, alertable, FALSE, &apc_pending);
+               waited = _wapi_handle_timedwait_signal_handle (handle, timeout, alertable, FALSE, &apc_pending);
 
                if(waited==0 && !apc_pending) {
                        /* Condition was signalled, so hopefully
@@ -262,7 +254,6 @@ guint32 SignalObjectAndWait(gpointer signal_handle, gpointer wait,
                            guint32 timeout, gboolean alertable)
 {
        guint32 ret, waited;
-       struct timespec abstime;
        int thr_ret;
        gboolean apc_pending = FALSE;
        gpointer current_thread = wapi_get_current_thread_handle ();
@@ -340,11 +331,6 @@ guint32 SignalObjectAndWait(gpointer signal_handle, gpointer wait,
                goto done;
        }
 
-       /* Have to wait for it */
-       if (timeout != INFINITE) {
-               _wapi_calc_timeout (&abstime, timeout);
-       }
-       
        do {
                /* Check before waiting on the condition, just in case
                 */
@@ -357,7 +343,7 @@ guint32 SignalObjectAndWait(gpointer signal_handle, gpointer wait,
                        goto done;
                }
 
-               waited = _wapi_handle_timedwait_signal_handle (wait, timeout == INFINITE ? NULL : &abstime, alertable, FALSE, &apc_pending);
+               waited = _wapi_handle_timedwait_signal_handle (wait, timeout, alertable, FALSE, &apc_pending);
 
                if (waited==0 && !apc_pending) {
                        /* Condition was signalled, so hopefully
@@ -456,7 +442,6 @@ guint32 WaitForMultipleObjectsEx(guint32 numobjects, gpointer *handles,
 {
        gboolean duplicate = FALSE, bogustype = FALSE, done;
        guint32 count, lowest;
-       struct timespec abstime;
        guint i;
        guint32 ret;
        int thr_ret;
@@ -551,10 +536,6 @@ guint32 WaitForMultipleObjectsEx(guint32 numobjects, gpointer *handles,
        /* Have to wait for some or all handles to become signalled
         */
 
-       if(timeout!=INFINITE) {
-               _wapi_calc_timeout (&abstime, timeout);
-       }
-
        for (i = 0; i < numobjects; i++) {
                /* Add a reference, as we need to ensure the handle wont
                 * disappear from under us while we're waiting in the loop
@@ -595,7 +576,7 @@ guint32 WaitForMultipleObjectsEx(guint32 numobjects, gpointer *handles,
                
                if (!done) {
                        /* Enter the wait */
-                       ret = _wapi_handle_timedwait_signal (timeout == INFINITE ? NULL : &abstime, poll, &apc_pending);
+                       ret = _wapi_handle_timedwait_signal (timeout, poll, &apc_pending);
                } else {
                        /* No need to wait */
                        ret = 0;

diff --git a/mono/io-layer/wapi-private.h b/mono/io-layer/wapi-private.h
index ee228b070f943091684369a999f80d4305fac623..e01cdf6804cda195b9b55d6cd89a89f9d0e8c109 100644 (file)
--- a/mono/io-layer/wapi-private.h
+++ b/mono/io-layer/wapi-private.h
@@ -14,9 +14,12 @@
 #include <glib.h>
 #include <sys/stat.h>
 
+#include <mono/io-layer/wapi.h>
 #include <mono/io-layer/handles.h>
 #include <mono/io-layer/io.h>
 
+#include <mono/utils/mono-os-mutex.h>
+
 /* Increment this whenever an incompatible change is made to the
  * shared handle structure.
  */
@@ -171,7 +174,7 @@ struct _WapiHandleSharedLayout
        struct _WapiHandleShared handles[_WAPI_HANDLE_INITIAL_COUNT];
 };
 
-#define _WAPI_FILESHARE_SIZE 102400
+typedef struct _WapiHandleSharedLayout _WapiHandleSharedLayout;
 
 struct _WapiFileShare
 {
@@ -189,15 +192,6 @@ struct _WapiFileShare
 
 typedef struct _WapiFileShare _WapiFileShare;
 
-struct _WapiFileShareLayout
-{
-       guint32 hwm;
-       
-       struct _WapiFileShare share_info[_WAPI_FILESHARE_SIZE];
-};
-
-
-
 #define _WAPI_HANDLE_INVALID (gpointer)-1
 
 #endif /* _WAPI_PRIVATE_H_ */

diff --git a/mono/io-layer/wapi.h b/mono/io-layer/wapi.h
index c2a89920c3469295084603cbc06377c335b92199..c6cbecd49c5758a4501b732c3e840e0b9c80a719 100644 (file)
--- a/mono/io-layer/wapi.h
+++ b/mono/io-layer/wapi.h
@@ -31,6 +31,4 @@
 #include <mono/io-layer/versioninfo.h>
 #include <mono/io-layer/wait.h>
 
-#include <mono/utils/mono-mutex.h>
-
 #endif /* _WAPI_WAPI_H_ */

diff --git a/mono/io-layer/wapi_glob.c b/mono/io-layer/wapi_glob.c
index 31c7f6d94111971a913552abda8b601c234446e3..88864821be44d394939dd5d19a9c87239eee38f7 100644 (file)
--- a/mono/io-layer/wapi_glob.c
+++ b/mono/io-layer/wapi_glob.c
@@ -266,8 +266,9 @@ globextend(const gchar *path, wapi_glob_t *pglob, size_t *limitp)
        const gchar *p;
 
        newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
-       pathv = pglob->gl_pathv ? realloc((char *)pglob->gl_pathv, newsize) :
-           malloc(newsize);
+       /* FIXME: Can just use realloc(). */
+       pathv = (char **)(pglob->gl_pathv ? realloc((char *)pglob->gl_pathv, newsize) :
+           malloc(newsize));
        if (pathv == NULL) {
                if (pglob->gl_pathv) {
                        free(pglob->gl_pathv);
@@ -288,7 +289,7 @@ globextend(const gchar *path, wapi_glob_t *pglob, size_t *limitp)
                ;
        len = (size_t)(p - path);
        *limitp += len;
-       if ((copy = malloc(len)) != NULL) {
+       if ((copy = (char *)malloc(len)) != NULL) {
                if (g_Ctoc(path, copy, len)) {
                        free(copy);
                        return(WAPI_GLOB_NOSPACE);

diff --git a/mono/io-layer/wthreads.c b/mono/io-layer/wthreads.c
index aac5bbeaacdfd62ef627701a9f32dc29b9494596..5245f6df9068787d302999c98bda374eee0e136b 100644 (file)
--- a/mono/io-layer/wthreads.c
+++ b/mono/io-layer/wthreads.c
@@ -23,14 +23,13 @@
 #include <mono/io-layer/wapi.h>
 #include <mono/io-layer/wapi-private.h>
 #include <mono/io-layer/handles-private.h>
-#include <mono/io-layer/misc-private.h>
 #include <mono/io-layer/thread-private.h>
 #include <mono/io-layer/mutex-private.h>
 
 #include <mono/utils/mono-threads.h>
 #include <mono/utils/atomic.h>
-#include <mono/utils/mono-mutex.h>
 #include <mono/utils/mono-time.h>
+#include <mono/utils/mono-once.h>
 
 #ifdef HAVE_VALGRIND_MEMCHECK_H
 #include <valgrind/memcheck.h>

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index 0e57d84fb44b27e15872550dbadec7855c493395..89c163c83ee5e7f52538738000a3882499852f28 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -237,8 +237,8 @@ mono_runtime_init (MonoDomain *domain, MonoThreadStartCB start_cb,
        mono_install_assembly_refonly_preload_hook (mono_domain_assembly_preload, GUINT_TO_POINTER (TRUE));
        mono_install_assembly_search_hook (mono_domain_assembly_search, GUINT_TO_POINTER (FALSE));
        mono_install_assembly_refonly_search_hook (mono_domain_assembly_search, GUINT_TO_POINTER (TRUE));
-       mono_install_assembly_postload_search_hook ((void*)mono_domain_assembly_postload_search, GUINT_TO_POINTER (FALSE));
-       mono_install_assembly_postload_refonly_search_hook ((void*)mono_domain_assembly_postload_search, GUINT_TO_POINTER (TRUE));
+       mono_install_assembly_postload_search_hook ((MonoAssemblySearchFunc)mono_domain_assembly_postload_search, GUINT_TO_POINTER (FALSE));
+       mono_install_assembly_postload_refonly_search_hook ((MonoAssemblySearchFunc)mono_domain_assembly_postload_search, GUINT_TO_POINTER (TRUE));
        mono_install_assembly_load_hook (mono_domain_fire_assembly_load, NULL);
        mono_install_lookup_dynamic_token (mono_reflection_lookup_dynamic_token);
 
@@ -647,7 +647,7 @@ ves_icall_System_AppDomain_GetData (MonoAppDomain *ad, MonoString *name)
        else if (!strcmp (str, "FORCE_CACHE_INSTALL"))
                o = (MonoObject *)add->setup->shadow_copy_files;
        else 
-               o = mono_g_hash_table_lookup (add->env, name);
+               o = (MonoObject *)mono_g_hash_table_lookup (add->env, name);
 
        mono_domain_unlock (add);
        g_free (str);
@@ -731,7 +731,7 @@ start_element (GMarkupParseContext *context,
               gpointer             user_data,
               GError             **error)
 {
-       RuntimeConfig *runtime_config = user_data;
+       RuntimeConfig *runtime_config = (RuntimeConfig *)user_data;
        
        if (strcmp (element_name, "runtime") == 0) {
                runtime_config->runtime_count++;
@@ -764,7 +764,7 @@ end_element (GMarkupParseContext *context,
             gpointer             user_data,
             GError             **error)
 {
-       RuntimeConfig *runtime_config = user_data;
+       RuntimeConfig *runtime_config = (RuntimeConfig *)user_data;
        if (strcmp (element_name, "runtime") == 0)
                runtime_config->runtime_count--;
        else if (strcmp (element_name, "assemblyBinding") == 0)
@@ -774,7 +774,7 @@ end_element (GMarkupParseContext *context,
 static void
 parse_error   (GMarkupParseContext *context, GError *error, gpointer user_data)
 {
-       RuntimeConfig *state = user_data;
+       RuntimeConfig *state = (RuntimeConfig *)user_data;
        const gchar *msg;
        const gchar *filename;
 
@@ -827,7 +827,7 @@ mono_set_private_bin_path_from_config (MonoDomain *domain)
        if (len > 3 && text [0] == '\xef' && text [1] == (gchar) '\xbb' && text [2] == '\xbf')
                offset = 3; /* Skip UTF-8 BOM */
 
-       context = g_markup_parse_context_new (&mono_parser, 0, &runtime_config, NULL);
+       context = g_markup_parse_context_new (&mono_parser, (GMarkupParseFlags)0, &runtime_config, NULL);
        if (g_markup_parse_context_parse (context, text + offset, len - offset, NULL))
                g_markup_parse_context_end_parse (context, NULL);
        g_markup_parse_context_free (context);
@@ -878,7 +878,7 @@ ves_icall_System_AppDomain_GetAssemblies (MonoAppDomain *ad, MonoBoolean refonly
        /* Need to skip internal assembly builders created by remoting */
        mono_domain_assemblies_lock (domain);
        for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
-               ass = tmp->data;
+               ass = (MonoAssembly *)tmp->data;
                if (refonly != ass->ref_only)
                        continue;
                if (ass->corlib_internal)
@@ -889,7 +889,7 @@ ves_icall_System_AppDomain_GetAssemblies (MonoAppDomain *ad, MonoBoolean refonly
 
        res = mono_array_new (domain, System_Reflection_Assembly, assemblies->len);
        for (i = 0; i < assemblies->len; ++i) {
-               ass = g_ptr_array_index (assemblies, i);
+               ass = (MonoAssembly *)g_ptr_array_index (assemblies, i);
                mono_array_setref (res, i, mono_assembly_get_object (domain, ass));
        }
 
@@ -1142,7 +1142,7 @@ set_domain_search_path (MonoDomain *domain)
        if (domain->search_path)
                g_strfreev (domain->search_path);
 
-       tmp = g_malloc ((npaths + 1) * sizeof (gchar *));
+       tmp = (gchar **)g_malloc ((npaths + 1) * sizeof (gchar *));
        tmp [npaths] = NULL;
 
        *tmp = mono_string_to_utf8_checked (setup->application_base, &error);
@@ -1521,7 +1521,7 @@ shadow_copy_create_ini (const char *shadow, const char *filename)
        if (!u16_ini) {
                return FALSE;
        }
-       handle = CreateFile (u16_ini, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE,
+       handle = (void **)CreateFile (u16_ini, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE,
                                NULL, CREATE_NEW, FileAttributes_Normal, NULL);
        g_free (u16_ini);
        if (handle == INVALID_HANDLE_VALUE) {
@@ -1864,7 +1864,7 @@ mono_domain_assembly_search (MonoAssemblyName *aname,
 
        mono_domain_assemblies_lock (domain);
        for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
-               ass = tmp->data;
+               ass = (MonoAssembly *)tmp->data;
                /* Dynamic assemblies can't match here in MS.NET */
                if (assembly_is_dynamic (ass) || refonly != ass->ref_only || !mono_assembly_names_equal (aname, &ass->aname))
                        continue;
@@ -2221,7 +2221,7 @@ deregister_reflection_info_roots_from_list (MonoImage *image)
        GSList *list = image->reflection_info_unregister_classes;
 
        while (list) {
-               MonoClass *klass = list->data;
+               MonoClass *klass = (MonoClass *)list->data;
 
                mono_class_free_ref_info (klass);
 
@@ -2238,7 +2238,7 @@ deregister_reflection_info_roots (MonoDomain *domain)
 
        mono_domain_assemblies_lock (domain);
        for (list = domain->domain_assemblies; list; list = list->next) {
-               MonoAssembly *assembly = list->data;
+               MonoAssembly *assembly = (MonoAssembly *)list->data;
                MonoImage *image = assembly->image;
                int i;
 
@@ -2310,11 +2310,11 @@ unload_thread_main (void *arg)
         * the collection there won't be any more remsets.
         */
        for (i = 0; i < domain->class_vtable_array->len; ++i)
-               zero_static_data (g_ptr_array_index (domain->class_vtable_array, i));
+               zero_static_data ((MonoVTable *)g_ptr_array_index (domain->class_vtable_array, i));
        mono_gc_collect (0);
 #endif
        for (i = 0; i < domain->class_vtable_array->len; ++i)
-               clear_cached_vtable (g_ptr_array_index (domain->class_vtable_array, i));
+               clear_cached_vtable ((MonoVTable *)g_ptr_array_index (domain->class_vtable_array, i));
        deregister_reflection_info_roots (domain);
 
        mono_assembly_cleanup_domain_bindings (domain->domain_id);
@@ -2408,9 +2408,9 @@ mono_domain_try_unload (MonoDomain *domain, MonoObject **exc)
        /* printf ("UNLOAD STARTING FOR %s (%p) IN THREAD 0x%x.\n", domain->friendly_name, domain, mono_native_thread_id_get ()); */
 
        /* Atomically change our state to UNLOADING */
-       prev_state = InterlockedCompareExchange ((gint32*)&domain->state,
-                                                                                        MONO_APPDOMAIN_UNLOADING_START,
-                                                                                        MONO_APPDOMAIN_CREATED);
+       prev_state = (MonoAppDomainState)InterlockedCompareExchange ((gint32*)&domain->state,
+               MONO_APPDOMAIN_UNLOADING_START,
+               MONO_APPDOMAIN_CREATED);
        if (prev_state != MONO_APPDOMAIN_CREATED) {
                switch (prev_state) {
                case MONO_APPDOMAIN_UNLOADING_START:

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index 3ea11123186a9720f1c2fa894364939cbaa3c721..a3916463b691522ce18b0f11b87e17c1d5195102 100644 (file)
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -37,7 +37,7 @@
 #include <mono/metadata/cil-coff.h>
 #include <mono/utils/mono-io-portability.h>
 #include <mono/utils/atomic.h>
-#include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-os-mutex.h>
 
 #ifndef HOST_WIN32
 #include <sys/types.h>
@@ -182,8 +182,8 @@ mono_set_corlib_data (void *data, size_t size)
 static char* unquote (const char *str);
 
 /* This protects loaded_assemblies and image->references */
-#define mono_assemblies_lock() mono_mutex_lock (&assemblies_mutex)
-#define mono_assemblies_unlock() mono_mutex_unlock (&assemblies_mutex)
+#define mono_assemblies_lock() mono_os_mutex_lock (&assemblies_mutex)
+#define mono_assemblies_unlock() mono_os_mutex_unlock (&assemblies_mutex)
 static mono_mutex_t assemblies_mutex;
 
 /* If defined, points to the bundled assembly information */
@@ -208,7 +208,7 @@ encode_public_tok (const guchar *token, gint32 len)
        gchar *res;
        int i;
 
-       res = g_malloc (len * 2 + 1);
+       res = (gchar *)g_malloc (len * 2 + 1);
        for (i = 0; i < len; i++) {
                res [i * 2] = allowed [token [i] >> 4];
                res [i * 2 + 1] = allowed [token [i] & 0xF];
@@ -752,20 +752,20 @@ mono_assemblies_init (void)
        check_path_env ();
        check_extra_gac_path_env ();
 
-       mono_mutex_init_recursive (&assemblies_mutex);
-       mono_mutex_init (&assembly_binding_mutex);
+       mono_os_mutex_init_recursive (&assemblies_mutex);
+       mono_os_mutex_init (&assembly_binding_mutex);
 }
 
 static void
 mono_assembly_binding_lock (void)
 {
-       mono_locks_mutex_acquire (&assembly_binding_mutex, AssemblyBindingLock);
+       mono_locks_os_acquire (&assembly_binding_mutex, AssemblyBindingLock);
 }
 
 static void
 mono_assembly_binding_unlock (void)
 {
-       mono_locks_mutex_release (&assembly_binding_mutex, AssemblyBindingLock);
+       mono_locks_os_release (&assembly_binding_mutex, AssemblyBindingLock);
 }
 
 gboolean
@@ -791,7 +791,7 @@ mono_assembly_fill_assembly_name (MonoImage *image, MonoAssemblyName *aname)
        aname->revision = cols [MONO_ASSEMBLY_REV_NUMBER];
        aname->hash_alg = cols [MONO_ASSEMBLY_HASH_ALG];
        if (cols [MONO_ASSEMBLY_PUBLIC_KEY]) {
-               guchar* token = g_malloc (8);
+               guchar* token = (guchar *)g_malloc (8);
                gchar* encoded;
                const gchar* pkey;
                int len;
@@ -1116,7 +1116,7 @@ mono_assembly_load_reference (MonoImage *image, int index)
                 * a non loaded reference using the ReflectionOnly api
                */
                if (!reference)
-                       reference = REFERENCE_MISSING;
+                       reference = (MonoAssembly *)REFERENCE_MISSING;
        } else {
                /* we first try without setting the basedir: this can eventually result in a ResolveAssembly
                 * event which is the MS .net compatible behaviour (the assemblyresolve_event3.cs test has been fixed
@@ -1157,7 +1157,7 @@ mono_assembly_load_reference (MonoImage *image, int index)
        mono_assemblies_lock ();
        if (reference == NULL) {
                /* Flag as not found */
-               reference = REFERENCE_MISSING;
+               reference = (MonoAssembly *)REFERENCE_MISSING;
        }       
 
        if (!image->references [index]) {
@@ -1937,10 +1937,10 @@ parse_public_key (const gchar *key, gchar** pubkey, gboolean *is_ecma)
        /* Encode the size of the blob */
        offset = 0;
        if (keylen <= 127) {
-               arr = g_malloc (keylen + 1);
+               arr = (gchar *)g_malloc (keylen + 1);
                arr [offset++] = keylen;
        } else {
-               arr = g_malloc (keylen + 2);
+               arr = (gchar *)g_malloc (keylen + 2);
                arr [offset++] = 0x80; /* 10bs */
                arr [offset++] = keylen;
        }
@@ -2547,7 +2547,7 @@ mono_assembly_load_publisher_policy (MonoAssemblyName *aname)
 
        if (strstr (aname->name, ".dll")) {
                len = strlen (aname->name) - 4;
-               name = g_malloc (len);
+               name = (gchar *)g_malloc (len);
                strncpy (name, aname->name, len);
        } else
                name = g_strdup (aname->name);
@@ -2613,7 +2613,7 @@ search_binding_loaded (MonoAssemblyName *aname)
        GSList *tmp;
 
        for (tmp = loaded_assembly_bindings; tmp; tmp = tmp->next) {
-               MonoAssemblyBindingInfo *info = tmp->data;
+               MonoAssemblyBindingInfo *info = (MonoAssemblyBindingInfo *)tmp->data;
                if (assembly_binding_maps_name (info, aname))
                        return info;
        }
@@ -2668,12 +2668,12 @@ assembly_binding_info_parsed (MonoAssemblyBindingInfo *info, void *user_data)
                return;
 
        for (tmp = domain->assembly_bindings; tmp; tmp = tmp->next) {
-               info_tmp = tmp->data;
+               info_tmp = (MonoAssemblyBindingInfo *)tmp->data;
                if (strcmp (info->name, info_tmp->name) == 0 && info_versions_equal (info, info_tmp))
                        return;
        }
 
-       info_copy = mono_mempool_alloc0 (domain->mp, sizeof (MonoAssemblyBindingInfo));
+       info_copy = (MonoAssemblyBindingInfo *)mono_mempool_alloc0 (domain->mp, sizeof (MonoAssemblyBindingInfo));
        memcpy (info_copy, info, sizeof (MonoAssemblyBindingInfo));
        if (info->name)
                info_copy->name = mono_mempool_strdup (domain->mp, info->name);
@@ -2721,7 +2721,7 @@ get_per_domain_assembly_binding_info (MonoDomain *domain, MonoAssemblyName *anam
 
        info = NULL;
        for (list = domain->assembly_bindings; list; list = list->next) {
-               info = list->data;
+               info = (MonoAssemblyBindingInfo *)list->data;
                if (info && !strcmp (aname->name, info->name) && info_major_minor_in_range (info, aname))
                        break;
                info = NULL;
@@ -2787,7 +2787,7 @@ mono_assembly_apply_binding (MonoAssemblyName *aname, MonoAssemblyName *dest_nam
                info2 = get_per_domain_assembly_binding_info (domain, aname);
 
                if (info2) {
-                       info = g_memdup (info2, sizeof (MonoAssemblyBindingInfo));
+                       info = (MonoAssemblyBindingInfo *)g_memdup (info2, sizeof (MonoAssemblyBindingInfo));
                        info->name = g_strdup (info2->name);
                        info->culture = g_strdup (info2->culture);
                        info->domain_id = domain->domain_id;
@@ -2858,7 +2858,7 @@ mono_assembly_load_from_gac (MonoAssemblyName *aname,  gchar *filename, MonoImag
 
        if (strstr (aname->name, ".dll")) {
                len = strlen (filename) - 4;
-               name = g_malloc (len);
+               name = (gchar *)g_malloc (len);
                strncpy (name, aname->name, len);
        } else {
                name = g_strdup (aname->name);
@@ -3173,7 +3173,7 @@ mono_assembly_close_except_image_pools (MonoAssembly *assembly)
                assembly->image = NULL;
 
        for (tmp = assembly->friend_assembly_names; tmp; tmp = tmp->next) {
-               MonoAssemblyName *fname = tmp->data;
+               MonoAssemblyName *fname = (MonoAssemblyName *)tmp->data;
                mono_assembly_name_free (fname);
                g_free (fname);
        }
@@ -3248,11 +3248,11 @@ mono_assemblies_cleanup (void)
 {
        GSList *l;
 
-       mono_mutex_destroy (&assemblies_mutex);
-       mono_mutex_destroy (&assembly_binding_mutex);
+       mono_os_mutex_destroy (&assemblies_mutex);
+       mono_os_mutex_destroy (&assembly_binding_mutex);
 
        for (l = loaded_assembly_bindings; l; l = l->next) {
-               MonoAssemblyBindingInfo *info = l->data;
+               MonoAssemblyBindingInfo *info = (MonoAssemblyBindingInfo *)l->data;
 
                mono_assembly_binding_info_free (info);
                g_free (info);
@@ -3274,7 +3274,7 @@ mono_assembly_cleanup_domain_bindings (guint32 domain_id)
        iter = &loaded_assembly_bindings;
        while (*iter) {
                GSList *l = *iter;
-               MonoAssemblyBindingInfo *info = l->data;
+               MonoAssemblyBindingInfo *info = (MonoAssemblyBindingInfo *)l->data;
 
                if (info->domain_id == domain_id) {
                        *iter = l->next;

diff --git a/mono/metadata/attach.c b/mono/metadata/attach.c
index cea84bc86ef762b4b43568ea6df44b89e9badf11..4f5024a72f0bb61a91d78f648b0265e9500b47de 100644 (file)
--- a/mono/metadata/attach.c
+++ b/mono/metadata/attach.c
@@ -99,10 +99,6 @@ static gboolean stop_receiver_thread;
 
 static gboolean needs_to_start, started;
 
-#define agent_lock() mono_mutex_lock (&agent_mutex)
-#define agent_unlock() mono_mutex_unlock (&agent_mutex)
-static mono_mutex_t agent_mutex;
-
 static void transport_connect (void);
 
 static guint32 WINAPI receiver_thread (void *arg);
@@ -156,7 +152,7 @@ decode_string_value (guint8 *buf, guint8 **endbuf, guint8 *limit)
 
        g_assert (length < (1 << 16));
 
-       s = g_malloc (length + 1);
+       s = (char *)g_malloc (length + 1);
 
        g_assert (p + length <= limit);
        memcpy (s, p, length);
@@ -184,8 +180,6 @@ mono_attach_parse_options (char *options)
 void
 mono_attach_init (void)
 {
-       mono_mutex_init_recursive (&agent_mutex);
-
        config.enabled = TRUE;
 }
 
@@ -530,7 +524,7 @@ receiver_thread (void *arg)
                        content_len = decode_int (p, &p, p_end);
 
                        /* Read message body */
-                       body = g_malloc (content_len);
+                       body = (guint8 *)g_malloc (content_len);
                        res = read (conn_fd, body, content_len);
                        
                        p = body;

diff --git a/mono/metadata/boehm-gc.c b/mono/metadata/boehm-gc.c
index 666f6381ebc0d6473e3435217e21f002fb57f1f4..0bd92412414f81254439cbe17c0edc83af451273 100644 (file)
--- a/mono/metadata/boehm-gc.c
+++ b/mono/metadata/boehm-gc.c
@@ -29,7 +29,7 @@
 #include <mono/utils/mono-threads.h>
 #include <mono/utils/dtrace.h>
 #include <mono/utils/gc_wrapper.h>
-#include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-os-mutex.h>
 #include <mono/utils/mono-counters.h>
 
 #if HAVE_BOEHM_GC
@@ -64,8 +64,8 @@ static MonoGCFinalizerCallbacks fin_callbacks;
 /* GC Handles */
 
 static mono_mutex_t handle_section;
-#define lock_handles(handles) mono_mutex_lock (&handle_section)
-#define unlock_handles(handles) mono_mutex_unlock (&handle_section)
+#define lock_handles(handles) mono_os_mutex_lock (&handle_section)
+#define unlock_handles(handles) mono_os_mutex_unlock (&handle_section)
 
 typedef struct {
        guint32  *bitmap;
@@ -196,6 +196,7 @@ mono_gc_base_init (void)
        GC_finalizer_notifier = mono_gc_finalize_notify;
 
        GC_init_gcj_malloc (5, NULL);
+       GC_allow_register_threads ();
 
        if ((env = g_getenv ("MONO_GC_PARAMS"))) {
                char **ptr, **opts = g_strsplit (env, ",", -1);
@@ -234,11 +235,11 @@ mono_gc_base_init (void)
        memset (&cb, 0, sizeof (cb));
        cb.thread_register = boehm_thread_register;
        cb.thread_unregister = boehm_thread_unregister;
-       cb.mono_method_is_critical = (gpointer)mono_runtime_is_critical_method;
+       cb.mono_method_is_critical = (gboolean (*)(void *))mono_runtime_is_critical_method;
 
        mono_threads_init (&cb, sizeof (MonoThreadInfo));
-       mono_mutex_init (&mono_gc_lock);
-       mono_mutex_init_recursive (&handle_section);
+       mono_os_mutex_init (&mono_gc_lock);
+       mono_os_mutex_init_recursive (&handle_section);
 
        mono_thread_info_attach (&dummy);
 
@@ -370,8 +371,6 @@ mono_gc_is_gc_thread (void)
        return GC_thread_is_registered ();
 }
 
-extern int GC_thread_register_foreign (void *base_addr);
-
 gboolean
 mono_gc_register_thread (void *baseptr)
 {
@@ -381,13 +380,15 @@ mono_gc_register_thread (void *baseptr)
 static void*
 boehm_thread_register (MonoThreadInfo* info, void *baseptr)
 {
-       if (mono_gc_is_gc_thread())
-               return info;
-#if !defined(HOST_WIN32)
-       return GC_thread_register_foreign (baseptr) ? info : NULL;
-#else
-       return NULL;
-#endif
+       struct GC_stack_base sb;
+       int res;
+
+       /* TODO: use GC_get_stack_base instead of baseptr. */
+       sb.mem_base = baseptr;
+       res = GC_register_my_thread (&sb);
+       if (res == GC_UNIMPLEMENTED)
+           return NULL; /* Cannot happen with GC v7+. */
+       return info;
 }
 
 static void
@@ -404,7 +405,7 @@ boehm_thread_unregister (MonoThreadInfo *p)
 gboolean
 mono_object_is_alive (MonoObject* o)
 {
-       return GC_is_marked ((gpointer)o);
+       return GC_is_marked ((ptr_t)o);
 }
 
 int
@@ -416,7 +417,7 @@ mono_gc_walk_heap (int flags, MonoGCReferences callback, void *data)
 static gint64 gc_start_time;
 
 static void
-on_gc_notification (GCEventType event)
+on_gc_notification (GC_EventType event)
 {
        MonoGCEvent e = (MonoGCEvent)event;
 
@@ -495,7 +496,7 @@ on_gc_heap_resize (size_t new_size)
 void
 mono_gc_enable_events (void)
 {
-       GC_notify_event = on_gc_notification;
+       GC_set_on_collection_event (on_gc_notification);
        GC_on_heap_resize = on_gc_heap_resize;
 }
 
@@ -550,14 +551,14 @@ mono_gc_weak_link_remove (void **link_addr, gboolean track)
 static gpointer
 reveal_link (gpointer link_addr)
 {
-       void **link_a = link_addr;
+       void **link_a = (void **)link_addr;
        return REVEAL_POINTER (*link_a);
 }
 
 static MonoObject *
 mono_gc_weak_link_get (void **link_addr)
 {
-       MonoObject *obj = GC_call_with_alloc_lock (reveal_link, link_addr);
+       MonoObject *obj = (MonoObject *)GC_call_with_alloc_lock (reveal_link, link_addr);
        if (obj == (MonoObject *) -1)
                return NULL;
        return obj;
@@ -628,16 +629,16 @@ mono_gc_alloc_obj (MonoVTable *vtable, size_t size)
        MonoObject *obj;
 
        if (!vtable->klass->has_references) {
-               obj = GC_MALLOC_ATOMIC (size);
+               obj = (MonoObject *)GC_MALLOC_ATOMIC (size);
 
                obj->vtable = vtable;
                obj->synchronisation = NULL;
 
                memset ((char *) obj + sizeof (MonoObject), 0, size - sizeof (MonoObject));
        } else if (vtable->gc_descr != GC_NO_DESCRIPTOR) {
-               obj = GC_GCJ_MALLOC (size, vtable);
+               obj = (MonoObject *)GC_GCJ_MALLOC (size, vtable);
        } else {
-               obj = GC_MALLOC (size);
+               obj = (MonoObject *)GC_MALLOC (size);
 
                obj->vtable = vtable;
        }
@@ -654,16 +655,16 @@ mono_gc_alloc_vector (MonoVTable *vtable, size_t size, uintptr_t max_length)
        MonoArray *obj;
 
        if (!vtable->klass->has_references) {
-               obj = GC_MALLOC_ATOMIC (size);
+               obj = (MonoArray *)GC_MALLOC_ATOMIC (size);
 
                obj->obj.vtable = vtable;
                obj->obj.synchronisation = NULL;
 
                memset ((char *) obj + sizeof (MonoObject), 0, size - sizeof (MonoObject));
        } else if (vtable->gc_descr != GC_NO_DESCRIPTOR) {
-               obj = GC_GCJ_MALLOC (size, vtable);
+               obj = (MonoArray *)GC_GCJ_MALLOC (size, vtable);
        } else {
-               obj = GC_MALLOC (size);
+               obj = (MonoArray *)GC_MALLOC (size);
 
                obj->obj.vtable = vtable;
        }
@@ -682,16 +683,16 @@ mono_gc_alloc_array (MonoVTable *vtable, size_t size, uintptr_t max_length, uint
        MonoArray *obj;
 
        if (!vtable->klass->has_references) {
-               obj = GC_MALLOC_ATOMIC (size);
+               obj = (MonoArray *)GC_MALLOC_ATOMIC (size);
 
                obj->obj.vtable = vtable;
                obj->obj.synchronisation = NULL;
 
                memset ((char *) obj + sizeof (MonoObject), 0, size - sizeof (MonoObject));
        } else if (vtable->gc_descr != GC_NO_DESCRIPTOR) {
-               obj = GC_GCJ_MALLOC (size, vtable);
+               obj = (MonoArray *)GC_GCJ_MALLOC (size, vtable);
        } else {
-               obj = GC_MALLOC (size);
+               obj = (MonoArray *)GC_MALLOC (size);
 
                obj->obj.vtable = vtable;
        }
@@ -710,7 +711,7 @@ mono_gc_alloc_array (MonoVTable *vtable, size_t size, uintptr_t max_length, uint
 void *
 mono_gc_alloc_string (MonoVTable *vtable, size_t size, gint32 len)
 {
-       MonoString *obj = GC_MALLOC_ATOMIC (size);
+       MonoString *obj = (MonoString *)GC_MALLOC_ATOMIC (size);
 
        obj->object.vtable = vtable;
        obj->object.synchronisation = NULL;
@@ -769,7 +770,7 @@ mono_gc_wbarrier_generic_store (gpointer ptr, MonoObject* value)
 void
 mono_gc_wbarrier_generic_store_atomic (gpointer ptr, MonoObject *value)
 {
-       InterlockedWritePointer (ptr, value);
+       InterlockedWritePointer ((volatile gpointer *)ptr, value);
 }
 
 void
@@ -805,7 +806,7 @@ mono_gc_get_suspend_signal (void)
 int
 mono_gc_get_restart_signal (void)
 {
-       return GC_get_restart_signal ();
+       return GC_get_thr_restart_signal ();
 }
 
 #if defined(USE_COMPILER_TLS) && defined(__linux__) && (defined(__i386__) || defined(__x86_64__))
@@ -924,11 +925,17 @@ create_allocator (int atype, int tls_key, gboolean slowpath)
        mono_mb_emit_byte (mb, 0x0D); /* CEE_MONO_TLS */
        mono_mb_emit_i4 (mb, tls_key);
        if (atype == ATYPE_FREEPTR || atype == ATYPE_FREEPTR_FOR_BOX || atype == ATYPE_STRING)
-               mono_mb_emit_icon (mb, G_STRUCT_OFFSET (struct GC_Thread_Rep, ptrfree_freelists));
+               mono_mb_emit_icon (mb, G_STRUCT_OFFSET (struct GC_Thread_Rep, tlfs)
+                                       + G_STRUCT_OFFSET (struct thread_local_freelists,
+                                                          ptrfree_freelists));
        else if (atype == ATYPE_NORMAL)
-               mono_mb_emit_icon (mb, G_STRUCT_OFFSET (struct GC_Thread_Rep, normal_freelists));
+               mono_mb_emit_icon (mb, G_STRUCT_OFFSET (struct GC_Thread_Rep, tlfs)
+                                       + G_STRUCT_OFFSET (struct thread_local_freelists,
+                                                          normal_freelists));
        else if (atype == ATYPE_GCJ)
-               mono_mb_emit_icon (mb, G_STRUCT_OFFSET (struct GC_Thread_Rep, gcj_freelists));
+               mono_mb_emit_icon (mb, G_STRUCT_OFFSET (struct GC_Thread_Rep, tlfs)
+                                       + G_STRUCT_OFFSET (struct thread_local_freelists,
+                                                          gcj_freelists));
        else
                g_assert_not_reached ();
        mono_mb_emit_byte (mb, MONO_CEE_ADD);
@@ -1141,7 +1148,7 @@ mono_gc_get_managed_allocator_by_type (int atype, gboolean slowpath)
                return res;
 
        res = create_allocator (atype, TLS_KEY_BOEHM_GC_THREAD, slowpath);
-       mono_mutex_lock (&mono_gc_lock);
+       mono_os_mutex_lock (&mono_gc_lock);
        if (cache [atype]) {
                mono_free_method (res);
                res = cache [atype];
@@ -1149,7 +1156,7 @@ mono_gc_get_managed_allocator_by_type (int atype, gboolean slowpath)
                mono_memory_barrier ();
                cache [atype] = res;
        }
-       mono_mutex_unlock (&mono_gc_lock);
+       mono_os_mutex_unlock (&mono_gc_lock);
        return res;
 }
 
@@ -1347,7 +1354,7 @@ mono_gc_register_for_finalization (MonoObject *obj, void *user_data)
        g_assert (GC_base (obj) == (char*)obj - offset);
 #endif
 
-       GC_REGISTER_FINALIZER_NO_ORDER ((char*)obj - offset, user_data, GUINT_TO_POINTER (offset), NULL, NULL);
+       GC_REGISTER_FINALIZER_NO_ORDER ((char*)obj - offset, (GC_finalization_proc)user_data, GUINT_TO_POINTER (offset), NULL, NULL);
 }
 
 #ifndef HOST_WIN32
@@ -1420,23 +1427,19 @@ mono_gc_make_root_descr_user (MonoGCRootMarkFunc marker)
        return NULL;
 }
 
-gboolean
-mono_gc_set_allow_synchronous_major (gboolean flag)
-{
-       return flag;
-}
 /* Toggleref support */
 
 void
 mono_gc_toggleref_add (MonoObject *object, mono_bool strong_ref)
 {
-       GC_toggleref_add ((GC_PTR)object, (int)strong_ref);
+       if (GC_toggleref_add ((GC_PTR)object, (int)strong_ref) != GC_SUCCESS)
+           g_error ("GC_toggleref_add failed\n");
 }
 
 void
 mono_gc_toggleref_register_callback (MonoToggleRefStatus (*proccess_toggleref) (MonoObject *obj))
 {
-       GC_toggleref_register_callback ((int (*) (GC_PTR obj)) proccess_toggleref);
+       GC_set_toggleref_func ((GC_ToggleRefStatus (*) (GC_PTR obj)) proccess_toggleref);
 }
 
 /* Test support code */
@@ -1445,7 +1448,7 @@ static MonoToggleRefStatus
 test_toggleref_callback (MonoObject *obj)
 {
        static MonoClassField *mono_toggleref_test_field;
-       int status = MONO_TOGGLE_REF_DROP;
+       MonoToggleRefStatus status = MONO_TOGGLE_REF_DROP;
 
        if (!mono_toggleref_test_field) {
                mono_toggleref_test_field = mono_class_get_field_from_name (mono_object_get_class (obj), "__test");
@@ -1485,7 +1488,7 @@ mono_gc_register_finalizer_callbacks (MonoGCFinalizerCallbacks *callbacks)
 
        fin_callbacks = *callbacks;
 
-       GC_set_finalizer_notify_proc ((void (*) (GC_PTR))fin_notifier);
+       GC_set_await_finalize_proc ((void (*) (GC_PTR))fin_notifier);
 }
 
 #define BITMAP_SIZE (sizeof (*((HandleData *)NULL)->bitmap) * CHAR_BIT)
@@ -1521,12 +1524,12 @@ handle_data_alloc_entries (HandleData *handles)
 {
        handles->size = 32;
        if (MONO_GC_HANDLE_TYPE_IS_WEAK (handles->type)) {
-               handles->entries = g_malloc0 (sizeof (*handles->entries) * handles->size);
-               handles->domain_ids = g_malloc0 (sizeof (*handles->domain_ids) * handles->size);
+               handles->entries = (void **)g_malloc0 (sizeof (*handles->entries) * handles->size);
+               handles->domain_ids = (guint16 *)g_malloc0 (sizeof (*handles->domain_ids) * handles->size);
        } else {
-               handles->entries = mono_gc_alloc_fixed (sizeof (*handles->entries) * handles->size, NULL, MONO_ROOT_SOURCE_GC_HANDLE, "gc handles table");
+               handles->entries = (void **)mono_gc_alloc_fixed (sizeof (*handles->entries) * handles->size, NULL, MONO_ROOT_SOURCE_GC_HANDLE, "gc handles table");
        }
-       handles->bitmap = g_malloc0 (handles->size / CHAR_BIT);
+       handles->bitmap = (guint32 *)g_malloc0 (handles->size / CHAR_BIT);
 }
 
 static gint
@@ -1563,7 +1566,7 @@ handle_data_grow (HandleData *handles, gboolean track)
        guint32 new_size = handles->size * 2; /* always double: we memset to 0 based on this below */
 
        /* resize and copy the bitmap */
-       new_bitmap = g_malloc0 (new_size / CHAR_BIT);
+       new_bitmap = (guint32 *)g_malloc0 (new_size / CHAR_BIT);
        memcpy (new_bitmap, handles->bitmap, handles->size / CHAR_BIT);
        g_free (handles->bitmap);
        handles->bitmap = new_bitmap;
@@ -1573,8 +1576,8 @@ handle_data_grow (HandleData *handles, gboolean track)
                gpointer *entries;
                guint16 *domain_ids;
                gint i;
-               domain_ids = g_malloc0 (sizeof (*handles->domain_ids) * new_size);
-               entries = g_malloc0 (sizeof (*handles->entries) * new_size);
+               domain_ids = (guint16 *)g_malloc0 (sizeof (*handles->domain_ids) * new_size);
+               entries = (void **)g_malloc0 (sizeof (*handles->entries) * new_size);
                memcpy (domain_ids, handles->domain_ids, sizeof (*handles->domain_ids) * handles->size);
                for (i = 0; i < handles->size; ++i) {
                        MonoObject *obj = mono_gc_weak_link_get (&(handles->entries [i]));
@@ -1591,7 +1594,7 @@ handle_data_grow (HandleData *handles, gboolean track)
                handles->domain_ids = domain_ids;
        } else {
                gpointer *entries;
-               entries = mono_gc_alloc_fixed (sizeof (*handles->entries) * new_size, NULL, MONO_ROOT_SOURCE_GC_HANDLE, "gc handles table");
+               entries = (void **)mono_gc_alloc_fixed (sizeof (*handles->entries) * new_size, NULL, MONO_ROOT_SOURCE_GC_HANDLE, "gc handles table");
                mono_gc_memmove_aligned (entries, handles->entries, sizeof (*handles->entries) * handles->size);
                mono_gc_free_fixed (handles->entries);
                handles->entries = entries;
@@ -1709,7 +1712,7 @@ mono_gchandle_get_target (guint32 gchandle)
                if (MONO_GC_HANDLE_TYPE_IS_WEAK (handles->type)) {
                        obj = mono_gc_weak_link_get (&handles->entries [slot]);
                } else {
-                       obj = handles->entries [slot];
+                       obj = (MonoObject *)handles->entries [slot];
                }
        } else {
                /* print a warning? */
@@ -1731,7 +1734,7 @@ mono_gchandle_set_target (guint32 gchandle, MonoObject *obj)
        lock_handles (handles);
        if (slot < handles->size && slot_occupied (handles, slot)) {
                if (MONO_GC_HANDLE_TYPE_IS_WEAK (handles->type)) {
-                       old_obj = handles->entries [slot];
+                       old_obj = (MonoObject *)handles->entries [slot];
                        if (handles->entries [slot])
                                mono_gc_weak_link_remove (&handles->entries [slot], handles->type == HANDLE_WEAK_TRACK);
                        if (obj)
@@ -1778,7 +1781,7 @@ mono_gchandle_is_in_domain (guint32 gchandle, MonoDomain *domain)
                        result = domain->domain_id == handles->domain_ids [slot];
                } else {
                        MonoObject *obj;
-                       obj = handles->entries [slot];
+                       obj = (MonoObject *)handles->entries [slot];
                        if (obj == NULL)
                                result = TRUE;
                        else

diff --git a/mono/metadata/class-internals.h b/mono/metadata/class-internals.h
index a7f7454749877cfd50665064a3f17904e6ebdc30..84a4c9090ae37af58c14b2d474db83d03c1d48b7 100644 (file)
--- a/mono/metadata/class-internals.h
+++ b/mono/metadata/class-internals.h
@@ -66,7 +66,7 @@ struct _MonoMethod {
        guint16 flags;  /* method flags */
        guint16 iflags; /* method implementation flags */
        guint32 token;
-       MonoClass *klass;
+       MonoClass *klass; /* To what class does this method belong */
        MonoMethodSignature *signature;
        /* name is useful mostly for debugging */
        const char *name;
@@ -528,7 +528,7 @@ struct _MonoMethodInflated {
  */
 struct _MonoGenericClass {
        MonoClass *container_class;     /* the generic type definition */
-       MonoGenericContext context;     /* a context that contains the type instantiation doesn't contain any method instantiation */
+       MonoGenericContext context;     /* a context that contains the type instantiation doesn't contain any method instantiation */ /* FIXME: Only the class_inst member of "context" is ever used, so this field could be replaced with just a monogenericinst */
        guint is_dynamic  : 1;          /* We're a MonoDynamicGenericClass */
        guint is_tb_open  : 1;          /* This is the fully open instantiation for a type_builder. Quite ugly, but it's temporary.*/
        MonoClass *cached_class;        /* if present, the MonoClass corresponding to the instantiation.  */
@@ -570,13 +570,6 @@ struct _MonoGenericParam {
         * sharing.
         */
        MonoType *gshared_constraint;
-       /* 
-        * If owner is NULL, or owner is 'owned' by this gparam,
-        * then this is the image whose mempool this struct was allocated from.
-        * The second case happens for gparams created in
-        * mono_reflection_initialize_generic_parameter ().
-        */
-       MonoImage *image;
 };
 
 /* Additional details about a MonoGenericParam */
@@ -609,33 +602,87 @@ struct _MonoGenericContainer {
           the generic container of the containing class. */
        MonoGenericContainer *parent;
        /* the generic type definition or the generic method definition corresponding to this container */
+       /* Union rules: If is_anonymous, image field is valid; else if is_method, method field is valid; else klass is valid. */
        union {
                MonoClass *klass;
                MonoMethod *method;
+               MonoImage *image;
        } owner;
-       int type_argc    : 31;
+       int type_argc    : 29; // Per the ECMA spec, this value is capped at 16 bits
        /* If true, we're a generic method, otherwise a generic type definition. */
        /* Invariant: parent != NULL => is_method */
-       int is_method    : 1;
+       int is_method     : 1;
+       /* If true, this container has no associated class/method and only the image is known. This can happen:
+          1. For the special anonymous containers kept by MonoImage.
+          2. During container creation via the mono_metadata_load_generic_params path-- in this case the caller
+             sets the owner, so temporarily while load_generic_params is completing the container is anonymous.
+          3. When user code creates a generic parameter via SRE, but has not yet set an owner. */
+       int is_anonymous : 1;
+       /* If false, all params in this container are full-size. If true, all params are just param structs. */
+       /* This field is always == to the is_anonymous field, except in "temporary" cases (2) and (3) above. */
+       /* TODO: Merge GenericParam and GenericParamFull, remove this field. Benefit is marginal. */
+       int is_small_param : 1;
        /* Our type parameters. */
        MonoGenericParamFull *type_params;
-
-       /* 
-        * For owner-less containers created by SRE, the image the container was
-        * allocated from.
-        */
-       MonoImage *image;
 };
 
-#define mono_generic_container_get_param(gc, i) ((MonoGenericParam *) ((gc)->type_params + (i)))
-#define mono_generic_container_get_param_info(gc, i) (&((gc)->type_params + (i))->info)
+static inline MonoGenericParam *
+mono_generic_container_get_param (MonoGenericContainer *gc, int i)
+{
+       return (MonoGenericParam *) &gc->type_params [i];
+}
+
+static inline MonoGenericParamInfo *
+mono_generic_container_get_param_info (MonoGenericContainer *gc, int i)
+{
+       return &gc->type_params [i].info;
+}
+
+static inline MonoGenericContainer *
+mono_generic_param_owner (MonoGenericParam *p)
+{
+       return p->owner;
+}
+
+static inline int
+mono_generic_param_num (MonoGenericParam *p)
+{
+       return p->num;
+}
+
+static inline gboolean
+mono_generic_param_is_fullsize (MonoGenericParam *p)
+{
+       return !mono_generic_param_owner (p)->is_small_param;
+}
+
+static inline MonoGenericParamInfo *
+mono_generic_param_info (MonoGenericParam *p)
+{
+       if (mono_generic_param_is_fullsize (p))
+               return &((MonoGenericParamFull *) p)->info;
+       return NULL;
+}
 
-#define mono_generic_param_owner(p)            ((p)->owner)
-#define mono_generic_param_num(p)              ((p)->num)
-#define mono_generic_param_info(p)             (mono_generic_param_owner (p) ? &((MonoGenericParamFull *) p)->info : NULL)
-#define mono_generic_param_name(p)             (((mono_generic_param_owner (p) || (p)->gshared_constraint)) ? ((MonoGenericParamFull *) p)->info.name : NULL)
-#define mono_type_get_generic_param_owner(t)   (mono_generic_param_owner ((t)->data.generic_param))
-#define mono_type_get_generic_param_num(t)     (mono_generic_param_num   ((t)->data.generic_param))
+static inline const char *
+mono_generic_param_name (MonoGenericParam *p)
+{
+       if (mono_generic_param_is_fullsize (p))
+               return ((MonoGenericParamFull *) p)->info.name;
+       return NULL;
+}
+
+static inline MonoGenericContainer *
+mono_type_get_generic_param_owner (MonoType *t)
+{
+       return mono_generic_param_owner (t->data.generic_param);
+}
+
+static inline int
+mono_type_get_generic_param_num (MonoType *t)
+{
+       return mono_generic_param_num (t->data.generic_param);
+}
 
 /*
  * Class information which might be cached by the runtime in the AOT file for
@@ -1416,4 +1463,13 @@ mono_field_from_token_checked (MonoImage *image, uint32_t token, MonoClass **ret
 gpointer
 mono_ldtoken_checked (MonoImage *image, guint32 token, MonoClass **handle_class, MonoGenericContext *context, MonoError *error);
 
+MonoClass *
+mono_class_from_generic_parameter_internal (MonoGenericParam *param);
+
+MonoImage *
+get_image_for_generic_param (MonoGenericParam *param);
+
+char *
+make_generic_name_string (MonoImage *image, int num);
+
 #endif /* __MONO_METADATA_CLASS_INTERNALS_H__ */

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index 548554a19872c47fa9f0c417ba1e611cd1fe8f1f..4d74e17e60ebabd5dac765cd6474b1cf751927ed 100644 (file)
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@ -43,6 +43,7 @@
 #include <mono/utils/mono-memory-model.h>
 #include <mono/utils/atomic.h>
 #include <mono/utils/bsearch.h>
+#include <mono/utils/checked-build.h>
 
 MonoStats mono_stats;
 
@@ -103,13 +104,13 @@ typedef gboolean (*gclass_record_func) (MonoClass*, void*);
 static inline void
 classes_lock (void)
 {
-       mono_locks_acquire (&classes_mutex, ClassesLock);
+       mono_locks_os_acquire (&classes_mutex, ClassesLock);
 }
 
 static inline void
 classes_unlock (void)
 {
-       mono_locks_release (&classes_mutex, ClassesLock);
+       mono_locks_os_release (&classes_mutex, ClassesLock);
 }
 
 /* 
@@ -222,7 +223,7 @@ mono_class_from_typeref_checked (MonoImage *image, guint32 type_token, MonoError
                if (enclosing->nested_classes_inited && enclosing->ext) {
                        /* Micro-optimization: don't scan the metadata tables if enclosing is already inited */
                        for (tmp = enclosing->ext->nested_classes; tmp; tmp = tmp->next) {
-                               res = tmp->data;
+                               res = (MonoClass *)tmp->data;
                                if (strcmp (res->name, name) == 0)
                                        return res;
                        }
@@ -298,17 +299,17 @@ MonoArrayType *
 mono_dup_array_type (MonoImage *image, MonoArrayType *a)
 {
        if (image) {
-               a = mono_image_memdup (image, a, sizeof (MonoArrayType));
+               a = (MonoArrayType *)mono_image_memdup (image, a, sizeof (MonoArrayType));
                if (a->sizes)
-                       a->sizes = mono_image_memdup (image, a->sizes, a->numsizes * sizeof (int));
+                       a->sizes = (int *)mono_image_memdup (image, a->sizes, a->numsizes * sizeof (int));
                if (a->lobounds)
-                       a->lobounds = mono_image_memdup (image, a->lobounds, a->numlobounds * sizeof (int));
+                       a->lobounds = (int *)mono_image_memdup (image, a->lobounds, a->numlobounds * sizeof (int));
        } else {
-               a = g_memdup (a, sizeof (MonoArrayType));
+               a = (MonoArrayType *)g_memdup (a, sizeof (MonoArrayType));
                if (a->sizes)
-                       a->sizes = g_memdup (a->sizes, a->numsizes * sizeof (int));
+                       a->sizes = (int *)g_memdup (a->sizes, a->numsizes * sizeof (int));
                if (a->lobounds)
-                       a->lobounds = g_memdup (a->lobounds, a->numlobounds * sizeof (int));
+                       a->lobounds = (int *)g_memdup (a->lobounds, a->numlobounds * sizeof (int));
        }
        return a;
 }
@@ -1109,7 +1110,7 @@ mono_class_inflate_generic_method_full_checked (MonoMethod *method, MonoClass *k
 
        // check cache
        mono_image_set_lock (set);
-       cached = g_hash_table_lookup (set->gmethod_cache, iresult);
+       cached = (MonoMethodInflated *)g_hash_table_lookup (set->gmethod_cache, iresult);
        mono_image_set_unlock (set);
 
        if (cached) {
@@ -1184,7 +1185,7 @@ mono_class_inflate_generic_method_full_checked (MonoMethod *method, MonoClass *k
 
        // check cache
        mono_image_set_lock (set);
-       cached = g_hash_table_lookup (set->gmethod_cache, iresult);
+       cached = (MonoMethodInflated *)g_hash_table_lookup (set->gmethod_cache, iresult);
        if (!cached) {
                g_hash_table_insert (set->gmethod_cache, iresult, iresult);
                iresult->owner = set;
@@ -1264,7 +1265,7 @@ mono_method_get_generic_container (MonoMethod *method)
        if (!method->is_generic)
                return NULL;
 
-       container = mono_image_property_lookup (method->klass->image, method, MONO_METHOD_PROP_GENERIC_CONTAINER);
+       container = (MonoGenericContainer *)mono_image_property_lookup (method->klass->image, method, MONO_METHOD_PROP_GENERIC_CONTAINER);
        g_assert (container);
 
        return container;
@@ -1453,7 +1454,7 @@ mono_class_setup_basic_field_info (MonoClass *klass)
                klass->field.count = gtd->field.count;
        }
 
-       klass->fields = mono_class_alloc0 (klass, sizeof (MonoClassField) * top);
+       klass->fields = (MonoClassField *)mono_class_alloc0 (klass, sizeof (MonoClassField) * top);
 
        /*
         * Fetch all the field information.
@@ -2191,7 +2192,7 @@ mono_class_setup_methods (MonoClass *klass)
 
                /* The + 1 makes this always non-NULL to pass the check in mono_class_setup_methods () */
                count = gklass->method.count;
-               methods = mono_class_alloc0 (klass, sizeof (MonoMethod*) * (count + 1));
+               methods = (MonoMethod **)mono_class_alloc0 (klass, sizeof (MonoMethod*) * (count + 1));
 
                for (i = 0; i < count; i++) {
                        methods [i] = mono_class_inflate_generic_method_full_checked (
@@ -2229,7 +2230,7 @@ mono_class_setup_methods (MonoClass *klass)
                        count += klass->interface_count * count_generic;
                }
 
-               methods = mono_class_alloc0 (klass, sizeof (MonoMethod*) * count);
+               methods = (MonoMethod **)mono_class_alloc0 (klass, sizeof (MonoMethod*) * count);
 
                sig = mono_metadata_signature_alloc (klass->image, klass->rank);
                sig->ret = &mono_defaults.void_class->byval_arg;
@@ -2299,7 +2300,7 @@ mono_class_setup_methods (MonoClass *klass)
                MonoError error;
 
                count = klass->method.count;
-               methods = mono_class_alloc (klass, sizeof (MonoMethod*) * count);
+               methods = (MonoMethod **)mono_class_alloc (klass, sizeof (MonoMethod*) * count);
                for (i = 0; i < count; ++i) {
                        int idx = mono_metadata_translate_token_index (klass->image, MONO_TABLE_METHOD, klass->method.first + i + 1);
                        methods [i] = mono_get_method_checked (klass->image, MONO_TOKEN_METHOD_DEF | idx, klass, NULL, &error);
@@ -2517,7 +2518,7 @@ mono_class_setup_properties (MonoClass *klass)
                                return;
                }
 
-               properties = mono_class_alloc0 (klass, sizeof (MonoProperty) * count);
+               properties = (MonoProperty *)mono_class_alloc0 (klass, sizeof (MonoProperty) * count);
                for (i = first; i < last; ++i) {
                        mono_metadata_decode_table_row (klass->image, MONO_TABLE_PROPERTY, i, cols, MONO_PROPERTY_SIZE);
                        properties [i - first].parent = klass;
@@ -2660,7 +2661,7 @@ mono_class_setup_events (MonoClass *klass)
                        }
                }
 
-               events = mono_class_alloc0 (klass, sizeof (MonoEvent) * count);
+               events = (MonoEvent *)mono_class_alloc0 (klass, sizeof (MonoEvent) * count);
                for (i = first; i < last; ++i) {
                        MonoEvent *event = &events [i - first];
 
@@ -2703,7 +2704,7 @@ mono_class_setup_events (MonoClass *klass)
                                        } else {
                                                while (event->other [n])
                                                        n++;
-                                               event->other = g_realloc (event->other, (n + 2) * sizeof (MonoMethod*));
+                                               event->other = (MonoMethod **)g_realloc (event->other, (n + 2) * sizeof (MonoMethod*));
                                        }
                                        event->other [n] = method;
                                        /* NULL terminated */
@@ -2881,8 +2882,8 @@ mono_class_get_implemented_interfaces (MonoClass *klass, MonoError *error)
 
 static int
 compare_interface_ids (const void *p_key, const void *p_element) {
-       const MonoClass *key = p_key;
-       const MonoClass *element = *(MonoClass**) p_element;
+       const MonoClass *key = (const MonoClass *)p_key;
+       const MonoClass *element = *(const MonoClass **)p_element;
        
        return (key->interface_id - element->interface_id);
 }
@@ -2890,7 +2891,7 @@ compare_interface_ids (const void *p_key, const void *p_element) {
 /*FIXME verify all callers if they should switch to mono_class_interface_offset_with_variance*/
 int
 mono_class_interface_offset (MonoClass *klass, MonoClass *itf) {
-       MonoClass **result = mono_binary_search (
+       MonoClass **result = (MonoClass **)mono_binary_search (
                        itf,
                        klass->interfaces_packed,
                        klass->interface_offsets_count,
@@ -2983,7 +2984,7 @@ print_implemented_interfaces (MonoClass *klass) {
                        mono_error_cleanup (&error);
                } else if (ifaces) {
                        for (i = 0; i < ifaces->len; i++) {
-                               MonoClass *ic = g_ptr_array_index (ifaces, i);
+                               MonoClass *ic = (MonoClass *)g_ptr_array_index (ifaces, i);
                                printf ("  [UIID %d] interface %s\n", ic->interface_id, ic->name);
                                printf ("  [%03d][UUID %03d][SLOT %03d][SIZE  %03d] interface %s.%s\n", i,
                                                ic->interface_id,
@@ -3135,7 +3136,7 @@ get_implicit_generic_array_interfaces (MonoClass *klass, int *num, int *is_enume
                                ++real_count;
                }
 
-               interfaces = g_malloc0 (sizeof (MonoClass*) * real_count);
+               interfaces = (MonoClass **)g_malloc0 (sizeof (MonoClass*) * real_count);
                interfaces [0] = valuetype_types [0];
                if (valuetype_types [1])
                        interfaces [nifaces] = valuetype_types [1];
@@ -3175,7 +3176,7 @@ get_implicit_generic_array_interfaces (MonoClass *klass, int *num, int *is_enume
                        if (valuetype_types [1])
                                ++real_count;
                }
-               interfaces = g_malloc0 (sizeof (MonoClass*) * real_count);
+               interfaces = (MonoClass **)g_malloc0 (sizeof (MonoClass*) * real_count);
                if (MONO_CLASS_IS_INTERFACE (eclass)) {
                        interfaces [0] = mono_defaults.object_class;
                        j = nifaces;
@@ -3528,7 +3529,7 @@ setup_interface_offsets (MonoClass *klass, int cur_slot, gboolean overwrite)
                if (ifaces) {
                        num_ifaces += ifaces->len;
                        for (i = 0; i < ifaces->len; ++i) {
-                               ic = g_ptr_array_index (ifaces, i);
+                               ic = (MonoClass *)g_ptr_array_index (ifaces, i);
                                if (max_iid < ic->interface_id)
                                        max_iid = ic->interface_id;
                        }
@@ -3550,8 +3551,8 @@ setup_interface_offsets (MonoClass *klass, int cur_slot, gboolean overwrite)
        }
        klass->max_interface_id = max_iid;
        /* compute vtable offset for interfaces */
-       interfaces_full = g_malloc0 (sizeof (MonoClass*) * num_ifaces);
-       interface_offsets_full = g_malloc (sizeof (int) * num_ifaces);
+       interfaces_full = (MonoClass **)g_malloc0 (sizeof (MonoClass*) * num_ifaces);
+       interface_offsets_full = (int *)g_malloc (sizeof (int) * num_ifaces);
 
        for (i = 0; i < num_ifaces; i++) {
                interface_offsets_full [i] = -1;
@@ -3565,7 +3566,7 @@ setup_interface_offsets (MonoClass *klass, int cur_slot, gboolean overwrite)
                if (ifaces) {
                        for (i = 0; i < ifaces->len; ++i) {
                                int io;
-                               ic = g_ptr_array_index (ifaces, i);
+                               ic = (MonoClass *)g_ptr_array_index (ifaces, i);
                                
                                /*Force the sharing of interface offsets between parent and subtypes.*/
                                io = mono_class_interface_offset (k, ic);
@@ -3580,7 +3581,7 @@ setup_interface_offsets (MonoClass *klass, int cur_slot, gboolean overwrite)
        if (ifaces) {
                for (i = 0; i < ifaces->len; ++i) {
                        int count;
-                       ic = g_ptr_array_index (ifaces, i);
+                       ic = (MonoClass *)g_ptr_array_index (ifaces, i);
                        if (set_interface_and_offset (num_ifaces, interfaces_full, interface_offsets_full, ic, cur_slot, FALSE))
                                continue;
                        count = count_virtual_methods (ic);
@@ -3668,13 +3669,13 @@ setup_interface_offsets (MonoClass *klass, int cur_slot, gboolean overwrite)
                uint8_t *bitmap;
                int bsize;
                klass->interface_offsets_count = interface_offsets_count;
-               klass->interfaces_packed = mono_class_alloc (klass, sizeof (MonoClass*) * interface_offsets_count);
-               klass->interface_offsets_packed = mono_class_alloc (klass, sizeof (guint16) * interface_offsets_count);
+               klass->interfaces_packed = (MonoClass **)mono_class_alloc (klass, sizeof (MonoClass*) * interface_offsets_count);
+               klass->interface_offsets_packed = (guint16 *)mono_class_alloc (klass, sizeof (guint16) * interface_offsets_count);
                bsize = (sizeof (guint8) * ((max_iid + 1) >> 3)) + (((max_iid + 1) & 7)? 1 :0);
 #ifdef COMPRESSED_INTERFACE_BITMAP
                bitmap = g_malloc0 (bsize);
 #else
-               bitmap = mono_class_alloc0 (klass, bsize);
+               bitmap = (uint8_t *)mono_class_alloc0 (klass, bsize);
 #endif
                for (i = 0; i < interface_offsets_count; i++) {
                        int id = interfaces_full [i]->interface_id;
@@ -4268,7 +4269,7 @@ verify_class_overrides (MonoClass *klass, MonoMethod **overrides, int onum)
                }
 
                if (!mono_class_is_assignable_from_slow (decl->klass, klass)) {
-                       mono_class_set_failure (klass, MONO_EXCEPTION_TYPE_LOAD, g_strdup ("Method overrides a class or interface that extended or implemented by this type"));
+                       mono_class_set_failure (klass, MONO_EXCEPTION_TYPE_LOAD, g_strdup ("Method overrides a class or interface that is not extended or implemented by this type"));
                        return FALSE;
                }
 
@@ -4327,7 +4328,7 @@ mono_class_setup_vtable_general (MonoClass *klass, MonoMethod **overrides, int o
                return;
        } else if (ifaces) {
                for (i = 0; i < ifaces->len; i++) {
-                       MonoClass *ic = g_ptr_array_index (ifaces, i);
+                       MonoClass *ic = (MonoClass *)g_ptr_array_index (ifaces, i);
                        max_vtsize += ic->method.count;
                }
                g_ptr_array_free (ifaces, TRUE);
@@ -4358,7 +4359,7 @@ mono_class_setup_vtable_general (MonoClass *klass, MonoMethod **overrides, int o
                ++cur_slot;
        }
 
-       vtable = alloca (sizeof (gpointer) * max_vtsize);
+       vtable = (MonoMethod **)alloca (sizeof (gpointer) * max_vtsize);
        memset (vtable, 0, sizeof (gpointer) * max_vtsize);
 
        /* printf ("METAINIT %s.%s\n", klass->name_space, klass->name); */
@@ -4382,7 +4383,7 @@ mono_class_setup_vtable_general (MonoClass *klass, MonoMethod **overrides, int o
                        return;
                }
 
-               tmp = mono_class_alloc0 (klass, sizeof (gpointer) * gklass->vtable_size);
+               tmp = (MonoMethod **)mono_class_alloc0 (klass, sizeof (gpointer) * gklass->vtable_size);
                klass->vtable_size = gklass->vtable_size;
                for (i = 0; i < gklass->vtable_size; ++i)
                        if (gklass->vtable [i]) {
@@ -4531,7 +4532,7 @@ mono_class_setup_vtable_general (MonoClass *klass, MonoMethod **overrides, int o
                for (im_index = 0; im_index < ic->method.count; im_index++) {
                        MonoMethod *im = ic->methods [im_index];
                        int im_slot = ic_offset + im->slot;
-                       MonoMethod *override_im = (override_map != NULL) ? g_hash_table_lookup (override_map, im) : NULL;
+                       MonoMethod *override_im = (override_map != NULL) ? (MonoMethod *)g_hash_table_lookup (override_map, im) : NULL;
                        
                        if (im->flags & METHOD_ATTRIBUTE_STATIC)
                                continue;
@@ -4546,7 +4547,7 @@ mono_class_setup_vtable_general (MonoClass *klass, MonoMethod **overrides, int o
 
                                // First look for a suitable method among the class methods
                                for (l = virt_methods; l; l = l->next) {
-                                       cm = l->data;
+                                       cm = (MonoMethod *)l->data;
                                        TRACE_INTERFACE_VTABLE (printf ("    For slot %d ('%s'.'%s':'%s'), trying method '%s'.'%s':'%s'... [EXPLICIT IMPLEMENTATION = %d][SLOT IS NULL = %d]", im_slot, ic->name_space, ic->name, im->name, cm->klass->name_space, cm->klass->name, cm->name, interface_is_explicitly_implemented_by_class, (vtable [im_slot] == NULL)));
                                        if (check_interface_method_override (klass, im, cm, TRUE, interface_is_explicitly_implemented_by_class, (vtable [im_slot] == NULL))) {
                                                TRACE_INTERFACE_VTABLE (printf ("[check ok]: ASSIGNING"));
@@ -4621,7 +4622,7 @@ mono_class_setup_vtable_general (MonoClass *klass, MonoMethod **overrides, int o
 
        TRACE_INTERFACE_VTABLE (print_vtable_full (klass, vtable, cur_slot, first_non_interface_slot, "AFTER SETTING UP INTERFACE METHODS", FALSE));
        for (l = virt_methods; l; l = l->next) {
-               cm = l->data;
+               cm = (MonoMethod *)l->data;
                /*
                 * If the method is REUSE_SLOT, we must check in the
                 * base class for a method to override.
@@ -4724,7 +4725,7 @@ mono_class_setup_vtable_general (MonoClass *klass, MonoMethod **overrides, int o
                        if (vtable [i]) {
                                TRACE_INTERFACE_VTABLE (printf ("checking slot %d method %s[%p] for overrides\n", i, mono_method_full_name (vtable [i], 1), vtable [i]));
 
-                               cm = g_hash_table_lookup (override_map, vtable [i]);
+                               cm = (MonoMethod *)g_hash_table_lookup (override_map, vtable [i]);
                                if (cm)
                                        vtable [i] = cm;
                        }
@@ -4768,7 +4769,7 @@ mono_class_setup_vtable_general (MonoClass *klass, MonoMethod **overrides, int o
                mono_memory_barrier ();
                klass->vtable = klass->parent->vtable;
        } else {
-               MonoMethod **tmp = mono_class_alloc0 (klass, sizeof (gpointer) * klass->vtable_size);
+               MonoMethod **tmp = (MonoMethod **)mono_class_alloc0 (klass, sizeof (gpointer) * klass->vtable_size);
                memcpy (tmp, vtable,  sizeof (gpointer) * klass->vtable_size);
                mono_memory_barrier ();
                klass->vtable = tmp;
@@ -4953,12 +4954,12 @@ generic_array_methods (MonoClass *klass)
                }
        }
        list = g_list_reverse (list);
-       generic_array_method_info = mono_image_alloc (mono_defaults.corlib, sizeof (GenericArrayMethodInfo) * count_generic);
+       generic_array_method_info = (GenericArrayMethodInfo *)mono_image_alloc (mono_defaults.corlib, sizeof (GenericArrayMethodInfo) * count_generic);
        i = 0;
        for (tmp = list; tmp; tmp = tmp->next) {
                const char *mname, *iname;
                gchar *name;
-               MonoMethod *m = tmp->data;
+               MonoMethod *m = (MonoMethod *)tmp->data;
                const char *ireadonlylist_prefix = "InternalArray__IReadOnlyList_";
                const char *ireadonlycollection_prefix = "InternalArray__IReadOnlyCollection_";
 
@@ -4982,7 +4983,7 @@ generic_array_methods (MonoClass *klass)
                        g_assert_not_reached ();
                }
 
-               name = mono_image_alloc (mono_defaults.corlib, strlen (iname) + strlen (mname) + 1);
+               name = (gchar *)mono_image_alloc (mono_defaults.corlib, strlen (iname) + strlen (mname) + 1);
                strcpy (name, iname);
                strcpy (name + strlen (iname), mname);
                generic_array_method_info [i].name = name;
@@ -5021,7 +5022,7 @@ concat_two_strings_with_zero (MonoImage *image, const char *s1, const char *s2)
 {
        int null_length = strlen ("(null)");
        int len = (s1 ? strlen (s1) : null_length) + (s2 ? strlen (s2) : null_length) + 2;
-       char *s = mono_image_alloc (image, len);
+       char *s = (char *)mono_image_alloc (image, len);
        int result;
 
        result = g_snprintf (s, len, "%s%c%s", s1 ? s1 : "(null)", '\0', s2 ? s2 : "(null)");
@@ -5449,11 +5450,14 @@ mono_class_setup_mono_type (MonoClass *klass)
                        klass->valuetype = 0;
                        klass->enumtype = 0;
                } else if (!strcmp (name, "Object")) {
-                       klass->this_arg.type = klass->byval_arg.type = MONO_TYPE_OBJECT;
+                       klass->byval_arg.type = MONO_TYPE_OBJECT;
+                       klass->this_arg.type = MONO_TYPE_OBJECT;
                } else if (!strcmp (name, "String")) {
-                       klass->this_arg.type = klass->byval_arg.type = MONO_TYPE_STRING;
+                       klass->byval_arg.type = MONO_TYPE_STRING;
+                       klass->this_arg.type = MONO_TYPE_STRING;
                } else if (!strcmp (name, "TypedReference")) {
-                       klass->this_arg.type = klass->byval_arg.type = MONO_TYPE_TYPEDBYREF;
+                       klass->byval_arg.type = MONO_TYPE_TYPEDBYREF;
+                       klass->this_arg.type = MONO_TYPE_TYPEDBYREF;
                }
        }
 
@@ -5535,7 +5539,8 @@ mono_class_setup_mono_type (MonoClass *klass)
                                break;
                        }
                }
-               klass->this_arg.type = klass->byval_arg.type = t;
+               klass->byval_arg.type = (MonoTypeEnum)t;
+               klass->this_arg.type = (MonoTypeEnum)t;
        }
 
        if (MONO_CLASS_IS_INTERFACE (klass))
@@ -5677,7 +5682,7 @@ mono_class_setup_supertypes (MonoClass *klass)
        int ms;
        MonoClass **supertypes;
 
-       mono_atomic_load_acquire (supertypes, void*, &klass->supertypes);
+       mono_atomic_load_acquire (supertypes, MonoClass **, &klass->supertypes);
        if (supertypes)
                return;
 
@@ -5689,16 +5694,19 @@ mono_class_setup_supertypes (MonoClass *klass)
                klass->idepth = 1;
 
        ms = MAX (MONO_DEFAULT_SUPERTABLE_SIZE, klass->idepth);
-       supertypes = mono_class_alloc0 (klass, sizeof (MonoClass *) * ms);
+       supertypes = (MonoClass **)mono_class_alloc0 (klass, sizeof (MonoClass *) * ms);
 
        if (klass->parent) {
-               supertypes [klass->idepth - 1] = klass;
-               memcpy (supertypes, klass->parent->supertypes, klass->parent->idepth * sizeof (gpointer));
+               CHECKED_METADATA_WRITE_PTR ( supertypes [klass->idepth - 1] , klass );
+
+               int supertype_idx;
+               for (supertype_idx = 0; supertype_idx < klass->parent->idepth; supertype_idx++)
+                       CHECKED_METADATA_WRITE_PTR ( supertypes [supertype_idx] , klass->parent->supertypes [supertype_idx] );
        } else {
-               supertypes [0] = klass;
+               CHECKED_METADATA_WRITE_PTR ( supertypes [0] , klass );
        }
 
-       mono_atomic_store_release (&klass->supertypes, supertypes);
+       CHECKED_METADATA_WRITE_PTR_ATOMIC ( klass->supertypes , supertypes );
 }
 
 static gboolean
@@ -5775,7 +5783,7 @@ mono_class_create_from_typedef (MonoImage *image, guint32 type_token, MonoError
 
        mono_loader_lock ();
 
-       if ((klass = mono_internal_hash_table_lookup (&image->class_cache, GUINT_TO_POINTER (type_token)))) {
+       if ((klass = (MonoClass *)mono_internal_hash_table_lookup (&image->class_cache, GUINT_TO_POINTER (type_token)))) {
                mono_loader_unlock ();
                mono_loader_assert_no_error ();
                return klass;
@@ -5786,7 +5794,7 @@ mono_class_create_from_typedef (MonoImage *image, guint32 type_token, MonoError
        name = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAME]);
        nspace = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAMESPACE]);
 
-       klass = mono_image_alloc0 (image, sizeof (MonoClass));
+       klass = (MonoClass *)mono_image_alloc0 (image, sizeof (MonoClass));
 
        klass->name = name;
        klass->name_space = nspace;
@@ -5808,6 +5816,7 @@ mono_class_create_from_typedef (MonoImage *image, guint32 type_token, MonoError
        if (klass->generic_container) {
                klass->is_generic = 1;
                klass->generic_container->owner.klass = klass;
+               klass->generic_container->is_anonymous = FALSE; // Owner class is now known, container is no longer anonymous
                context = &klass->generic_container->context;
        }
 
@@ -5977,7 +5986,7 @@ parent_failure:
        return NULL;
 }
 
-/** is klass Nullable<T>? */
+/** Is klass a Nullable<T> ginst? */
 gboolean
 mono_class_is_nullable (MonoClass *klass)
 {
@@ -6037,7 +6046,7 @@ mono_generic_class_get_class (MonoGenericClass *gclass)
                return gclass->cached_class;
        }
 
-       klass = mono_image_set_alloc0 (gclass->owner, sizeof (MonoClass));
+       klass = (MonoClass *)mono_image_set_alloc0 (gclass->owner, sizeof (MonoClass));
 
        gklass = gclass->container_class;
 
@@ -6062,7 +6071,8 @@ mono_generic_class_get_class (MonoGenericClass *gclass)
        klass->is_inflated = 1;
        klass->generic_class = gclass;
 
-       klass->this_arg.type = klass->byval_arg.type = MONO_TYPE_GENERICINST;
+       klass->byval_arg.type = MONO_TYPE_GENERICINST;
+       klass->this_arg.type = klass->byval_arg.type;
        klass->this_arg.data.generic_class = klass->byval_arg.data.generic_class = gclass;
        klass->this_arg.byref = TRUE;
        klass->enumtype = gklass->enumtype;
@@ -6117,42 +6127,83 @@ mono_generic_class_get_class (MonoGenericClass *gclass)
        return klass;
 }
 
+static MonoImage *
+get_image_for_container (MonoGenericContainer *container)
+{
+       MonoImage *result;
+       if (container->is_anonymous) {
+               result = container->owner.image;
+       } else {
+               MonoClass *klass;
+               if (container->is_method) {
+                       MonoMethod *method = container->owner.method;
+                       g_assert_checked (method);
+                       klass = method->klass;
+               } else {
+                       klass = container->owner.klass;
+               }
+               g_assert_checked (klass);
+               result = klass->image;
+       }
+       g_assert (result);
+       return result;
+}
+
+MonoImage *
+get_image_for_generic_param (MonoGenericParam *param)
+{
+       MonoGenericContainer *container = mono_generic_param_owner (param);
+       g_assert_checked (container);
+       return get_image_for_container (container);
+}
+
+// Make a string in the designated image consisting of a single integer.
+#define INT_STRING_SIZE 16
+char *
+make_generic_name_string (MonoImage *image, int num)
+{
+       char *name = (char *)mono_image_alloc0 (image, INT_STRING_SIZE);
+       g_snprintf (name, INT_STRING_SIZE, "%d", num);
+       return name;
+}
+
+// This is called by mono_class_from_generic_parameter_internal when a new class must be created.
+// pinfo is derived from param by the caller for us.
 static MonoClass*
-make_generic_param_class (MonoGenericParam *param, MonoImage *image, gboolean is_mvar, MonoGenericParamInfo *pinfo)
+make_generic_param_class (MonoGenericParam *param, MonoGenericParamInfo *pinfo)
 {
        MonoClass *klass, **ptr;
        int count, pos, i;
        MonoGenericContainer *container = mono_generic_param_owner (param);
+       g_assert_checked (container);
 
-       if (!image)
-               /* FIXME: */
-               image = mono_defaults.corlib;
+       MonoImage *image = get_image_for_container (container);
+       gboolean is_mvar = container->is_method;
+       gboolean is_anonymous = container->is_anonymous;
 
-       klass = mono_image_alloc0 (image, sizeof (MonoClass));
+       klass = (MonoClass *)mono_image_alloc0 (image, sizeof (MonoClass));
        classes_size += sizeof (MonoClass);
 
        if (pinfo) {
-               klass->name = pinfo->name;
+               CHECKED_METADATA_WRITE_PTR_EXEMPT ( klass->name , pinfo->name );
        } else {
                int n = mono_generic_param_num (param);
-               klass->name = mono_image_alloc0 (image, 16);
-               sprintf ((char*)klass->name, "%d", n);
+               CHECKED_METADATA_WRITE_PTR_LOCAL ( klass->name , make_generic_name_string (image, n) );
        }
 
-       if (container) {
-               if (is_mvar) {
-                       MonoMethod *omethod = container->owner.method;
-                       klass->name_space = (omethod && omethod->klass) ? omethod->klass->name_space : "";
-               } else {
-                       MonoClass *oklass = container->owner.klass;
-                       klass->name_space = oklass ? oklass->name_space : "";
-               }
+       if (is_anonymous) {
+               CHECKED_METADATA_WRITE_PTR_EXEMPT ( klass->name_space ,  "" );
+       } else if (is_mvar) {
+               MonoMethod *omethod = container->owner.method;
+               CHECKED_METADATA_WRITE_PTR_EXEMPT ( klass->name_space , (omethod && omethod->klass) ? omethod->klass->name_space : "" );
        } else {
-               klass->name_space = "";
+               MonoClass *oklass = container->owner.klass;
+               CHECKED_METADATA_WRITE_PTR_EXEMPT ( klass->name_space , oklass ? oklass->name_space : "" );
        }
 
        mono_profiler_class_event (klass, MONO_PROFILE_START_LOAD);
 
+       // Count non-NULL items in pinfo->constraints
        count = 0;
        if (pinfo)
                for (ptr = pinfo->constraints; ptr && *ptr; ptr++, count++)
@@ -6160,30 +6211,33 @@ make_generic_param_class (MonoGenericParam *param, MonoImage *image, gboolean is
 
        pos = 0;
        if ((count > 0) && !MONO_CLASS_IS_INTERFACE (pinfo->constraints [0])) {
-               klass->parent = pinfo->constraints [0];
+               CHECKED_METADATA_WRITE_PTR ( klass->parent , pinfo->constraints [0] );
                pos++;
-       } else if (pinfo && pinfo->flags & GENERIC_PARAMETER_ATTRIBUTE_VALUE_TYPE_CONSTRAINT)
-               klass->parent = mono_class_from_name (mono_defaults.corlib, "System", "ValueType");
-       else
-               klass->parent = mono_defaults.object_class;
-
+       } else if (pinfo && pinfo->flags & GENERIC_PARAMETER_ATTRIBUTE_VALUE_TYPE_CONSTRAINT) {
+               CHECKED_METADATA_WRITE_PTR ( klass->parent , mono_class_from_name (mono_defaults.corlib, "System", "ValueType") );
+       } else {
+               CHECKED_METADATA_WRITE_PTR ( klass->parent , mono_defaults.object_class );
+       }
 
        if (count - pos > 0) {
                klass->interface_count = count - pos;
-               klass->interfaces = mono_image_alloc0 (image, sizeof (MonoClass *) * (count - pos));
+               CHECKED_METADATA_WRITE_PTR_LOCAL ( klass->interfaces , (MonoClass **)mono_image_alloc0 (image, sizeof (MonoClass *) * (count - pos)) );
                klass->interfaces_inited = TRUE;
                for (i = pos; i < count; i++)
-                       klass->interfaces [i - pos] = pinfo->constraints [i];
+                       CHECKED_METADATA_WRITE_PTR ( klass->interfaces [i - pos] , pinfo->constraints [i] );
        }
 
-       klass->image = image;
+       CHECKED_METADATA_WRITE_PTR_EXEMPT ( klass->image , image );
 
        klass->inited = TRUE;
-       klass->cast_class = klass->element_class = klass;
+       CHECKED_METADATA_WRITE_PTR_LOCAL ( klass->cast_class ,    klass );
+       CHECKED_METADATA_WRITE_PTR_LOCAL ( klass->element_class , klass );
        klass->flags = TYPE_ATTRIBUTE_PUBLIC;
 
-       klass->this_arg.type = klass->byval_arg.type = is_mvar ? MONO_TYPE_MVAR : MONO_TYPE_VAR;
-       klass->this_arg.data.generic_param = klass->byval_arg.data.generic_param = param;
+       klass->byval_arg.type = is_mvar ? MONO_TYPE_MVAR : MONO_TYPE_VAR;
+       klass->this_arg.type = klass->byval_arg.type;
+       CHECKED_METADATA_WRITE_PTR ( klass->this_arg.data.generic_param ,  param );
+       CHECKED_METADATA_WRITE_PTR ( klass->byval_arg.data.generic_param , param );
        klass->this_arg.byref = TRUE;
 
        /* We don't use type_token for VAR since only classes can use it (not arrays, pointer, VARs, etc) */
@@ -6216,24 +6270,31 @@ make_generic_param_class (MonoGenericParam *param, MonoImage *image, gboolean is
 #define FAST_CACHE_SIZE 16
 
 /*
+ * get_anon_gparam_class and set_anon_gparam_class are helpers for mono_class_from_generic_parameter_internal.
+ * The latter will sometimes create MonoClasses for anonymous generic params. To prevent this being wasteful,
+ * we cache the MonoClasses.
+ * FIXME: It would be better to instead cache anonymous MonoGenericParams, and allow anonymous params to point directly to classes using the pklass field.
  * LOCKING: Takes the image lock depending on @take_lock.
  */
 static MonoClass *
-get_anon_gparam_class (MonoGenericParam *param, gboolean is_mvar, gboolean take_lock)
+get_anon_gparam_class (MonoGenericParam *param, gboolean take_lock)
 {
        int n = mono_generic_param_num (param);
-       MonoImage *image = param->image;
+       MonoImage *image = get_image_for_generic_param (param);
+       gboolean is_mvar = mono_generic_param_owner (param)->is_method;
        MonoClass *klass = NULL;
        GHashTable *ht;
 
        g_assert (image);
 
+       // For params with a small num and no constraints, we use a "fast" cache which does simple num lookup in an array.
+       // For high numbers or constraints we have to use pointer hashes.
        if (param->gshared_constraint) {
                ht = is_mvar ? image->mvar_cache_constrained : image->var_cache_constrained;
                if (ht) {
                        if (take_lock)
                                mono_image_lock (image);
-                       klass = g_hash_table_lookup (ht, param);
+                       klass = (MonoClass *)g_hash_table_lookup (ht, param);
                        if (take_lock)
                                mono_image_unlock (image);
                }
@@ -6250,7 +6311,7 @@ get_anon_gparam_class (MonoGenericParam *param, gboolean is_mvar, gboolean take_
                if (ht) {
                        if (take_lock)
                                mono_image_lock (image);
-                       klass = g_hash_table_lookup (ht, GINT_TO_POINTER (n));
+                       klass = (MonoClass *)g_hash_table_lookup (ht, GINT_TO_POINTER (n));
                        if (take_lock)
                                mono_image_unlock (image);
                }
@@ -6262,10 +6323,11 @@ get_anon_gparam_class (MonoGenericParam *param, gboolean is_mvar, gboolean take_
  * LOCKING: Image lock (param->image) must be held
  */
 static void
-set_anon_gparam_class (MonoGenericParam *param, gboolean is_mvar, MonoClass *klass)
+set_anon_gparam_class (MonoGenericParam *param, MonoClass *klass)
 {
        int n = mono_generic_param_num (param);
-       MonoImage *image = param->image;
+       MonoImage *image = get_image_for_generic_param (param);
+       gboolean is_mvar = mono_generic_param_owner (param)->is_method;
 
        g_assert (image);
 
@@ -6284,11 +6346,11 @@ set_anon_gparam_class (MonoGenericParam *param, gboolean is_mvar, MonoClass *kla
                if (is_mvar) {
                        /* Requires locking to avoid droping an already published class */
                        if (!image->mvar_cache_fast)
-                               image->mvar_cache_fast = mono_image_alloc0 (image, sizeof (MonoClass*) * FAST_CACHE_SIZE);
+                               image->mvar_cache_fast = (MonoClass **)mono_image_alloc0 (image, sizeof (MonoClass*) * FAST_CACHE_SIZE);
                        image->mvar_cache_fast [n] = klass;
                } else {
                        if (!image->var_cache_fast)
-                               image->var_cache_fast = mono_image_alloc0 (image, sizeof (MonoClass*) * FAST_CACHE_SIZE);
+                               image->var_cache_fast = (MonoClass **)mono_image_alloc0 (image, sizeof (MonoClass*) * FAST_CACHE_SIZE);
                        image->var_cache_fast [n] = klass;
                }
        } else {
@@ -6312,66 +6374,71 @@ set_anon_gparam_class (MonoGenericParam *param, gboolean is_mvar, MonoClass *kla
  * LOCKING: Acquires the image lock (@image).
  */
 MonoClass *
-mono_class_from_generic_parameter (MonoGenericParam *param, MonoImage *image, gboolean is_mvar)
+mono_class_from_generic_parameter_internal (MonoGenericParam *param)
 {
-       MonoGenericContainer *container = mono_generic_param_owner (param);
-       MonoGenericParamInfo *pinfo = NULL;
+       MonoImage *image = get_image_for_generic_param (param);
+       MonoGenericParamInfo *pinfo = mono_generic_param_info (param);
        MonoClass *klass, *klass2;
 
-       if (container) {
-               pinfo = mono_generic_param_info (param);
+       // If a klass already exists for this object and is cached, return it.
+       if (pinfo) // Non-anonymous
                klass = pinfo->pklass;
-       } else {
-               image = NULL;
-               klass = get_anon_gparam_class (param, is_mvar, TRUE);
-       }
+       else     // Anonymous
+               klass = get_anon_gparam_class (param, TRUE);
+
        if (klass)
                return klass;
 
-       if (!image && container) {
-               if (is_mvar) {
-                       MonoMethod *method = container->owner.method;
-                       image = (method && method->klass) ? method->klass->image : NULL;
-               } else {
-                       MonoClass *klass = container->owner.klass;
-                       // FIXME: 'klass' should not be null
-                       //        But, monodis creates GenericContainers without associating a owner to it
-                       image = klass ? klass->image : NULL;
-               }
-       }
-
-       klass = make_generic_param_class (param, image, is_mvar, pinfo);
+       // Create a new klass
+       klass = make_generic_param_class (param, pinfo);
 
+       // Now we need to cache the klass we created.
+       // But since we wait to grab the lock until after creating the klass, we need to check to make sure
+       // another thread did not get in and cache a klass ahead of us. In that case, return their klass
+       // and allow our newly-created klass object to just leak.
        mono_memory_barrier ();
 
-       if (!image) //FIXME is this only needed by monodis? Can't we fix monodis instead of having this hack?
-               image = mono_defaults.corlib;
-
        mono_image_lock (image);
-       if (container)
+
+    // Here "klass2" refers to the klass potentially created by the other thread.
+       if (pinfo) // Repeat check from above
                klass2 = pinfo->pklass;
        else
-               klass2 = get_anon_gparam_class (param, is_mvar, FALSE);
+               klass2 = get_anon_gparam_class (param, FALSE);
 
        if (klass2) {
                klass = klass2;
        } else {
-               if (container)
+               // Cache here
+               if (pinfo)
                        pinfo->pklass = klass;
                else
-                       set_anon_gparam_class (param, is_mvar, klass);
+                       set_anon_gparam_class (param, klass);
        }
        mono_image_unlock (image);
 
        /* FIXME: Should this go inside 'make_generic_param_klass'? */
        if (klass2)
-               mono_profiler_class_loaded (klass2, MONO_PROFILE_FAILED);
+               mono_profiler_class_loaded (klass2, MONO_PROFILE_FAILED); // Alert profiler about botched class create
        else
                mono_profiler_class_loaded (klass, MONO_PROFILE_OK);
 
        return klass;
 }
 
+/**
+ * mono_class_from_generic_parameter:
+ * @param: Parameter to find/construct a class for.
+ * @arg2: Is ignored.
+ * @arg3: Is ignored.
+ */
+MonoClass *
+mono_class_from_generic_parameter (MonoGenericParam *param, MonoImage *arg2 G_GNUC_UNUSED, gboolean arg3 G_GNUC_UNUSED)
+{
+       return mono_class_from_generic_parameter_internal (param);
+}
+
+
 MonoClass *
 mono_ptr_class_get (MonoType *type)
 {
@@ -6385,14 +6452,14 @@ mono_ptr_class_get (MonoType *type)
 
        mono_image_lock (image);
        if (image->ptr_cache) {
-               if ((result = g_hash_table_lookup (image->ptr_cache, el_class))) {
+               if ((result = (MonoClass *)g_hash_table_lookup (image->ptr_cache, el_class))) {
                        mono_image_unlock (image);
                        return result;
                }
        }
        mono_image_unlock (image);
        
-       result = mono_image_alloc0 (image, sizeof (MonoClass));
+       result = (MonoClass *)mono_image_alloc0 (image, sizeof (MonoClass));
 
        classes_size += sizeof (MonoClass);
 
@@ -6412,7 +6479,8 @@ mono_ptr_class_get (MonoType *type)
        result->cast_class = result->element_class = el_class;
        result->blittable = TRUE;
 
-       result->this_arg.type = result->byval_arg.type = MONO_TYPE_PTR;
+       result->byval_arg.type = MONO_TYPE_PTR;
+       result->this_arg.type = result->byval_arg.type;
        result->this_arg.data.type = result->byval_arg.data.type = &result->element_class->byval_arg;
        result->this_arg.byref = TRUE;
 
@@ -6421,7 +6489,7 @@ mono_ptr_class_get (MonoType *type)
        mono_image_lock (image);
        if (image->ptr_cache) {
                MonoClass *result2;
-               if ((result2 = g_hash_table_lookup (image->ptr_cache, el_class))) {
+               if ((result2 = (MonoClass *)g_hash_table_lookup (image->ptr_cache, el_class))) {
                        mono_image_unlock (image);
                        mono_profiler_class_loaded (result, MONO_PROFILE_FAILED);
                        return result2;
@@ -6450,7 +6518,7 @@ mono_fnptr_class_get (MonoMethodSignature *sig)
        if (!ptr_hash)
                ptr_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
        
-       if ((result = g_hash_table_lookup (ptr_hash, sig))) {
+       if ((result = (MonoClass *)g_hash_table_lookup (ptr_hash, sig))) {
                mono_loader_unlock ();
                return result;
        }
@@ -6470,7 +6538,8 @@ mono_fnptr_class_get (MonoMethodSignature *sig)
        result->cast_class = result->element_class = result;
        result->blittable = TRUE;
 
-       result->this_arg.type = result->byval_arg.type = MONO_TYPE_FNPTR;
+       result->byval_arg.type = MONO_TYPE_FNPTR;
+       result->this_arg.type = result->byval_arg.type;
        result->this_arg.data.method = result->byval_arg.data.method = sig;
        result->this_arg.byref = TRUE;
        result->blittable = TRUE;
@@ -6539,10 +6608,9 @@ mono_class_from_mono_type (MonoType *type)
                return type->data.klass;
        case MONO_TYPE_GENERICINST:
                return mono_generic_class_get_class (type->data.generic_class);
-       case MONO_TYPE_VAR:
-               return mono_class_from_generic_parameter (type->data.generic_param, NULL, FALSE);
        case MONO_TYPE_MVAR:
-               return mono_class_from_generic_parameter (type->data.generic_param, NULL, TRUE);
+       case MONO_TYPE_VAR:
+               return mono_class_from_generic_parameter_internal (type->data.generic_param);
        default:
                g_warning ("mono_class_from_mono_type: implement me 0x%02x\n", type->type);
                g_assert_not_reached ();
@@ -6637,11 +6705,11 @@ mono_bounded_array_class_get (MonoClass *eclass, guint32 rank, gboolean bounded)
                 * from mono_class_from_mono_type (), mono_array_new (), 
                 * Array:CreateInstance (), etc, so use a separate cache + a separate lock.
                 */
-               mono_mutex_lock (&image->szarray_cache_lock);
+               mono_os_mutex_lock (&image->szarray_cache_lock);
                if (!image->szarray_cache)
                        image->szarray_cache = g_hash_table_new (mono_aligned_addr_hash, NULL);
-               klass = g_hash_table_lookup (image->szarray_cache, eclass);
-               mono_mutex_unlock (&image->szarray_cache_lock);
+               klass = (MonoClass *)g_hash_table_lookup (image->szarray_cache, eclass);
+               mono_os_mutex_unlock (&image->szarray_cache_lock);
                if (klass)
                        return klass;
 
@@ -6652,9 +6720,9 @@ mono_bounded_array_class_get (MonoClass *eclass, guint32 rank, gboolean bounded)
                if (!image->array_cache)
                        image->array_cache = g_hash_table_new (mono_aligned_addr_hash, NULL);
 
-               if ((rootlist = list = g_hash_table_lookup (image->array_cache, eclass))) {
+               if ((rootlist = list = (GSList *)g_hash_table_lookup (image->array_cache, eclass))) {
                        for (; list; list = list->next) {
-                               klass = list->data;
+                               klass = (MonoClass *)list->data;
                                if ((klass->rank == rank) && (klass->byval_arg.type == (((rank > 1) || bounded) ? MONO_TYPE_ARRAY : MONO_TYPE_SZARRAY))) {
                                        mono_loader_unlock ();
                                        return klass;
@@ -6673,12 +6741,12 @@ mono_bounded_array_class_get (MonoClass *eclass, guint32 rank, gboolean bounded)
                        mono_class_init (parent);
        }
 
-       klass = mono_image_alloc0 (image, sizeof (MonoClass));
+       klass = (MonoClass *)mono_image_alloc0 (image, sizeof (MonoClass));
 
        klass->image = image;
        klass->name_space = eclass->name_space;
        nsize = strlen (eclass->name);
-       name = g_malloc (nsize + 2 + rank + 1);
+       name = (char *)g_malloc (nsize + 2 + rank + 1);
        memcpy (name, eclass->name, nsize);
        name [nsize] = '[';
        if (rank > 1)
@@ -6759,7 +6827,7 @@ mono_bounded_array_class_get (MonoClass *eclass, guint32 rank, gboolean bounded)
        klass->element_class = eclass;
 
        if ((rank > 1) || bounded) {
-               MonoArrayType *at = mono_image_alloc0 (image, sizeof (MonoArrayType));
+               MonoArrayType *at = (MonoArrayType *)mono_image_alloc0 (image, sizeof (MonoArrayType));
                klass->byval_arg.type = MONO_TYPE_ARRAY;
                klass->byval_arg.data.array = at;
                at->eklass = eclass;
@@ -6780,14 +6848,14 @@ mono_bounded_array_class_get (MonoClass *eclass, guint32 rank, gboolean bounded)
        if (rank == 1 && !bounded) {
                MonoClass *prev_class;
 
-               mono_mutex_lock (&image->szarray_cache_lock);
-               prev_class = g_hash_table_lookup (image->szarray_cache, eclass);
+               mono_os_mutex_lock (&image->szarray_cache_lock);
+               prev_class = (MonoClass *)g_hash_table_lookup (image->szarray_cache, eclass);
                if (prev_class)
                        /* Someone got in before us */
                        klass = prev_class;
                else
                        g_hash_table_insert (image->szarray_cache, eclass, klass);
-               mono_mutex_unlock (&image->szarray_cache_lock);
+               mono_os_mutex_unlock (&image->szarray_cache_lock);
        } else {
                list = g_slist_append (rootlist, klass);
                g_hash_table_insert (image->array_cache, eclass, list);
@@ -7073,7 +7141,7 @@ mono_class_get_field_default_value (MonoClassField *field, MonoTypeEnum *def_typ
 
                mono_class_alloc_ext (klass);
 
-               def_values = mono_class_alloc0 (klass, sizeof (MonoFieldDefaultValue) * klass->field.count);
+               def_values = (MonoFieldDefaultValue *)mono_class_alloc0 (klass, sizeof (MonoFieldDefaultValue) * klass->field.count);
 
                mono_image_lock (klass->image);
                mono_memory_barrier ();
@@ -7092,8 +7160,8 @@ mono_class_get_field_default_value (MonoClassField *field, MonoTypeEnum *def_typ
                g_assert (!(field->type->attrs & FIELD_ATTRIBUTE_HAS_FIELD_RVA));
 
                mono_metadata_decode_row (&field->parent->image->tables [MONO_TABLE_CONSTANT], cindex - 1, constant_cols, MONO_CONSTANT_SIZE);
-               klass->ext->field_def_values [field_index].def_type = constant_cols [MONO_CONSTANT_TYPE];
-               klass->ext->field_def_values [field_index].data = (gpointer)mono_metadata_blob_heap (field->parent->image, constant_cols [MONO_CONSTANT_VALUE]);
+               klass->ext->field_def_values [field_index].def_type = (MonoTypeEnum)constant_cols [MONO_CONSTANT_TYPE];
+               klass->ext->field_def_values [field_index].data = (const char *)mono_metadata_blob_heap (field->parent->image, constant_cols [MONO_CONSTANT_VALUE]);
        }
 
        *def_type = klass->ext->field_def_values [field_index].def_type;
@@ -7142,8 +7210,8 @@ mono_class_get_property_default_value (MonoProperty *property, MonoTypeEnum *def
                return NULL;
 
        mono_metadata_decode_row (&klass->image->tables [MONO_TABLE_CONSTANT], cindex - 1, constant_cols, MONO_CONSTANT_SIZE);
-       *def_type = constant_cols [MONO_CONSTANT_TYPE];
-       return (gpointer)mono_metadata_blob_heap (klass->image, constant_cols [MONO_CONSTANT_VALUE]);
+       *def_type = (MonoTypeEnum)constant_cols [MONO_CONSTANT_TYPE];
+       return (const char *)mono_metadata_blob_heap (klass->image, constant_cols [MONO_CONSTANT_VALUE]);
 }
 
 guint32
@@ -7376,7 +7444,7 @@ mono_class_get_checked (MonoImage *image, guint32 type_token, MonoError *error)
                        mono_error_set_bad_image (error, image,"Bad token table for dynamic image: %x", table);
                        return NULL;
                }
-               klass = mono_lookup_dynamic_token (image, type_token, NULL); /*FIXME proper error handling*/
+               klass = (MonoClass *)mono_lookup_dynamic_token (image, type_token, NULL); /*FIXME proper error handling*/
                goto done;
        }
 
@@ -7427,7 +7495,7 @@ mono_type_get_checked (MonoImage *image, guint32 type_token, MonoGenericContext
 
        //FIXME: this will not fix the very issue for which mono_type_get_full exists -but how to do it then?
        if (image_is_dynamic (image))
-               return mono_class_get_type (mono_lookup_dynamic_token (image, type_token, context));
+               return mono_class_get_type ((MonoClass *)mono_lookup_dynamic_token (image, type_token, context));
 
        if ((type_token & 0xff000000) != MONO_TOKEN_TYPE_SPEC) {
                MonoClass *klass = mono_class_get_checked (image, type_token, error);
@@ -7522,7 +7590,7 @@ mono_image_init_name_cache (MonoImage *image)
                nspace = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAMESPACE]);
 
                nspace_index = cols [MONO_TYPEDEF_NAMESPACE];
-               nspace_table = g_hash_table_lookup (name_cache2, GUINT_TO_POINTER (nspace_index));
+               nspace_table = (GHashTable *)g_hash_table_lookup (name_cache2, GUINT_TO_POINTER (nspace_index));
                if (!nspace_table) {
                        nspace_table = g_hash_table_new (g_str_hash, g_str_equal);
                        g_hash_table_insert (the_name_cache, (char*)nspace, nspace_table);
@@ -7550,7 +7618,7 @@ mono_image_init_name_cache (MonoImage *image)
                        nspace = mono_metadata_string_heap (image, cols [MONO_EXP_TYPE_NAMESPACE]);
 
                        nspace_index = cols [MONO_EXP_TYPE_NAMESPACE];
-                       nspace_table = g_hash_table_lookup (name_cache2, GUINT_TO_POINTER (nspace_index));
+                       nspace_table = (GHashTable *)g_hash_table_lookup (name_cache2, GUINT_TO_POINTER (nspace_index));
                        if (!nspace_table) {
                                nspace_table = g_hash_table_new (g_str_hash, g_str_equal);
                                g_hash_table_insert (the_name_cache, (char*)nspace, nspace_table);
@@ -7586,7 +7654,7 @@ mono_image_add_to_name_cache (MonoImage *image, const char *nspace,
        mono_image_lock (image);
 
        name_cache = image->name_cache;
-       if (!(nspace_table = g_hash_table_lookup (name_cache, nspace))) {
+       if (!(nspace_table = (GHashTable *)g_hash_table_lookup (name_cache, nspace))) {
                nspace_table = g_hash_table_new (g_str_hash, g_str_equal);
                g_hash_table_insert (name_cache, (char *)nspace, (char *)nspace_table);
        }
@@ -7794,7 +7862,7 @@ mono_class_from_name_checked_aux (MonoImage *image, const char* name_space, cons
        mono_image_init_name_cache (image);
        mono_image_lock (image);
 
-       nspace_table = g_hash_table_lookup (image->name_cache, name_space);
+       nspace_table = (GHashTable *)g_hash_table_lookup (image->name_cache, name_space);
 
        if (nspace_table)
                token = GPOINTER_TO_UINT (g_hash_table_lookup (nspace_table, name));
@@ -8327,7 +8395,7 @@ mono_class_implement_interface_slow (MonoClass *target, MonoClass *candidate)
 
                /*A TypeBuilder can have more interfaces on tb->interfaces than on candidate->interfaces*/
                if (image_is_dynamic (candidate->image) && !candidate->wastypebuilder) {
-                       MonoReflectionTypeBuilder *tb = mono_class_get_ref_info (candidate);
+                       MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)mono_class_get_ref_info (candidate);
                        int j;
                        if (tb && tb->interfaces) {
                                for (j = mono_array_length (tb->interfaces) - 1; j >= 0; --j) {
@@ -8988,16 +9056,18 @@ mono_class_get_fields (MonoClass* klass, gpointer *iter)
                        return NULL;
                /* start from the first */
                if (klass->field.count) {
-                       return *iter = &klass->fields [0];
+                       *iter = &klass->fields [0];
+                       return &klass->fields [0];
                } else {
                        /* no fields */
                        return NULL;
                }
        }
-       field = *iter;
+       field = (MonoClassField *)*iter;
        field++;
        if (field < &klass->fields [klass->field.count]) {
-               return *iter = field;
+               *iter = field;
+               return field;
        }
        return NULL;
 }
@@ -9038,7 +9108,7 @@ mono_class_get_methods (MonoClass* klass, gpointer *iter)
                        return NULL;
                }
        }
-       method = *iter;
+       method = (MonoMethod **)*iter;
        method++;
        if (method < &klass->methods [klass->method.count]) {
                *iter = method;
@@ -9072,7 +9142,7 @@ mono_class_get_virtual_methods (MonoClass* klass, gpointer *iter)
                        /* start from the first */
                        method = &klass->methods [0];
                } else {
-                       method = *iter;
+                       method = (MonoMethod **)*iter;
                        method++;
                }
                while (method < &klass->methods [klass->method.count]) {
@@ -9143,16 +9213,18 @@ mono_class_get_properties (MonoClass* klass, gpointer *iter)
                mono_class_setup_properties (klass);
                /* start from the first */
                if (klass->ext->property.count) {
-                       return *iter = &klass->ext->properties [0];
+                       *iter = &klass->ext->properties [0];
+                       return (MonoProperty *)*iter;
                } else {
                        /* no fields */
                        return NULL;
                }
        }
-       property = *iter;
+       property = (MonoProperty *)*iter;
        property++;
        if (property < &klass->ext->properties [klass->ext->property.count]) {
-               return *iter = property;
+               *iter = property;
+               return (MonoProperty *)*iter;
        }
        return NULL;
 }
@@ -9179,16 +9251,18 @@ mono_class_get_events (MonoClass* klass, gpointer *iter)
                mono_class_setup_events (klass);
                /* start from the first */
                if (klass->ext->event.count) {
-                       return *iter = &klass->ext->events [0];
+                       *iter = &klass->ext->events [0];
+                       return (MonoEvent *)*iter;
                } else {
                        /* no fields */
                        return NULL;
                }
        }
-       event = *iter;
+       event = (MonoEvent *)*iter;
        event++;
        if (event < &klass->ext->events [klass->ext->event.count]) {
-               return *iter = event;
+               *iter = event;
+               return (MonoEvent *)*iter;
        }
        return NULL;
 }
@@ -9231,7 +9305,7 @@ mono_class_get_interfaces (MonoClass* klass, gpointer *iter)
                        return NULL;
                }
        }
-       iface = *iter;
+       iface = (MonoClass **)*iter;
        iface++;
        if (iface < &klass->interfaces [klass->interface_count]) {
                *iter = iface;
@@ -9319,17 +9393,17 @@ mono_class_get_nested_types (MonoClass* klass, gpointer *iter)
                /* start from the first */
                if (klass->ext && klass->ext->nested_classes) {
                        *iter = klass->ext->nested_classes;
-                       return klass->ext->nested_classes->data;
+                       return (MonoClass *)klass->ext->nested_classes->data;
                } else {
                        /* no nested types */
                        return NULL;
                }
        }
-       item = *iter;
+       item = (GList *)*iter;
        item = item->next;
        if (item) {
                *iter = item;
-               return item->data;
+               return (MonoClass *)item->data;
        }
        return NULL;
 }
@@ -9461,7 +9535,7 @@ mono_field_get_rva (MonoClassField *field)
        if (!klass->ext || !klass->ext->field_def_values) {
                mono_class_alloc_ext (klass);
 
-               field_def_values = mono_class_alloc0 (klass, sizeof (MonoFieldDefaultValue) * klass->field.count);
+               field_def_values = (MonoFieldDefaultValue *)mono_class_alloc0 (klass, sizeof (MonoFieldDefaultValue) * klass->field.count);
 
                mono_image_lock (klass->image);
                if (!klass->ext->field_def_values)
@@ -9800,7 +9874,7 @@ mono_class_get_exception_data (MonoClass *klass)
 void
 mono_classes_init (void)
 {
-       mono_mutex_init (&classes_mutex);
+       mono_os_mutex_init (&classes_mutex);
 
        mono_counters_register ("Inflated methods size",
                                                        MONO_COUNTER_GENERICS | MONO_COUNTER_INT, &inflated_methods_size);
@@ -9825,7 +9899,7 @@ mono_classes_cleanup (void)
        if (global_interface_bitset)
                mono_bitset_free (global_interface_bitset);
        global_interface_bitset = NULL;
-       mono_mutex_destroy (&classes_mutex);
+       mono_os_mutex_destroy (&classes_mutex);
 }
 
 /**
@@ -9854,19 +9928,19 @@ mono_class_get_exception_for_failure (MonoClass *klass)
                return ex;
        }
        case MONO_EXCEPTION_MISSING_METHOD: {
-               char *class_name = exception_data;
+               char *class_name = (char *)exception_data;
                char *assembly_name = class_name + strlen (class_name) + 1;
 
                return mono_get_exception_missing_method (class_name, assembly_name);
        }
        case MONO_EXCEPTION_MISSING_FIELD: {
-               char *class_name = exception_data;
+               char *class_name = (char *)exception_data;
                char *member_name = class_name + strlen (class_name) + 1;
 
                return mono_get_exception_missing_field (class_name, member_name);
        }
        case MONO_EXCEPTION_FILE_NOT_FOUND: {
-               char *msg_format = exception_data;
+               char *msg_format = (char *)exception_data;
                char *assembly_name = msg_format + strlen (msg_format) + 1;
                char *msg = g_strdup_printf (msg_format, assembly_name);
                MonoException *ex;
@@ -9878,7 +9952,7 @@ mono_class_get_exception_for_failure (MonoClass *klass)
                return ex;
        }
        case MONO_EXCEPTION_BAD_IMAGE: {
-               return mono_get_exception_bad_image_format (exception_data);
+               return mono_get_exception_bad_image_format ((const char *)exception_data);
        }
        default: {
                MonoLoaderError *error;
@@ -9983,16 +10057,16 @@ can_access_internals (MonoAssembly *accessing, MonoAssembly* accessed)
 
        mono_assembly_load_friends (accessed);
        for (tmp = accessed->friend_assembly_names; tmp; tmp = tmp->next) {
-               MonoAssemblyName *friend = tmp->data;
+               MonoAssemblyName *friend_ = (MonoAssemblyName *)tmp->data;
                /* Be conservative with checks */
-               if (!friend->name)
+               if (!friend_->name)
                        continue;
-               if (strcmp (accessing->aname.name, friend->name))
+               if (strcmp (accessing->aname.name, friend_->name))
                        continue;
-               if (friend->public_key_token [0]) {
+               if (friend_->public_key_token [0]) {
                        if (!accessing->aname.public_key_token [0])
                                continue;
-                       if (!mono_public_tokens_are_equal (friend->public_key_token, accessing->aname.public_key_token))
+                       if (!mono_public_tokens_are_equal (friend_->public_key_token, accessing->aname.public_key_token))
                                continue;
                }
                return TRUE;
@@ -10424,7 +10498,7 @@ mono_class_alloc_ext (MonoClass *klass)
        if (klass->ext)
                return;
 
-       ext = mono_class_alloc0 (klass, sizeof (MonoClassExt));
+       ext = (MonoClassExt *)mono_class_alloc0 (klass, sizeof (MonoClassExt));
        mono_image_lock (klass->image);
        mono_memory_barrier ();
        if (!klass->ext)
@@ -10456,7 +10530,7 @@ mono_class_setup_interfaces (MonoClass *klass, MonoError *error)
 
                /* generic IList, ICollection, IEnumerable */
                interface_count = mono_defaults.generic_ireadonlylist_class ? 2 : 1;
-               interfaces = mono_image_alloc0 (klass->image, sizeof (MonoClass*) * interface_count);
+               interfaces = (MonoClass **)mono_image_alloc0 (klass->image, sizeof (MonoClass*) * interface_count);
 
                args [0] = &klass->element_class->byval_arg;
                interfaces [0] = mono_class_bind_generic_parameters (
@@ -10625,16 +10699,18 @@ mono_class_get_fields_lazy (MonoClass* klass, gpointer *iter)
                        return NULL;
                /* start from the first */
                if (klass->field.count) {
-                       return *iter = &klass->fields [0];
+                       *iter = &klass->fields [0];
+                       return (MonoClassField *)*iter;
                } else {
                        /* no fields */
                        return NULL;
                }
        }
-       field = *iter;
+       field = (MonoClassField *)*iter;
        field++;
        if (field < &klass->fields [klass->field.count]) {
-               return *iter = field;
+               *iter = field;
+               return (MonoClassField *)*iter;
        }
        return NULL;
 }

diff --git a/mono/metadata/cominterop.c b/mono/metadata/cominterop.c
index 7ac6667914d94aee80c89eea89b3b8679e76e7c2..9c4c8e60d371401b4c8b96845db4122bd7ca7d3c 100644 (file)
--- a/mono/metadata/cominterop.c
+++ b/mono/metadata/cominterop.c
@@ -75,8 +75,8 @@ enum {
 #undef OPDEF
 
 /* This mutex protects the various cominterop related caches in MonoImage */
-#define mono_cominterop_lock() mono_mutex_lock (&cominterop_mutex)
-#define mono_cominterop_unlock() mono_mutex_unlock (&cominterop_mutex)
+#define mono_cominterop_lock() mono_os_mutex_lock (&cominterop_mutex)
+#define mono_cominterop_unlock() mono_os_mutex_unlock (&cominterop_mutex)
 static mono_mutex_t cominterop_mutex;
 
 /* STDCALL on windows, CDECL everywhere else to work with XPCOM and MainWin COM */
@@ -322,7 +322,7 @@ cominterop_get_method_interface (MonoMethod* method)
                        for (i = 0; i < ifaces->len; ++i) {
                                int j, offset;
                                gboolean found = FALSE;
-                               ic = g_ptr_array_index (ifaces, i);
+                               ic = (MonoClass *)g_ptr_array_index (ifaces, i);
                                offset = mono_class_interface_offset (method->klass, ic);
                                for (j = 0; j < ic->method.count; ++j) {
                                        if (method->klass->vtable [j + offset] == method) {
@@ -443,7 +443,7 @@ cominterop_com_visible (MonoClass* klass)
                int i;
                for (i = 0; i < ifaces->len; ++i) {
                        MonoClass *ic = NULL;
-                       ic = g_ptr_array_index (ifaces, i);
+                       ic = (MonoClass *)g_ptr_array_index (ifaces, i);
                        if (MONO_CLASS_IS_IMPORT (ic))
                                visible = TRUE;
 
@@ -532,7 +532,7 @@ mono_cominterop_init (void)
 {
        const char* com_provider_env;
 
-       mono_mutex_init_recursive (&cominterop_mutex);
+       mono_os_mutex_init_recursive (&cominterop_mutex);
 
        com_provider_env = g_getenv ("MONO_COM");
        if (com_provider_env && !strcmp(com_provider_env, "MS"))
@@ -564,7 +564,7 @@ mono_cominterop_init (void)
 void
 mono_cominterop_cleanup (void)
 {
-       mono_mutex_destroy (&cominterop_mutex);
+       mono_os_mutex_destroy (&cominterop_mutex);
 }
 
 void
@@ -1640,7 +1640,8 @@ ves_icall_System_ComObject_ReleaseInterfaces (MonoComObject* obj)
                g_hash_table_foreach_remove (obj->itf_hash, cominterop_rcw_interface_finalizer, NULL);
                g_hash_table_destroy (obj->itf_hash);
                ves_icall_System_Runtime_InteropServices_Marshal_ReleaseInternal (obj->iunknown);
-               obj->itf_hash = obj->iunknown = NULL;
+               obj->iunknown = NULL;
+               obj->itf_hash = NULL;
                mono_cominterop_unlock ();
        }
 }
@@ -1661,7 +1662,8 @@ cominterop_rcw_finalizer (gpointer key, gpointer value, gpointer user_data)
                        }
                        if (proxy->com_object->iunknown)
                                ves_icall_System_Runtime_InteropServices_Marshal_ReleaseInternal (proxy->com_object->iunknown);
-                       proxy->com_object->itf_hash = proxy->com_object->iunknown = NULL;
+                       proxy->com_object->iunknown = NULL;
+                       proxy->com_object->itf_hash = NULL;
                }
                
                mono_gchandle_free (gchandle);
@@ -1764,7 +1766,7 @@ cominterop_get_ccw_object (MonoCCWInterface* ccw_entry, gboolean verify)
                return NULL;
 
        if (verify) {
-               ccw = g_hash_table_lookup (ccw_interface_hash, ccw_entry);
+               ccw = (MonoCCW *)g_hash_table_lookup (ccw_interface_hash, ccw_entry);
        }
        else {
                ccw = ccw_entry->ccw;
@@ -1838,12 +1840,12 @@ cominterop_get_ccw (MonoObject* object, MonoClass* itf)
        if (!ccw_interface_hash)
                ccw_interface_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
 
-       ccw_list = g_hash_table_lookup (ccw_hash, GINT_TO_POINTER (mono_object_hash (object)));
+       ccw_list = (GList *)g_hash_table_lookup (ccw_hash, GINT_TO_POINTER (mono_object_hash (object)));
        mono_cominterop_unlock ();
 
        ccw_list_item = ccw_list;
        while (ccw_list_item) {
-               MonoCCW* ccw_iter = ccw_list_item->data;
+               MonoCCW* ccw_iter = (MonoCCW *)ccw_list_item->data;
                if (mono_gchandle_get_target (ccw_iter->gc_handle) == object) {
                        ccw = ccw_iter;
                        break;
@@ -1913,11 +1915,11 @@ cominterop_get_ccw (MonoObject* object, MonoClass* itf)
                iface = NULL;
        }
 
-       ccw_entry = g_hash_table_lookup (ccw->vtable_hash, itf);
+       ccw_entry = (MonoCCWInterface *)g_hash_table_lookup (ccw->vtable_hash, itf);
 
        if (!ccw_entry) {
                int vtable_index = method_count-1+start_slot;
-               vtable = mono_image_alloc0 (klass->image, sizeof (gpointer)*(method_count+start_slot));
+               vtable = (void **)mono_image_alloc0 (klass->image, sizeof (gpointer)*(method_count+start_slot));
                memcpy (vtable, iunknown, sizeof (iunknown));
                if (start_slot == 7)
                        memcpy (vtable+3, idispatch, sizeof (idispatch));
@@ -2055,7 +2057,7 @@ mono_marshal_free_ccw (MonoObject* object)
 
        /* need to cache orig list address to remove from hash_table if empty */
        mono_cominterop_lock ();
-       ccw_list = ccw_list_orig = g_hash_table_lookup (ccw_hash, GINT_TO_POINTER (mono_object_hash (object)));
+       ccw_list = ccw_list_orig = (GList *)g_hash_table_lookup (ccw_hash, GINT_TO_POINTER (mono_object_hash (object)));
        mono_cominterop_unlock ();
 
        if (!ccw_list)
@@ -2063,7 +2065,7 @@ mono_marshal_free_ccw (MonoObject* object)
 
        ccw_list_item = ccw_list;
        while (ccw_list_item) {
-               MonoCCW* ccw_iter = ccw_list_item->data;
+               MonoCCW* ccw_iter = (MonoCCW *)ccw_list_item->data;
                MonoObject* handle_target = mono_gchandle_get_target (ccw_iter->gc_handle);
 
                /* Looks like the GC NULLs the weakref handle target before running the
@@ -2072,7 +2074,7 @@ mono_marshal_free_ccw (MonoObject* object)
                */
                gboolean destroy_ccw = !handle_target || handle_target == object;
                if (!handle_target) {
-                       MonoCCWInterface* ccw_entry = g_hash_table_lookup (ccw_iter->vtable_hash, mono_class_get_iunknown_class ());
+                       MonoCCWInterface* ccw_entry = (MonoCCWInterface *)g_hash_table_lookup (ccw_iter->vtable_hash, mono_class_get_iunknown_class ());
                        if (!(ccw_entry && object == cominterop_get_ccw_object (ccw_entry, FALSE)))
                                destroy_ccw = FALSE;
                }
@@ -2350,7 +2352,7 @@ cominterop_ccw_queryinterface (MonoCCWInterface* ccwe, guint8* riid, gpointer* p
        if (cominterop_class_guid_equal (riid, mono_class_get_iunknown_class ())) {
                *ppv = cominterop_get_ccw (object, mono_class_get_iunknown_class ());
                /* remember to addref on QI */
-               cominterop_ccw_addref (*ppv);
+               cominterop_ccw_addref ((MonoCCWInterface *)*ppv);
                return MONO_S_OK;
        }
 
@@ -2361,7 +2363,7 @@ cominterop_ccw_queryinterface (MonoCCWInterface* ccwe, guint8* riid, gpointer* p
                
                *ppv = cominterop_get_ccw (object, mono_class_get_idispatch_class ());
                /* remember to addref on QI */
-               cominterop_ccw_addref (*ppv);
+               cominterop_ccw_addref ((MonoCCWInterface *)*ppv);
                return MONO_S_OK;
        }
 
@@ -2378,7 +2380,7 @@ cominterop_ccw_queryinterface (MonoCCWInterface* ccwe, guint8* riid, gpointer* p
                if (ifaces) {
                        for (i = 0; i < ifaces->len; ++i) {
                                MonoClass *ic = NULL;
-                               ic = g_ptr_array_index (ifaces, i);
+                               ic = (MonoClass *)g_ptr_array_index (ifaces, i);
                                if (cominterop_class_guid_equal (riid, ic)) {
                                        itf = ic;
                                        break;
@@ -2395,7 +2397,7 @@ cominterop_ccw_queryinterface (MonoCCWInterface* ccwe, guint8* riid, gpointer* p
        if (itf) {
                *ppv = cominterop_get_ccw (object, itf);
                /* remember to addref on QI */
-               cominterop_ccw_addref (*ppv);
+               cominterop_ccw_addref ((MonoCCWInterface *)*ppv);
                return MONO_S_OK;
        }
 
@@ -2619,7 +2621,7 @@ mono_string_to_bstr (MonoString *string_obj)
        if (com_provider == MONO_COM_DEFAULT) {
                int slen = mono_string_length (string_obj);
                /* allocate len + 1 utf16 characters plus 4 byte integer for length*/
-               char *ret = g_malloc ((slen + 1) * sizeof(gunichar2) + sizeof(guint32));
+               char *ret = (char *)g_malloc ((slen + 1) * sizeof(gunichar2) + sizeof(guint32));
                if (ret == NULL)
                        return NULL;
                memcpy (ret + sizeof(guint32), mono_string_chars (string_obj), slen * sizeof(gunichar2));
@@ -2653,13 +2655,13 @@ mono_string_from_bstr (gpointer bstr)
        return mono_string_new_utf16 (mono_domain_get (), bstr, SysStringLen (bstr));
 #else
        if (com_provider == MONO_COM_DEFAULT) {
-               return mono_string_new_utf16 (mono_domain_get (), bstr, *((guint32 *)bstr - 1) / sizeof(gunichar2));
+               return mono_string_new_utf16 (mono_domain_get (), (const mono_unichar2 *)bstr, *((guint32 *)bstr - 1) / sizeof(gunichar2));
        } else if (com_provider == MONO_COM_MS && init_com_provider_ms ()) {
                MonoString* str = NULL;
                glong written = 0;
                gunichar2* utf16 = NULL;
 
-               utf16 = g_ucs4_to_utf16 (bstr, sys_string_len_ms (bstr), NULL, &written, NULL);
+               utf16 = g_ucs4_to_utf16 ((const gunichar *)bstr, sys_string_len_ms (bstr), NULL, &written, NULL);
                str = mono_string_new_utf16 (mono_domain_get (), utf16, written);
                g_free (utf16);
                return str;
@@ -2681,7 +2683,7 @@ mono_free_bstr (gpointer bstr)
        if (com_provider == MONO_COM_DEFAULT) {
                g_free (((char *)bstr) - 4);
        } else if (com_provider == MONO_COM_MS && init_com_provider_ms ()) {
-               sys_free_string_ms (bstr);
+               sys_free_string_ms ((gunichar *)bstr);
        } else {
                g_assert_not_reached ();
        }
@@ -3017,8 +3019,8 @@ mono_marshal_safearray_begin (gpointer safearray, MonoArray **result, gpointer *
 
                        *indices = g_malloc (dim * sizeof(int));
 
-                       sizes = alloca (dim * sizeof(uintptr_t));
-                       bounds = alloca (dim * sizeof(intptr_t));
+                       sizes = (uintptr_t *)alloca (dim * sizeof(uintptr_t));
+                       bounds = (intptr_t *)alloca (dim * sizeof(intptr_t));
 
                        for (i=0; i<dim; ++i) {
                                glong lbound, ubound;
@@ -3049,7 +3051,7 @@ mono_marshal_safearray_begin (gpointer safearray, MonoArray **result, gpointer *
                                aklass = mono_bounded_array_class_get (mono_defaults.object_class, dim, bounded);
                                *result = mono_array_new_full (mono_domain_get (), aklass, sizes, bounds);
                        } else {
-                               *result = parameter;
+                               *result = (MonoArray *)parameter;
                        }
                }
        }
@@ -3067,7 +3069,7 @@ gpointer mono_marshal_safearray_get_value (gpointer safearray, gpointer indices)
        }
 #else
        if (com_provider == MONO_COM_MS && init_com_provider_ms ()) {
-               int hr = safe_array_ptr_of_index_ms (safearray, indices, &result);
+               int hr = safe_array_ptr_of_index_ms (safearray, (glong *)indices, &result);
                if (hr < 0) {
                        cominterop_raise_hr_exception (hr);
                }
@@ -3151,7 +3153,7 @@ mono_marshal_safearray_create (MonoArray *input, gpointer *newsafearray, gpointe
        dim = ((MonoObject *)input)->vtable->klass->rank;
 
        *indices = g_malloc (dim * sizeof (int));
-       bounds = alloca (dim * sizeof (SAFEARRAYBOUND));
+       bounds = (SAFEARRAYBOUND *)alloca (dim * sizeof (SAFEARRAYBOUND));
        (*(int*)empty) = (max_array_length == 0);
 
        if (dim > 1) {
@@ -3183,7 +3185,7 @@ void mono_marshal_safearray_set_value (gpointer safearray, gpointer indices, gpo
                cominterop_raise_hr_exception (hr);
 #else
        if (com_provider == MONO_COM_MS && init_com_provider_ms ()) {
-               int hr = safe_array_put_element_ms (safearray, indices, value);
+               int hr = safe_array_put_element_ms (safearray, (glong *)indices, (void **)value);
                if (hr < 0) {
                        cominterop_raise_hr_exception (hr);
                }

diff --git a/mono/metadata/console-unix.c b/mono/metadata/console-unix.c
index 9629857be704a59656a345ab33761c1a7f95c676..0ac3b3981f1a6dc5d0bc3f83c317c4c031321635 100644 (file)
--- a/mono/metadata/console-unix.c
+++ b/mono/metadata/console-unix.c
@@ -344,19 +344,19 @@ console_set_signal_handlers ()
        memset (&sigwinch, 0, sizeof (struct sigaction));
        
        // Continuing
-       sigcont.sa_handler = (void *) sigcont_handler;
+       sigcont.sa_handler = (void (*)(int)) sigcont_handler;
        sigcont.sa_flags = 0;
        sigemptyset (&sigcont.sa_mask);
        sigaction (SIGCONT, &sigcont, &save_sigcont);
        
        // Interrupt handler
-       sigint.sa_handler = (void *) sigint_handler;
+       sigint.sa_handler = (void (*)(int)) sigint_handler;
        sigint.sa_flags = 0;
        sigemptyset (&sigint.sa_mask);
        sigaction (SIGINT, &sigint, &save_sigint);
 
        // Window size changed
-       sigwinch.sa_handler = (void *) sigwinch_handler;
+       sigwinch.sa_handler = (void (*)(int)) sigwinch_handler;
        sigwinch.sa_flags = 0;
        sigemptyset (&sigwinch.sa_mask);
        sigaction (SIGWINCH, &sigwinch, &save_sigwinch);

diff --git a/mono/metadata/debug-helpers.c b/mono/metadata/debug-helpers.c
index f55443001b41a5fb7ea4fb50028ba95a6e254245..f89de87218e19197eb676c6be2b5ce54cecc2e6d 100644 (file)
--- a/mono/metadata/debug-helpers.c
+++ b/mono/metadata/debug-helpers.c
@@ -1031,7 +1031,7 @@ mono_class_describe_statics (MonoClass* klass)
 
        if (!vtable)
                return;
-       if (!(addr = mono_vtable_get_static_field_data (vtable)))
+       if (!(addr = (const char *)mono_vtable_get_static_field_data (vtable)))
                return;
 
        for (p = klass; p != NULL; p = p->parent) {

diff --git a/mono/metadata/debug-mono-ppdb.c b/mono/metadata/debug-mono-ppdb.c
index 560f6bd035b007888900ac09f9bd03ed53499222..46cf3468e5db286e541bc687d15daa36a15249d2 100644 (file)
--- a/mono/metadata/debug-mono-ppdb.c
+++ b/mono/metadata/debug-mono-ppdb.c
@@ -88,7 +88,7 @@ get_pe_debug_guid (MonoImage *image, guint8 *out_guid, gint32 *out_age, gint32 *
 static void
 doc_free (gpointer key)
 {
-       MonoDebugSourceInfo *info = key;
+       MonoDebugSourceInfo *info = (MonoDebugSourceInfo *)key;
 
        g_free (info->source_file);
        g_free (info);
@@ -111,7 +111,7 @@ mono_ppdb_load_file (MonoImage *image, const guint8 *raw_contents, int size)
        } else {
                /* ppdb files drop the .exe/.dll extension */
                filename = mono_image_get_filename (image);
-               if (strlen (filename) > 4 && (!strcmp (filename + strlen (filename) - 4, ".exe"))) {
+               if (strlen (filename) > 4 && (!strcmp (filename + strlen (filename) - 4, ".exe") || !strcmp (filename + strlen (filename) - 4, ".dll"))) {
                        s = g_strdup (filename);
                        s [strlen (filename) - 4] = '\0';
                        ppdb_filename = g_strdup_printf ("%s.pdb", s);
@@ -176,7 +176,7 @@ mono_ppdb_lookup_method (MonoDebugHandle *handle, MonoMethod *method)
 
        mono_debugger_lock ();
 
-       minfo = g_hash_table_lookup (ppdb->method_hash, method);
+       minfo = (MonoDebugMethodInfo *)g_hash_table_lookup (ppdb->method_hash, method);
        if (minfo) {
                mono_debugger_unlock ();
                return minfo;
@@ -208,7 +208,7 @@ get_docinfo (MonoPPDBFile *ppdb, MonoImage *image, int docidx)
        MonoDebugSourceInfo *res, *cached;
 
        mono_debugger_lock ();
-       cached = g_hash_table_lookup (ppdb->doc_hash, GUINT_TO_POINTER (docidx));
+       cached = (MonoDebugSourceInfo *)g_hash_table_lookup (ppdb->doc_hash, GUINT_TO_POINTER (docidx));
        mono_debugger_unlock ();
        if (cached)
                return cached;
@@ -246,7 +246,7 @@ get_docinfo (MonoPPDBFile *ppdb, MonoImage *image, int docidx)
        res->hash = (guint8*)mono_metadata_blob_heap (image, cols [MONO_DOCUMENT_HASH]);
 
        mono_debugger_lock ();
-       cached = g_hash_table_lookup (ppdb->doc_hash, GUINT_TO_POINTER (docidx));
+       cached = (MonoDebugSourceInfo *)g_hash_table_lookup (ppdb->doc_hash, GUINT_TO_POINTER (docidx));
        if (!cached) {
                g_hash_table_insert (ppdb->doc_hash, GUINT_TO_POINTER (docidx), res);
        } else {
@@ -518,7 +518,7 @@ mono_ppdb_lookup_locals (MonoDebugMethodInfo *minfo)
        scope_idx = start_scope_idx;
        mono_metadata_decode_row (&tables [MONO_TABLE_LOCALSCOPE], scope_idx-1, cols, MONO_LOCALSCOPE_SIZE);
        locals_idx = cols [MONO_LOCALSCOPE_VARIABLELIST];
-       while (TRUE) {
+       while (scope_idx == tables [MONO_TABLE_LOCALSCOPE].rows) {
                mono_metadata_decode_row (&tables [MONO_TABLE_LOCALSCOPE], scope_idx-1, cols, MONO_LOCALSCOPE_SIZE);
                if (cols [MONO_LOCALSCOPE_METHOD] != method_idx)
                        break;
@@ -526,9 +526,7 @@ mono_ppdb_lookup_locals (MonoDebugMethodInfo *minfo)
        }
        nscopes = scope_idx - start_scope_idx;
        if (scope_idx == tables [MONO_TABLE_LOCALSCOPE].rows) {
-               // FIXME:
-               g_assert_not_reached ();
-               locals_end_idx = -1;
+               locals_end_idx = tables [MONO_TABLE_LOCALVARIABLE].rows;
        } else {
                locals_end_idx = cols [MONO_LOCALSCOPE_VARIABLELIST];
        }
@@ -546,8 +544,7 @@ mono_ppdb_lookup_locals (MonoDebugMethodInfo *minfo)
 
                locals_idx = cols [MONO_LOCALSCOPE_VARIABLELIST];
                if (scope_idx == tables [MONO_TABLE_LOCALSCOPE].rows) {
-                       // FIXME:
-                       g_assert_not_reached ();
+                       locals_end_idx = tables [MONO_TABLE_LOCALVARIABLE].rows;
                } else {
                        locals_end_idx = mono_metadata_decode_row_col (&tables [MONO_TABLE_LOCALSCOPE], scope_idx-1 + 1, MONO_LOCALSCOPE_VARIABLELIST);
                }

diff --git a/mono/metadata/debug-mono-symfile.c b/mono/metadata/debug-mono-symfile.c
index 39c348cd7be38615dd5a94bcbdfa7c331aa227d1..8df4c0f902606edc04b31b5b97cb1350b851482d 100644 (file)
--- a/mono/metadata/debug-mono-symfile.c
+++ b/mono/metadata/debug-mono-symfile.c
@@ -147,7 +147,7 @@ mono_debug_open_mono_symbols (MonoDebugHandle *handle, const uint8_t *raw_conten
        if (raw_contents != NULL) {
                unsigned char *p;
                symfile->raw_contents_size = size;
-               symfile->raw_contents = p = g_malloc (size);
+               symfile->raw_contents = p = (unsigned char *)g_malloc (size);
                memcpy (p, raw_contents, size);
                symfile->filename = g_strdup_printf ("LoadedFromMemory");
                symfile->was_loaded_from_memory = TRUE;
@@ -163,7 +163,7 @@ mono_debug_open_mono_symbols (MonoDebugHandle *handle, const uint8_t *raw_conten
                                        g_warning ("stat of %s failed: %s",
                                                   symfile->filename,  g_strerror (errno));
                        } else {
-                               symfile->raw_contents = mono_file_map (symfile->raw_contents_size, MONO_MMAP_READ|MONO_MMAP_PRIVATE, mono_file_map_fd (f), 0, &symfile->raw_contents_handle);
+                               symfile->raw_contents = (const unsigned char *)mono_file_map (symfile->raw_contents_size, MONO_MMAP_READ|MONO_MMAP_PRIVATE, mono_file_map_fd (f), 0, &symfile->raw_contents_handle);
                        }
 
                        mono_file_map_close (f);
@@ -444,7 +444,7 @@ get_source_info (MonoSymbolFile *symfile, int index)
 {
        MonoDebugSourceInfo *info;
 
-       info = g_hash_table_lookup (symfile->source_hash, GUINT_TO_POINTER (index));
+       info = (MonoDebugSourceInfo *)g_hash_table_lookup (symfile->source_hash, GUINT_TO_POINTER (index));
        if (!info) {
                int offset = read32(&(symfile->offset_table->_source_table_offset)) +
                        (index - 1) * sizeof (MonoSymbolFileSourceEntry);
@@ -454,10 +454,10 @@ get_source_info (MonoSymbolFile *symfile, int index)
 
                info = g_new0 (MonoDebugSourceInfo, 1);
                info->source_file = read_string (ptr, &ptr);
-               info->guid = g_malloc0 (16);
+               info->guid = (guint8 *)g_malloc0 (16);
                memcpy (info->guid, ptr, 16);
                ptr += 16;
-               info->hash = g_malloc0 (16);
+               info->hash = (guint8 *)g_malloc0 (16);
                memcpy (info->hash, ptr, 16);
                ptr += 16;
                g_hash_table_insert (symfile->source_hash, GUINT_TO_POINTER (index), info);
@@ -478,7 +478,7 @@ method_get_lnt_flags (MonoDebugMethodInfo *minfo)
        guint32 flags;
 
        if ((symfile = minfo->handle->symfile) == NULL)
-               return FALSE;
+               return (LineNumberTableFlags)0;
 
        ptr = symfile->raw_contents + minfo->data_offset;
 
@@ -497,7 +497,7 @@ method_get_lnt_flags (MonoDebugMethodInfo *minfo)
        read_leb128 (ptr, &ptr);
 
        flags = read_leb128 (ptr, &ptr);
-       return flags;
+       return (LineNumberTableFlags)flags;
 }
 
 /*
@@ -635,7 +635,7 @@ mono_debug_symfile_get_seq_points (MonoDebugMethodInfo *minfo, char **source_fil
 
                *source_file_list = g_ptr_array_new ();
                if (source_files)
-                       *source_files = g_malloc (il_offset_array->len * sizeof (int));
+                       *source_files = (int *)g_malloc (il_offset_array->len * sizeof (int));
 
                for (i = 0; i < il_offset_array->len; ++i) {
                        file = GPOINTER_TO_UINT (g_ptr_array_index (source_file_array, i));
@@ -744,7 +744,7 @@ mono_debug_symfile_lookup_method (MonoDebugHandle *handle, MonoMethod *method)
 
        mono_debugger_lock ();
 
-       minfo = g_hash_table_lookup (symfile->method_hash, method);
+       minfo = (MonoDebugMethodInfo *)g_hash_table_lookup (symfile->method_hash, method);
        if (minfo) {
                mono_debugger_unlock ();
                return minfo;
@@ -753,7 +753,7 @@ mono_debug_symfile_lookup_method (MonoDebugHandle *handle, MonoMethod *method)
        first_ie = (MonoSymbolFileMethodEntry *)
                (symfile->raw_contents + read32(&(symfile->offset_table->_method_table_offset)));
 
-       ie = mono_binary_search (GUINT_TO_POINTER (mono_method_get_token (method)), first_ie,
+       ie = (MonoSymbolFileMethodEntry *)mono_binary_search (GUINT_TO_POINTER (mono_method_get_token (method)), first_ie,
                                   read32(&(symfile->offset_table->_method_count)),
                                   sizeof (MonoSymbolFileMethodEntry), compare_method);
 
@@ -823,7 +823,7 @@ mono_debug_symfile_lookup_locals (MonoDebugMethodInfo *minfo)
        for (i = 0; i < num_locals; ++i) {
                res->locals [i].index = read_leb128 (p, &p);
                len = read_leb128 (p, &p);
-               res->locals [i].name = g_malloc (len + 1);
+               res->locals [i].name = (char *)g_malloc (len + 1);
                memcpy (res->locals [i].name, p, len);
                res->locals [i].name [len] = '\0';
                p += len;

diff --git a/mono/metadata/domain-internals.h b/mono/metadata/domain-internals.h
index effa3d851c8c17391da96006e521c05593740d8d..2159f50f0e6dfcd04852820981aef3e040099614 100644 (file)
--- a/mono/metadata/domain-internals.h
+++ b/mono/metadata/domain-internals.h
@@ -9,7 +9,6 @@
 #include <mono/metadata/mempool.h>
 #include <mono/metadata/lock-tracer.h>
 #include <mono/utils/mono-codeman.h>
-#include <mono/utils/mono-mutex.h>
 #include <mono/metadata/mono-hash.h>
 #include <mono/utils/mono-compiler.h>
 #include <mono/utils/mono-internal-hash.h>
@@ -285,7 +284,7 @@ struct _MonoDomain {
         * i.e. if both are taken by the same thread, the loader lock
         * must taken first.
         */
-       mono_mutex_t    lock;
+       MonoCoopMutex    lock;
        MonoMemPool        *mp;
        MonoCodeManager    *code_mp;
        /*
@@ -421,10 +420,10 @@ typedef struct  {
        const AssemblyVersionSet version_sets [4];
 } MonoRuntimeInfo;
 
-#define mono_domain_assemblies_lock(domain) mono_locks_acquire(&(domain)->assemblies_lock, DomainAssembliesLock)
-#define mono_domain_assemblies_unlock(domain) mono_locks_release(&(domain)->assemblies_lock, DomainAssembliesLock)
-#define mono_domain_jit_code_hash_lock(domain) mono_locks_acquire(&(domain)->jit_code_hash_lock, DomainJitCodeHashLock)
-#define mono_domain_jit_code_hash_unlock(domain) mono_locks_release(&(domain)->jit_code_hash_lock, DomainJitCodeHashLock)
+#define mono_domain_assemblies_lock(domain) mono_locks_os_acquire(&(domain)->assemblies_lock, DomainAssembliesLock)
+#define mono_domain_assemblies_unlock(domain) mono_locks_os_release(&(domain)->assemblies_lock, DomainAssembliesLock)
+#define mono_domain_jit_code_hash_lock(domain) mono_locks_os_acquire(&(domain)->jit_code_hash_lock, DomainJitCodeHashLock)
+#define mono_domain_jit_code_hash_unlock(domain) mono_locks_os_release(&(domain)->jit_code_hash_lock, DomainJitCodeHashLock)
 
 typedef MonoDomain* (*MonoLoadFunc) (const char *filename, const char *runtime_version);
 

diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c
index 85d89d579fc62b6afb8f8b831c1aaec79ceedab0..a485b71c969cd6ba252371e03a036005e53469dc 100644 (file)
--- a/mono/metadata/domain.c
+++ b/mono/metadata/domain.c
@@ -93,14 +93,9 @@ static gboolean debug_domain_unload;
 
 gboolean mono_dont_free_domains;
 
-#define mono_appdomains_lock() do {    \
-       MONO_TRY_BLOCKING;      \
-       mono_mutex_lock (&appdomains_mutex); \
-       MONO_FINISH_TRY_BLOCKING;       \
-} while (0);
-
-#define mono_appdomains_unlock() mono_mutex_unlock (&appdomains_mutex)
-static mono_mutex_t appdomains_mutex;
+#define mono_appdomains_lock() mono_coop_mutex_lock (&appdomains_mutex)
+#define mono_appdomains_unlock() mono_coop_mutex_unlock (&appdomains_mutex)
+static MonoCoopMutex appdomains_mutex;
 
 static MonoDomain *mono_root_domain = NULL;
 
@@ -182,7 +177,7 @@ lock_free_mempool_free (LockFreeMempool *mp)
 
        chunk = mp->chunks;
        while (chunk) {
-               next = chunk->prev;
+               next = (LockFreeMempoolChunk *)chunk->prev;
                mono_vfree (chunk, mono_pagesize ());
                chunk = next;
        }
@@ -201,9 +196,9 @@ lock_free_mempool_chunk_new (LockFreeMempool *mp, int len)
        size = mono_pagesize ();
        while (size - sizeof (LockFreeMempoolChunk) < len)
                size += mono_pagesize ();
-       chunk = mono_valloc (0, size, MONO_MMAP_READ|MONO_MMAP_WRITE);
+       chunk = (LockFreeMempoolChunk *)mono_valloc (0, size, MONO_MMAP_READ|MONO_MMAP_WRITE);
        g_assert (chunk);
-       chunk->mem = ALIGN_PTR_TO ((char*)chunk + sizeof (LockFreeMempoolChunk), 16);
+       chunk->mem = (guint8 *)ALIGN_PTR_TO ((char*)chunk + sizeof (LockFreeMempoolChunk), 16);
        chunk->size = ((char*)chunk + size) - (char*)chunk->mem;
        chunk->pos = 0;
 
@@ -346,7 +341,7 @@ domain_id_alloc (MonoDomain *domain)
        int id = -1, i;
        if (!appdomains_list) {
                appdomain_list_size = 2;
-               appdomains_list = mono_gc_alloc_fixed (appdomain_list_size * sizeof (void*), MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_DOMAIN, "domains list");
+               appdomains_list = (MonoDomain **)mono_gc_alloc_fixed (appdomain_list_size * sizeof (void*), MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_DOMAIN, "domains list");
        }
        for (i = appdomain_next; i < appdomain_list_size; ++i) {
                if (!appdomains_list [i]) {
@@ -368,7 +363,7 @@ domain_id_alloc (MonoDomain *domain)
                if (new_size >= (1 << 16))
                        g_assert_not_reached ();
                id = appdomain_list_size;
-               new_list = mono_gc_alloc_fixed (new_size * sizeof (void*), MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_DOMAIN, "domains list");
+               new_list = (MonoDomain **)mono_gc_alloc_fixed (new_size * sizeof (void*), MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_DOMAIN, "domains list");
                memcpy (new_list, appdomains_list, appdomain_list_size * sizeof (void*));
                mono_gc_free_fixed (appdomains_list);
                appdomains_list = new_list;
@@ -412,9 +407,9 @@ mono_domain_create (void)
         * running the corlib test suite.
         * To solve this, we pass a NULL descriptor, and don't register roots.
         */
-       domain = mono_gc_alloc_fixed (sizeof (MonoDomain), NULL, MONO_ROOT_SOURCE_DOMAIN, "domain object");
+       domain = (MonoDomain *)mono_gc_alloc_fixed (sizeof (MonoDomain), NULL, MONO_ROOT_SOURCE_DOMAIN, "domain object");
 #else
-       domain = mono_gc_alloc_fixed (sizeof (MonoDomain), domain_gc_desc, MONO_ROOT_SOURCE_DOMAIN, "domain object");
+       domain = (MonoDomain *)mono_gc_alloc_fixed (sizeof (MonoDomain), domain_gc_desc, MONO_ROOT_SOURCE_DOMAIN, "domain object");
        mono_gc_register_root ((char*)&(domain->MONO_DOMAIN_FIRST_GC_TRACKED), G_STRUCT_OFFSET (MonoDomain, MONO_DOMAIN_LAST_GC_TRACKED) - G_STRUCT_OFFSET (MonoDomain, MONO_DOMAIN_FIRST_GC_TRACKED), MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_DOMAIN, "misc domain fields");
 #endif
        domain->shadow_serial = shadow_serial;
@@ -443,10 +438,11 @@ mono_domain_create (void)
        domain->finalizable_objects_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
        domain->ftnptrs_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
 
-       mono_mutex_init_recursive (&domain->lock);
-       mono_mutex_init_recursive (&domain->assemblies_lock);
-       mono_mutex_init_recursive (&domain->jit_code_hash_lock);
-       mono_mutex_init_recursive (&domain->finalizable_objects_hash_lock);
+       mono_coop_mutex_init_recursive (&domain->lock);
+
+       mono_os_mutex_init_recursive (&domain->assemblies_lock);
+       mono_os_mutex_init_recursive (&domain->jit_code_hash_lock);
+       mono_os_mutex_init_recursive (&domain->finalizable_objects_hash_lock);
 
        domain->method_rgctx_hash = NULL;
 
@@ -522,7 +518,7 @@ mono_init_internal (const char *filename, const char *exe_filename, const char *
        MONO_FAST_TLS_INIT (tls_appdomain);
        mono_native_tls_alloc (&appdomain_thread_id, NULL);
 
-       mono_mutex_init_recursive (&appdomains_mutex);
+       mono_coop_mutex_init_recursive (&appdomains_mutex);
 
        mono_metadata_init ();
        mono_images_init ();
@@ -944,7 +940,7 @@ mono_cleanup (void)
        mono_metadata_cleanup ();
 
        mono_native_tls_free (appdomain_thread_id);
-       mono_mutex_destroy (&appdomains_mutex);
+       mono_coop_mutex_destroy (&appdomains_mutex);
 
 #ifndef HOST_WIN32
        wapi_cleanup ();
@@ -1039,7 +1035,7 @@ mono_domain_foreach (MonoDomainFunc func, gpointer user_data)
         */
        mono_appdomains_lock ();
        size = appdomain_list_size;
-       copy = mono_gc_alloc_fixed (appdomain_list_size * sizeof (void*), MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_DOMAIN, "temporary domains list");
+       copy = (MonoDomain **)mono_gc_alloc_fixed (appdomain_list_size * sizeof (void*), MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_DOMAIN, "temporary domains list");
        memcpy (copy, appdomains_list, appdomain_list_size * sizeof (void*));
        mono_appdomains_unlock ();
 
@@ -1067,7 +1063,7 @@ mono_domain_assembly_open (MonoDomain *domain, const char *name)
 
        mono_domain_assemblies_lock (domain);
        for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
-               ass = tmp->data;
+               ass = (MonoAssembly *)tmp->data;
                if (strcmp (name, ass->aname.name) == 0) {
                        mono_domain_assemblies_unlock (domain);
                        return ass;
@@ -1091,7 +1087,7 @@ mono_domain_assembly_open (MonoDomain *domain, const char *name)
 static void
 unregister_vtable_reflection_type (MonoVTable *vtable)
 {
-       MonoObject *type = vtable->type;
+       MonoObject *type = (MonoObject *)vtable->type;
 
        if (type->vtable->klass != mono_defaults.monotype_class)
                MONO_GC_UNREGISTER_ROOT_IF_MOVING (vtable->type);
@@ -1146,7 +1142,7 @@ mono_domain_free (MonoDomain *domain, gboolean force)
        if (domain->class_vtable_array) {
                int i;
                for (i = 0; i < domain->class_vtable_array->len; ++i)
-                       unregister_vtable_reflection_type (g_ptr_array_index (domain->class_vtable_array, i));
+                       unregister_vtable_reflection_type ((MonoVTable *)g_ptr_array_index (domain->class_vtable_array, i));
        }
 
        if (domain->type_hash) {
@@ -1159,7 +1155,7 @@ mono_domain_free (MonoDomain *domain, gboolean force)
        }
 
        for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
-               MonoAssembly *ass = tmp->data;
+               MonoAssembly *ass = (MonoAssembly *)tmp->data;
                mono_assembly_release_gc_roots (ass);
        }
 
@@ -1172,7 +1168,7 @@ mono_domain_free (MonoDomain *domain, gboolean force)
 
        /* Close dynamic assemblies first, since they have no ref count */
        for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
-               MonoAssembly *ass = tmp->data;
+               MonoAssembly *ass = (MonoAssembly *)tmp->data;
                if (!ass->image || !image_is_dynamic (ass->image))
                        continue;
                mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Unloading domain %s[%p], assembly %s[%p], ref_count=%d", domain->friendly_name, domain, ass->aname.name, ass, ass->ref_count);
@@ -1181,7 +1177,7 @@ mono_domain_free (MonoDomain *domain, gboolean force)
        }
 
        for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
-               MonoAssembly *ass = tmp->data;
+               MonoAssembly *ass = (MonoAssembly *)tmp->data;
                if (!ass)
                        continue;
                if (!ass->image || image_is_dynamic (ass->image))
@@ -1192,7 +1188,7 @@ mono_domain_free (MonoDomain *domain, gboolean force)
        }
 
        for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
-               MonoAssembly *ass = tmp->data;
+               MonoAssembly *ass = (MonoAssembly *)tmp->data;
                if (ass)
                        mono_assembly_close_finish (ass);
        }
@@ -1291,10 +1287,12 @@ mono_domain_free (MonoDomain *domain, gboolean force)
                domain->method_to_dyn_method = NULL;
        }
 
-       mono_mutex_destroy (&domain->finalizable_objects_hash_lock);
-       mono_mutex_destroy (&domain->assemblies_lock);
-       mono_mutex_destroy (&domain->jit_code_hash_lock);
-       mono_mutex_destroy (&domain->lock);
+       mono_os_mutex_destroy (&domain->finalizable_objects_hash_lock);
+       mono_os_mutex_destroy (&domain->assemblies_lock);
+       mono_os_mutex_destroy (&domain->jit_code_hash_lock);
+
+       mono_coop_mutex_destroy (&domain->lock);
+
        domain->setup = NULL;
 
        mono_gc_deregister_root ((char*)&(domain->MONO_DOMAIN_FIRST_GC_TRACKED));
@@ -1574,7 +1572,7 @@ mono_domain_add_class_static_data (MonoDomain *domain, MonoClass *klass, gpointe
                next = GPOINTER_TO_INT (domain->static_data_array [0]);
                if (next >= size) {
                        /* 'data' is allocated by alloc_fixed */
-                       gpointer *new_array = mono_gc_alloc_fixed (sizeof (gpointer) * (size * 2), MONO_GC_ROOT_DESCR_FOR_FIXED (size * 2), MONO_ROOT_SOURCE_DOMAIN, "static field list");
+                       gpointer *new_array = (gpointer *)mono_gc_alloc_fixed (sizeof (gpointer) * (size * 2), MONO_GC_ROOT_DESCR_FOR_FIXED (size * 2), MONO_ROOT_SOURCE_DOMAIN, "static field list");
                        mono_gc_memmove_aligned (new_array, domain->static_data_array, sizeof (gpointer) * size);
                        size *= 2;
                        new_array [1] = GINT_TO_POINTER (size);
@@ -1583,7 +1581,7 @@ mono_domain_add_class_static_data (MonoDomain *domain, MonoClass *klass, gpointe
                }
        } else {
                int size = 32;
-               gpointer *new_array = mono_gc_alloc_fixed (sizeof (gpointer) * size, MONO_GC_ROOT_DESCR_FOR_FIXED (size), MONO_ROOT_SOURCE_DOMAIN, "static field list");
+               gpointer *new_array = (gpointer *)mono_gc_alloc_fixed (sizeof (gpointer) * size, MONO_GC_ROOT_DESCR_FOR_FIXED (size), MONO_ROOT_SOURCE_DOMAIN, "static field list");
                next = 2;
                new_array [0] = GINT_TO_POINTER (next);
                new_array [1] = GINT_TO_POINTER (size);
@@ -1817,7 +1815,7 @@ app_config_parse (const char *exe_filename)
 
        app_config = g_new0 (AppConfigInfo, 1);
 
-       context = g_markup_parse_context_new (&mono_parser, 0, app_config, NULL);
+       context = g_markup_parse_context_new (&mono_parser, (GMarkupParseFlags)0, app_config, NULL);
        if (g_markup_parse_context_parse (context, text, len, NULL)) {
                g_markup_parse_context_end_parse (context, NULL);
        }
@@ -1967,13 +1965,11 @@ mono_get_aot_cache_config (void)
 void
 mono_domain_lock (MonoDomain *domain)
 {
-       MONO_TRY_BLOCKING;
-       mono_locks_acquire (&(domain)->lock, DomainLock);
-       MONO_FINISH_TRY_BLOCKING;
+       mono_locks_coop_acquire (&domain->lock, DomainLock);
 }
 
 void
 mono_domain_unlock (MonoDomain *domain)
 {
-       mono_locks_release (&(domain)->lock, DomainLock);
+       mono_locks_coop_release (&domain->lock, DomainLock);
 }

diff --git a/mono/metadata/exception.c b/mono/metadata/exception.c
index 6a37cc89562f4167797c96f7cf52759508927cb0..3c70edb3ac9045051932da332d7bae79a10c65d0 100644 (file)
--- a/mono/metadata/exception.c
+++ b/mono/metadata/exception.c
@@ -849,7 +849,7 @@ mono_exception_get_native_backtrace (MonoException *exc)
 
        for (i = 0; i < len; ++i) {
                gpointer ip = mono_array_get (arr, gpointer, i);
-               MonoJitInfo *ji = mono_jit_info_table_find (mono_domain_get (), ip);
+               MonoJitInfo *ji = mono_jit_info_table_find (mono_domain_get (), (char *)ip);
                if (ji) {
                        char *msg = mono_debug_print_stack_frame (mono_jit_info_get_method (ji), (char*)ip - (char*)ji->code_start, domain);
                        g_string_append_printf (text, "%s\n", msg);

diff --git a/mono/metadata/file-io.c b/mono/metadata/file-io.c
index c4364a11437fa501fb27911e64084e090b3c3a8f..69c67eabc4f46f29980dfb95a57a85e03756d96b 100644 (file)
--- a/mono/metadata/file-io.c
+++ b/mono/metadata/file-io.c
@@ -190,7 +190,7 @@ static void convert_win32_file_attribute_data (const WIN32_FILE_ATTRIBUTE_DATA *
 static guint32 convert_attrs(MonoFileAttributes attrs)
 {
        if(attrs & FileAttributes_Encrypted) {
-               attrs |= FILE_ATTRIBUTE_ENCRYPTED;
+               attrs = (MonoFileAttributes)(attrs | FILE_ATTRIBUTE_ENCRYPTED);
        }
        
        return(attrs);
@@ -324,7 +324,7 @@ get_filesystem_entries (const gunichar2 *path,
        gchar *utf8_path = NULL, *utf8_result, *full_name;
        gint32 attributes;
 
-       mask = convert_attrs (mask);
+       mask = convert_attrs ((MonoFileAttributes)mask);
        attributes = get_file_attributes (path);
        if (attributes != -1) {
                if ((attributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
@@ -415,7 +415,7 @@ ves_icall_System_IO_MonoIO_GetFileSystemEntries (MonoString *path,
 
        result = mono_array_new (domain, mono_defaults.string_class, names->len);
        for (i = 0; i < names->len; i++) {
-               mono_array_setref (result, i, mono_string_new (domain, g_ptr_array_index (names, i)));
+               mono_array_setref (result, i, mono_string_new (domain, (const char *)g_ptr_array_index (names, i)));
                g_free (g_ptr_array_index (names, i));
        }
        g_ptr_array_free (names, TRUE);
@@ -499,7 +499,7 @@ ves_icall_System_IO_MonoIO_FindFirst (MonoString *path,
 MonoString *
 ves_icall_System_IO_MonoIO_FindNext (gpointer handle, gint32 *result_attr, gint32 *error)
 {
-       IncrementalFind *ifh = handle;
+       IncrementalFind *ifh = (IncrementalFind *)handle;
        WIN32_FIND_DATA data;
        MonoString *result;
 
@@ -520,7 +520,7 @@ ves_icall_System_IO_MonoIO_FindNext (gpointer handle, gint32 *result_attr, gint3
 int
 ves_icall_System_IO_MonoIO_FindClose (gpointer handle)
 {
-       IncrementalFind *ifh = handle;
+       IncrementalFind *ifh = (IncrementalFind *)handle;
        gint32 error;
 
        MONO_PREPARE_BLOCKING;
@@ -705,7 +705,7 @@ ves_icall_System_IO_MonoIO_SetFileAttributes (MonoString *path, gint32 attrs,
        *error=ERROR_SUCCESS;
        
        ret=SetFileAttributes (mono_string_chars (path),
-                              convert_attrs (attrs));
+               convert_attrs ((MonoFileAttributes)attrs));
        if(ret==FALSE) {
                *error=GetLastError ();
        }
@@ -803,8 +803,8 @@ ves_icall_System_IO_MonoIO_Open (MonoString *filename, gint32 mode,
                }
        }
        
-       ret=CreateFile (chars, convert_access (access_mode),
-                       convert_share (share), NULL, convert_mode (mode),
+       ret=CreateFile (chars, convert_access ((MonoFileAccess)access_mode),
+                       convert_share ((MonoFileShare)share), NULL, convert_mode ((MonoFileMode)mode),
                        attributes, NULL);
        if(ret==INVALID_HANDLE_VALUE) {
                *error=GetLastError ();
@@ -905,7 +905,7 @@ ves_icall_System_IO_MonoIO_Seek (HANDLE handle, gint64 offset, gint32 origin,
        
        offset_hi = offset >> 32;
        offset = SetFilePointer (handle, (gint32) (offset & 0xFFFFFFFF), &offset_hi,
-                                convert_seekorigin (origin));
+                                convert_seekorigin ((MonoSeekOrigin)origin));
 
        if(offset==INVALID_SET_FILE_POINTER) {
                *error=GetLastError ();

diff --git a/mono/metadata/file-mmap-posix.c b/mono/metadata/file-mmap-posix.c
index 3de44d7a1db89342a2bd1282f14545a232ac12ed..aca3e7fb49c6fab2a7f25c8b89aeca79d801763e 100644 (file)
--- a/mono/metadata/file-mmap-posix.c
+++ b/mono/metadata/file-mmap-posix.c
@@ -36,6 +36,8 @@
 #include <mono/utils/atomic.h>
 #include <mono/utils/mono-memory-model.h>
 #include <mono/utils/mono-mmap.h>
+#include <mono/utils/mono-coop-mutex.h>
+#include <mono/utils/mono-threads.h>
 
 typedef struct {
        int kind;
@@ -88,7 +90,7 @@ enum {
 #endif
 
 static int mmap_init_state;
-static mono_mutex_t named_regions_mutex;
+static MonoCoopMutex named_regions_mutex;
 static GHashTable *named_regions;
 
 
@@ -115,14 +117,14 @@ retry:
                if (InterlockedCompareExchange (&mmap_init_state, 1, 0) != 0)
                        goto retry;
                named_regions = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
-               mono_mutex_init (&named_regions_mutex);
+               mono_coop_mutex_init (&named_regions_mutex);
 
                mono_atomic_store_release (&mmap_init_state, 2);
                break;
 
        case 1:
                do {
-                       g_usleep (1000); /* Been init'd by other threads, this is very rare. */
+                       mono_thread_info_sleep (1, NULL); /* Been init'd by other threads, this is very rare. */
                } while (mmap_init_state != 2);
                break;
        case 2:
@@ -136,13 +138,13 @@ static void
 named_regions_lock (void)
 {
        file_mmap_init ();
-       mono_mutex_lock (&named_regions_mutex);
+       mono_coop_mutex_lock (&named_regions_mutex);
 }
 
 static void
 named_regions_unlock (void)
 {
-       mono_mutex_unlock (&named_regions_mutex);       
+       mono_coop_mutex_unlock (&named_regions_mutex);
 }
 
 
@@ -340,7 +342,7 @@ open_memory_map (MonoString *mapName, int mode, gint64 *capacity, int access, in
                        *error = COULD_NOT_MAP_MEMORY;
                        goto done;
                }
-               file_name = alloca (alloc_size);
+               file_name = (char *)alloca (alloc_size);
                strcpy (file_name, tmp_dir);
                strcat (file_name, MONO_ANON_FILE_TEMPLATE);
 
@@ -389,7 +391,7 @@ mono_mmap_open_file (MonoString *path, int mode, MonoString *mapName, gint64 *ca
                        *error = FILE_ALREADY_EXISTS;
                        handle = NULL;
                } else {
-                       handle = open_file_map (path, -1, mode, capacity, access, options, error);
+                       handle = (MmapHandle *)open_file_map (path, -1, mode, capacity, access, options, error);
                        if (handle) {
                                handle->name = g_strdup (c_mapName);
                                g_hash_table_insert (named_regions, handle->name, handle);
@@ -409,7 +411,7 @@ mono_mmap_open_handle (void *input_fd, MonoString *mapName, gint64 *capacity, in
 {
        MmapHandle *handle;
        if (!mapName) {
-               handle = open_file_map (NULL, GPOINTER_TO_INT (input_fd), FILE_MODE_OPEN, capacity, access, options, error);
+               handle = (MmapHandle *)open_file_map (NULL, GPOINTER_TO_INT (input_fd), FILE_MODE_OPEN, capacity, access, options, error);
        } else {
                char *c_mapName = mono_string_to_utf8 (mapName);
 
@@ -420,7 +422,7 @@ mono_mmap_open_handle (void *input_fd, MonoString *mapName, gint64 *capacity, in
                        handle = NULL;
                } else {
                        //XXX we're exploiting wapi HANDLE == FD equivalence. THIS IS FRAGILE, create a _wapi_handle_to_fd call
-                       handle = open_file_map (NULL, GPOINTER_TO_INT (input_fd), FILE_MODE_OPEN, capacity, access, options, error);
+                       handle = (MmapHandle *)open_file_map (NULL, GPOINTER_TO_INT (input_fd), FILE_MODE_OPEN, capacity, access, options, error);
                        handle->name = g_strdup (c_mapName);
                        g_hash_table_insert (named_regions, handle->name, handle);
                }
@@ -434,7 +436,7 @@ mono_mmap_open_handle (void *input_fd, MonoString *mapName, gint64 *capacity, in
 void
 mono_mmap_close (void *mmap_handle)
 {
-       MmapHandle *handle = mmap_handle;
+       MmapHandle *handle = (MmapHandle *)mmap_handle;
 
        named_regions_lock ();
        --handle->ref_count;
@@ -452,7 +454,7 @@ mono_mmap_close (void *mmap_handle)
 void
 mono_mmap_configure_inheritability (void *mmap_handle, gboolean inheritability)
 {
-       MmapHandle *h = mmap_handle;
+       MmapHandle *h = (MmapHandle *)mmap_handle;
        int fd, flags;
 
        fd = h->fd;
@@ -467,7 +469,7 @@ mono_mmap_configure_inheritability (void *mmap_handle, gboolean inheritability)
 void
 mono_mmap_flush (void *mmap_handle)
 {
-       MmapInstance *h = mmap_handle;
+       MmapInstance *h = (MmapInstance *)mmap_handle;
 
        if (h)
                msync (h->address, h->length, MS_SYNC);
@@ -477,7 +479,7 @@ int
 mono_mmap_map (void *handle, gint64 offset, gint64 *size, int access, void **mmap_handle, void **base_address)
 {
        gint64 mmap_offset = 0;
-       MmapHandle *fh = handle;
+       MmapHandle *fh = (MmapHandle *)handle;
        MmapInstance res = { 0 };
        size_t eff_size = *size;
        struct stat buf = { 0 };
@@ -516,7 +518,7 @@ gboolean
 mono_mmap_unmap (void *mmap_handle)
 {
        int res = 0;
-       MmapInstance *h = mmap_handle;
+       MmapInstance *h = (MmapInstance *)mmap_handle;
 
        res = mono_file_unmap (h->address, h->free_handle);
 

diff --git a/mono/metadata/gc-internals.h b/mono/metadata/gc-internals.h
index 465c92b9c6ef677a8fa7c1d7992412416fc70fcc..bc9edcbe3ad1a1fb289d37dd8adc04e5fd2cb0e3 100644 (file)
--- a/mono/metadata/gc-internals.h
+++ b/mono/metadata/gc-internals.h
@@ -17,8 +17,8 @@
 #include <mono/sgen/gc-internal-agnostic.h>
 #include <mono/utils/gc_wrapper.h>
 
-#define mono_domain_finalizers_lock(domain) mono_mutex_lock (&(domain)->finalizable_objects_hash_lock);
-#define mono_domain_finalizers_unlock(domain) mono_mutex_unlock (&(domain)->finalizable_objects_hash_lock);
+#define mono_domain_finalizers_lock(domain) mono_os_mutex_lock (&(domain)->finalizable_objects_hash_lock);
+#define mono_domain_finalizers_unlock(domain) mono_os_mutex_unlock (&(domain)->finalizable_objects_hash_lock);
 
 /* Register a memory area as a conservatively scanned GC root */
 #define MONO_GC_REGISTER_ROOT_PINNING(x,src,msg) mono_gc_register_root ((char*)&(x), sizeof(x), MONO_GC_DESCRIPTOR_NULL, (src), (msg))
@@ -80,7 +80,6 @@ gpointer    ves_icall_System_GCHandle_GetAddrOfPinnedObject (guint32 handle);
 void        ves_icall_System_GC_register_ephemeron_array (MonoObject *array);
 MonoObject  *ves_icall_System_GC_get_ephemeron_tombstone (void);
 
-MonoBoolean ves_icall_Mono_Runtime_SetGCAllowSynchronousMajor (MonoBoolean flag);
 
 extern void mono_gc_init (void);
 extern void mono_gc_base_init (void);
@@ -111,9 +110,6 @@ void mono_gchandle_set_target (guint32 gchandle, MonoObject *obj);
 /*Ephemeron functionality. Sgen only*/
 gboolean    mono_gc_ephemeron_array_add (MonoObject *obj);
 
-/* To disable synchronous, evacuating collections - concurrent SGen only */
-gboolean    mono_gc_set_allow_synchronous_major (gboolean flag);
-
 MonoBoolean
 mono_gc_GCHandle_CheckCurrentDomain (guint32 gchandle);
 

diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c
index 18f3b655cad9097d0046b02d9daeb35a315884cf..e0f12d34b558cf3ad62cc353a2e91618c6377062 100644 (file)
--- a/mono/metadata/gc.c
+++ b/mono/metadata/gc.c
@@ -31,13 +31,14 @@
 #include <mono/metadata/marshal.h> /* for mono_delegate_free_ftnptr () */
 #include <mono/metadata/attach.h>
 #include <mono/metadata/console-io.h>
-#include <mono/utils/mono-semaphore.h>
+#include <mono/utils/mono-os-semaphore.h>
 #include <mono/utils/mono-memory-model.h>
 #include <mono/utils/mono-counters.h>
 #include <mono/utils/mono-time.h>
 #include <mono/utils/dtrace.h>
 #include <mono/utils/mono-threads.h>
 #include <mono/utils/atomic.h>
+#include <mono/utils/mono-coop-semaphore.h>
 
 #ifndef HOST_WIN32
 #include <pthread.h>
@@ -56,17 +57,17 @@ gboolean log_finalizers = FALSE;
 gboolean mono_do_not_finalize = FALSE;
 gchar **mono_do_not_finalize_class_names = NULL;
 
-#define mono_finalizer_lock() mono_mutex_lock (&finalizer_mutex)
-#define mono_finalizer_unlock() mono_mutex_unlock (&finalizer_mutex)
-static mono_mutex_t finalizer_mutex;
-static mono_mutex_t reference_queue_mutex;
+#define mono_finalizer_lock() mono_coop_mutex_lock (&finalizer_mutex)
+#define mono_finalizer_unlock() mono_coop_mutex_unlock (&finalizer_mutex)
+static MonoCoopMutex finalizer_mutex;
+static MonoCoopMutex reference_queue_mutex;
 
 static GSList *domains_to_finalize= NULL;
 static MonoMList *threads_to_finalize = NULL;
 
 static gboolean finalizer_thread_exited;
 /* Uses finalizer_mutex */
-static mono_cond_t exited_cond;
+static MonoCoopCond exited_cond;
 
 static MonoInternalThread *gc_thread;
 
@@ -150,7 +151,7 @@ mono_gc_run_finalize (void *obj, void *data)
 #ifndef HAVE_SGEN_GC
        mono_domain_finalizers_lock (domain);
 
-       o2 = g_hash_table_lookup (domain->finalizable_objects_hash, o);
+       o2 = (MonoObject *)g_hash_table_lookup (domain->finalizable_objects_hash, o);
 
        mono_domain_finalizers_unlock (domain);
 
@@ -160,7 +161,7 @@ mono_gc_run_finalize (void *obj, void *data)
 #endif
 
        /* make sure the finalizer is not called again if the object is resurrected */
-       object_register_finalizer (obj, NULL);
+       object_register_finalizer ((MonoObject *)obj, NULL);
 
        if (log_finalizers)
                g_log ("mono-gc-finalizers", G_LOG_LEVEL_MESSAGE, "<%s at %p> Registered finalizer as processed.", o->vtable->klass->name, o);
@@ -240,7 +241,7 @@ mono_gc_run_finalize (void *obj, void *data)
                domain->finalize_runtime_invoke = mono_compile_method (invoke);
        }
 
-       runtime_invoke = domain->finalize_runtime_invoke;
+       runtime_invoke = (RuntimeInvokeFunction)domain->finalize_runtime_invoke;
 
        mono_runtime_class_init (o->vtable);
 
@@ -334,11 +335,8 @@ object_register_finalizer (MonoObject *obj, void (*callback)(void *, void*))
         * end up running them while or after the domain is being cleared, so
         * the objects will not be valid anymore.
         */
-       if (!mono_domain_is_unloading (domain)) {
-               MONO_TRY_BLOCKING;
+       if (!mono_domain_is_unloading (domain))
                mono_gc_register_for_finalization (obj, callback);
-               MONO_FINISH_TRY_BLOCKING;
-       }
 #endif
 }
 
@@ -540,10 +538,6 @@ ves_icall_System_GC_get_ephemeron_tombstone (void)
        return mono_domain_get ()->ephemeron_tombstone;
 }
 
-#define mono_allocator_lock() mono_mutex_lock (&allocator_section)
-#define mono_allocator_unlock() mono_mutex_unlock (&allocator_section)
-static mono_mutex_t allocator_section;
-
 MonoObject *
 ves_icall_System_GCHandle_GetTarget (guint32 handle)
 {
@@ -607,22 +601,13 @@ ves_icall_System_GCHandle_GetAddrOfPinnedObject (guint32 handle)
        return NULL;
 }
 
-MonoBoolean
-ves_icall_Mono_Runtime_SetGCAllowSynchronousMajor (MonoBoolean flag)
-{
-       return mono_gc_set_allow_synchronous_major (flag);
-}
-
 MonoBoolean
 mono_gc_GCHandle_CheckCurrentDomain (guint32 gchandle)
 {
        return mono_gchandle_is_in_domain (gchandle, mono_domain_get ());
 }
 
-#ifdef MONO_HAS_SEMAPHORES
-static MonoSemType finalizer_sem;
-#endif
-static HANDLE finalizer_event;
+static MonoCoopSem finalizer_sem;
 static volatile gboolean finished=FALSE;
 
 void
@@ -635,11 +620,7 @@ mono_gc_finalize_notify (void)
        if (mono_gc_is_null ())
                return;
 
-#ifdef MONO_HAS_SEMAPHORES
-       MONO_SEM_POST (&finalizer_sem);
-#else
-       SetEvent (finalizer_event);
-#endif
+       mono_coop_sem_post (&finalizer_sem);
 }
 
 #ifdef HAVE_BOEHM_GC
@@ -724,18 +705,13 @@ finalizer_thread (gpointer unused)
 
                g_assert (mono_domain_get () == mono_get_root_domain ());
                mono_gc_set_skip_thread (TRUE);
-               MONO_PREPARE_BLOCKING;
 
                if (wait) {
-               /* An alertable wait is required so this thread can be suspended on windows */
-#ifdef MONO_HAS_SEMAPHORES
-                       MONO_SEM_WAIT_ALERTABLE (&finalizer_sem, TRUE);
-#else
-                       WaitForSingleObjectEx (finalizer_event, INFINITE, TRUE);
-#endif
+                       /* An alertable wait is required so this thread can be suspended on windows */
+                       mono_coop_sem_wait (&finalizer_sem, MONO_SEM_FLAGS_ALERTABLE);
                }
                wait = TRUE;
-               MONO_FINISH_BLOCKING;
+
                mono_gc_set_skip_thread (FALSE);
 
                mono_threads_perform_thread_dump ();
@@ -747,7 +723,7 @@ finalizer_thread (gpointer unused)
                if (domains_to_finalize) {
                        mono_finalizer_lock ();
                        if (domains_to_finalize) {
-                               DomainFinalizationReq *req = domains_to_finalize->data;
+                               DomainFinalizationReq *req = (DomainFinalizationReq *)domains_to_finalize->data;
                                domains_to_finalize = g_slist_remove (domains_to_finalize, req);
                                mono_finalizer_unlock ();
 
@@ -766,21 +742,18 @@ finalizer_thread (gpointer unused)
 
                reference_queue_proccess_all ();
 
-#ifdef MONO_HAS_SEMAPHORES
                /* Avoid posting the pending done event until there are pending finalizers */
-               if (MONO_SEM_TIMEDWAIT (&finalizer_sem, 0) == 0)
+               if (mono_coop_sem_timedwait (&finalizer_sem, 0, MONO_SEM_FLAGS_NONE) == 0) {
                        /* Don't wait again at the start of the loop */
                        wait = FALSE;
-               else
-                       SetEvent (pending_done_event);
-#else
+               } else {
                        SetEvent (pending_done_event);
-#endif
+               }
        }
 
        mono_finalizer_lock ();
        finalizer_thread_exited = TRUE;
-       mono_cond_signal (&exited_cond);
+       mono_coop_cond_signal (&exited_cond);
        mono_finalizer_unlock ();
 
        return 0;
@@ -799,10 +772,8 @@ mono_gc_init_finalizer_thread (void)
 void
 mono_gc_init (void)
 {
-       mono_mutex_init_recursive (&allocator_section);
-
-       mono_mutex_init_recursive (&finalizer_mutex);
-       mono_mutex_init_recursive (&reference_queue_mutex);
+       mono_coop_mutex_init_recursive (&finalizer_mutex);
+       mono_coop_mutex_init_recursive (&reference_queue_mutex);
 
        mono_counters_register ("Minor GC collections", MONO_COUNTER_GC | MONO_COUNTER_UINT, &gc_stats.minor_gc_count);
        mono_counters_register ("Major GC collections", MONO_COUNTER_GC | MONO_COUNTER_UINT, &gc_stats.major_gc_count);
@@ -816,15 +787,11 @@ mono_gc_init (void)
                gc_disabled = TRUE;
                return;
        }
-       
-       finalizer_event = CreateEvent (NULL, FALSE, FALSE, NULL);
-       g_assert (finalizer_event);
+
        pending_done_event = CreateEvent (NULL, TRUE, FALSE, NULL);
        g_assert (pending_done_event);
-       mono_cond_init (&exited_cond, 0);
-#ifdef MONO_HAS_SEMAPHORES
-       MONO_SEM_INIT (&finalizer_sem, 0);
-#endif
+       mono_coop_cond_init (&exited_cond);
+       mono_coop_sem_init (&finalizer_sem, 0);
 
 #ifndef LAZY_GC_THREAD_CREATION
        mono_gc_init_finalizer_thread ();
@@ -859,12 +826,10 @@ mono_gc_cleanup (void)
                                        break;
                                else
                                        timeout = end_ticks - current_ticks;
-                               MONO_PREPARE_BLOCKING;
                                mono_finalizer_lock ();
                                if (!finalizer_thread_exited)
-                                       mono_cond_timedwait_ms (&exited_cond, &finalizer_mutex, timeout);
+                                       mono_coop_cond_timedwait (&exited_cond, &finalizer_mutex, timeout);
                                mono_finalizer_unlock ();
-                               MONO_FINISH_BLOCKING;
                        }
 
                        if (!finalizer_thread_exited) {
@@ -899,6 +864,7 @@ mono_gc_cleanup (void)
 
                                mono_thread_join (GUINT_TO_POINTER (gc_thread->tid));
                        }
+                       g_assert (finalizer_thread_exited);
                }
                gc_thread = NULL;
                mono_gc_base_cleanup ();
@@ -906,9 +872,8 @@ mono_gc_cleanup (void)
 
        mono_reference_queue_cleanup ();
 
-       mono_mutex_destroy (&allocator_section);
-       mono_mutex_destroy (&finalizer_mutex);
-       mono_mutex_destroy (&reference_queue_mutex);
+       mono_coop_mutex_destroy (&finalizer_mutex);
+       mono_coop_mutex_destroy (&reference_queue_mutex);
 }
 
 gboolean
@@ -967,7 +932,7 @@ ref_list_remove_element (RefQueueEntry **prev, RefQueueEntry *element)
                /* Guard if head is changed concurrently. */
                while (*prev != element)
                        prev = &(*prev)->next;
-       } while (prev && InterlockedCompareExchangePointer ((void*)prev, element->next, element) != element);
+       } while (prev && InterlockedCompareExchangePointer ((volatile gpointer *)prev, element->next, element) != element);
 }
 
 static void
@@ -978,7 +943,7 @@ ref_list_push (RefQueueEntry **head, RefQueueEntry *value)
                current = *head;
                value->next = current;
                STORE_STORE_FENCE; /*Must make sure the previous store is visible before the CAS. */
-       } while (InterlockedCompareExchangePointer ((void*)head, value, current) != current);
+       } while (InterlockedCompareExchangePointer ((volatile gpointer *)head, value, current) != current);
 }
 
 static void
@@ -1007,7 +972,7 @@ reference_queue_proccess_all (void)
                reference_queue_proccess (queue);
 
 restart:
-       mono_mutex_lock (&reference_queue_mutex);
+       mono_coop_mutex_lock (&reference_queue_mutex);
        for (iter = &ref_queues; *iter;) {
                queue = *iter;
                if (!queue->should_be_deleted) {
@@ -1015,14 +980,14 @@ restart:
                        continue;
                }
                if (queue->queue) {
-                       mono_mutex_unlock (&reference_queue_mutex);
+                       mono_coop_mutex_unlock (&reference_queue_mutex);
                        reference_queue_proccess (queue);
                        goto restart;
                }
                *iter = queue->next;
                g_free (queue);
        }
-       mono_mutex_unlock (&reference_queue_mutex);
+       mono_coop_mutex_unlock (&reference_queue_mutex);
 }
 
 static void
@@ -1076,10 +1041,10 @@ mono_gc_reference_queue_new (mono_reference_queue_callback callback)
        MonoReferenceQueue *res = g_new0 (MonoReferenceQueue, 1);
        res->callback = callback;
 
-       mono_mutex_lock (&reference_queue_mutex);
+       mono_coop_mutex_lock (&reference_queue_mutex);
        res->next = ref_queues;
        ref_queues = res;
-       mono_mutex_unlock (&reference_queue_mutex);
+       mono_coop_mutex_unlock (&reference_queue_mutex);
 
        return res;
 }

diff --git a/mono/metadata/icall-def.h b/mono/metadata/icall-def.h
index 489b5ded65b19fcf2edf5080854849470530a86d..88fb2539e83319225eda11d4e5f8247949b2eee9 100644 (file)
--- a/mono/metadata/icall-def.h
+++ b/mono/metadata/icall-def.h
@@ -46,7 +46,6 @@ ICALL(COMPROX_2, "FindProxy", ves_icall_Mono_Interop_ComInteropProxy_FindProxy)
 ICALL_TYPE(RUNTIME, "Mono.Runtime", RUNTIME_1)
 ICALL(RUNTIME_1, "GetDisplayName", ves_icall_Mono_Runtime_GetDisplayName)
 ICALL(RUNTIME_12, "GetNativeStackTrace", ves_icall_Mono_Runtime_GetNativeStackTrace)
-ICALL(RUNTIME_13, "SetGCAllowSynchronousMajor", ves_icall_Mono_Runtime_SetGCAllowSynchronousMajor)
 
 #ifndef PLATFORM_RO_FS
 ICALL_TYPE(KPAIR, "Mono.Security.Cryptography.KeyPairPersistence", KPAIR_1)

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 1b36b74bc697c68e14b008387c7a54125f16164e..eaecf5b2027da4795c132c2f3554dcd9f7fa986b 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -6,10 +6,11 @@
  *   Paolo Molaro (lupus@ximian.com)
  *      Patrik Torstensson (patrik.torstensson@labs2.com)
  *   Marek Safar (marek.safar@gmail.com)
+ *   Aleksey Kliger (aleksey@xamarin.com)
  *
  * Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
  * Copyright 2004-2009 Novell, Inc (http://www.novell.com)
- * Copyright 2011-2014 Xamarin Inc (http://www.xamarin.com).
+ * Copyright 2011-2015 Xamarin Inc (http://www.xamarin.com).
  */
 
 #include <config.h>
@@ -89,7 +90,7 @@
 #include <mono/utils/mono-io-portability.h>
 #include <mono/utils/mono-digest.h>
 #include <mono/utils/bsearch.h>
-#include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-os-mutex.h>
 #include <mono/utils/mono-threads.h>
 
 #if defined (HOST_WIN32)
@@ -134,7 +135,7 @@ ves_icall_System_Array_GetValueImpl (MonoArray *arr, guint32 pos)
        if (ac->element_class->valuetype)
                return mono_value_box (arr->obj.vtable->domain, ac->element_class, ea);
        else
-               return *ea;
+               return (MonoObject *)*ea;
 }
 
 ICALL_EXPORT MonoObject *
@@ -544,7 +545,7 @@ ves_icall_System_Array_CreateInstanceImpl (MonoReflectionType *type, MonoArray *
 
        aklass = mono_bounded_array_class_get (klass, mono_array_length (lengths), bounded);
 
-       sizes = alloca (aklass->rank * sizeof(intptr_t) * 2);
+       sizes = (uintptr_t *)alloca (aklass->rank * sizeof(intptr_t) * 2);
        for (i = 0; i < aklass->rank; ++i) {
                sizes [i] = mono_array_get (lengths, guint32, i);
                if (bounds)
@@ -592,7 +593,7 @@ ves_icall_System_Array_CreateInstanceImpl64 (MonoReflectionType *type, MonoArray
 
        aklass = mono_bounded_array_class_get (klass, mono_array_length (lengths), bounded);
 
-       sizes = alloca (aklass->rank * sizeof(intptr_t) * 2);
+       sizes = (uintptr_t *)alloca (aklass->rank * sizeof(intptr_t) * 2);
        for (i = 0; i < aklass->rank; ++i) {
                sizes [i] = mono_array_get (lengths, guint64, i);
                if (bounds)
@@ -770,7 +771,7 @@ ves_icall_System_Array_SetGenericValueImpl (MonoArray *arr, guint32 pos, gpointe
 
        if (MONO_TYPE_IS_REFERENCE (&ec->byval_arg)) {
                g_assert (esize == sizeof (gpointer));
-               mono_gc_wbarrier_generic_store (ea, *(gpointer*)value);
+               mono_gc_wbarrier_generic_store (ea, *(MonoObject **)value);
        } else {
                g_assert (ec->inited);
                g_assert (esize == mono_class_value_size (ec, NULL));
@@ -1158,10 +1159,10 @@ ves_icall_ModuleBuilder_RegisterToken (MonoReflectionModuleBuilder *mb, MonoObje
 ICALL_EXPORT MonoObject*
 ves_icall_ModuleBuilder_GetRegisteredToken (MonoReflectionModuleBuilder *mb, guint32 token)
 {
-       gpointer obj;
+       MonoObject *obj;
 
        mono_loader_lock ();
-       obj = mono_g_hash_table_lookup (mb->dynamic_image->tokens, GUINT_TO_POINTER (token));
+       obj = (MonoObject *)mono_g_hash_table_lookup (mb->dynamic_image->tokens, GUINT_TO_POINTER (token));
        mono_loader_unlock ();
 
        return obj;
@@ -1170,7 +1171,7 @@ ves_icall_ModuleBuilder_GetRegisteredToken (MonoReflectionModuleBuilder *mb, gui
 static gboolean
 get_caller (MonoMethod *m, gint32 no, gint32 ilo, gboolean managed, gpointer data)
 {
-       MonoMethod **dest = data;
+       MonoMethod **dest = (MonoMethod **)data;
 
        /* skip unmanaged frames */
        if (!managed)
@@ -1190,7 +1191,7 @@ get_caller (MonoMethod *m, gint32 no, gint32 ilo, gboolean managed, gpointer dat
 static gboolean
 get_executing (MonoMethod *m, gint32 no, gint32 ilo, gboolean managed, gpointer data)
 {
-       MonoMethod **dest = data;
+       MonoMethod **dest = (MonoMethod **)data;
 
        /* skip unmanaged frames */
        if (!managed)
@@ -1208,7 +1209,7 @@ get_executing (MonoMethod *m, gint32 no, gint32 ilo, gboolean managed, gpointer
 static gboolean
 get_caller_no_reflection (MonoMethod *m, gint32 no, gint32 ilo, gboolean managed, gpointer data)
 {
-       MonoMethod **dest = data;
+       MonoMethod **dest = (MonoMethod **)data;
 
        /* skip unmanaged frames */
        if (!managed)
@@ -1780,9 +1781,9 @@ ves_icall_MonoField_SetValueInternal (MonoReflectionField *field, MonoObject *ob
                                 */
                                nullable = mono_object_new (mono_domain_get (), nklass);
 
-                               mono_nullable_init (mono_object_unbox (nullable), value, nklass);
+                               mono_nullable_init ((guint8 *)mono_object_unbox (nullable), value, nklass);
 
-                               v = mono_object_unbox (nullable);
+                               v = (gchar *)mono_object_unbox (nullable);
                        }
                        else 
                                if (gclass->container_class->valuetype && (v != NULL))
@@ -2030,8 +2031,8 @@ typedef struct {
 static void
 fill_iface_array (gpointer key, gpointer value, gpointer user_data)
 {
-       FillIfaceArrayData *data = user_data;
-       MonoClass *ic = key;
+       FillIfaceArrayData *data = (FillIfaceArrayData *)user_data;
+       MonoClass *ic = (MonoClass *)key;
        MonoType *ret = &ic->byval_arg, *inflated = NULL;
 
        if (!mono_error_ok (data->error))
@@ -2324,7 +2325,7 @@ ves_icall_MonoType_GetGenericArguments (MonoReflectionType *type, MonoBoolean ru
                MonoGenericContainer *container = klass->generic_container;
                res = create_type_array (domain, runtimeTypeArray, container->type_argc);
                for (i = 0; i < container->type_argc; ++i) {
-                       pklass = mono_class_from_generic_parameter (mono_generic_container_get_param (container, i), klass->image, FALSE);
+                       pklass = mono_class_from_generic_parameter_internal (mono_generic_container_get_param (container, i));
                        mono_array_setref (res, i, mono_type_get_object (domain, &pklass->byval_arg));
                }
        } else if (klass->generic_class) {
@@ -2373,7 +2374,7 @@ ves_icall_Type_GetGenericTypeDefinition_impl (MonoReflectionType *type)
                tb = mono_class_get_ref_info (generic_class);
 
                if (generic_class->wastypebuilder && tb)
-                       return tb;
+                       return (MonoReflectionType *)tb;
                else
                        return mono_type_get_object (mono_object_domain (type), &generic_class->byval_arg);
        }
@@ -2394,7 +2395,7 @@ ves_icall_Type_MakeGenericType (MonoReflectionType *type, MonoArray *type_array)
        types = g_new0 (MonoType *, count);
 
        for (i = 0; i < count; i++) {
-               MonoReflectionType *t = mono_array_get (type_array, gpointer, i);
+               MonoReflectionType *t = (MonoReflectionType *)mono_array_get (type_array, gpointer, i);
                types [i] = t->type;
        }
 
@@ -2445,7 +2446,7 @@ ves_icall_Type_GetGenericParameterAttributes (MonoReflectionType *type)
 {
        g_assert (IS_MONOTYPE (type));
        g_assert (is_generic_parameter (type->type));
-       return mono_generic_param_info (type->type->data.generic_param)->flags;
+       return (GenericParameterAttributes)mono_generic_param_info (type->type->data.generic_param)->flags;
 }
 
 ICALL_EXPORT MonoArray *
@@ -2562,7 +2563,7 @@ ves_icall_MonoMethod_GetPInvoke (MonoReflectionMethod *method, int* flags, MonoS
 
        if (image_is_dynamic (image)) {
                MonoReflectionMethodAux *method_aux = 
-                       g_hash_table_lookup (((MonoDynamicImage*)image)->method_aux_hash, method->method);
+                       (MonoReflectionMethodAux *)g_hash_table_lookup (((MonoDynamicImage*)image)->method_aux_hash, method->method);
                if (method_aux) {
                        import = method_aux->dllentry;
                        scope = method_aux->dll;
@@ -2617,7 +2618,7 @@ ves_icall_MonoMethod_GetGenericMethodDefinition (MonoReflectionMethod *method)
                 * the dynamic case as well ?
                 */
                mono_image_lock ((MonoImage*)image);
-               res = mono_g_hash_table_lookup (image->generic_def_objects, imethod);
+               res = (MonoReflectionMethod *)mono_g_hash_table_lookup (image->generic_def_objects, imethod);
                mono_image_unlock ((MonoImage*)image);
 
                if (res)
@@ -2678,8 +2679,7 @@ ves_icall_MonoMethod_GetGenericArguments (MonoReflectionMethod *method)
        for (i = 0; i < count; i++) {
                MonoGenericContainer *container = mono_method_get_generic_container (method->method);
                MonoGenericParam *param = mono_generic_container_get_param (container, i);
-               MonoClass *pklass = mono_class_from_generic_parameter (
-                       param, method->method->klass->image, TRUE);
+               MonoClass *pklass = mono_class_from_generic_parameter_internal (param);
                mono_array_setref (res, i,
                                mono_type_get_object (domain, &pklass->byval_arg));
        }
@@ -2765,7 +2765,7 @@ ves_icall_InternalInvoke (MonoReflectionMethod *method, MonoObject *this_arg, Mo
                uintptr_t *lengths;
                intptr_t *lower_bounds;
                pcount = mono_array_length (params);
-               lengths = alloca (sizeof (uintptr_t) * pcount);
+               lengths = (uintptr_t *)alloca (sizeof (uintptr_t) * pcount);
                /* Note: the synthetized array .ctors have int32 as argument type */
                for (i = 0; i < pcount; ++i)
                        lengths [i] = *(int32_t*) ((char*)mono_array_get (params, gpointer, i) + sizeof (MonoObject));
@@ -2788,7 +2788,7 @@ ves_icall_InternalInvoke (MonoReflectionMethod *method, MonoObject *this_arg, Mo
                } else {
                        g_assert (pcount == (m->klass->rank * 2));
                        /* The arguments are lower-bound-length pairs */
-                       lower_bounds = g_alloca (sizeof (intptr_t) * pcount);
+                       lower_bounds = (intptr_t *)g_alloca (sizeof (intptr_t) * pcount);
 
                        for (i = 0; i < pcount / 2; ++i) {
                                lower_bounds [i] = *(int32_t*) ((char*)mono_array_get (params, gpointer, (i * 2)) + sizeof (MonoObject));
@@ -2836,7 +2836,7 @@ ves_icall_InternalExecute (MonoReflectionMethod *method, MonoObject *this_arg, M
                                        if (field_klass->valuetype)
                                                result = mono_value_box (domain, field_klass, (char *)this_arg + field->offset);
                                        else 
-                                               result = *((gpointer *)((char *)this_arg + field->offset));
+                                               result = (MonoObject *)*((gpointer *)((char *)this_arg + field->offset));
                                
                                        out_args = mono_array_new (domain, mono_defaults.object_class, 1);
                                        mono_gc_wbarrier_generic_store (outArgs, (MonoObject*) out_args);
@@ -2872,7 +2872,7 @@ ves_icall_InternalExecute (MonoReflectionMethod *method, MonoObject *this_arg, M
                                MonoClassField* field = mono_class_get_field_from_name (k, str);
                                if (field) {
                                        MonoClass *field_klass =  mono_class_from_mono_type (field->type);
-                                       MonoObject *val = mono_array_get (params, gpointer, 2);
+                                       MonoObject *val = (MonoObject *)mono_array_get (params, gpointer, 2);
 
                                        if (field_klass->valuetype) {
                                                size = mono_type_size (field->type, &align);
@@ -2967,19 +2967,19 @@ write_enum_value (char *mem, int type, guint64 value)
        }
        case MONO_TYPE_U2:
        case MONO_TYPE_I2: {
-               guint16 *p = (void*)mem;
+               guint16 *p = (guint16 *)mem;
                *p = value;
                break;
        }
        case MONO_TYPE_U4:
        case MONO_TYPE_I4: {
-               guint32 *p = (void*)mem;
+               guint32 *p = (guint32 *)mem;
                *p = value;
                break;
        }
        case MONO_TYPE_U8:
        case MONO_TYPE_I8: {
-               guint64 *p = (void*)mem;
+               guint64 *p = (guint64 *)mem;
                *p = value;
                break;
        }
@@ -3479,7 +3479,7 @@ ves_icall_Type_GetMethodsByName (MonoReflectionType *type, MonoString *name, gui
        res = mono_array_new_specific (array_vtable, method_array->len);
 
        for (i = 0; i < method_array->len; ++i) {
-               MonoMethod *method = g_ptr_array_index (method_array, i);
+               MonoMethod *method = (MonoMethod *)g_ptr_array_index (method_array, i);
                mono_array_setref (res, i, mono_method_get_object (domain, method, refklass));
        }
 
@@ -3567,6 +3567,17 @@ property_hash (gconstpointer data)
        return g_str_hash (prop->name);
 }
 
+static gboolean
+method_declaring_signatures_equal (MonoMethod *method1, MonoMethod *method2)
+{
+       if (method1->is_inflated)
+               method1 = ((MonoMethodInflated*) method1)->declaring;
+       if (method2->is_inflated)
+               method2 = ((MonoMethodInflated*) method2)->declaring;
+
+       return mono_metadata_signature_equal (mono_method_signature (method1), mono_method_signature (method2));
+}
+
 static gboolean
 property_equal (MonoProperty *prop1, MonoProperty *prop2)
 {
@@ -3574,10 +3585,26 @@ property_equal (MonoProperty *prop1, MonoProperty *prop2)
        if (!g_str_equal (prop1->name, prop2->name))
                return FALSE;
 
-       if (prop1->get && prop2->get && !mono_metadata_signature_equal (mono_method_signature (prop1->get), mono_method_signature (prop2->get)))
+       /* If we see a property in a generic method, we want to
+          compare the generic signatures, not the inflated signatures
+          because we might conflate two properties that were
+          distinct:
+
+          class Foo<T,U> {
+            public T this[T t] { getter { return t; } } // method 1
+            public U this[U u] { getter { return u; } } // method 2
+          }
+
+          If we see int Foo<int,int>::Item[int] we need to know if
+          the indexer came from method 1 or from method 2, and we
+          shouldn't conflate them.   (Bugzilla 36283)
+       */
+       if (prop1->get && prop2->get && !method_declaring_signatures_equal (prop1->get, prop2->get))
                return FALSE;
-       if (prop1->set && prop2->set && !mono_metadata_signature_equal (mono_method_signature (prop1->set), mono_method_signature (prop2->set)))
+
+       if (prop1->set && prop2->set && !method_declaring_signatures_equal (prop1->set, prop2->set))
                return FALSE;
+
        return TRUE;
 }
 
@@ -5011,7 +5038,7 @@ ves_icall_System_Reflection_Assembly_GetTypes (MonoReflectionAssembly *assembly,
 
        ex_count = 0;
        for (i = 0; i < len; i++) {
-               MonoReflectionType *t = mono_array_get (res, gpointer, i);
+               MonoReflectionType *t = (MonoReflectionType *)mono_array_get (res, gpointer, i);
                MonoClass *klass;
 
                if (t) {
@@ -5038,7 +5065,7 @@ ves_icall_System_Reflection_Assembly_GetTypes (MonoReflectionAssembly *assembly,
                exl = mono_array_new (domain, mono_defaults.exception_class, length);
                /* Types for which mono_class_get_checked () succeeded */
                for (i = 0, tmp = list; tmp; i++, tmp = tmp->next) {
-                       MonoException *exc = mono_class_get_exception_for_failure (tmp->data);
+                       MonoException *exc = mono_class_get_exception_for_failure ((MonoClass *)tmp->data);
                        mono_array_setref (exl, i, exc);
                }
                /* Types for which it don't */
@@ -5230,12 +5257,12 @@ ves_icall_System_Reflection_Module_ResolveTypeToken (MonoImage *image, guint32 t
 
        if (image_is_dynamic (image)) {
                if ((table == MONO_TABLE_TYPEDEF) || (table == MONO_TABLE_TYPEREF)) {
-                       klass = mono_lookup_dynamic_token_class (image, token, FALSE, NULL, NULL);
+                       klass = (MonoClass *)mono_lookup_dynamic_token_class (image, token, FALSE, NULL, NULL);
                        return klass ? &klass->byval_arg : NULL;
                }
 
                init_generic_context_from_args (&context, type_args, method_args);
-               klass = mono_lookup_dynamic_token_class (image, token, FALSE, NULL, &context);
+               klass = (MonoClass *)mono_lookup_dynamic_token_class (image, token, FALSE, NULL, &context);
                return klass ? &klass->byval_arg : NULL;
        }
 
@@ -5276,7 +5303,7 @@ ves_icall_System_Reflection_Module_ResolveMethodToken (MonoImage *image, guint32
 
        if (image_is_dynamic (image)) {
                if (table == MONO_TABLE_METHOD)
-                       return mono_lookup_dynamic_token_class (image, token, FALSE, NULL, NULL);
+                       return (MonoMethod *)mono_lookup_dynamic_token_class (image, token, FALSE, NULL, NULL);
 
                if ((table == MONO_TABLE_MEMBERREF) && !(mono_memberref_is_method (image, token))) {
                        *resolve_error = ResolveTokenError_BadTable;
@@ -5284,7 +5311,7 @@ ves_icall_System_Reflection_Module_ResolveMethodToken (MonoImage *image, guint32
                }
 
                init_generic_context_from_args (&context, type_args, method_args);
-               return mono_lookup_dynamic_token_class (image, token, FALSE, NULL, &context);
+               return (MonoMethod *)mono_lookup_dynamic_token_class (image, token, FALSE, NULL, &context);
        }
 
        if ((index <= 0) || (index > image->tables [table].rows)) {
@@ -5317,7 +5344,7 @@ ves_icall_System_Reflection_Module_ResolveStringToken (MonoImage *image, guint32
        }
 
        if (image_is_dynamic (image))
-               return mono_lookup_dynamic_token_class (image, token, FALSE, NULL, NULL);
+               return (MonoString *)mono_lookup_dynamic_token_class (image, token, FALSE, NULL, NULL);
 
        if ((index <= 0) || (index >= image->heap_us.size)) {
                *error = ResolveTokenError_OutOfRange;
@@ -5349,7 +5376,7 @@ ves_icall_System_Reflection_Module_ResolveFieldToken (MonoImage *image, guint32
 
        if (image_is_dynamic (image)) {
                if (table == MONO_TABLE_FIELD)
-                       return mono_lookup_dynamic_token_class (image, token, FALSE, NULL, NULL);
+                       return (MonoClassField *)mono_lookup_dynamic_token_class (image, token, FALSE, NULL, NULL);
 
                if (mono_memberref_is_method (image, token)) {
                        *resolve_error = ResolveTokenError_BadTable;
@@ -5357,7 +5384,7 @@ ves_icall_System_Reflection_Module_ResolveFieldToken (MonoImage *image, guint32
                }
 
                init_generic_context_from_args (&context, type_args, method_args);
-               return mono_lookup_dynamic_token_class (image, token, FALSE, NULL, &context);
+               return (MonoClassField *)mono_lookup_dynamic_token_class (image, token, FALSE, NULL, &context);
        }
 
        if ((index <= 0) || (index > image->tables [table].rows)) {
@@ -5759,7 +5786,7 @@ ves_icall_Remoting_RealProxy_GetTransparentProxy (MonoObject *this_obj, MonoStri
        tp->custom_type_info = (mono_object_isinst (this_obj, mono_defaults.iremotingtypeinfo_class) != NULL);
        tp->remote_class = mono_remote_class (domain, class_name, klass);
 
-       res->vtable = mono_remote_class_vtable (domain, tp->remote_class, rp);
+       res->vtable = (MonoVTable *)mono_remote_class_vtable (domain, tp->remote_class, rp);
        return res;
 }
 
@@ -6094,7 +6121,7 @@ ves_icall_System_Environment_GetLogicalDrives (void)
                if (size > initial_size) {
                        if (ptr != buf)
                                g_free (ptr);
-                       ptr = g_malloc0 ((size + 1) * sizeof (gunichar2));
+                       ptr = (gunichar2 *)g_malloc0 ((size + 1) * sizeof (gunichar2));
                        initial_size = size;
                        size++;
                }
@@ -6461,7 +6488,7 @@ get_bundled_app_config (void)
                return NULL;
 
        len = config_file_path_length - config_ext_length;
-       module = g_malloc0 (len + 1);
+       module = (gchar *)g_malloc0 (len + 1);
        memcpy (module, config_file_path, len);
        // Get the config file from the module name
        app_config = mono_config_string_for_assembly_file (module);
@@ -6525,7 +6552,7 @@ ves_icall_get_resources_ptr (MonoReflectionAssembly *assembly, gpointer *result,
        *result = NULL;
        *size = 0;
        image = assembly->assembly->image;
-       entry = mono_image_lookup_resource (image, MONO_PE_RESOURCE_ID_ASPNET_STRING, 0, NULL);
+       entry = (MonoPEResourceDataEntry *)mono_image_lookup_resource (image, MONO_PE_RESOURCE_ID_ASPNET_STRING, 0, NULL);
        if (!entry)
                return FALSE;
 
@@ -6593,6 +6620,7 @@ ICALL_EXPORT MonoReflectionMethod *
 ves_icall_MonoMethod_get_base_method (MonoReflectionMethod *m, gboolean definition)
 {
        MonoClass *klass, *parent;
+       MonoGenericContext *generic_inst = NULL;
        MonoMethod *method = m->method;
        MonoMethod *result = NULL;
        int slot;
@@ -6610,21 +6638,75 @@ ves_icall_MonoMethod_get_base_method (MonoReflectionMethod *m, gboolean definiti
                return m;
 
        klass = method->klass;
-       if (klass->generic_class)
+       if (klass->generic_class) {
+               generic_inst = mono_class_get_context (klass);
                klass = klass->generic_class->container_class;
+       }
 
        if (definition) {
                /* At the end of the loop, klass points to the eldest class that has this virtual function slot. */
                for (parent = klass->parent; parent != NULL; parent = parent->parent) {
+                       /* on entry, klass is either a plain old non-generic class and generic_inst == NULL
+                          or klass is the generic container class and generic_inst is the instantiation.
+
+                          when we go to the parent, if the parent is an open constructed type, we need to
+                          replace the type parameters by the definitions from the generic_inst, and then take it
+                          apart again into the klass and the generic_inst.
+
+                          For cases like this:
+                          class C<T> : B<T, int> {
+                              public override void Foo () { ... }
+                          }
+                          class B<U,V> : A<HashMap<U,V>> {
+                              public override void Foo () { ... }
+                          }
+                          class A<X> {
+                              public virtual void Foo () { ... }
+                          }
+
+                          if at each iteration the parent isn't open, we can skip inflating it.  if at some
+                          iteration the parent isn't generic (after possible inflation), we set generic_inst to
+                          NULL;
+                       */
+                       MonoGenericContext *parent_inst = NULL;
+                       if (mono_class_is_open_constructed_type (mono_class_get_type (parent))) {
+                               MonoError error;
+                               parent = mono_class_inflate_generic_class_checked (parent, generic_inst, &error);
+                               mono_error_raise_exception(&error);
+                       }
+                       if (parent->generic_class) {
+                               parent_inst = mono_class_get_context (parent);
+                               parent = parent->generic_class->container_class;
+                       }
+
                        mono_class_setup_vtable (parent);
                        if (parent->vtable_size <= slot)
                                break;
                        klass = parent;
+                       generic_inst = parent_inst;
                }
        } else {
                klass = klass->parent;
                if (!klass)
                        return m;
+               if (mono_class_is_open_constructed_type (mono_class_get_type (klass))) {
+                       MonoError error;
+                       klass = mono_class_inflate_generic_class_checked (klass, generic_inst, &error);
+                       mono_error_raise_exception(&error);
+
+                       generic_inst = NULL;
+               }
+               if (klass->generic_class) {
+                       generic_inst = mono_class_get_context (klass);
+                       klass = klass->generic_class->container_class;
+               }
+
+       }
+
+       if (generic_inst) {
+               MonoError error;
+               klass = mono_class_inflate_generic_class_checked (klass, generic_inst, &error);
+               mono_error_raise_exception(&error);
        }
 
        if (klass == method->klass)
@@ -6772,7 +6854,7 @@ ICALL_EXPORT MonoObject*
 mono_TypedReference_ToObject (MonoTypedRef* tref)
 {
        if (MONO_TYPE_IS_REFERENCE (tref->type)) {
-               MonoObject** objp = tref->value;
+               MonoObject** objp = (MonoObject **)tref->value;
                return *objp;
        }
 
@@ -7266,19 +7348,19 @@ mono_icall_init (void)
 #endif
 
        icall_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-       mono_mutex_init (&icall_mutex);
+       mono_os_mutex_init (&icall_mutex);
 }
 
 static void
 mono_icall_lock (void)
 {
-       mono_locks_mutex_acquire (&icall_mutex, IcallLock);
+       mono_locks_os_acquire (&icall_mutex, IcallLock);
 }
 
 static void
 mono_icall_unlock (void)
 {
-       mono_locks_mutex_release (&icall_mutex, IcallLock);
+       mono_locks_os_release (&icall_mutex, IcallLock);
 }
 
 void
@@ -7287,7 +7369,7 @@ mono_icall_cleanup (void)
        g_hash_table_destroy (icall_hash);
        g_hash_table_destroy (jit_icall_hash_name);
        g_hash_table_destroy (jit_icall_hash_addr);
-       mono_mutex_destroy (&icall_mutex);
+       mono_os_mutex_destroy (&icall_mutex);
 }
 
 void
@@ -7313,7 +7395,7 @@ compare_method_imap (const void *key, const void *elem)
 static gpointer
 find_method_icall (const IcallTypeDesc *imap, const char *name)
 {
-       const guint16 *nameslot = mono_binary_search (name, icall_names_idx + imap->first_icall, icall_desc_num_icalls (imap), sizeof (icall_names_idx [0]), compare_method_imap);
+       const guint16 *nameslot = (const guint16 *)mono_binary_search (name, icall_names_idx + imap->first_icall, icall_desc_num_icalls (imap), sizeof (icall_names_idx [0]), compare_method_imap);
        if (!nameslot)
                return NULL;
        return (gpointer)icall_functions [(nameslot - &icall_names_idx [0])];
@@ -7329,7 +7411,7 @@ compare_class_imap (const void *key, const void *elem)
 static const IcallTypeDesc*
 find_class_icalls (const char *name)
 {
-       const guint16 *nameslot = mono_binary_search (name, icall_type_names_idx, Icall_type_num, sizeof (icall_type_names_idx [0]), compare_class_imap);
+       const guint16 *nameslot = (const guint16 *)mono_binary_search (name, icall_type_names_idx, Icall_type_num, sizeof (icall_type_names_idx [0]), compare_class_imap);
        if (!nameslot)
                return NULL;
        return &icall_type_descs [nameslot - &icall_type_names_idx [0]];
@@ -7588,48 +7670,48 @@ mono_lookup_icall_symbol (MonoMethod *m)
 }
 
 static MonoType*
-type_from_typename (char *typename)
+type_from_typename (char *type_name)
 {
        MonoClass *klass = NULL;        /* assignment to shut GCC warning up */
 
-       if (!strcmp (typename, "int"))
+       if (!strcmp (type_name, "int"))
                klass = mono_defaults.int_class;
-       else if (!strcmp (typename, "ptr"))
+       else if (!strcmp (type_name, "ptr"))
                klass = mono_defaults.int_class;
-       else if (!strcmp (typename, "void"))
+       else if (!strcmp (type_name, "void"))
                klass = mono_defaults.void_class;
-       else if (!strcmp (typename, "int32"))
+       else if (!strcmp (type_name, "int32"))
                klass = mono_defaults.int32_class;
-       else if (!strcmp (typename, "uint32"))
+       else if (!strcmp (type_name, "uint32"))
                klass = mono_defaults.uint32_class;
-       else if (!strcmp (typename, "int8"))
+       else if (!strcmp (type_name, "int8"))
                klass = mono_defaults.sbyte_class;
-       else if (!strcmp (typename, "uint8"))
+       else if (!strcmp (type_name, "uint8"))
                klass = mono_defaults.byte_class;
-       else if (!strcmp (typename, "int16"))
+       else if (!strcmp (type_name, "int16"))
                klass = mono_defaults.int16_class;
-       else if (!strcmp (typename, "uint16"))
+       else if (!strcmp (type_name, "uint16"))
                klass = mono_defaults.uint16_class;
-       else if (!strcmp (typename, "long"))
+       else if (!strcmp (type_name, "long"))
                klass = mono_defaults.int64_class;
-       else if (!strcmp (typename, "ulong"))
+       else if (!strcmp (type_name, "ulong"))
                klass = mono_defaults.uint64_class;
-       else if (!strcmp (typename, "float"))
+       else if (!strcmp (type_name, "float"))
                klass = mono_defaults.single_class;
-       else if (!strcmp (typename, "double"))
+       else if (!strcmp (type_name, "double"))
                klass = mono_defaults.double_class;
-       else if (!strcmp (typename, "object"))
+       else if (!strcmp (type_name, "object"))
                klass = mono_defaults.object_class;
-       else if (!strcmp (typename, "obj"))
+       else if (!strcmp (type_name, "obj"))
                klass = mono_defaults.object_class;
-       else if (!strcmp (typename, "string"))
+       else if (!strcmp (type_name, "string"))
                klass = mono_defaults.string_class;
-       else if (!strcmp (typename, "bool"))
+       else if (!strcmp (type_name, "bool"))
                klass = mono_defaults.boolean_class;
-       else if (!strcmp (typename, "boolean"))
+       else if (!strcmp (type_name, "boolean"))
                klass = mono_defaults.boolean_class;
        else {
-               g_error ("%s", typename);
+               g_error ("%s", type_name);
                g_assert_not_reached ();
        }
        return &klass->byval_arg;
@@ -7648,7 +7730,7 @@ mono_create_icall_signature (const char *sigstr)
        MonoImage *corlib = mono_defaults.corlib;
 
        mono_image_lock (corlib);
-       res = g_hash_table_lookup (corlib->helper_signatures, sigstr);
+       res = (MonoMethodSignature *)g_hash_table_lookup (corlib->helper_signatures, sigstr);
        mono_image_unlock (corlib);
 
        if (res)
@@ -7682,7 +7764,7 @@ mono_create_icall_signature (const char *sigstr)
        g_strfreev (parts);
 
        mono_image_lock (corlib);
-       res2 = g_hash_table_lookup (corlib->helper_signatures, sigstr);
+       res2 = (MonoMethodSignature *)g_hash_table_lookup (corlib->helper_signatures, sigstr);
        if (res2)
                res = res2; /*Value is allocated in the image pool*/
        else
@@ -7699,7 +7781,7 @@ mono_find_jit_icall_by_name (const char *name)
        g_assert (jit_icall_hash_name);
 
        mono_icall_lock ();
-       info = g_hash_table_lookup (jit_icall_hash_name, name);
+       info = (MonoJitICallInfo *)g_hash_table_lookup (jit_icall_hash_name, name);
        mono_icall_unlock ();
        return info;
 }
@@ -7711,7 +7793,7 @@ mono_find_jit_icall_by_addr (gconstpointer addr)
        g_assert (jit_icall_hash_addr);
 
        mono_icall_lock ();
-       info = g_hash_table_lookup (jit_icall_hash_addr, (gpointer)addr);
+       info = (MonoJitICallInfo *)g_hash_table_lookup (jit_icall_hash_addr, (gpointer)addr);
        mono_icall_unlock ();
 
        return info;
@@ -7741,7 +7823,7 @@ mono_lookup_jit_icall_symbol (const char *name)
        const char *res = NULL;
 
        mono_icall_lock ();
-       info = g_hash_table_lookup (jit_icall_hash_name, name);
+       info = (MonoJitICallInfo *)g_hash_table_lookup (jit_icall_hash_name, name);
        if (info)
                res = info->c_symbol;
        mono_icall_unlock ();

diff --git a/mono/metadata/image-internals.h b/mono/metadata/image-internals.h
index 3bfd9553dcccad3db4eb315c3f32580e92dd346f..e5211176d8eeb390d84f797d0f4d036759316d82 100644 (file)
--- a/mono/metadata/image-internals.h
+++ b/mono/metadata/image-internals.h
@@ -4,28 +4,9 @@
 #ifndef __MONO_METADATA_IMAGE_INTERNALS_H__
 #define __MONO_METADATA_IMAGE_INTERNALS_H__
 
-#ifdef CHECKED_BUILD
-
 #include <mono/metadata/image.h>
-#include <mono/metadata/metadata-internals.h>
-
-typedef struct
-{
-       MonoImage *image;
-       MonoImageSet *image_set;
-} MonoMemPoolOwner;
-
-static MonoMemPoolOwner mono_mempool_no_owner = {NULL,NULL};
-
-static gboolean
-check_mempool_owner_eq (MonoMemPoolOwner a, MonoMemPoolOwner b)
-{
-       return a.image == b.image && a.image_set == b.image_set;
-}
-
-MonoMemPoolOwner
-mono_find_mempool_owner (void *ptr);
 
-#endif /* CHECKED_BUILD */
+MonoImage *
+mono_find_image_owner (void *ptr);
 
 #endif /* __MONO_METADATA_IMAGE_INTERNALS_H__ */

diff --git a/mono/metadata/image.c b/mono/metadata/image.c
index 158831256dc2eacb34f728ef746fb950e60f5cda..fbbf58f6b3ea541d87a28fd78b583fa492585bbb 100644 (file)
--- a/mono/metadata/image.c
+++ b/mono/metadata/image.c
@@ -79,8 +79,8 @@ static GHashTable *get_loaded_images_by_name_hash (gboolean refonly)
 
 static gboolean debug_assembly_unload = FALSE;
 
-#define mono_images_lock() if (mutex_inited) mono_mutex_lock (&images_mutex)
-#define mono_images_unlock() if (mutex_inited) mono_mutex_unlock (&images_mutex)
+#define mono_images_lock() if (mutex_inited) mono_os_mutex_lock (&images_mutex)
+#define mono_images_unlock() if (mutex_inited) mono_os_mutex_unlock (&images_mutex)
 static gboolean mutex_inited;
 static mono_mutex_t images_mutex;
 
@@ -114,7 +114,7 @@ mono_remove_image_unload_hook (MonoImageUnloadFunc func, gpointer user_data)
        ImageUnloadHook *hook;
 
        for (l = image_unload_hooks; l; l = l->next) {
-               hook = l->data;
+               hook = (ImageUnloadHook *)l->data;
 
                if (hook->func == func && hook->user_data == user_data) {
                        g_free (hook);
@@ -131,7 +131,7 @@ mono_image_invoke_unload_hook (MonoImage *image)
        ImageUnloadHook *hook;
 
        for (l = image_unload_hooks; l; l = l->next) {
-               hook = l->data;
+               hook = (ImageUnloadHook *)l->data;
 
                hook->func (image, hook->user_data);
        }
@@ -149,7 +149,7 @@ mono_install_image_loader (const MonoImageLoader *loader)
 guint32
 mono_cli_rva_image_map (MonoImage *image, guint32 addr)
 {
-       MonoCLIImageInfo *iinfo = image->image_info;
+       MonoCLIImageInfo *iinfo = (MonoCLIImageInfo *)image->image_info;
        const int top = iinfo->cli_section_count;
        MonoSectionTable *tables = iinfo->cli_section_tables;
        int i;
@@ -185,7 +185,7 @@ mono_cli_rva_image_map (MonoImage *image, guint32 addr)
 char *
 mono_image_rva_map (MonoImage *image, guint32 addr)
 {
-       MonoCLIImageInfo *iinfo = image->image_info;
+       MonoCLIImageInfo *iinfo = (MonoCLIImageInfo *)image->image_info;
        const int top = iinfo->cli_section_count;
        MonoSectionTable *tables = iinfo->cli_section_tables;
        int i;
@@ -222,7 +222,7 @@ mono_image_rva_map (MonoImage *image, guint32 addr)
 void
 mono_images_init (void)
 {
-       mono_mutex_init_recursive (&images_mutex);
+       mono_os_mutex_init_recursive (&images_mutex);
 
        int hash_idx;
        for(hash_idx = 0; hash_idx < IMAGES_HASH_COUNT; hash_idx++)
@@ -246,7 +246,7 @@ mono_images_cleanup (void)
        GHashTableIter iter;
        MonoImage *image;
 
-       mono_mutex_destroy (&images_mutex);
+       mono_os_mutex_destroy (&images_mutex);
 
        // If an assembly image is still loaded at shutdown, this could indicate managed code is still running.
        // Reflection-only images being still loaded doesn't indicate anything as harmful, so we don't check for it.
@@ -274,7 +274,7 @@ mono_images_cleanup (void)
 int
 mono_image_ensure_section_idx (MonoImage *image, int section)
 {
-       MonoCLIImageInfo *iinfo = image->image_info;
+       MonoCLIImageInfo *iinfo = (MonoCLIImageInfo *)image->image_info;
        MonoSectionTable *sect;
        
        g_return_val_if_fail (section < iinfo->cli_section_count, FALSE);
@@ -309,7 +309,7 @@ mono_image_ensure_section_idx (MonoImage *image, int section)
 int
 mono_image_ensure_section (MonoImage *image, const char *section)
 {
-       MonoCLIImageInfo *ii = image->image_info;
+       MonoCLIImageInfo *ii = (MonoCLIImageInfo *)image->image_info;
        int i;
        
        for (i = 0; i < ii->cli_section_count; i++){
@@ -697,7 +697,7 @@ mono_image_load_module (MonoImage *image, int idx)
 static gpointer
 class_key_extract (gpointer value)
 {
-       MonoClass *klass = value;
+       MonoClass *klass = (MonoClass *)value;
 
        return GUINT_TO_POINTER (klass->type_token);
 }
@@ -705,7 +705,7 @@ class_key_extract (gpointer value)
 static gpointer*
 class_next_value (gpointer value)
 {
-       MonoClass *klass = value;
+       MonoClass *klass = (MonoClass *)value;
 
        return (gpointer*)&klass->next_class_cache;
 }
@@ -713,8 +713,8 @@ class_next_value (gpointer value)
 void
 mono_image_init (MonoImage *image)
 {
-       mono_mutex_init_recursive (&image->lock);
-       mono_mutex_init_recursive (&image->szarray_cache_lock);
+       mono_os_mutex_init_recursive (&image->lock);
+       mono_os_mutex_init_recursive (&image->szarray_cache_lock);
 
        image->mempool = mono_mempool_new_size (INITIAL_IMAGE_SIZE);
        mono_internal_hash_table_init (&image->class_cache,
@@ -894,7 +894,7 @@ pe_image_load_pe_data (MonoImage *image)
        MonoMSDOSHeader msdos;
        gint32 offset = 0;
 
-       iinfo = image->image_info;
+       iinfo = (MonoCLIImageInfo *)image->image_info;
        header = &iinfo->cli_header;
 
 #ifdef HOST_WIN32
@@ -963,7 +963,7 @@ pe_image_load_cli_data (MonoImage *image)
        MonoCLIImageInfo *iinfo;
        MonoDotNetHeader *header;
 
-       iinfo = image->image_info;
+       iinfo = (MonoCLIImageInfo *)image->image_info;
        header = &iinfo->cli_header;
 
        /* Load the CLI header */
@@ -1034,12 +1034,12 @@ do_mono_image_load (MonoImage *image, MonoImageOpenStatus *status,
 
        mono_image_init (image);
 
-       iinfo = image->image_info;
+       iinfo = (MonoCLIImageInfo *)image->image_info;
        header = &iinfo->cli_header;
 
        if (!image->metadata_only) {
                for (l = image_loaders; l; l = l->next) {
-                       MonoImageLoader *loader = l->data;
+                       MonoImageLoader *loader = (MonoImageLoader *)l->data;
                        if (loader->match (image)) {
                                image->loader = loader;
                                break;
@@ -1062,7 +1062,7 @@ do_mono_image_load (MonoImage *image, MonoImageOpenStatus *status,
                if (!mono_image_load_pe_data (image))
                        goto invalid_image;
        } else {
-               image->loader = &pe_loader;
+               image->loader = (MonoImageLoader*)&pe_loader;
        }
 
        if (care_about_cli == FALSE) {
@@ -1091,7 +1091,7 @@ done:
 
 invalid_image:
        if (errors) {
-               MonoVerifyInfo *info = errors->data;
+               MonoVerifyInfo *info = (MonoVerifyInfo *)errors->data;
                g_warning ("Could not load image %s due to %s", image->name, info->message);
                mono_free_verify_list (errors);
        }
@@ -1127,11 +1127,11 @@ do_mono_image_open (const char *fname, MonoImageOpenStatus *status,
        image = g_new0 (MonoImage, 1);
        image->raw_buffer_used = TRUE;
        image->raw_data_len = mono_file_map_size (filed);
-       image->raw_data = mono_file_map (image->raw_data_len, MONO_MMAP_READ|MONO_MMAP_PRIVATE, mono_file_map_fd (filed), 0, &image->raw_data_handle);
+       image->raw_data = (char *)mono_file_map (image->raw_data_len, MONO_MMAP_READ|MONO_MMAP_PRIVATE, mono_file_map_fd (filed), 0, &image->raw_data_handle);
 #if defined(HAVE_MMAP) && !defined (HOST_WIN32)
        if (!image->raw_data) {
                image->fileio_used = TRUE;
-               image->raw_data = mono_file_map_fileio (image->raw_data_len, MONO_MMAP_READ|MONO_MMAP_PRIVATE, mono_file_map_fd (filed), 0, &image->raw_data_handle);
+               image->raw_data = (char *)mono_file_map_fileio (image->raw_data_len, MONO_MMAP_READ|MONO_MMAP_PRIVATE, mono_file_map_fd (filed), 0, &image->raw_data_handle);
        }
 #endif
        if (!image->raw_data) {
@@ -1170,9 +1170,9 @@ mono_image_loaded_full (const char *name, gboolean refonly)
        MonoImage *res;
 
        mono_images_lock ();
-       res = g_hash_table_lookup (get_loaded_images_hash (refonly), name);
+       res = (MonoImage *)g_hash_table_lookup (get_loaded_images_hash (refonly), name);
        if (!res)
-               res = g_hash_table_lookup (get_loaded_images_by_name_hash (refonly), name);
+               res = (MonoImage *)g_hash_table_lookup (get_loaded_images_by_name_hash (refonly), name);
        mono_images_unlock ();
 
        return res;
@@ -1200,12 +1200,12 @@ typedef struct {
 static void
 find_by_guid (gpointer key, gpointer val, gpointer user_data)
 {
-       GuidData *data = user_data;
+       GuidData *data = (GuidData *)user_data;
        MonoImage *image;
 
        if (data->res)
                return;
-       image = val;
+       image = (MonoImage *)val;
        if (strcmp (data->guid, mono_image_get_guid (image)) == 0)
                data->res = image;
 }
@@ -1237,7 +1237,7 @@ register_image (MonoImage *image)
        GHashTable *loaded_images = get_loaded_images_hash (image->ref_only);
 
        mono_images_lock ();
-       image2 = g_hash_table_lookup (loaded_images, image->name);
+       image2 = (MonoImage *)g_hash_table_lookup (loaded_images, image->name);
 
        if (image2) {
                /* Somebody else beat us to it */
@@ -1270,7 +1270,7 @@ mono_image_open_from_data_internal (char *data, guint32 data_len, gboolean need_
        }
        datac = data;
        if (need_copy) {
-               datac = g_try_malloc (data_len);
+               datac = (char *)g_try_malloc (data_len);
                if (!datac) {
                        if (status)
                                *status = MONO_IMAGE_ERROR_ERRNO;
@@ -1429,7 +1429,7 @@ mono_image_open_full (const char *fname, MonoImageOpenStatus *status, gboolean r
         * the same image, we discard all but the first copy.
         */
        mono_images_lock ();
-       image = g_hash_table_lookup (loaded_images, absfname);
+       image = (MonoImage *)g_hash_table_lookup (loaded_images, absfname);
        g_free (absfname);
 
        if (image) { // Image already loaded
@@ -1669,7 +1669,7 @@ mono_image_close_except_pools (MonoImage *image)
 
        loaded_images         = get_loaded_images_hash (image->ref_only);
        loaded_images_by_name = get_loaded_images_by_name_hash (image->ref_only);
-       image2 = g_hash_table_lookup (loaded_images, image->name);
+       image2 = (MonoImage *)g_hash_table_lookup (loaded_images, image->name);
        if (image == image2) {
                /* This is not true if we are called from mono_image_open () */
                g_hash_table_remove (loaded_images, image->name);
@@ -1740,7 +1740,7 @@ mono_image_close_except_pools (MonoImage *image)
        if (image->raw_data_allocated) {
                /* FIXME: do we need this? (image is disposed anyway) */
                /* image->raw_metadata and cli_sections might lie inside image->raw_data */
-               MonoCLIImageInfo *ii = image->image_info;
+               MonoCLIImageInfo *ii = (MonoCLIImageInfo *)image->image_info;
 
                if ((image->raw_metadata > image->raw_data) &&
                        (image->raw_metadata <= (image->raw_data + image->raw_data_len)))
@@ -1829,7 +1829,7 @@ mono_image_close_except_pools (MonoImage *image)
                mono_bitset_free (image->interface_bitset);
        }
        if (image->image_info){
-               MonoCLIImageInfo *ii = image->image_info;
+               MonoCLIImageInfo *ii = (MonoCLIImageInfo *)image->image_info;
 
                if (ii->cli_section_tables)
                        g_free (ii->cli_section_tables);
@@ -1847,8 +1847,8 @@ mono_image_close_except_pools (MonoImage *image)
        if (image->modules_loaded)
                g_free (image->modules_loaded);
 
-       mono_mutex_destroy (&image->szarray_cache_lock);
-       mono_mutex_destroy (&image->lock);
+       mono_os_mutex_destroy (&image->szarray_cache_lock);
+       mono_os_mutex_destroy (&image->lock);
 
        /*g_print ("destroy image %p (dynamic: %d)\n", image, image->dynamic);*/
        if (image_is_dynamic (image)) {
@@ -2049,7 +2049,7 @@ mono_image_lookup_resource (MonoImage *image, guint32 res_id, guint32 lang_id, g
 
        mono_image_ensure_section_idx (image, MONO_SECTION_RSRC);
 
-       info=image->image_info;
+       info = (MonoCLIImageInfo *)image->image_info;
        if(info==NULL) {
                return(NULL);
        }
@@ -2122,7 +2122,7 @@ mono_image_get_entry_point (MonoImage *image)
 const char*
 mono_image_get_resource (MonoImage *image, guint32 offset, guint32 *size)
 {
-       MonoCLIImageInfo *iinfo = image->image_info;
+       MonoCLIImageInfo *iinfo = (MonoCLIImageInfo *)image->image_info;
        MonoCLIHeader *ch = &iinfo->cli_cli_header;
        const char* data;
 
@@ -2212,7 +2212,7 @@ done:
 const char*
 mono_image_get_strong_name (MonoImage *image, guint32 *size)
 {
-       MonoCLIImageInfo *iinfo = image->image_info;
+       MonoCLIImageInfo *iinfo = (MonoCLIImageInfo *)image->image_info;
        MonoPEDirEntry *de = &iinfo->cli_cli_header.ch_strong_name;
        const char* data;
 
@@ -2240,7 +2240,7 @@ mono_image_get_strong_name (MonoImage *image, guint32 *size)
 guint32
 mono_image_strong_name_position (MonoImage *image, guint32 *size)
 {
-       MonoCLIImageInfo *iinfo = image->image_info;
+       MonoCLIImageInfo *iinfo = (MonoCLIImageInfo *)image->image_info;
        MonoPEDirEntry *de = &iinfo->cli_cli_header.ch_strong_name;
        guint32 pos;
 
@@ -2384,7 +2384,7 @@ mono_image_is_dynamic (MonoImage *image)
 gboolean
 mono_image_has_authenticode_entry (MonoImage *image)
 {
-       MonoCLIImageInfo *iinfo = image->image_info;
+       MonoCLIImageInfo *iinfo = (MonoCLIImageInfo *)image->image_info;
        MonoDotNetHeader *header = &iinfo->cli_header;
        MonoPEDirEntry *de = &header->datadir.pe_certificate_table;
        // the Authenticode "pre" (non ASN.1) header is 8 bytes long
@@ -2441,7 +2441,7 @@ g_list_prepend_image (MonoImage *image, GList *list, gpointer data)
 {
        GList *new_list;
        
-       new_list = mono_image_alloc (image, sizeof (GList));
+       new_list = (GList *)mono_image_alloc (image, sizeof (GList));
        new_list->data = data;
        new_list->prev = list ? list->prev : NULL;
     new_list->next = list;
@@ -2459,7 +2459,7 @@ g_slist_append_image (MonoImage *image, GSList *list, gpointer data)
 {
        GSList *new_list;
 
-       new_list = mono_image_alloc (image, sizeof (GSList));
+       new_list = (GSList *)mono_image_alloc (image, sizeof (GSList));
        new_list->data = data;
        new_list->next = NULL;
 
@@ -2469,13 +2469,13 @@ g_slist_append_image (MonoImage *image, GSList *list, gpointer data)
 void
 mono_image_lock (MonoImage *image)
 {
-       mono_locks_acquire (&image->lock, ImageDataLock);
+       mono_locks_os_acquire (&image->lock, ImageDataLock);
 }
 
 void
 mono_image_unlock (MonoImage *image)
 {
-       mono_locks_release (&image->lock, ImageDataLock);
+       mono_locks_os_release (&image->lock, ImageDataLock);
 }
 
 
@@ -2538,51 +2538,24 @@ mono_image_append_class_to_reflection_info_set (MonoClass *klass)
        mono_image_unlock (image);
 }
 
-#if CHECKED_BUILD
-
-// These are support for the mempool reference tracking feature in checked-build, but live in image.c due to use of static variables of this file.
-
-// Given an image and a pointer, return the mempool owner if it is either this image or one of its imagesets.
-static MonoMemPoolOwner
-check_for_mempool_owner (void *ptr, MonoImage *image)
-{
-       if (mono_mempool_contains_addr (image->mempool, ptr))
-       {
-               MonoMemPoolOwner owner = {image, NULL};
-               return owner;
-       }
-
-       GSList *l;
-       for (l = image->image_sets; l; l = l->next) {
-               MonoImageSet *set = l->data;
-
-               if (mono_mempool_contains_addr (set->mempool, ptr))
-               {
-                       MonoMemPoolOwner owner = {NULL, set};
-                       return owner;
-               }
-       }
-
-       return mono_mempool_no_owner;
-}
+// This is support for the mempool reference tracking feature in checked-build, but lives in image.c due to use of static variables of this file.
 
 /**
- * mono_find_mempool_owner:
+ * mono_find_image_owner:
  *
- * Find the image or imageset, if any, which a given pointer is located in the memory of.
+ * Find the image, if any, which a given pointer is located in the memory of.
  */
-MonoMemPoolOwner
-mono_find_mempool_owner (void *ptr)
+MonoImage *
+mono_find_image_owner (void *ptr)
 {
        mono_images_lock ();
 
-       MonoMemPoolOwner owner = mono_mempool_no_owner;
-       gboolean searching = TRUE;
+       MonoImage *owner = NULL;
 
        // Iterate over both by-path image hashes
        const int hash_candidates[] = {IMAGES_HASH_PATH, IMAGES_HASH_PATH_REFONLY};
        int hash_idx;
-       for (hash_idx = 0; searching && hash_idx < G_N_ELEMENTS (hash_candidates); hash_idx++)
+       for (hash_idx = 0; !owner && hash_idx < G_N_ELEMENTS (hash_candidates); hash_idx++)
        {
                GHashTable *target = loaded_images_hashes [hash_candidates [hash_idx]];
                GHashTableIter iter;
@@ -2590,14 +2563,12 @@ mono_find_mempool_owner (void *ptr)
 
                // Iterate over images within a hash
                g_hash_table_iter_init (&iter, target);
-               while (searching && g_hash_table_iter_next(&iter, NULL, (gpointer *)&image))
+               while (!owner && g_hash_table_iter_next(&iter, NULL, (gpointer *)&image))
                {
                        mono_image_lock (image);
-                       owner = check_for_mempool_owner (ptr, image);
+                       if (mono_mempool_contains_addr (image->mempool, ptr))
+                               owner = image;
                        mono_image_unlock (image);
-
-                       // Continue searching if null owner returned
-                       searching = check_mempool_owner_eq (owner, mono_mempool_no_owner);
                }
        }
 
@@ -2605,5 +2576,3 @@ mono_find_mempool_owner (void *ptr)
 
        return owner;
 }
-
-#endif

diff --git a/mono/metadata/jit-info.c b/mono/metadata/jit-info.c
index 06375a4977384fa0470080717388e77d08baed90..33dd5471c5fc713016ed172149a0b0642720d9bb 100644 (file)
--- a/mono/metadata/jit-info.c
+++ b/mono/metadata/jit-info.c
@@ -90,7 +90,7 @@ jit_info_table_new_chunk (void)
 MonoJitInfoTable *
 mono_jit_info_table_new (MonoDomain *domain)
 {
-       MonoJitInfoTable *table = g_malloc0 (MONO_SIZEOF_JIT_INFO_TABLE + sizeof (MonoJitInfoTableChunk*));
+       MonoJitInfoTable *table = (MonoJitInfoTable *)g_malloc0 (MONO_SIZEOF_JIT_INFO_TABLE + sizeof (MonoJitInfoTableChunk*));
 
        table->domain = domain;
        table->num_chunks = 1;
@@ -197,7 +197,7 @@ jit_info_table_chunk_index (MonoJitInfoTableChunk *chunk, MonoThreadHazardPointe
 
        while (left < right) {
                int pos = (left + right) / 2;
-               MonoJitInfo *ji = get_hazardous_pointer((gpointer volatile*)&chunk->data [pos], hp, JIT_INFO_HAZARD_INDEX);
+               MonoJitInfo *ji = (MonoJitInfo *)get_hazardous_pointer((gpointer volatile*)&chunk->data [pos], hp, JIT_INFO_HAZARD_INDEX);
                gint8 *code_end = (gint8*)ji->code_start + ji->code_size;
 
                if (addr < code_end)
@@ -230,7 +230,7 @@ jit_info_table_find (MonoJitInfoTable *table, MonoThreadHazardPointers *hp, gint
                MonoJitInfoTableChunk *chunk = table->chunks [chunk_pos];
 
                while (pos < chunk->num_elements) {
-                       ji = get_hazardous_pointer ((gpointer volatile*)&chunk->data [pos], hp, JIT_INFO_HAZARD_INDEX);
+                       ji = (MonoJitInfo *)get_hazardous_pointer ((gpointer volatile*)&chunk->data [pos], hp, JIT_INFO_HAZARD_INDEX);
 
                        ++pos;
 
@@ -288,7 +288,7 @@ mono_jit_info_table_find_internal (MonoDomain *domain, char *addr, gboolean try_
           table by a hazard pointer and make sure that the pointer is
           still there after we've made it hazardous, we don't have to
           worry about the writer freeing the table. */
-       table = get_hazardous_pointer ((gpointer volatile*)&domain->jit_info_table, hp, JIT_INFO_TABLE_HAZARD_INDEX);
+       table = (MonoJitInfoTable *)get_hazardous_pointer ((gpointer volatile*)&domain->jit_info_table, hp, JIT_INFO_TABLE_HAZARD_INDEX);
 
        ji = jit_info_table_find (table, hp, (gint8*)addr);
        if (hp)
@@ -300,7 +300,7 @@ mono_jit_info_table_find_internal (MonoDomain *domain, char *addr, gboolean try_
 
        /* Maybe its an AOT module */
        if (try_aot && mono_get_root_domain () && mono_get_root_domain ()->aot_modules) {
-               table = get_hazardous_pointer ((gpointer volatile*)&mono_get_root_domain ()->aot_modules, hp, JIT_INFO_TABLE_HAZARD_INDEX);
+               table = (MonoJitInfoTable *)get_hazardous_pointer ((gpointer volatile*)&mono_get_root_domain ()->aot_modules, hp, JIT_INFO_TABLE_HAZARD_INDEX);
                module_ji = jit_info_table_find (table, hp, (gint8*)addr);
                if (module_ji)
                        ji = jit_info_find_in_aot_func (domain, module_ji->d.image, addr);
@@ -370,7 +370,7 @@ jit_info_table_realloc (MonoJitInfoTable *old)
        int required_size;
        int num_chunks;
        int new_chunk, new_element;
-       MonoJitInfoTable *new;
+       MonoJitInfoTable *result;
 
        /* number of needed places for elements needed */
        required_size = (int)((long)num_elements * JIT_INFO_TABLE_FILL_RATIO_DENOM / JIT_INFO_TABLE_FILL_RATIO_NOM);
@@ -381,12 +381,12 @@ jit_info_table_realloc (MonoJitInfoTable *old)
        }
        g_assert (num_chunks > 0);
 
-       new = g_malloc (MONO_SIZEOF_JIT_INFO_TABLE + sizeof (MonoJitInfoTableChunk*) * num_chunks);
-       new->domain = old->domain;
-       new->num_chunks = num_chunks;
+       result = (MonoJitInfoTable *)g_malloc (MONO_SIZEOF_JIT_INFO_TABLE + sizeof (MonoJitInfoTableChunk*) * num_chunks);
+       result->domain = old->domain;
+       result->num_chunks = num_chunks;
 
        for (i = 0; i < num_chunks; ++i)
-               new->chunks [i] = jit_info_table_new_chunk ();
+               result->chunks [i] = jit_info_table_new_chunk ();
 
        new_chunk = 0;
        new_element = 0;
@@ -398,9 +398,9 @@ jit_info_table_realloc (MonoJitInfoTable *old)
                for (j = 0; j < chunk_num_elements; ++j) {
                        if (!IS_JIT_INFO_TOMBSTONE (chunk->data [j])) {
                                g_assert (new_chunk < num_chunks);
-                               new->chunks [new_chunk]->data [new_element] = chunk->data [j];
+                               result->chunks [new_chunk]->data [new_element] = chunk->data [j];
                                if (++new_element >= JIT_INFO_TABLE_FILLED_NUM_ELEMENTS) {
-                                       new->chunks [new_chunk]->num_elements = new_element;
+                                       result->chunks [new_chunk]->num_elements = new_element;
                                        ++new_chunk;
                                        new_element = 0;
                                }
@@ -410,18 +410,18 @@ jit_info_table_realloc (MonoJitInfoTable *old)
 
        if (new_chunk < num_chunks) {
                g_assert (new_chunk == num_chunks - 1);
-               new->chunks [new_chunk]->num_elements = new_element;
-               g_assert (new->chunks [new_chunk]->num_elements > 0);
+               result->chunks [new_chunk]->num_elements = new_element;
+               g_assert (result->chunks [new_chunk]->num_elements > 0);
        }
 
        for (i = 0; i < num_chunks; ++i) {
-               MonoJitInfoTableChunk *chunk = new->chunks [i];
+               MonoJitInfoTableChunk *chunk = result->chunks [i];
                MonoJitInfo *ji = chunk->data [chunk->num_elements - 1];
 
-               new->chunks [i]->last_code_end = (gint8*)ji->code_start + ji->code_size;
+               result->chunks [i]->last_code_end = (gint8*)ji->code_start + ji->code_size;
        }
 
-       return new;
+       return result;
 }
 
 static void
@@ -450,7 +450,7 @@ jit_info_table_split_chunk (MonoJitInfoTableChunk *chunk, MonoJitInfoTableChunk
 static MonoJitInfoTable*
 jit_info_table_copy_and_split_chunk (MonoJitInfoTable *table, MonoJitInfoTableChunk *chunk)
 {
-       MonoJitInfoTable *new_table = g_malloc (MONO_SIZEOF_JIT_INFO_TABLE
+       MonoJitInfoTable *new_table = (MonoJitInfoTable *)g_malloc (MONO_SIZEOF_JIT_INFO_TABLE
                + sizeof (MonoJitInfoTableChunk*) * (table->num_chunks + 1));
        int i, j;
 
@@ -477,28 +477,28 @@ jit_info_table_copy_and_split_chunk (MonoJitInfoTable *table, MonoJitInfoTableCh
 static MonoJitInfoTableChunk*
 jit_info_table_purify_chunk (MonoJitInfoTableChunk *old)
 {
-       MonoJitInfoTableChunk *new = jit_info_table_new_chunk ();
+       MonoJitInfoTableChunk *result = jit_info_table_new_chunk ();
        int i, j;
 
        j = 0;
        for (i = 0; i < old->num_elements; ++i) {
                if (!IS_JIT_INFO_TOMBSTONE (old->data [i]))
-                       new->data [j++] = old->data [i];
+                       result->data [j++] = old->data [i];
        }
 
-       new->num_elements = j;
-       if (new->num_elements > 0)
-               new->last_code_end = (gint8*)new->data [j - 1]->code_start + new->data [j - 1]->code_size;
+       result->num_elements = j;
+       if (result->num_elements > 0)
+               result->last_code_end = (gint8*)result->data [j - 1]->code_start + result->data [j - 1]->code_size;
        else
-               new->last_code_end = old->last_code_end;
+               result->last_code_end = old->last_code_end;
 
-       return new;
+       return result;
 }
 
 static MonoJitInfoTable*
 jit_info_table_copy_and_purify_chunk (MonoJitInfoTable *table, MonoJitInfoTableChunk *chunk)
 {
-       MonoJitInfoTable *new_table = g_malloc (MONO_SIZEOF_JIT_INFO_TABLE
+       MonoJitInfoTable *new_table = (MonoJitInfoTable *)g_malloc (MONO_SIZEOF_JIT_INFO_TABLE
                + sizeof (MonoJitInfoTableChunk*) * table->num_chunks);
        int i, j;
 
@@ -690,10 +690,10 @@ jit_info_table_remove (MonoJitInfoTable *table, MonoJitInfo *ji)
        gpointer start = ji->code_start;
        int chunk_pos, pos;
 
-       chunk_pos = jit_info_table_index (table, start);
+       chunk_pos = jit_info_table_index (table, (gint8 *)start);
        g_assert (chunk_pos < table->num_chunks);
 
-       pos = jit_info_table_chunk_index (table->chunks [chunk_pos], NULL, start);
+       pos = jit_info_table_chunk_index (table->chunks [chunk_pos], NULL, (gint8 *)start);
 
        do {
                chunk = table->chunks [chunk_pos];

diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c
index b99d6a00b1168fc4ccd5be41af8686ab7c62bb64..0566fe2d1028268ae0b92dd1531422364d750289 100644 (file)
--- a/mono/metadata/loader.c
+++ b/mono/metadata/loader.c
@@ -56,7 +56,8 @@ MonoDefaults mono_defaults;
  * See domain-internals.h for locking policy in combination with the
  * domain lock.
  */
-static mono_mutex_t loader_mutex, global_loader_data_mutex;
+static MonoCoopMutex loader_mutex;
+static mono_mutex_t global_loader_data_mutex;
 static gboolean loader_lock_inited;
 
 /* Statistics */
@@ -82,13 +83,13 @@ static void dllmap_cleanup (void);
 static void
 global_loader_data_lock (void)
 {
-       mono_locks_acquire (&global_loader_data_mutex, LoaderGlobalDataLock);
+       mono_locks_os_acquire (&global_loader_data_mutex, LoaderGlobalDataLock);
 }
 
 static void
 global_loader_data_unlock (void)
 {
-       mono_locks_release (&global_loader_data_mutex, LoaderGlobalDataLock);
+       mono_locks_os_release (&global_loader_data_mutex, LoaderGlobalDataLock);
 }
 
 void
@@ -97,8 +98,8 @@ mono_loader_init ()
        static gboolean inited;
 
        if (!inited) {
-               mono_mutex_init_recursive (&loader_mutex);
-               mono_mutex_init_recursive (&global_loader_data_mutex);
+               mono_coop_mutex_init_recursive (&loader_mutex);
+               mono_os_mutex_init_recursive (&global_loader_data_mutex);
                loader_lock_inited = TRUE;
 
                mono_native_tls_alloc (&loader_error_thread_id, NULL);
@@ -126,8 +127,8 @@ mono_loader_cleanup (void)
        mono_native_tls_free (loader_error_thread_id);
        mono_native_tls_free (loader_lock_nest_id);
 
-       mono_mutex_destroy (&loader_mutex);
-       mono_mutex_destroy (&global_loader_data_mutex);
+       mono_coop_mutex_destroy (&loader_mutex);
+       mono_os_mutex_destroy (&global_loader_data_mutex);
        loader_lock_inited = FALSE;     
 }
 
@@ -460,7 +461,7 @@ field_from_memberref (MonoImage *image, guint32 token, MonoClass **retklass,
        MonoTableInfo *tables = image->tables;
        MonoType *sig_type;
        guint32 cols[6];
-       guint32 nindex, class;
+       guint32 nindex, class_index;
        const char *fname;
        const char *ptr;
        guint32 idx = mono_metadata_token_index (token);
@@ -469,16 +470,16 @@ field_from_memberref (MonoImage *image, guint32 token, MonoClass **retklass,
 
        mono_metadata_decode_row (&tables [MONO_TABLE_MEMBERREF], idx-1, cols, MONO_MEMBERREF_SIZE);
        nindex = cols [MONO_MEMBERREF_CLASS] >> MONO_MEMBERREF_PARENT_BITS;
-       class = cols [MONO_MEMBERREF_CLASS] & MONO_MEMBERREF_PARENT_MASK;
+       class_index = cols [MONO_MEMBERREF_CLASS] & MONO_MEMBERREF_PARENT_MASK;
 
        fname = mono_metadata_string_heap (image, cols [MONO_MEMBERREF_NAME]);
 
        if (!mono_verifier_verify_memberref_field_signature (image, cols [MONO_MEMBERREF_SIGNATURE], NULL)) {
-               mono_error_set_bad_image (error, image, "Bad field '%s' signature 0x%08x", class, token);
+               mono_error_set_bad_image (error, image, "Bad field '%s' signature 0x%08x", class_index, token);
                return NULL;
        }
 
-       switch (class) {
+       switch (class_index) {
        case MONO_MEMBERREF_PARENT_TYPEDEF:
                klass = mono_class_get_checked (image, MONO_TOKEN_TYPE_DEF | nindex, error);
                break;
@@ -489,7 +490,7 @@ field_from_memberref (MonoImage *image, guint32 token, MonoClass **retklass,
                klass = mono_class_get_and_inflate_typespec_checked (image, MONO_TOKEN_TYPE_SPEC | nindex, context, error);
                break;
        default:
-               mono_error_set_bad_image (error, image, "Bad field field '%s' signature 0x%08x", class, token);
+               mono_error_set_bad_image (error, image, "Bad field field '%s' signature 0x%08x", class_index, token);
        }
 
        if (!klass)
@@ -500,21 +501,21 @@ field_from_memberref (MonoImage *image, guint32 token, MonoClass **retklass,
        /* we may want to check the signature here... */
 
        if (*ptr++ != 0x6) {
-               mono_error_set_field_load (error, klass, fname, "Bad field signature class token %08x field name %s token %08x", class, fname, token);
+               mono_error_set_field_load (error, klass, fname, "Bad field signature class token %08x field name %s token %08x", class_index, fname, token);
                return NULL;
        }
 
        /* FIXME: This needs a cache, especially for generic instances, since
         * mono_metadata_parse_type () allocates everything from a mempool.
         */
-       sig_type = find_cached_memberref_sig (image, cols [MONO_MEMBERREF_SIGNATURE]);
+       sig_type = (MonoType *)find_cached_memberref_sig (image, cols [MONO_MEMBERREF_SIGNATURE]);
        if (!sig_type) {
                sig_type = mono_metadata_parse_type (image, MONO_PARSE_TYPE, 0, ptr, &ptr);
                if (sig_type == NULL) {
                        mono_error_set_field_load (error, klass, fname, "Could not parse field '%s' signature %08x", fname, token);
                        return NULL;
                }
-               sig_type = cache_memberref_sig (image, cols [MONO_MEMBERREF_SIGNATURE], sig_type);
+               sig_type = (MonoType *)cache_memberref_sig (image, cols [MONO_MEMBERREF_SIGNATURE], sig_type);
        }
 
        mono_class_init (klass); /*FIXME is this really necessary?*/
@@ -561,7 +562,7 @@ mono_field_from_token_checked (MonoImage *image, guint32 token, MonoClass **retk
                MonoClass *handle_class;
 
                *retklass = NULL;
-               result = mono_lookup_dynamic_token_class (image, token, TRUE, &handle_class, context);
+               result = (MonoClassField *)mono_lookup_dynamic_token_class (image, token, TRUE, &handle_class, context);
                // This checks the memberref type as well
                if (!result || handle_class != mono_defaults.fieldhandle_class) {
                        mono_error_set_bad_image (error, image, "Bad field token 0x%08x", token);
@@ -571,7 +572,7 @@ mono_field_from_token_checked (MonoImage *image, guint32 token, MonoClass **retk
                return result;
        }
 
-       if ((field = mono_conc_hashtable_lookup (image->field_cache, GUINT_TO_POINTER (token)))) {
+       if ((field = (MonoClassField *)mono_conc_hashtable_lookup (image->field_cache, GUINT_TO_POINTER (token)))) {
                *retklass = field->parent;
                return field;
        }
@@ -814,7 +815,7 @@ inflate_generic_signature_checked (MonoImage *image, MonoMethodSignature *sig, M
        if (!context)
                return sig;
 
-       res = g_malloc0 (MONO_SIZEOF_METHOD_SIGNATURE + ((gint32)sig->param_count) * sizeof (MonoType*));
+       res = (MonoMethodSignature *)g_malloc0 (MONO_SIZEOF_METHOD_SIGNATURE + ((gint32)sig->param_count) * sizeof (MonoType*));
        res->param_count = sig->param_count;
        res->sentinelpos = -1;
        res->ret = mono_class_inflate_generic_type_checked (sig->ret, context, error);
@@ -874,7 +875,7 @@ inflate_generic_header (MonoMethodHeader *header, MonoGenericContext *context)
 {
        MonoMethodHeader *res;
        int i;
-       res = g_malloc0 (MONO_SIZEOF_METHOD_HEADER + sizeof (gpointer) * header->num_locals);
+       res = (MonoMethodHeader *)g_malloc0 (MONO_SIZEOF_METHOD_HEADER + sizeof (gpointer) * header->num_locals);
        res->code = header->code;
        res->code_size = header->code_size;
        res->max_stack = header->max_stack;
@@ -885,7 +886,7 @@ inflate_generic_header (MonoMethodHeader *header, MonoGenericContext *context)
        for (i = 0; i < header->num_locals; ++i)
                res->locals [i] = mono_class_inflate_generic_type (header->locals [i], context);
        if (res->num_clauses) {
-               res->clauses = g_memdup (header->clauses, sizeof (MonoExceptionClause) * res->num_clauses);
+               res->clauses = (MonoExceptionClause *)g_memdup (header->clauses, sizeof (MonoExceptionClause) * res->num_clauses);
                for (i = 0; i < header->num_clauses; ++i) {
                        MonoExceptionClause *clause = &res->clauses [i];
                        if (clause->flags != MONO_EXCEPTION_CLAUSE_NONE)
@@ -950,14 +951,14 @@ mono_method_get_signature_checked (MonoMethod *method, MonoImage *image, guint32
                mono_metadata_decode_row (&image->tables [MONO_TABLE_MEMBERREF], idx-1, cols, MONO_MEMBERREF_SIZE);
                sig_idx = cols [MONO_MEMBERREF_SIGNATURE];
 
-               sig = find_cached_memberref_sig (image, sig_idx);
+               sig = (MonoMethodSignature *)find_cached_memberref_sig (image, sig_idx);
                if (!sig) {
                        if (!mono_verifier_verify_memberref_method_signature (image, sig_idx, NULL)) {
-                               guint32 class = cols [MONO_MEMBERREF_CLASS] & MONO_MEMBERREF_PARENT_MASK;
+                               guint32 klass = cols [MONO_MEMBERREF_CLASS] & MONO_MEMBERREF_PARENT_MASK;
                                const char *fname = mono_metadata_string_heap (image, cols [MONO_MEMBERREF_NAME]);
 
                                //FIXME include the verification error
-                               mono_error_set_bad_image (error, image, "Bad method signature class token 0x%08x field name %s token 0x%08x", class, fname, token);
+                               mono_error_set_bad_image (error, image, "Bad method signature class token 0x%08x field name %s token 0x%08x", klass, fname, token);
                                return NULL;
                        }
 
@@ -968,14 +969,14 @@ mono_method_get_signature_checked (MonoMethod *method, MonoImage *image, guint32
                        if (!sig)
                                return NULL;
 
-                       sig = cache_memberref_sig (image, sig_idx, sig);
+                       sig = (MonoMethodSignature *)cache_memberref_sig (image, sig_idx, sig);
                }
                /* FIXME: we probably should verify signature compat in the dynamic case too*/
                if (!mono_verifier_is_sig_compatible (image, method, sig)) {
-                       guint32 class = cols [MONO_MEMBERREF_CLASS] & MONO_MEMBERREF_PARENT_MASK;
+                       guint32 klass = cols [MONO_MEMBERREF_CLASS] & MONO_MEMBERREF_PARENT_MASK;
                        const char *fname = mono_metadata_string_heap (image, cols [MONO_MEMBERREF_NAME]);
 
-                       mono_error_set_bad_image (error, image, "Incompatible method signature class token 0x%08x field name %s token 0x%08x", class, fname, token);
+                       mono_error_set_bad_image (error, image, "Incompatible method signature class token 0x%08x field name %s token 0x%08x", klass, fname, token);
                        return NULL;
                }
        }
@@ -1040,7 +1041,7 @@ method_from_memberref (MonoImage *image, guint32 idx, MonoGenericContext *typesp
        MonoMethod *method = NULL;
        MonoTableInfo *tables = image->tables;
        guint32 cols[6];
-       guint32 nindex, class, sig_idx;
+       guint32 nindex, class_index, sig_idx;
        const char *mname;
        MonoMethodSignature *sig;
        const char *ptr;
@@ -1049,7 +1050,7 @@ method_from_memberref (MonoImage *image, guint32 idx, MonoGenericContext *typesp
 
        mono_metadata_decode_row (&tables [MONO_TABLE_MEMBERREF], idx-1, cols, 3);
        nindex = cols [MONO_MEMBERREF_CLASS] >> MONO_MEMBERREF_PARENT_BITS;
-       class = cols [MONO_MEMBERREF_CLASS] & MONO_MEMBERREF_PARENT_MASK;
+       class_index = cols [MONO_MEMBERREF_CLASS] & MONO_MEMBERREF_PARENT_MASK;
        /*g_print ("methodref: 0x%x 0x%x %s\n", class, nindex,
                mono_metadata_string_heap (m, cols [MONO_MEMBERREF_NAME]));*/
 
@@ -1061,9 +1062,9 @@ method_from_memberref (MonoImage *image, guint32 idx, MonoGenericContext *typesp
         * method into a cache.
         */
        if (used_context)
-               *used_context = class == MONO_MEMBERREF_PARENT_TYPESPEC;
+               *used_context = class_index == MONO_MEMBERREF_PARENT_TYPESPEC;
 
-       switch (class) {
+       switch (class_index) {
        case MONO_MEMBERREF_PARENT_TYPEREF:
                klass = mono_class_from_typeref_checked (image, MONO_TOKEN_TYPE_REF | nindex, error);
                if (!klass)
@@ -1089,7 +1090,7 @@ method_from_memberref (MonoImage *image, guint32 idx, MonoGenericContext *typesp
                return method;
        }
        default:
-               mono_error_set_bad_image (error, image, "Memberref parent unknown: class: %d, index %d", class, nindex);
+               mono_error_set_bad_image (error, image, "Memberref parent unknown: class: %d, index %d", class_index, nindex);
                goto fail;
        }
 
@@ -1106,16 +1107,16 @@ method_from_memberref (MonoImage *image, guint32 idx, MonoGenericContext *typesp
        ptr = mono_metadata_blob_heap (image, sig_idx);
        mono_metadata_decode_blob_size (ptr, &ptr);
 
-       sig = find_cached_memberref_sig (image, sig_idx);
+       sig = (MonoMethodSignature *)find_cached_memberref_sig (image, sig_idx);
        if (!sig) {
                sig = mono_metadata_parse_method_signature_full (image, NULL, 0, ptr, NULL, error);
                if (sig == NULL)
                        goto fail;
 
-               sig = cache_memberref_sig (image, sig_idx, sig);
+               sig = (MonoMethodSignature *)cache_memberref_sig (image, sig_idx, sig);
        }
 
-       switch (class) {
+       switch (class_index) {
        case MONO_MEMBERREF_PARENT_TYPEREF:
        case MONO_MEMBERREF_PARENT_TYPEDEF:
                method = find_method (klass, NULL, mname, sig, klass, error);
@@ -1137,7 +1138,7 @@ method_from_memberref (MonoImage *image, guint32 idx, MonoGenericContext *typesp
                break;
        }
        default:
-               mono_error_set_bad_image (error, image,"Memberref parent unknown: class: %d, index %d", class, nindex);
+               mono_error_set_bad_image (error, image,"Memberref parent unknown: class: %d, index %d", class_index, nindex);
                goto fail;
        }
 
@@ -1331,7 +1332,7 @@ mono_dllmap_insert (MonoImage *assembly, const char *dll, const char *func, cons
        mono_loader_init ();
 
        if (!assembly) {
-               entry = g_malloc0 (sizeof (MonoDllMap));
+               entry = (MonoDllMap *)g_malloc0 (sizeof (MonoDllMap));
                entry->dll = dll? g_strdup (dll): NULL;
                entry->target = tdll? g_strdup (tdll): NULL;
                entry->func = func? g_strdup (func): NULL;
@@ -1342,7 +1343,7 @@ mono_dllmap_insert (MonoImage *assembly, const char *dll, const char *func, cons
                global_dll_map = entry;
                global_loader_data_unlock ();
        } else {
-               entry = mono_image_alloc0 (assembly, sizeof (MonoDllMap));
+               entry = (MonoDllMap *)mono_image_alloc0 (assembly, sizeof (MonoDllMap));
                entry->dll = dll? mono_image_strdup (assembly, dll): NULL;
                entry->target = tdll? mono_image_strdup (assembly, tdll): NULL;
                entry->func = func? mono_image_strdup (assembly, func): NULL;
@@ -1389,7 +1390,7 @@ cached_module_load (const char *name, int flags, char **err)
        global_loader_data_lock ();
        if (!global_module_map)
                global_module_map = g_hash_table_new (g_str_hash, g_str_equal);
-       res = g_hash_table_lookup (global_module_map, name);
+       res = (MonoDl *)g_hash_table_lookup (global_module_map, name);
        if (res) {
                global_loader_data_unlock ();
                return res;
@@ -1445,7 +1446,7 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char
 
        if (image_is_dynamic (method->klass->image)) {
                MonoReflectionMethodAux *method_aux = 
-                       g_hash_table_lookup (
+                       (MonoReflectionMethodAux *)g_hash_table_lookup (
                                ((MonoDynamicImage*)method->klass->image)->method_aux_hash, method);
                if (!method_aux)
                        return NULL;
@@ -1476,8 +1477,8 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char
                        image->pinvoke_scopes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
                        image->pinvoke_scope_filenames = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
                }
-               module = g_hash_table_lookup (image->pinvoke_scopes, new_scope);
-               found_name = g_hash_table_lookup (image->pinvoke_scope_filenames, new_scope);
+               module = (MonoDl *)g_hash_table_lookup (image->pinvoke_scopes, new_scope);
+               found_name = (char *)g_hash_table_lookup (image->pinvoke_scope_filenames, new_scope);
                mono_image_unlock (image);
                if (module)
                        cached = TRUE;
@@ -1865,7 +1866,7 @@ mono_get_method_from_token (MonoImage *image, guint32 token, MonoClass *klass,
        if (image_is_dynamic (image)) {
                MonoClass *handle_class;
 
-               result = mono_lookup_dynamic_token_class (image, token, TRUE, &handle_class, context);
+               result = (MonoMethod *)mono_lookup_dynamic_token_class (image, token, TRUE, &handle_class, context);
                mono_loader_assert_no_error ();
 
                // This checks the memberref type as well
@@ -1942,6 +1943,7 @@ mono_get_method_from_token (MonoImage *image, guint32 token, MonoClass *klass,
        if (generic_container) {
                result->is_generic = TRUE;
                generic_container->owner.method = result;
+               generic_container->is_anonymous = FALSE; // Method is now known, container is no longer anonymous
                /*FIXME put this before the image alloc*/
                if (!mono_metadata_load_generic_param_constraints_checked (image, token, generic_container, error))
                        return NULL;
@@ -2010,11 +2012,11 @@ mono_get_method_checked (MonoImage *image, guint32 token, MonoClass *klass, Mono
        if (mono_metadata_token_table (token) == MONO_TABLE_METHOD) {
                if (!image->method_cache)
                        image->method_cache = g_hash_table_new (NULL, NULL);
-               result = g_hash_table_lookup (image->method_cache, GINT_TO_POINTER (mono_metadata_token_index (token)));
+               result = (MonoMethod *)g_hash_table_lookup (image->method_cache, GINT_TO_POINTER (mono_metadata_token_index (token)));
        } else if (!image_is_dynamic (image)) {
                if (!image->methodref_cache)
                        image->methodref_cache = g_hash_table_new (NULL, NULL);
-               result = g_hash_table_lookup (image->methodref_cache, GINT_TO_POINTER (token));
+               result = (MonoMethod *)g_hash_table_lookup (image->methodref_cache, GINT_TO_POINTER (token));
        }
        mono_image_unlock (image);
 
@@ -2031,9 +2033,9 @@ mono_get_method_checked (MonoImage *image, guint32 token, MonoClass *klass, Mono
                MonoMethod *result2 = NULL;
 
                if (mono_metadata_token_table (token) == MONO_TABLE_METHOD)
-                       result2 = g_hash_table_lookup (image->method_cache, GINT_TO_POINTER (mono_metadata_token_index (token)));
+                       result2 = (MonoMethod *)g_hash_table_lookup (image->method_cache, GINT_TO_POINTER (mono_metadata_token_index (token)));
                else if (!image_is_dynamic (image))
-                       result2 = g_hash_table_lookup (image->methodref_cache, GINT_TO_POINTER (token));
+                       result2 = (MonoMethod *)g_hash_table_lookup (image->methodref_cache, GINT_TO_POINTER (token));
 
                if (result2) {
                        mono_image_unlock (image);
@@ -2229,7 +2231,7 @@ mono_method_get_param_names (MonoMethod *method, const char **names)
 
        if (image_is_dynamic (klass->image)) {
                MonoReflectionMethodAux *method_aux = 
-                       g_hash_table_lookup (
+                       (MonoReflectionMethodAux *)g_hash_table_lookup (
                                ((MonoDynamicImage*)method->klass->image)->method_aux_hash, method);
                if (method_aux && method_aux->param_names) {
                        for (i = 0; i < mono_method_signature (method)->param_count; ++i)
@@ -2244,7 +2246,7 @@ mono_method_get_param_names (MonoMethod *method, const char **names)
 
                mono_image_lock (klass->image);
                if (klass->image->wrapper_param_names)
-                       pnames = g_hash_table_lookup (klass->image->wrapper_param_names, method);
+                       pnames = (char **)g_hash_table_lookup (klass->image->wrapper_param_names, method);
                mono_image_unlock (klass->image);
 
                if (pnames) {
@@ -2320,7 +2322,7 @@ mono_method_get_marshal_info (MonoMethod *method, MonoMarshalSpec **mspecs)
 
        if (image_is_dynamic (method->klass->image)) {
                MonoReflectionMethodAux *method_aux = 
-                       g_hash_table_lookup (
+                       (MonoReflectionMethodAux *)g_hash_table_lookup (
                                ((MonoDynamicImage*)method->klass->image)->method_aux_hash, method);
                if (method_aux && method_aux->param_marshall) {
                        MonoMarshalSpec **dyn_specs = method_aux->param_marshall;
@@ -2375,7 +2377,7 @@ mono_method_has_marshal_info (MonoMethod *method)
 
        if (image_is_dynamic (method->klass->image)) {
                MonoReflectionMethodAux *method_aux = 
-                       g_hash_table_lookup (
+                       (MonoReflectionMethodAux *)g_hash_table_lookup (
                                ((MonoDynamicImage*)method->klass->image)->method_aux_hash, method);
                MonoMarshalSpec **dyn_specs = method_aux->param_marshall;
                if (dyn_specs) {
@@ -2420,7 +2422,7 @@ mono_method_get_wrapper_data (MonoMethod *method, guint32 id)
 
        if (method->is_inflated)
                method = ((MonoMethodInflated *) method)->declaring;
-       data = ((MonoMethodWrapper *)method)->method_data;
+       data = (void **)((MonoMethodWrapper *)method)->method_data;
        g_assert (data != NULL);
        g_assert (id <= GPOINTER_TO_UINT (*data));
        return data [id];
@@ -2434,7 +2436,7 @@ typedef struct {
 static gboolean
 stack_walk_adapter (MonoStackFrameInfo *frame, MonoContext *ctx, gpointer data)
 {
-       StackWalkUserData *d = data;
+       StackWalkUserData *d = (StackWalkUserData *)data;
 
        switch (frame->type) {
        case FRAME_TYPE_DEBUGGER_INVOKE:
@@ -2474,7 +2476,7 @@ typedef struct {
 static gboolean
 async_stack_walk_adapter (MonoStackFrameInfo *frame, MonoContext *ctx, gpointer data)
 {
-       AsyncStackWalkUserData *d = data;
+       AsyncStackWalkUserData *d = (AsyncStackWalkUserData *)data;
 
        switch (frame->type) {
        case FRAME_TYPE_DEBUGGER_INVOKE:
@@ -2515,7 +2517,7 @@ mono_stack_walk_async_safe (MonoStackWalkAsyncSafe func, void *initial_sig_conte
 static gboolean
 last_managed (MonoMethod *m, gint no, gint ilo, gboolean managed, gpointer data)
 {
-       MonoMethod **dest = data;
+       MonoMethod **dest = (MonoMethod **)data;
        *dest = m;
        /*g_print ("In %s::%s [%d] [%d]\n", m->klass->name, m->name, no, ilo);*/
 
@@ -2540,10 +2542,7 @@ static gboolean loader_lock_track_ownership = FALSE;
 void
 mono_loader_lock (void)
 {
-       MONO_TRY_BLOCKING;
-       mono_locks_acquire (&loader_mutex, LoaderLock);
-       MONO_FINISH_TRY_BLOCKING;
-               
+       mono_locks_coop_acquire (&loader_mutex, LoaderLock);
        if (G_UNLIKELY (loader_lock_track_ownership)) {
                mono_native_tls_set_value (loader_lock_nest_id, GUINT_TO_POINTER (GPOINTER_TO_UINT (mono_native_tls_get_value (loader_lock_nest_id)) + 1));
        }
@@ -2552,7 +2551,7 @@ mono_loader_lock (void)
 void
 mono_loader_unlock (void)
 {
-       mono_locks_release (&loader_mutex, LoaderLock);
+       mono_locks_coop_release (&loader_mutex, LoaderLock);
        if (G_UNLIKELY (loader_lock_track_ownership)) {
                mono_native_tls_set_value (loader_lock_nest_id, GUINT_TO_POINTER (GPOINTER_TO_UINT (mono_native_tls_get_value (loader_lock_nest_id)) - 1));
        }
@@ -2671,7 +2670,7 @@ mono_method_signature_checked (MonoMethod *m, MonoError *error)
 
        if (can_cache_signature) {
                mono_image_lock (img);
-               signature = g_hash_table_lookup (img->method_signatures, sig);
+               signature = (MonoMethodSignature *)g_hash_table_lookup (img->method_signatures, sig);
                mono_image_unlock (img);
        }
 
@@ -2689,7 +2688,7 @@ mono_method_signature_checked (MonoMethod *m, MonoError *error)
 
                if (can_cache_signature) {
                        mono_image_lock (img);
-                       sig2 = g_hash_table_lookup (img->method_signatures, sig);
+                       sig2 = (MonoMethodSignature *)g_hash_table_lookup (img->method_signatures, sig);
                        if (!sig2)
                                g_hash_table_insert (img->method_signatures, (gpointer)sig, signature);
                        mono_image_unlock (img);
@@ -2715,7 +2714,7 @@ mono_method_signature_checked (MonoMethod *m, MonoError *error)
        if (m->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL)
                signature->pinvoke = 1;
        else if (m->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
-               MonoCallConvention conv = 0;
+               MonoCallConvention conv = (MonoCallConvention)0;
                MonoMethodPInvoke *piinfo = (MonoMethodPInvoke *)m;
                signature->pinvoke = 1;
 
@@ -2866,7 +2865,7 @@ mono_method_get_header (MonoMethod *method)
        container = mono_method_get_generic_container (method);
        if (!container)
                container = method->klass->generic_container;
-       header = mono_metadata_parse_mh_full (img, container, loc);
+       header = mono_metadata_parse_mh_full (img, container, (const char *)loc);
 
        return header;
 }

diff --git a/mono/metadata/locales.c b/mono/metadata/locales.c
index 26732679cac03db1eee3afd590c7d45ba0565283..52e97eaca1efa3320afd009ecebb680026719eed 100644 (file)
--- a/mono/metadata/locales.c
+++ b/mono/metadata/locales.c
@@ -60,8 +60,8 @@ static const RegionInfoEntry* region_info_entry_from_lcid (int lcid);
 static int
 culture_lcid_locator (const void *a, const void *b)
 {
-       const int *lcid = a;
-       const CultureInfoEntry *bb = b;
+       const int *lcid = (const int *)a;
+       const CultureInfoEntry *bb = (const CultureInfoEntry *)b;
 
        return *lcid - bb->lcid;
 }
@@ -69,8 +69,8 @@ culture_lcid_locator (const void *a, const void *b)
 static int
 culture_name_locator (const void *a, const void *b)
 {
-       const char *aa = a;
-       const CultureInfoNameEntry *bb = b;
+       const char *aa = (const char *)a;
+       const CultureInfoNameEntry *bb = (const CultureInfoNameEntry *)b;
        int ret;
        
        ret = strcmp (aa, idx2string (bb->name));
@@ -81,8 +81,8 @@ culture_name_locator (const void *a, const void *b)
 static int
 region_name_locator (const void *a, const void *b)
 {
-       const char *aa = a;
-       const RegionInfoNameEntry *bb = b;
+       const char *aa = (const char *)a;
+       const RegionInfoNameEntry *bb = (const RegionInfoNameEntry *)b;
        int ret;
        
        ret = strcmp (aa, idx2string (bb->name));
@@ -167,7 +167,7 @@ ves_icall_System_Globalization_CalendarData_fill_calendar_data (MonoCalendarData
        char *n;
 
        n = mono_string_to_utf8 (name);
-       ne = mono_binary_search (n, culture_name_entries, NUM_CULTURE_ENTRIES,
+       ne = (const CultureInfoNameEntry *)mono_binary_search (n, culture_name_entries, NUM_CULTURE_ENTRIES,
                        sizeof (CultureInfoNameEntry), culture_name_locator);
        g_free (n);
        if (ne == NULL) {
@@ -317,7 +317,7 @@ culture_info_entry_from_lcid (int lcid)
 {
        const CultureInfoEntry *ci;
 
-       ci = mono_binary_search (&lcid, culture_entries, NUM_CULTURE_ENTRIES, sizeof (CultureInfoEntry), culture_lcid_locator);
+       ci = (const CultureInfoEntry *)mono_binary_search (&lcid, culture_entries, NUM_CULTURE_ENTRIES, sizeof (CultureInfoEntry), culture_lcid_locator);
 
        return ci;
 }
@@ -328,7 +328,7 @@ region_info_entry_from_lcid (int lcid)
        const RegionInfoEntry *entry;
        const CultureInfoEntry *ne;
 
-       ne = mono_binary_search (&lcid, culture_entries, NUM_CULTURE_ENTRIES, sizeof (CultureInfoEntry), culture_lcid_locator);
+       ne = (const CultureInfoEntry *)mono_binary_search (&lcid, culture_entries, NUM_CULTURE_ENTRIES, sizeof (CultureInfoEntry), culture_lcid_locator);
 
        if (ne == NULL)
                return FALSE;
@@ -509,7 +509,7 @@ ves_icall_System_Globalization_CultureInfo_construct_internal_locale_from_name (
        char *n;
        
        n = mono_string_to_utf8 (name);
-       ne = mono_binary_search (n, culture_name_entries, NUM_CULTURE_ENTRIES,
+       ne = (const CultureInfoNameEntry *)mono_binary_search (n, culture_name_entries, NUM_CULTURE_ENTRIES,
                        sizeof (CultureInfoNameEntry), culture_name_locator);
 
        if (ne == NULL) {
@@ -557,7 +557,7 @@ ves_icall_System_Globalization_RegionInfo_construct_internal_region_from_name (M
        char *n;
        
        n = mono_string_to_utf8 (name);
-       ne = mono_binary_search (n, region_name_entries, NUM_REGION_ENTRIES,
+       ne = (const RegionInfoNameEntry *)mono_binary_search (n, region_name_entries, NUM_REGION_ENTRIES,
                sizeof (RegionInfoNameEntry), region_name_locator);
 
        if (ne == NULL) {
@@ -666,12 +666,12 @@ int ves_icall_System_Threading_Thread_current_lcid (void)
        return(0x007F);
 }
 
-MonoString *ves_icall_System_String_InternalReplace_Str_Comp (MonoString *this_obj, MonoString *old, MonoString *new, MonoCompareInfo *comp)
+MonoString *ves_icall_System_String_InternalReplace_Str_Comp (MonoString *this_obj, MonoString *old, MonoString *new_, MonoCompareInfo *comp)
 {
        /* Do a normal ascii string compare and replace, as we only
         * know the invariant locale if we dont have ICU
         */
-       return(string_invariant_replace (this_obj, old, new));
+       return(string_invariant_replace (this_obj, old, new_));
 }
 
 static gint32 string_invariant_compare_char (gunichar2 c1, gunichar2 c2,

diff --git a/mono/metadata/lock-tracer.c b/mono/metadata/lock-tracer.c
index ab39f393b58a42346754d3fb1e90b8d759c7e240..f0d2bca6ed49d12a513f5356d770a9790b2e53f3 100644 (file)
--- a/mono/metadata/lock-tracer.c
+++ b/mono/metadata/lock-tracer.c
@@ -31,8 +31,10 @@
  * 
  * To log more kind of locks just do the following:
  *     - add an entry into the RuntimeLocks enum
- *  - change mono_mutex_lock(mutex) to mono_locks_acquire (mutex, LockName)
- *  - change mono_mutex_unlock to mono_locks_release (mutex, LockName)
+ *  - change mono_os_mutex_lock(mutex) to mono_locks_os_acquire (mutex, LockName)
+ *  - change mono_os_mutex_unlock(mutex) to mono_locks_os_release (mutex, LockName)
+ *  - change mono_coop_mutex_lock(mutex) to mono_locks_coop_acquire (mutex, LockName)
+ *  - change mono_coop_mutex_unlock(mutex) to mono_locks_coop_release (mutex, LockName)
  *  - change the decoder to understand the new lock kind.
  *
  * TODO:
@@ -71,7 +73,7 @@ mono_locks_tracer_init (void)
        Dl_info info;
        int res;
        char *name;
-       mono_mutex_init_recursive (&tracer_lock);
+       mono_os_mutex_init_recursive (&tracer_lock);
        if (!g_getenv ("MONO_ENABLE_LOCK_TRACER"))
                return;
        name = g_strdup_printf ("locks.%d", getpid ());

diff --git a/mono/metadata/lock-tracer.h b/mono/metadata/lock-tracer.h
index 7c49bf4f59706b42bf1dfedccf81f32775626d32..ee4ab3419504a593ece5443c857a74792ae186af 100644 (file)
--- a/mono/metadata/lock-tracer.h
+++ b/mono/metadata/lock-tracer.h
@@ -4,7 +4,8 @@
 /*This is a private header*/
 #include <glib.h>
 
-#include "mono/utils/mono-compiler.h"
+#include "mono/utils/mono-os-mutex.h"
+#include "mono/utils/mono-coop-mutex.h"
 
 G_BEGIN_DECLS
 
@@ -39,25 +40,30 @@ void mono_locks_lock_released (RuntimeLocks kind, gpointer lock);
 
 #endif
 
-#define mono_locks_acquire(LOCK, NAME) do { \
-       mono_mutex_lock (LOCK); \
-       mono_locks_lock_acquired (NAME, LOCK); \
-} while (0)
-
-#define mono_locks_release(LOCK, NAME) do { \
-       mono_locks_lock_released (NAME, LOCK); \
-       mono_mutex_unlock (LOCK); \
-} while (0)
-
-#define mono_locks_mutex_acquire(LOCK, NAME) do { \
-       mono_mutex_lock (LOCK); \
-       mono_locks_lock_acquired (NAME, LOCK); \
-} while (0)
-
-#define mono_locks_mutex_release(LOCK, NAME) do { \
-       mono_locks_lock_released (NAME, LOCK); \
-       mono_mutex_unlock (LOCK); \
-} while (0)
+#define mono_locks_os_acquire(LOCK,NAME)       \
+       do {    \
+               mono_os_mutex_lock (LOCK);      \
+               mono_locks_lock_acquired (NAME, LOCK);  \
+       } while (0)
+
+#define mono_locks_os_release(LOCK,NAME)       \
+       do {    \
+               mono_locks_lock_released (NAME, LOCK);  \
+               mono_os_mutex_unlock (LOCK);    \
+       } while (0)
+
+#define mono_locks_coop_acquire(LOCK,NAME)     \
+       do {    \
+               mono_coop_mutex_lock (LOCK);    \
+               mono_locks_lock_acquired (NAME, LOCK);  \
+       } while (0)
+
+#define mono_locks_coop_release(LOCK,NAME)     \
+       do {    \
+               mono_locks_lock_released (NAME, LOCK);  \
+               mono_coop_mutex_unlock (LOCK);  \
+       } while (0)
+
 G_END_DECLS
 
 #endif /* __MONO_METADATA_LOCK_TRACER_H__ */

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index 0e2d8fb628593ed39aa6d3808623ea877d502dcc..830434175405988088d7f58a2f85b85de36d5bd9 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -66,8 +66,8 @@ enum {
  * The marshal lock is a non-recursive complex lock that sits below the domain lock in the
  * runtime locking latice. Which means it can take simple locks suck as the image lock.
  */
-#define mono_marshal_lock() mono_locks_acquire (&marshal_mutex, MarshalLock)
-#define mono_marshal_unlock() mono_locks_release (&marshal_mutex, MarshalLock)
+#define mono_marshal_lock() mono_locks_os_acquire (&marshal_mutex, MarshalLock)
+#define mono_marshal_unlock() mono_locks_os_release (&marshal_mutex, MarshalLock)
 static mono_mutex_t marshal_mutex;
 static gboolean marshal_mutex_initialized;
 
@@ -187,7 +187,7 @@ mono_marshal_init (void)
 
        if (!module_initialized) {
                module_initialized = TRUE;
-               mono_mutex_init_recursive (&marshal_mutex);
+               mono_os_mutex_init_recursive (&marshal_mutex);
                marshal_mutex_initialized = TRUE;
 
                register_icall (ves_icall_System_Threading_Thread_ResetAbort, "ves_icall_System_Threading_Thread_ResetAbort", "void", TRUE);
@@ -257,7 +257,7 @@ mono_marshal_cleanup (void)
 
        mono_native_tls_free (load_type_info_tls_id);
        mono_native_tls_free (last_error_tls_id);
-       mono_mutex_destroy (&marshal_mutex);
+       mono_os_mutex_destroy (&marshal_mutex);
        marshal_mutex_initialized = FALSE;
 }
 
@@ -436,7 +436,7 @@ mono_ftnptr_to_delegate (MonoClass *klass, gpointer ftn)
                else
                        d = NULL;
        } else {
-               d = g_hash_table_lookup (delegate_hash_table, ftn);
+               d = (MonoDelegate *)g_hash_table_lookup (delegate_hash_table, ftn);
                mono_marshal_unlock ();
        }
        if (d == NULL) {
@@ -502,11 +502,11 @@ mono_delegate_free_ftnptr (MonoDelegate *delegate)
                void **method_data;
                MonoMethod *method;
 
-               ji = mono_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (ptr));
+               ji = mono_jit_info_table_find (mono_domain_get (), (char *)mono_get_addr_from_ftnptr (ptr));
                g_assert (ji);
 
                method = mono_jit_info_get_method (ji);
-               method_data = ((MonoMethodWrapper*)method)->method_data;
+               method_data = (void **)((MonoMethodWrapper*)method)->method_data;
 
                /*the target gchandle is the first entry after size and the wrapper itself.*/
                gchandle = GPOINTER_TO_UINT (method_data [2]);
@@ -580,9 +580,9 @@ mono_array_to_lparray (MonoArray *array)
                break;
        case MONO_TYPE_CLASS:
                nativeArraySize = array->max_length;
-               nativeArray = malloc(sizeof(gpointer) * nativeArraySize);
+               nativeArray = (void **)malloc(sizeof(gpointer) * nativeArraySize);
                for(i = 0; i < nativeArraySize; ++i)    
-                       nativeArray[i] = ves_icall_System_Runtime_InteropServices_Marshal_GetIUnknownForObjectInternal(((gpointer*)array->vector)[i]);
+                       nativeArray[i] = ves_icall_System_Runtime_InteropServices_Marshal_GetIUnknownForObjectInternal(((MonoObject **)array->vector)[i]);
                return nativeArray;
        case MONO_TYPE_U1:
        case MONO_TYPE_BOOLEAN:
@@ -647,7 +647,7 @@ mono_byvalarray_to_array (MonoArray *arr, gpointer native_arr, MonoClass *elclas
                guint16 *ut;
                glong items_written;
 
-               ut = g_utf8_to_utf16 (native_arr, elnum, NULL, &items_written, &error);
+               ut = g_utf8_to_utf16 ((const gchar *)native_arr, elnum, NULL, &items_written, &error);
 
                if (!error) {
                        memcpy (mono_array_addr (arr, guint16, 0), ut, items_written * sizeof (guint16));
@@ -847,7 +847,7 @@ mono_string_builder_to_utf8 (MonoStringBuilder *sb)
                return NULL;
        } else {
                guint len = mono_string_builder_capacity (sb) + 1;
-               gchar *res = mono_marshal_alloc (len * sizeof (gchar));
+               gchar *res = (gchar *)mono_marshal_alloc (len * sizeof (gchar));
                g_assert (str_len < len);
                memcpy (res, tmp, str_len * sizeof (gchar));
                res[str_len] = '\0';
@@ -882,7 +882,7 @@ mono_string_builder_to_utf16 (MonoStringBuilder *sb)
        if (len == 0)
                len = 1;
 
-       gunichar2 *str = mono_marshal_alloc ((len + 1) * sizeof (gunichar2));
+       gunichar2 *str = (gunichar2 *)mono_marshal_alloc ((len + 1) * sizeof (gunichar2));
        str[len] = '\0';
 
        if (len == 0)
@@ -1798,7 +1798,7 @@ emit_struct_conv_full (MonoMethodBuilder *mb, MonoClass *klass, gboolean to_obje
                if (ftype->attrs & FIELD_ATTRIBUTE_STATIC)
                        continue;
 
-               ntype = mono_type_to_unmanaged (ftype, info->fields [i].mspec, TRUE, klass->unicode, &conv);
+               ntype = (MonoMarshalNative)mono_type_to_unmanaged (ftype, info->fields [i].mspec, TRUE, klass->unicode, &conv);
 
                if (last_field) {
                        msize = klass->instance_size - info->fields [i].field->offset;
@@ -1977,7 +1977,7 @@ emit_struct_conv_full (MonoMethodBuilder *mb, MonoClass *klass, gboolean to_obje
 static void
 emit_struct_conv (MonoMethodBuilder *mb, MonoClass *klass, gboolean to_object)
 {
-       emit_struct_conv_full (mb, klass, to_object, -1);
+       emit_struct_conv_full (mb, klass, to_object, (MonoMarshalNative)-1);
 }
 
 static void
@@ -2225,7 +2225,7 @@ mono_marshal_get_string_to_ptr_conv (MonoMethodPInvoke *piinfo, MonoMarshalSpec
        case MONO_NATIVE_BSTR:
                return MONO_MARSHAL_CONV_STR_BSTR;
        default:
-               return -1;
+               return (MonoMarshalConv)-1;
        }
 }
 
@@ -2245,7 +2245,7 @@ mono_marshal_get_stringbuilder_to_ptr_conv (MonoMethodPInvoke *piinfo, MonoMarsh
                return MONO_MARSHAL_CONV_SB_LPTSTR;
                break;
        default:
-               return -1;
+               return (MonoMarshalConv)-1;
        }
 }
 
@@ -2268,7 +2268,7 @@ mono_marshal_get_ptr_to_string_conv (MonoMethodPInvoke *piinfo, MonoMarshalSpec
        case MONO_NATIVE_BSTR:
                return MONO_MARSHAL_CONV_BSTR_STR;
        default:
-               return -1;
+               return (MonoMarshalConv)-1;
        }
 }
 
@@ -2294,7 +2294,7 @@ mono_marshal_get_ptr_to_stringbuilder_conv (MonoMethodPInvoke *piinfo, MonoMarsh
                return MONO_MARSHAL_CONV_LPTSTR_SB;
                break;
        default:
-               return -1;
+               return (MonoMarshalConv)-1;
        }
 }
 
@@ -2358,7 +2358,7 @@ mono_marshal_find_in_cache (GHashTable *cache, gpointer key)
        MonoMethod *res;
 
        mono_marshal_lock ();
-       res = g_hash_table_lookup (cache, key);
+       res = (MonoMethod *)g_hash_table_lookup (cache, key);
        mono_marshal_unlock ();
        return res;
 }
@@ -2392,13 +2392,13 @@ mono_mb_create_and_cache_full (GHashTable *cache, gpointer key,
                *out_found = FALSE;
 
        mono_marshal_lock ();
-       res = g_hash_table_lookup (cache, key);
+       res = (MonoMethod *)g_hash_table_lookup (cache, key);
        mono_marshal_unlock ();
        if (!res) {
                MonoMethod *newm;
                newm = mono_mb_create_method (mb, sig, max_stack);
                mono_marshal_lock ();
-               res = g_hash_table_lookup (cache, key);
+               res = (MonoMethod *)g_hash_table_lookup (cache, key);
                if (!res) {
                        res = newm;
                        g_hash_table_insert (cache, key, res);
@@ -2489,7 +2489,7 @@ mono_marshal_get_wrapper_info (MonoMethod *wrapper)
 {
        g_assert (wrapper->wrapper_type);
 
-       return mono_method_get_wrapper_data (wrapper, 1);
+       return (WrapperInfo *)mono_method_get_wrapper_data (wrapper, 1);
 }
 
 /*
@@ -2506,7 +2506,7 @@ mono_marshal_set_wrapper_info (MonoMethod *method, WrapperInfo *info)
        if (method->wrapper_type == MONO_WRAPPER_NONE || method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
                return;
 
-       datav = ((MonoMethodWrapper *)method)->method_data;
+       datav = (void **)((MonoMethodWrapper *)method)->method_data;
        datav [1] = info;
 }
 
@@ -2515,7 +2515,7 @@ mono_wrapper_info_create (MonoMethodBuilder *mb, WrapperSubtype subtype)
 {
        WrapperInfo *info;
 
-       info = mono_image_alloc0 (mb->method->klass->image, sizeof (WrapperInfo));
+       info = (WrapperInfo *)mono_image_alloc0 (mb->method->klass->image, sizeof (WrapperInfo));
        info->subtype = subtype;
        return info;
 }
@@ -2595,7 +2595,7 @@ check_generic_wrapper_cache (GHashTable *cache, MonoMethod *orig_method, gpointe
                /* Cache it */
                mono_memory_barrier ();
                mono_marshal_lock ();
-               res = g_hash_table_lookup (cache, key);
+               res = (MonoMethod *)g_hash_table_lookup (cache, key);
                if (!res) {
                        g_hash_table_insert (cache, key, inst);
                        res = inst;
@@ -2619,7 +2619,7 @@ cache_generic_wrapper (GHashTable *cache, MonoMethod *orig_method, MonoMethod *d
        g_assert (mono_error_ok (&error)); /* FIXME don't swallow the error */
        mono_memory_barrier ();
        mono_marshal_lock ();
-       res = g_hash_table_lookup (cache, key);
+       res = (MonoMethod *)g_hash_table_lookup (cache, key);
        if (!res) {
                g_hash_table_insert (cache, key, inst);
                res = inst;
@@ -2653,7 +2653,7 @@ check_generic_delegate_wrapper_cache (GHashTable *cache, MonoMethod *orig_method
                /* Cache it */
                mono_memory_barrier ();
                mono_marshal_lock ();
-               res = g_hash_table_lookup (cache, orig_method->klass);
+               res = (MonoMethod *)g_hash_table_lookup (cache, orig_method->klass);
                if (!res) {
                        g_hash_table_insert (cache, orig_method->klass, inst);
                        res = inst;
@@ -2678,7 +2678,7 @@ cache_generic_delegate_wrapper (GHashTable *cache, MonoMethod *orig_method, Mono
 
        mono_memory_barrier ();
        mono_marshal_lock ();
-       res = g_hash_table_lookup (cache, orig_method->klass);
+       res = (MonoMethod *)g_hash_table_lookup (cache, orig_method->klass);
        if (!res) {
                g_hash_table_insert (cache, orig_method->klass, inst);
                res = inst;
@@ -2790,7 +2790,7 @@ mono_delegate_end_invoke (MonoDelegate *delegate, gpointer *params)
 
        msg = mono_method_call_message_new (method, params, NULL, NULL, NULL);
 
-       ares = mono_array_get (msg->args, gpointer, sig->param_count - 1);
+       ares = (MonoAsyncResult *)mono_array_get (msg->args, gpointer, sig->param_count - 1);
        if (ares == NULL) {
                mono_raise_exception (mono_exception_from_name_msg (mono_defaults.corlib, "System.Runtime.Remoting", "RemotingException", "The async result object is null or of an unexpected type."));
                return NULL;
@@ -3017,7 +3017,7 @@ sig_to_rgctx_sig (MonoMethodSignature *sig)
        MonoMethodSignature *res;
        int i;
 
-       res = g_malloc (MONO_SIZEOF_METHOD_SIGNATURE + (sig->param_count + 1) * sizeof (MonoType*));
+       res = (MonoMethodSignature *)g_malloc (MONO_SIZEOF_METHOD_SIGNATURE + (sig->param_count + 1) * sizeof (MonoType*));
        memcpy (res, sig, MONO_SIZEOF_METHOD_SIGNATURE);
        res->param_count = sig->param_count + 1;
        for (i = 0; i < sig->param_count; ++i)
@@ -3130,7 +3130,7 @@ mono_marshal_get_delegate_invoke_internal (MonoMethod *method, gboolean callvirt
                cache = *cache_ptr;
                key.sig = invoke_sig;
                key.pointer = target_method;
-               res = g_hash_table_lookup (cache, &key);
+               res = (MonoMethod *)g_hash_table_lookup (cache, &key);
                mono_marshal_unlock ();
                if (res)
                        return res;
@@ -3455,7 +3455,7 @@ lookup_string_ctor_signature (MonoMethodSignature *sig)
        mono_marshal_lock ();
        callsig = NULL;
        for (item = strsig_list; item; item = item->next) {
-               cs = item->data;
+               cs = (CtorSigPair *)item->data;
                /* mono_metadata_signature_equal () is safe to call with the marshal lock
                 * because it is lock-free.
                 */
@@ -3590,7 +3590,7 @@ static void
 emit_invoke_call (MonoMethodBuilder *mb, MonoMethod *method,
                                  MonoMethodSignature *sig, MonoMethodSignature *callsig,
                                  int loc_res,
-                                 gboolean virtual, gboolean need_direct_wrapper)
+                                 gboolean virtual_, gboolean need_direct_wrapper)
 {
        static MonoString *string_dummy = NULL;
        int i;
@@ -3603,7 +3603,7 @@ emit_invoke_call (MonoMethodBuilder *mb, MonoMethod *method,
                string_dummy = mono_string_new_wrapper ("dummy");
        }
 
-       if (virtual) {
+       if (virtual_) {
                g_assert (sig->hasthis);
                g_assert (method->flags & METHOD_ATTRIBUTE_VIRTUAL);
        }
@@ -3703,7 +3703,7 @@ handle_enum:
                }
        }
        
-       if (virtual) {
+       if (virtual_) {
                mono_mb_emit_op (mb, CEE_CALLVIRT, method);
        } else if (need_direct_wrapper) {
                mono_mb_emit_op (mb, CEE_CALL, method);
@@ -3786,7 +3786,7 @@ handle_enum:
 static void
 emit_runtime_invoke_body (MonoMethodBuilder *mb, MonoClass *target_klass, MonoMethod *method,
                                                  MonoMethodSignature *sig, MonoMethodSignature *callsig,
-                                                 gboolean virtual, gboolean need_direct_wrapper)
+                                                 gboolean virtual_, gboolean need_direct_wrapper)
 {
        gint32 labels [16];
        MonoExceptionClause *clause;
@@ -3821,12 +3821,12 @@ emit_runtime_invoke_body (MonoMethodBuilder *mb, MonoClass *target_klass, MonoMe
         */
        labels [1] = mono_mb_get_label (mb);
        emit_thread_force_interrupt_checkpoint (mb);
-       emit_invoke_call (mb, method, sig, callsig, loc_res, virtual, need_direct_wrapper);
+       emit_invoke_call (mb, method, sig, callsig, loc_res, virtual_, need_direct_wrapper);
 
        labels [2] = mono_mb_emit_branch (mb, CEE_LEAVE);
 
        /* Add a try clause around the call */
-       clause = mono_image_alloc0 (target_klass->image, sizeof (MonoExceptionClause));
+       clause = (MonoExceptionClause *)mono_image_alloc0 (target_klass->image, sizeof (MonoExceptionClause));
        clause->flags = MONO_EXCEPTION_CLAUSE_NONE;
        clause->data.catch_class = mono_defaults.exception_class;
        clause->try_offset = labels [1];
@@ -3855,7 +3855,7 @@ emit_runtime_invoke_body (MonoMethodBuilder *mb, MonoClass *target_klass, MonoMe
         */
        mono_mb_patch_branch (mb, labels [0]);
        emit_thread_force_interrupt_checkpoint (mb);
-       emit_invoke_call (mb, method, sig, callsig, loc_res, virtual, need_direct_wrapper);
+       emit_invoke_call (mb, method, sig, callsig, loc_res, virtual_, need_direct_wrapper);
 
        mono_mb_emit_ldloc (mb, 0);
        mono_mb_emit_byte (mb, CEE_RET);
@@ -3875,7 +3875,7 @@ emit_runtime_invoke_body (MonoMethodBuilder *mb, MonoClass *target_klass, MonoMe
  * first argument (after 'this').
  */
 MonoMethod *
-mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean virtual, gboolean pass_rgctx)
+mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean virtual_, gboolean pass_rgctx)
 {
        MonoMethodSignature *sig, *csig, *callsig;
        MonoMethodBuilder *mb;
@@ -3901,14 +3901,14 @@ mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean virtual, gboolean
                finalize_signature->hasthis = 1;
        }
 
-       if (virtual)
+       if (virtual_)
                need_direct_wrapper = TRUE;
 
        /* 
         * Use a separate cache indexed by methods to speed things up and to avoid the
         * boundless mempool growth caused by the signature_dup stuff below.
         */
-       if (virtual)
+       if (virtual_)
                cache = get_cache (&method->klass->image->runtime_invoke_vcall_cache, mono_aligned_addr_hash, NULL);
        else
                cache = get_cache (&mono_method_get_wrapper_cache (method)->runtime_invoke_direct_cache, mono_aligned_addr_hash, NULL);
@@ -3975,7 +3975,7 @@ mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean virtual, gboolean
 
                /* from mono_marshal_find_in_cache */
                mono_marshal_lock ();
-               res = g_hash_table_lookup (cache, callsig);
+               res = (MonoMethod *)g_hash_table_lookup (cache, callsig);
                mono_marshal_unlock ();
 
                if (res) {
@@ -4005,7 +4005,7 @@ mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean virtual, gboolean
        csig->call_convention = MONO_CALL_C;
 #endif
 
-       name = mono_signature_to_name (callsig, pass_rgctx ? (virtual ? "runtime_invoke_virtual_rgctx" : "runtime_invoke_rgctx") : (virtual ? "runtime_invoke_virtual" : "runtime_invoke"));
+       name = mono_signature_to_name (callsig, pass_rgctx ? (virtual_ ? "runtime_invoke_virtual_rgctx" : "runtime_invoke_rgctx") : (virtual_ ? "runtime_invoke_virtual" : "runtime_invoke"));
        mb = mono_mb_new (target_klass, name,  MONO_WRAPPER_RUNTIME_INVOKE);
        g_free (name);
 
@@ -4016,20 +4016,20 @@ mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean virtual, gboolean
        param_names [3] = "method";
        mono_mb_set_param_names (mb, param_names);
 
-       emit_runtime_invoke_body (mb, target_klass, method, sig, callsig, virtual, need_direct_wrapper);
+       emit_runtime_invoke_body (mb, target_klass, method, sig, callsig, virtual_, need_direct_wrapper);
 #endif
 
        if (need_direct_wrapper) {
 #ifndef DISABLE_JIT
                mb->skip_visibility = 1;
 #endif
-               info = mono_wrapper_info_create (mb, virtual ? WRAPPER_SUBTYPE_RUNTIME_INVOKE_VIRTUAL : WRAPPER_SUBTYPE_RUNTIME_INVOKE_DIRECT);
+               info = mono_wrapper_info_create (mb, virtual_ ? WRAPPER_SUBTYPE_RUNTIME_INVOKE_VIRTUAL : WRAPPER_SUBTYPE_RUNTIME_INVOKE_DIRECT);
                info->d.runtime_invoke.method = method;
                res = mono_mb_create_and_cache_full (cache, method, mb, csig, sig->param_count + 16, info, NULL);
        } else {
                /* taken from mono_mb_create_and_cache */
                mono_marshal_lock ();
-               res = g_hash_table_lookup (cache, callsig);
+               res = (MonoMethod *)g_hash_table_lookup (cache, callsig);
                mono_marshal_unlock ();
 
                info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_RUNTIME_INVOKE_NORMAL);
@@ -4042,7 +4042,7 @@ mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean virtual, gboolean
                        newm = mono_mb_create (mb, csig, sig->param_count + 16, info);
 
                        mono_marshal_lock ();
-                       res = g_hash_table_lookup (cache, callsig);
+                       res = (MonoMethod *)g_hash_table_lookup (cache, callsig);
                        if (!res) {
                                GHashTable *direct_cache;
                                res = newm;
@@ -4129,7 +4129,7 @@ mono_marshal_get_runtime_invoke_dynamic (void)
 
        pos = mono_mb_emit_branch (mb, CEE_LEAVE);
 
-       clause = mono_image_alloc0 (mono_defaults.corlib, sizeof (MonoExceptionClause));
+       clause = (MonoExceptionClause *)mono_image_alloc0 (mono_defaults.corlib, sizeof (MonoExceptionClause));
        clause->flags = MONO_EXCEPTION_CLAUSE_FILTER;
        clause->try_len = mono_mb_get_label (mb);
 
@@ -6007,7 +6007,7 @@ emit_marshal_array (EmitMarshalContext *m, int argnum, MonoType *t,
                                conv = mono_marshal_get_stringbuilder_to_ptr_conv (m->piinfo, spec);
                        }
                        else
-                               conv = -1;
+                               conv = (MonoMarshalConv)-1;
 
                        if (is_string && conv == -1) {
                                char *msg = g_strdup_printf ("string/stringbuilder marshalling conversion %d not implemented", encoding);
@@ -6083,7 +6083,7 @@ emit_marshal_array (EmitMarshalContext *m, int argnum, MonoType *t,
                                mono_mb_emit_stloc (mb, 1);
 
                                /* emit valuetype conversion code */
-                               emit_struct_conv_full (mb, eklass, FALSE, eklass == mono_defaults.char_class ? encoding : -1);
+                               emit_struct_conv_full (mb, eklass, FALSE, eklass == mono_defaults.char_class ? encoding : (MonoMarshalNative)-1);
                        }
 
                        mono_mb_emit_add_to_local (mb, index_var, 1);
@@ -6228,7 +6228,7 @@ emit_marshal_array (EmitMarshalContext *m, int argnum, MonoType *t,
                                        mono_mb_emit_stloc (mb, 1);
 
                                        /* emit valuetype conversion code */
-                                       emit_struct_conv_full (mb, eklass, TRUE, eklass == mono_defaults.char_class ? encoding : -1);
+                                       emit_struct_conv_full (mb, eklass, TRUE, eklass == mono_defaults.char_class ? encoding : (MonoMarshalNative)-1);
                                }
 
                                if (need_free) {
@@ -6328,7 +6328,7 @@ emit_marshal_array (EmitMarshalContext *m, int argnum, MonoType *t,
                        conv = mono_marshal_get_ptr_to_stringbuilder_conv (m->piinfo, spec, &need_free);
                }
                else
-                       conv = -1;
+                       conv = (MonoMarshalConv)-1;
 
                mono_marshal_load_type_info (eklass);
 
@@ -6491,7 +6491,7 @@ emit_marshal_array (EmitMarshalContext *m, int argnum, MonoType *t,
                        conv = mono_marshal_get_stringbuilder_to_ptr_conv (m->piinfo, spec);
                }
                else
-                       conv = -1;
+                       conv = (MonoMarshalConv)-1;
 
                mono_marshal_load_type_info (eklass);
 
@@ -6573,7 +6573,7 @@ emit_marshal_array (EmitMarshalContext *m, int argnum, MonoType *t,
                MonoClass *eklass;
                guint32 label1, label2, label3;
                int index_var, src, dest, esize;
-               MonoMarshalConv conv = -1;
+               MonoMarshalConv conv = (MonoMarshalConv)-1;
                gboolean is_string = FALSE;
                
                g_assert (!t->byref);
@@ -7131,8 +7131,8 @@ mono_marshal_emit_native_wrapper (MonoImage *image, MonoMethodBuilder *mb, MonoM
        }
 
        /* we first do all conversions */
-       tmp_locals = alloca (sizeof (int) * sig->param_count);
-       m.orig_conv_args = alloca (sizeof (int) * (sig->param_count + 1));
+       tmp_locals = (int *)alloca (sizeof (int) * sig->param_count);
+       m.orig_conv_args = (int *)alloca (sizeof (int) * (sig->param_count + 1));
 
        for (i = 0; i < sig->param_count; i ++) {
                tmp_locals [i] = emit_marshal (&m, i + param_shift, sig->params [i], mspecs [i + 1], 0, &csig->params [i], MARSHAL_ACTION_CONV_IN);
@@ -7755,7 +7755,7 @@ mono_marshal_emit_managed_wrapper (MonoMethodBuilder *mb, MonoMethodSignature *i
        }
 
        /* we first do all conversions */
-       tmp_locals = alloca (sizeof (int) * sig->param_count);
+       tmp_locals = (int *)alloca (sizeof (int) * sig->param_count);
        for (i = 0; i < sig->param_count; i ++) {
                MonoType *t = sig->params [i];
 
@@ -8874,7 +8874,7 @@ mono_marshal_get_synchronized_wrapper (MonoMethod *method)
        this_local = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
        taken_local = mono_mb_add_local (mb, &mono_defaults.boolean_class->byval_arg);
 
-       clause = mono_image_alloc0 (method->klass->image, sizeof (MonoExceptionClause));
+       clause = (MonoExceptionClause *)mono_image_alloc0 (method->klass->image, sizeof (MonoExceptionClause));
        clause->flags = MONO_EXCEPTION_CLAUSE_FINALLY;
 #endif
 
@@ -9517,7 +9517,7 @@ mono_marshal_get_virtual_stelemref_wrappers (int *nwrappers)
        int i;
 
        *nwrappers = STELEMREF_KIND_COUNT;
-       res = g_malloc0 (STELEMREF_KIND_COUNT * sizeof (MonoMethod*));
+       res = (MonoMethod **)g_malloc0 (STELEMREF_KIND_COUNT * sizeof (MonoMethod*));
        for (i = 0; i < STELEMREF_KIND_COUNT; ++i)
                res [i] = get_virtual_stelemref_wrapper (i);
        return res;
@@ -10062,7 +10062,7 @@ mono_marshal_string_to_utf16_copy (MonoString *s)
        if (s == NULL) {
                return NULL;
        } else {
-               gunichar2 *res = mono_marshal_alloc ((mono_string_length (s) * 2) + 2);
+               gunichar2 *res = (gunichar2 *)mono_marshal_alloc ((mono_string_length (s) * 2) + 2);
                memcpy (res, mono_string_chars (s), mono_string_length (s) * 2);
                res [mono_string_length (s)] = 0;
                return res;
@@ -10420,7 +10420,7 @@ ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalUni (MonoString
                gunichar2 *res = ves_icall_System_Runtime_InteropServices_Marshal_AllocHGlobal 
                        ((mono_string_length (string) + 1) * 2);
 #else
-               gunichar2 *res = g_malloc ((mono_string_length (string) + 1) * 2);              
+               gunichar2 *res = (gunichar2 *)g_malloc ((mono_string_length (string) + 1) * 2);
 #endif
                memcpy (res, mono_string_chars (string), mono_string_length (string) * 2);
                res [mono_string_length (string)] = 0;
@@ -10619,7 +10619,7 @@ ves_icall_System_Runtime_InteropServices_Marshal_GetDelegateForFunctionPointerIn
 static gboolean
 mono_marshal_is_loading_type_info (MonoClass *klass)
 {
-       GSList *loads_list = mono_native_tls_get_value (load_type_info_tls_id);
+       GSList *loads_list = (GSList *)mono_native_tls_get_value (load_type_info_tls_id);
 
        return g_slist_find (loads_list, klass) != NULL;
 }
@@ -10660,7 +10660,7 @@ mono_marshal_load_type_info (MonoClass* klass)
         * under initialization in a TLS list.
         */
        g_assert (!mono_marshal_is_loading_type_info (klass));
-       loads_list = mono_native_tls_get_value (load_type_info_tls_id);
+       loads_list = (GSList *)mono_native_tls_get_value (load_type_info_tls_id);
        loads_list = g_slist_prepend (loads_list, klass);
        mono_native_tls_set_value (load_type_info_tls_id, loads_list);
        
@@ -10676,7 +10676,7 @@ mono_marshal_load_type_info (MonoClass* klass)
        layout = klass->flags & TYPE_ATTRIBUTE_LAYOUT_MASK;
 
        /* The mempool is protected by the loader lock */
-       info = mono_image_alloc0 (klass->image, MONO_SIZEOF_MARSHAL_TYPE + sizeof (MonoMarshalField) * count);
+       info = (MonoMarshalType *)mono_image_alloc0 (klass->image, MONO_SIZEOF_MARSHAL_TYPE + sizeof (MonoMarshalField) * count);
        info->num_fields = count;
        
        /* Try to find a size for this type in metadata */
@@ -10767,7 +10767,7 @@ mono_marshal_load_type_info (MonoClass* klass)
                mono_marshal_load_type_info (klass->element_class);
        }
 
-       loads_list = mono_native_tls_get_value (load_type_info_tls_id);
+       loads_list = (GSList *)mono_native_tls_get_value (load_type_info_tls_id);
        loads_list = g_slist_remove (loads_list, klass);
        mono_native_tls_set_value (load_type_info_tls_id, loads_list);
 
@@ -11103,7 +11103,7 @@ mono_marshal_free_asany (MonoObject *o, gpointer ptr, MonoMarshalNative string_e
                }
 
                if (!((param_attrs & PARAM_ATTRIBUTE_OUT) && !(param_attrs & PARAM_ATTRIBUTE_IN))) {
-                       mono_struct_delete_old (klass, ptr);
+                       mono_struct_delete_old (klass, (char *)ptr);
                }
 
                mono_marshal_free (ptr);
@@ -11297,7 +11297,7 @@ mono_marshal_get_thunk_invoke_wrapper (MonoMethod *method)
        }
 
        /* try */
-       clause = mono_image_alloc0 (image, sizeof (MonoExceptionClause));
+       clause = (MonoExceptionClause *)mono_image_alloc0 (image, sizeof (MonoExceptionClause));
        clause->try_offset = mono_mb_get_label (mb);
 
        /* push method's args */

diff --git a/mono/metadata/mempool.c b/mono/metadata/mempool.c
index 0cc8ca036c1e069ab4588e51e9206f116721344b..abbdbdbace3b167545217577638bccda303b010a 100644 (file)
--- a/mono/metadata/mempool.c
+++ b/mono/metadata/mempool.c
@@ -107,7 +107,7 @@ mono_mempool_new_size (int initial_size)
                initial_size = MONO_MEMPOOL_MINSIZE;
 #endif
 
-       pool = g_malloc (initial_size);
+       pool = (MonoMemPool *)g_malloc (initial_size);
 
        pool->next = NULL;
        pool->pos = (guint8*)pool + SIZEOF_MEM_POOL; // Start after header
@@ -202,11 +202,11 @@ mono_backtrace (int size)
         static gboolean inited;
 
         if (!inited) {
-            mono_mutex_init_recursive (&mempool_tracing_lock);
+            mono_os_mutex_init_recursive (&mempool_tracing_lock);
             inited = TRUE;
         }
 
-        mono_mutex_lock (&mempool_tracing_lock);
+        mono_os_mutex_lock (&mempool_tracing_lock);
         g_print ("Allocating %d bytes\n", size);
         symbols = backtrace (array, BACKTRACE_DEPTH);
         names = backtrace_symbols (array, symbols);
@@ -214,7 +214,7 @@ mono_backtrace (int size)
                 g_print ("\t%s\n", names [i]);
         }
         free (names);
-        mono_mutex_unlock (&mempool_tracing_lock);
+        mono_os_mutex_unlock (&mempool_tracing_lock);
 }
 
 #endif
@@ -277,7 +277,7 @@ mono_mempool_alloc (MonoMemPool *pool, guint size)
                // (In individual allocation mode, the constant will be 0 and this path will always be taken)
                if (size >= MONO_MEMPOOL_PREFER_INDIVIDUAL_ALLOCATION_SIZE) {
                        guint new_size = SIZEOF_MEM_POOL + size;
-                       MonoMemPool *np = g_malloc (new_size);
+                       MonoMemPool *np = (MonoMemPool *)g_malloc (new_size);
 
                        np->next = pool->next;
                        np->size = new_size;
@@ -289,7 +289,7 @@ mono_mempool_alloc (MonoMemPool *pool, guint size)
                } else {
                        // Notice: any unused memory at the end of the old head becomes simply abandoned in this case until the mempool is freed (see Bugzilla #35136)
                        guint new_size = get_next_size (pool, size);
-                       MonoMemPool *np = g_malloc (new_size);
+                       MonoMemPool *np = (MonoMemPool *)g_malloc (new_size);
 
                        np->next = pool->next;
                        np->size = new_size;
@@ -373,7 +373,7 @@ mono_mempool_strdup (MonoMemPool *pool,
                return NULL;
 
        l = strlen (s);
-       res = mono_mempool_alloc (pool, l + 1);
+       res = (char *)mono_mempool_alloc (pool, l + 1);
        memcpy (res, s, l + 1);
 
        return res;

diff --git a/mono/metadata/metadata-internals.h b/mono/metadata/metadata-internals.h
index 710cdf0b5020e83f78a1075f428df17ffc3d8d91..30c3fb07a60f02a49408b73a7db17910b6938f6c 100644 (file)
--- a/mono/metadata/metadata-internals.h
+++ b/mono/metadata/metadata-internals.h
@@ -389,6 +389,11 @@ struct _MonoImage {
        /* The loader used to load this image */
        MonoImageLoader *loader;
 
+       // Containers for MonoGenericParams associated with this image but not with any specific class or method. Created on demand.
+       // This could happen, for example, for MonoTypes associated with TypeSpec table entries.
+       MonoGenericContainer *anonymous_generic_class_container;
+       MonoGenericContainer *anonymous_generic_method_container;
+
        /*
         * No other runtime locks must be taken while holding this lock.
         * It's meant to be used only to mutate and query structures part of this image.
@@ -899,5 +904,14 @@ mono_method_get_wrapper_cache (MonoMethod *method);
 MonoType*
 mono_metadata_parse_type_checked (MonoImage *m, MonoGenericContainer *container, short opt_attrs, gboolean transient, const char *ptr, const char **rptr, MonoError *error);
 
+MonoGenericContainer *
+get_anonymous_container_for_image (MonoImage *image, gboolean is_mvar);
+
+char *
+mono_image_set_description (MonoImageSet *);
+
+MonoImageSet *
+mono_find_image_set_owner (void *ptr);
+
 #endif /* __MONO_METADATA_INTERNALS_H__ */
 

diff --git a/mono/metadata/metadata-verify.c b/mono/metadata/metadata-verify.c
index 1a1597f6ca73e6d1ada66adc0c16f1594f772eb6..65f3bba5686998a1b5b7ea59f79fd20ffbd4cf70 100644 (file)
--- a/mono/metadata/metadata-verify.c
+++ b/mono/metadata/metadata-verify.c
@@ -332,7 +332,7 @@ bounds_check_virtual_address (VerifyContext *ctx, guint32 rva, guint32 size)
                return FALSE;
 
        if (ctx->stage > STAGE_PE) {
-               MonoCLIImageInfo *iinfo = ctx->image->image_info;
+               MonoCLIImageInfo *iinfo = (MonoCLIImageInfo *)ctx->image->image_info;
                const int top = iinfo->cli_section_count;
                MonoSectionTable *tables = iinfo->cli_section_tables;
                int i;
@@ -689,7 +689,7 @@ verify_resources_table (VerifyContext *ctx)
 static DataDirectory
 get_data_dir (VerifyContext *ctx, int idx)
 {
-       MonoCLIImageInfo *iinfo = ctx->image->image_info;
+       MonoCLIImageInfo *iinfo = (MonoCLIImageInfo *)ctx->image->image_info;
        MonoPEDirEntry *entry= &iinfo->cli_header.datadir.pe_export_table;
        DataDirectory res;
 
@@ -1069,7 +1069,7 @@ search_sorted_table (VerifyContext *ctx, int table, int column, guint32 coded_to
        base = tinfo->base;
 
        VERIFIER_DEBUG ( printf ("looking token %x table %d col %d rsize %d roff %d\n", coded_token, table, column, locator.col_size, locator.col_offset) );
-       res = mono_binary_search (&locator, base, tinfo->rows, tinfo->row_size, token_locator);
+       res = (const char *)mono_binary_search (&locator, base, tinfo->rows, tinfo->row_size, token_locator);
        if (!res)
                return -1;
 
@@ -1787,7 +1787,7 @@ get_enum_by_encoded_name (VerifyContext *ctx, const char **_ptr, const char *end
                return NULL;
        }
 
-       enum_name = g_memdup (str_start, str_len + 1);
+       enum_name = (char *)g_memdup (str_start, str_len + 1);
        enum_name [str_len] = 0;
        type = mono_reflection_type_from_name (enum_name, ctx->image);
        if (!type) {
@@ -1881,7 +1881,7 @@ handle_enum:
                        } else if (etype == 0x50 || etype == MONO_TYPE_CLASS) {
                                klass = mono_defaults.systemtype_class;
                        } else if ((etype >= MONO_TYPE_BOOLEAN && etype <= MONO_TYPE_STRING) || etype == 0x51) {
-                               simple_type.type = etype == 0x51 ? MONO_TYPE_OBJECT : etype;
+                               simple_type.type = etype == 0x51 ? MONO_TYPE_OBJECT : (MonoTypeEnum)etype;
                                klass = mono_class_from_mono_type (&simple_type);
                        } else
                                FAIL (ctx, g_strdup_printf ("CustomAttribute: Invalid array element type %x", etype));
@@ -1986,7 +1986,7 @@ is_valid_cattr_content (VerifyContext *ctx, MonoMethod *ctor, const char *ptr, g
                        FAIL (ctx, g_strdup_printf ("CustomAttribute: Not enough space for named parameter %d type", i));
 
                if (kind >= MONO_TYPE_BOOLEAN && kind <= MONO_TYPE_STRING) {
-                       simple_type.type = kind;
+                       simple_type.type = (MonoTypeEnum)kind;
                        type = &simple_type;
                } else if (kind == MONO_TYPE_ENUM) {
                        MonoClass *klass = get_enum_by_encoded_name (ctx, &ptr, end);
@@ -2010,7 +2010,7 @@ is_valid_cattr_content (VerifyContext *ctx, MonoMethod *ctor, const char *ptr, g
                        } else if (etype == 0x50 || etype == MONO_TYPE_CLASS) {
                                klass = mono_defaults.systemtype_class;
                        } else if ((etype >= MONO_TYPE_BOOLEAN && etype <= MONO_TYPE_STRING) || etype == 0x51) {
-                               simple_type.type = etype == 0x51 ? MONO_TYPE_OBJECT : etype;
+                               simple_type.type = etype == 0x51 ? MONO_TYPE_OBJECT : (MonoTypeEnum)etype;
                                klass = mono_class_from_mono_type (&simple_type);
                        } else
                                FAIL (ctx, g_strdup_printf ("CustomAttribute: Invalid array element type %x", etype));
@@ -3487,7 +3487,7 @@ verify_exportedtype_table (VerifyContext *ctx)
 static void
 verify_manifest_resource_table (VerifyContext *ctx)
 {
-       MonoCLIImageInfo *iinfo = ctx->image->image_info;
+       MonoCLIImageInfo *iinfo = (MonoCLIImageInfo *)ctx->image->image_info;
        MonoCLIHeader *ch = &iinfo->cli_cli_header;
        MonoTableInfo *table = &ctx->image->tables [MONO_TABLE_MANIFESTRESOURCE];
        guint32 data [MONO_MANIFEST_SIZE], impl_table, token, resources_size;
@@ -3662,15 +3662,15 @@ typedef struct {
 static guint
 typedef_hash (gconstpointer _key)
 {
-       const TypeDefUniqueId *key = _key;
+       const TypeDefUniqueId *key = (const TypeDefUniqueId *)_key;
        return g_str_hash (key->name) ^ g_str_hash (key->name_space) ^ key->resolution_scope; /*XXX better salt the int key*/
 }
 
 static gboolean
 typedef_equals (gconstpointer _a, gconstpointer _b)
 {
-       const TypeDefUniqueId *a = _a;
-       const TypeDefUniqueId *b = _b;
+       const TypeDefUniqueId *a = (const TypeDefUniqueId *)_a;
+       const TypeDefUniqueId *b = (const TypeDefUniqueId *)_b;
        return !strcmp (a->name, b->name) && !strcmp (a->name_space, b->name_space) && a->resolution_scope == b->resolution_scope;
 }
 
@@ -3878,7 +3878,7 @@ cleanup_context_checked (VerifyContext *ctx, MonoError *error)
 {
        g_free (ctx->sections);
        if (ctx->errors) {
-               MonoVerifyInfo *info = ctx->errors->data;
+               MonoVerifyInfo *info = (MonoVerifyInfo *)ctx->errors->data;
                mono_error_set_bad_image (error, ctx->image, "%s", info->message);
                mono_free_verify_list (ctx->errors);
        }

diff --git a/mono/metadata/metadata.c b/mono/metadata/metadata.c
index 1f74ab9debc2f4852bb91568e8c69291fa711ce7..e50ad0288c968135460f054b7e73e34f5406f363 100644 (file)
--- a/mono/metadata/metadata.c
+++ b/mono/metadata/metadata.c
@@ -28,6 +28,7 @@
 #include "abi-details.h"
 #include <mono/utils/mono-error-internals.h>
 #include <mono/utils/bsearch.h>
+#include <mono/utils/atomic.h>
 
 /* Auxiliary structure used for caching inflated signatures */
 typedef struct {
@@ -1332,19 +1333,19 @@ mono_metadata_parse_array_internal (MonoImage *m, MonoGenericContainer *containe
        if (!etype)
                return NULL;
 
-       array = transient ? g_malloc0 (sizeof (MonoArrayType)) : mono_image_alloc0 (m, sizeof (MonoArrayType));
+       array = transient ? (MonoArrayType *)g_malloc0 (sizeof (MonoArrayType)) : (MonoArrayType *)mono_image_alloc0 (m, sizeof (MonoArrayType));
        array->eklass = mono_class_from_mono_type (etype);
        array->rank = mono_metadata_decode_value (ptr, &ptr);
 
        array->numsizes = mono_metadata_decode_value (ptr, &ptr);
        if (array->numsizes)
-               array->sizes = transient ? g_malloc0 (sizeof (int) * array->numsizes) : mono_image_alloc0 (m, sizeof (int) * array->numsizes);
+               array->sizes = transient ? (int *)g_malloc0 (sizeof (int) * array->numsizes) : (int *)mono_image_alloc0 (m, sizeof (int) * array->numsizes);
        for (i = 0; i < array->numsizes; ++i)
                array->sizes [i] = mono_metadata_decode_value (ptr, &ptr);
 
        array->numlobounds = mono_metadata_decode_value (ptr, &ptr);
        if (array->numlobounds)
-               array->lobounds = transient ? g_malloc0 (sizeof (int) * array->numlobounds) : mono_image_alloc0 (m, sizeof (int) * array->numlobounds);
+               array->lobounds = transient ? (int *)g_malloc0 (sizeof (int) * array->numlobounds) : (int *)mono_image_alloc0 (m, sizeof (int) * array->numlobounds);
        for (i = 0; i < array->numlobounds; ++i)
                array->lobounds [i] = mono_metadata_decode_signed_value (ptr, &ptr);
 
@@ -1492,10 +1493,14 @@ mono_generic_inst_equal_full (const MonoGenericInst *a, const MonoGenericInst *b
 {
        int i;
 
-#ifndef MONO_SMALL_CONFIG
-       if (a->id && b->id) {
+       // An optimization: if the ids of two insts are the same, we know they are the same inst and don't check contents.
+       // Furthermore, because we perform early de-duping, if the ids differ, we know the contents differ.
+#ifndef MONO_SMALL_CONFIG // Optimization does not work in MONO_SMALL_CONFIG: There are no IDs
+       if (a->id && b->id) { // "id 0" means "object has no id"-- de-duping hasn't been performed yet, must check contents.
                if (a->id == b->id)
                        return TRUE;
+               // In signature-comparison mode id equality implies object equality, but this is not true for inequality.
+               // Two separate objects could have signature-equavalent contents.
                if (!signature_only)
                        return FALSE;
        }
@@ -1557,7 +1562,7 @@ mono_metadata_init (void)
        for (i = 0; i < NBUILTIN_TYPES (); ++i)
                g_hash_table_insert (type_cache, (gpointer) &builtin_types [i], (gpointer) &builtin_types [i]);
 
-       mono_mutex_init_recursive (&image_sets_mutex);
+       mono_os_mutex_init_recursive (&image_sets_mutex);
 }
 
 /**
@@ -1573,7 +1578,7 @@ mono_metadata_cleanup (void)
        type_cache = NULL;
        g_ptr_array_free (image_sets, TRUE);
        image_sets = NULL;
-       mono_mutex_destroy (&image_sets_mutex);
+       mono_os_mutex_destroy (&image_sets_mutex);
 }
 
 /**
@@ -1611,7 +1616,7 @@ mono_metadata_parse_type_internal (MonoImage *m, MonoGenericContainer *container
        gboolean byref = FALSE;
        gboolean pinned = FALSE;
        const char *tmp_ptr;
-       int count = 0;
+       int count = 0; // Number of mod arguments
        gboolean found;
 
        /*
@@ -1645,20 +1650,20 @@ mono_metadata_parse_type_internal (MonoImage *m, MonoGenericContainer *container
                }
        }
 
-       if (count) {
+       if (count) { // There are mods, so the MonoType will be of nonstandard size.
                int size;
 
                size = MONO_SIZEOF_TYPE + ((gint32)count) * sizeof (MonoCustomMod);
-               type = transient ? g_malloc0 (size) : mono_image_alloc0 (m, size);
+               type = transient ? (MonoType *)g_malloc0 (size) : (MonoType *)mono_image_alloc0 (m, size);
                type->num_mods = count;
                if (count > 64)
                        g_warning ("got more than 64 modifiers in type");
-       } else {
+       } else {     // The type is of standard size, so we can allocate it on the stack.
                type = &stype;
                memset (type, 0, MONO_SIZEOF_TYPE);
        }
 
-       /* Parse pinned, byref and custom modifiers */
+       /* Iterate again, but now parse pinned, byref and custom modifiers */
        found = TRUE;
        count = 0;
        while (found) {
@@ -1694,6 +1699,7 @@ mono_metadata_parse_type_internal (MonoImage *m, MonoGenericContainer *container
        if (rptr)
                *rptr = ptr;
 
+       // Possibly we can return an already-allocated type instead of the one we decoded
        if (!type->num_mods && !transient) {
                /* no need to free type here, because it is on the stack */
                if ((type->type == MONO_TYPE_CLASS || type->type == MONO_TYPE_VALUETYPE) && !type->pinned && !type->attrs) {
@@ -1722,15 +1728,15 @@ mono_metadata_parse_type_internal (MonoImage *m, MonoGenericContainer *container
                        }
                }
                /* No need to use locking since nobody is modifying the hash table */
-               if ((cached = g_hash_table_lookup (type_cache, type))) {
+               if ((cached = (MonoType *)g_hash_table_lookup (type_cache, type))) {
                        return cached;
                }
        }
        
        /* printf ("%x %x %c %s\n", type->attrs, type->num_mods, type->pinned ? 'p' : ' ', mono_type_full_name (type)); */
        
-       if (type == &stype) {
-               type = transient ? g_malloc (MONO_SIZEOF_TYPE) : mono_image_alloc (m, MONO_SIZEOF_TYPE);
+       if (type == &stype) { // Type was allocated on the stack, so we need to copy it to safety
+               type = transient ? (MonoType *)g_malloc (MONO_SIZEOF_TYPE) : (MonoType *)mono_image_alloc (m, MONO_SIZEOF_TYPE);
                memcpy (type, &stype, MONO_SIZEOF_TYPE);
        }
        return type;
@@ -1859,7 +1865,7 @@ mono_metadata_parse_signature (MonoImage *image, guint32 token)
        const char *ptr;
 
        if (image_is_dynamic (image))
-               return mono_lookup_dynamic_token (image, token, NULL);
+               return (MonoMethodSignature *)mono_lookup_dynamic_token (image, token, NULL);
 
        g_assert (mono_metadata_token_table(token) == MONO_TABLE_STANDALONESIG);
                
@@ -1891,7 +1897,7 @@ mono_metadata_signature_alloc (MonoImage *m, guint32 nparams)
 {
        MonoMethodSignature *sig;
 
-       sig = mono_image_alloc0 (m, MONO_SIZEOF_METHOD_SIGNATURE + ((gint32)nparams) * sizeof (MonoType*));
+       sig = (MonoMethodSignature *)mono_image_alloc0 (m, MONO_SIZEOF_METHOD_SIGNATURE + ((gint32)nparams) * sizeof (MonoType*));
        sig->param_count = nparams;
        sig->sentinelpos = -1;
 
@@ -1908,11 +1914,11 @@ mono_metadata_signature_dup_internal_with_padding (MonoImage *image, MonoMemPool
                sigsize += MONO_SIZEOF_TYPE;
 
        if (image) {
-               ret = mono_image_alloc (image, sigsize);
+               ret = (MonoMethodSignature *)mono_image_alloc (image, sigsize);
        } else if (mp) {
-               ret = mono_mempool_alloc (mp, sigsize);
+               ret = (MonoMethodSignature *)mono_mempool_alloc (mp, sigsize);
        } else {
-               ret = g_malloc (sigsize);
+               ret = (MonoMethodSignature *)g_malloc (sigsize);
        }
 
        memcpy (ret, sig, sig_header_size - padding);
@@ -2182,8 +2188,8 @@ mono_metadata_free_inflated_signature (MonoMethodSignature *sig)
 static gboolean
 inflated_method_equal (gconstpointer a, gconstpointer b)
 {
-       const MonoMethodInflated *ma = a;
-       const MonoMethodInflated *mb = b;
+       const MonoMethodInflated *ma = (const MonoMethodInflated *)a;
+       const MonoMethodInflated *mb = (const MonoMethodInflated *)b;
        if (ma->declaring != mb->declaring)
                return FALSE;
        return mono_metadata_generic_context_equal (&ma->context, &mb->context);
@@ -2192,15 +2198,15 @@ inflated_method_equal (gconstpointer a, gconstpointer b)
 static guint
 inflated_method_hash (gconstpointer a)
 {
-       const MonoMethodInflated *ma = a;
+       const MonoMethodInflated *ma = (const MonoMethodInflated *)a;
        return (mono_metadata_generic_context_hash (&ma->context) ^ mono_aligned_addr_hash (ma->declaring));
 }
 
 static gboolean
 inflated_signature_equal (gconstpointer a, gconstpointer b)
 {
-       const MonoInflatedMethodSignature *sig1 = a;
-       const MonoInflatedMethodSignature *sig2 = b;
+       const MonoInflatedMethodSignature *sig1 = (const MonoInflatedMethodSignature *)a;
+       const MonoInflatedMethodSignature *sig2 = (const MonoInflatedMethodSignature *)b;
 
        /* sig->sig is assumed to be canonized */
        if (sig1->sig != sig2->sig)
@@ -2212,7 +2218,7 @@ inflated_signature_equal (gconstpointer a, gconstpointer b)
 static guint
 inflated_signature_hash (gconstpointer a)
 {
-       const MonoInflatedMethodSignature *sig = a;
+       const MonoInflatedMethodSignature *sig = (const MonoInflatedMethodSignature *)a;
 
        /* sig->sig is assumed to be canonized */
        return mono_metadata_generic_context_hash (&sig->context) ^ mono_aligned_addr_hash (sig->sig);
@@ -2288,43 +2294,9 @@ retry:
                goto retry;
        case MONO_TYPE_FNPTR:
                return signature_in_image (type->data.method, image);
-       case MONO_TYPE_VAR: {
-               MonoGenericContainer *container = mono_type_get_generic_param_owner (type);
-               if (container) {
-                       g_assert (!container->is_method);
-                       /*
-                        * FIXME: The following check is here solely
-                        * for monodis, which uses the internal
-                        * function
-                        * mono_metadata_load_generic_params().  The
-                        * caller of that function needs to fill in
-                        * owner->klass or owner->method of the
-                        * returned struct, but monodis doesn't do
-                        * that.  The image unloading depends on that,
-                        * however, so a crash results without this
-                        * check.
-                        */
-                       if (!container->owner.klass)
-                               return container->image == image;
-                       return container->owner.klass->image == image;
-               } else {
-                       return type->data.generic_param->image == image;
-               }
-       }
-       case MONO_TYPE_MVAR: {
-               MonoGenericContainer *container = mono_type_get_generic_param_owner (type);
-               if (type->data.generic_param->image == image)
-                       return TRUE;
-               if (container) {
-                       g_assert (container->is_method);
-                       if (!container->owner.method)
-                               /* RefEmit created generic param whose method is not finished */
-                               return container->image == image;
-                       return container->owner.method->klass->image == image;
-               } else {
-                       return type->data.generic_param->image == image;
-               }
-       }
+       case MONO_TYPE_VAR:
+       case MONO_TYPE_MVAR:
+               return image == get_image_for_generic_param (type->data.generic_param);
        default:
                /* At this point, we should've avoided all potential allocations in mono_class_from_mono_type () */
                return image == mono_class_from_mono_type (type)->image;
@@ -2334,13 +2306,13 @@ retry:
 static inline void
 image_sets_lock (void)
 {
-       mono_mutex_lock (&image_sets_mutex);
+       mono_os_mutex_lock (&image_sets_mutex);
 }
 
 static inline void
 image_sets_unlock (void)
 {
-       mono_mutex_unlock (&image_sets_mutex);
+       mono_os_mutex_unlock (&image_sets_mutex);
 }
 
 /*
@@ -2355,11 +2327,12 @@ get_image_set (MonoImage **images, int nimages)
        MonoImageSet *set;
        GSList *l;
 
-       /* Common case */
+       /* Common case: Image set contains corlib only. If we've seen that case before, we cached the set. */
        if (nimages == 1 && images [0] == mono_defaults.corlib && mscorlib_image_set)
                return mscorlib_image_set;
 
        /* Happens with empty generic instances */
+       // FIXME: Is corlib the correct thing to return here? If so, why? This may be an artifact of generic instances previously defaulting to allocating from corlib.
        if (nimages == 0)
                return mscorlib_image_set;
 
@@ -2368,43 +2341,51 @@ get_image_set (MonoImage **images, int nimages)
        if (!image_sets)
                image_sets = g_ptr_array_new ();
 
+       // Before we go on, we should check to see whether a MonoImageSet with these images already exists.
+       // We can search the referred-by imagesets of any one of our images to do this. Arbitrarily pick one here:
        if (images [0] == mono_defaults.corlib && nimages > 1)
-               l = images [1]->image_sets;
+               l = images [1]->image_sets; // Prefer not to search the imagesets of corlib-- that will be a long list.
        else
                l = images [0]->image_sets;
 
        set = NULL;
-       for (; l; l = l->next) {
-               set = l->data;
+       while (l) // Iterate over selected list, looking for an imageset with members equal to our target one
+       {
+               set = (MonoImageSet *)l->data;
 
-               if (set->nimages == nimages) {
+               if (set->nimages == nimages) { // Member count differs, this can't be it
+                       // Compare all members to all members-- order might be different
                        for (j = 0; j < nimages; ++j) {
                                for (k = 0; k < nimages; ++k)
                                        if (set->images [k] == images [j])
-                                               break;
+                                               break; // Break on match
+
+                               // If we iterated all the way through set->images, images[j] was *not* found.
                                if (k == nimages)
-                                       /* Not found */
-                                       break;
+                                       break; // Break on "image not found"
                        }
+
+                       // If we iterated all the way through images without breaking, all items in images were found in set->images
                        if (j == nimages)
-                               /* Found */
-                               break;
+                               break; // Break on "found a set with equal members"
                }
+
+               l = l->next;
        }
 
+       // If we iterated all the way through l without breaking, the imageset does not already exist and we shuold create it
        if (!l) {
-               /* Not found */
                set = g_new0 (MonoImageSet, 1);
                set->nimages = nimages;
                set->images = g_new0 (MonoImage*, nimages);
-               mono_mutex_init_recursive (&set->lock);
+               mono_os_mutex_init_recursive (&set->lock);
                for (i = 0; i < nimages; ++i)
                        set->images [i] = images [i];
                set->gclass_cache = g_hash_table_new_full (mono_generic_class_hash, mono_generic_class_equal, NULL, (GDestroyNotify)free_generic_class);
                set->ginst_cache = g_hash_table_new_full (mono_metadata_generic_inst_hash, mono_metadata_generic_inst_equal, NULL, (GDestroyNotify)free_generic_inst);
                set->gmethod_cache = g_hash_table_new_full (inflated_method_hash, inflated_method_equal, NULL, (GDestroyNotify)free_inflated_method);
                set->gsignature_cache = g_hash_table_new_full (inflated_signature_hash, inflated_signature_equal, NULL, (GDestroyNotify)free_inflated_signature);
-       
+
                for (i = 0; i < nimages; ++i)
                        set->images [i]->image_sets = g_slist_prepend (set->images [i]->image_sets, set);
 
@@ -2445,20 +2426,20 @@ delete_image_set (MonoImageSet *set)
        if (set->mempool)
                mono_mempool_destroy (set->mempool);
        g_free (set->images);
-       mono_mutex_destroy (&set->lock);
+       mono_os_mutex_destroy (&set->lock);
        g_free (set);
 }
 
 void
 mono_image_set_lock (MonoImageSet *set)
 {
-       mono_mutex_lock (&set->lock);
+       mono_os_mutex_lock (&set->lock);
 }
 
 void
 mono_image_set_unlock (MonoImageSet *set)
 {
-       mono_mutex_unlock (&set->lock);
+       mono_os_mutex_unlock (&set->lock);
 }
 
 gpointer
@@ -2503,6 +2484,24 @@ mono_image_set_strdup (MonoImageSet *set, const char *s)
        return res;
 }
 
+// Get a descriptive string for a MonoImageSet
+// Callers are obligated to free buffer with g_free after use
+char *
+mono_image_set_description (MonoImageSet *set)
+{
+       GString *result = g_string_new (NULL);
+       int img;
+       g_string_append (result, "[");
+       for (img = 0; img < set->nimages; img++)
+       {
+               if (img > 0)
+                       g_string_append (result, ", ");
+               g_string_append (result, set->images[img]->name);
+       }
+       g_string_append (result, "]");
+       return g_string_free (result, FALSE);
+}
+
 /* 
  * Structure used by the collect_..._images functions to store the image list.
  */
@@ -2637,48 +2636,13 @@ retry:
        case MONO_TYPE_FNPTR:
                //return signature_in_image (type->data.method, image);
                g_assert_not_reached ();
-       case MONO_TYPE_VAR: {
-               MonoGenericContainer *container = mono_type_get_generic_param_owner (type);
-               if (container) {
-                       g_assert (!container->is_method);
-                       /*
-                        * FIXME: The following check is here solely
-                        * for monodis, which uses the internal
-                        * function
-                        * mono_metadata_load_generic_params().  The
-                        * caller of that function needs to fill in
-                        * owner->klass or owner->method of the
-                        * returned struct, but monodis doesn't do
-                        * that.  The image unloading depends on that,
-                        * however, so a crash results without this
-                        * check.
-                        */
-                       if (!container->owner.klass)
-                               add_image (container->image, data);
-                       else
-                               add_image (container->owner.klass->image, data);
-               } else {
-                       add_image (type->data.generic_param->image, data);
-               }
-       }
+       case MONO_TYPE_VAR:
+       case MONO_TYPE_MVAR:
+       {
+               MonoImage *image = get_image_for_generic_param (type->data.generic_param);
+               add_image (image, data);
                break;
-       case MONO_TYPE_MVAR: {
-               MonoGenericContainer *container = mono_type_get_generic_param_owner (type);
-               if (type->data.generic_param->image)
-                       add_image (type->data.generic_param->image, data);
-               if (container) {
-                       if (!container->owner.method) {
-                               /* RefEmit created generic param whose method is not finished */
-                               add_image (container->image, data);
-                       } else {
-                               g_assert (container->is_method);
-                               add_image (container->owner.method->klass->image, data);
-                       }
-               } else {
-                       add_image (type->data.generic_param->image, data);
-               }
        }
-               break;
        case MONO_TYPE_CLASS:
        case MONO_TYPE_VALUETYPE:
                add_image (mono_class_from_mono_type (type)->image, data);
@@ -2696,8 +2660,8 @@ typedef struct {
 static gboolean
 steal_gclass_in_image (gpointer key, gpointer value, gpointer data)
 {
-       MonoGenericClass *gclass = key;
-       CleanForImageUserData *user_data = data;
+       MonoGenericClass *gclass = (MonoGenericClass *)key;
+       CleanForImageUserData *user_data = (CleanForImageUserData *)data;
 
        g_assert (gclass_in_image (gclass, user_data->image));
 
@@ -2708,8 +2672,8 @@ steal_gclass_in_image (gpointer key, gpointer value, gpointer data)
 static gboolean
 steal_ginst_in_image (gpointer key, gpointer value, gpointer data)
 {
-       MonoGenericInst *ginst = key;
-       CleanForImageUserData *user_data = data;
+       MonoGenericInst *ginst = (MonoGenericInst *)key;
+       CleanForImageUserData *user_data = (CleanForImageUserData *)data;
 
        // This doesn't work during corlib compilation
        //g_assert (ginst_in_image (ginst, user_data->image));
@@ -2721,8 +2685,8 @@ steal_ginst_in_image (gpointer key, gpointer value, gpointer data)
 static gboolean
 inflated_method_in_image (gpointer key, gpointer value, gpointer data)
 {
-       MonoImage *image = data;
-       MonoMethodInflated *method = key;
+       MonoImage *image = (MonoImage *)data;
+       MonoMethodInflated *method = (MonoMethodInflated *)key;
 
        // FIXME:
        // https://bugzilla.novell.com/show_bug.cgi?id=458168
@@ -2736,8 +2700,8 @@ inflated_method_in_image (gpointer key, gpointer value, gpointer data)
 static gboolean
 inflated_signature_in_image (gpointer key, gpointer value, gpointer data)
 {
-       MonoImage *image = data;
-       MonoInflatedMethodSignature *sig = key;
+       MonoImage *image = (MonoImage *)data;
+       MonoInflatedMethodSignature *sig = (MonoInflatedMethodSignature *)key;
 
        return signature_in_image (sig->sig, image) ||
                (sig->context.class_inst && ginst_in_image (sig->context.class_inst, image)) ||
@@ -2747,8 +2711,8 @@ inflated_signature_in_image (gpointer key, gpointer value, gpointer data)
 static void
 check_gmethod (gpointer key, gpointer value, gpointer data)
 {
-       MonoMethodInflated *method = key;
-       MonoImage *image = data;
+       MonoMethodInflated *method = (MonoMethodInflated *)key;
+       MonoImage *image = (MonoImage *)data;
 
        if (method->context.class_inst)
                g_assert (!ginst_in_image (method->context.class_inst, image));
@@ -2773,7 +2737,7 @@ check_image_sets (MonoImage *image)
                return;
 
        for (i = 0; i < image_sets->len; ++i) {
-               MonoImageSet *set = g_ptr_array_index (image_sets, i);
+               MonoImageSet *set = (MonoImageSet *)g_ptr_array_index (image_sets, i);
 
                if (!g_slist_find (l, set)) {
                        g_hash_table_foreach (set->gmethod_cache, check_gmethod, image);
@@ -2799,7 +2763,7 @@ mono_metadata_clean_for_image (MonoImage *image)
        /* Collect the items to delete */
        /* delete_image_set () modifies the lists so make a copy */
        for (l = image->image_sets; l; l = l->next) {
-               MonoImageSet *set = l->data;
+               MonoImageSet *set = (MonoImageSet *)l->data;
 
                mono_image_set_lock (set);
                g_hash_table_foreach_steal (set->gclass_cache, steal_gclass_in_image, &gclass_data);
@@ -2811,15 +2775,15 @@ mono_metadata_clean_for_image (MonoImage *image)
 
        /* Delete the removed items */
        for (l = ginst_data.list; l; l = l->next)
-               free_generic_inst (l->data);
+               free_generic_inst ((MonoGenericInst *)l->data);
        for (l = gclass_data.list; l; l = l->next)
-               free_generic_class (l->data);
+               free_generic_class ((MonoGenericClass *)l->data);
        g_slist_free (ginst_data.list);
        g_slist_free (gclass_data.list);
        /* delete_image_set () modifies the lists so make a copy */
        set_list = g_slist_copy (image->image_sets);
        for (l = set_list; l; l = l->next) {
-               MonoImageSet *set = l->data;
+               MonoImageSet *set = (MonoImageSet *)l->data;
 
                delete_image_set (set);
        }
@@ -2905,7 +2869,7 @@ mono_metadata_get_inflated_signature (MonoMethodSignature *sig, MonoGenericConte
 
        mono_image_set_lock (set);
 
-       res = g_hash_table_lookup (set->gsignature_cache, &helper);
+       res = (MonoInflatedMethodSignature *)g_hash_table_lookup (set->gsignature_cache, &helper);
        if (!res) {
                res = g_new0 (MonoInflatedMethodSignature, 1);
                res->sig = sig;
@@ -2956,7 +2920,7 @@ mono_metadata_get_generic_inst (int type_argc, MonoType **type_argv)
                        break;
        is_open = (i < type_argc);
 
-       ginst = g_alloca (size);
+       ginst = (MonoGenericInst *)g_alloca (size);
        memset (ginst, 0, sizeof (MonoGenericInst));
        ginst->is_open = is_open;
        ginst->type_argc = type_argc;
@@ -2972,9 +2936,9 @@ mono_metadata_get_generic_inst (int type_argc, MonoType **type_argv)
 
        mono_image_set_lock (set);
 
-       ginst = g_hash_table_lookup (set->ginst_cache, ginst);
+       ginst = (MonoGenericInst *)g_hash_table_lookup (set->ginst_cache, ginst);
        if (!ginst) {
-               ginst = mono_image_set_alloc0 (set, size);
+               ginst = (MonoGenericInst *)mono_image_set_alloc0 (set, size);
 #ifndef MONO_SMALL_CONFIG
                ginst->id = ++next_generic_inst_id;
 #endif
@@ -3016,12 +2980,11 @@ mono_metadata_lookup_generic_class (MonoClass *container_class, MonoGenericInst
        MonoImageSet *set;
        CollectData data;
 
+       memset (&helper, 0, sizeof(helper)); // act like g_new0
        helper.container_class = container_class;
        helper.context.class_inst = inst;
-       helper.context.method_inst = NULL;
        helper.is_dynamic = is_dynamic; /* We use this in a hash lookup, which does not attempt to downcast the pointer */
        helper.is_tb_open = is_tb_open;
-       helper.cached_class = NULL;
 
        collect_data_init (&data);
 
@@ -3033,7 +2996,7 @@ mono_metadata_lookup_generic_class (MonoClass *container_class, MonoGenericInst
 
        mono_image_set_lock (set);
 
-       gclass = g_hash_table_lookup (set->gclass_cache, &helper);
+       gclass = (MonoGenericClass *)g_hash_table_lookup (set->gclass_cache, &helper);
 
        /* A tripwire just to keep us honest */
        g_assert (!helper.cached_class);
@@ -3195,7 +3158,36 @@ select_container (MonoGenericContainer *gc, MonoTypeEnum type)
        return gc;
 }
 
-/* 
+MonoGenericContainer *
+get_anonymous_container_for_image (MonoImage *image, gboolean is_mvar)
+{
+       MonoGenericContainer **container_pointer;
+       if (is_mvar)
+               container_pointer = &image->anonymous_generic_method_container;
+       else
+               container_pointer = &image->anonymous_generic_class_container;
+       MonoGenericContainer *result = *container_pointer;
+
+       // This container has never been created; make it now.
+       if (!result)
+       {
+               // Note this is never deallocated anywhere-- it exists for the lifetime of the image it's allocated from
+               result = (MonoGenericContainer *)mono_image_alloc0 (image, sizeof (MonoGenericContainer));
+               result->owner.image = image;
+               result->is_anonymous = TRUE;
+               result->is_small_param = TRUE;
+               result->is_method = is_mvar;
+
+               // If another thread already made a container, use that and leak this new one.
+               // (Technically it would currently be safe to just assign instead of CASing.)
+               MonoGenericContainer *exchange = (MonoGenericContainer *)InterlockedCompareExchangePointer ((volatile gpointer *)container_pointer, result, NULL);
+               if (exchange)
+                       result = exchange;
+       }
+       return result;
+}
+
+/*
  * mono_metadata_parse_generic_param:
  * @generic_container: Our MonoClass's or MonoMethod's MonoGenericContainer;
  *                     see mono_metadata_parse_type_full() for details.
@@ -3214,12 +3206,24 @@ mono_metadata_parse_generic_param (MonoImage *m, MonoGenericContainer *generic_c
 
        generic_container = select_container (generic_container, type);
        if (!generic_container) {
+               gboolean is_mvar = FALSE;
+               switch (type)
+               {
+                       case MONO_TYPE_VAR:
+                               break;
+                       case MONO_TYPE_MVAR:
+                               is_mvar = TRUE;
+                               break;
+                       default:
+                               g_error ("Cerating generic param object with invalid MonoType"); // This is not a generic param
+               }
+
                /* Create dummy MonoGenericParam */
                MonoGenericParam *param;
 
-               param = mono_image_alloc0 (m, sizeof (MonoGenericParam));
+               param = (MonoGenericParam *)mono_image_alloc0 (m, sizeof (MonoGenericParam));
                param->num = index;
-               param->image = m;
+               param->owner = get_anonymous_container_for_image (m, is_mvar);
 
                return param;
        }
@@ -3251,7 +3255,7 @@ mono_metadata_get_shared_type (MonoType *type)
        MonoType *cached;
 
        /* No need to use locking since nobody is modifying the hash table */
-       if ((cached = g_hash_table_lookup (type_cache, type)))
+       if ((cached = (MonoType *)g_hash_table_lookup (type_cache, type)))
                return cached;
 
        switch (type->type){
@@ -3365,7 +3369,7 @@ do_mono_metadata_parse_type (MonoType *type, MonoImage *m, MonoGenericContainer
 {
        mono_error_init (error);
 
-       type->type = mono_metadata_decode_value (ptr, &ptr);
+       type->type = (MonoTypeEnum)mono_metadata_decode_value (ptr, &ptr);
        
        switch (type->type){
        case MONO_TYPE_VOID:
@@ -3548,7 +3552,7 @@ parse_section_data (MonoImage *m, int *num_clauses, const unsigned char *ptr)
                        int i;
                        *num_clauses = is_fat ? sect_data_len / 24: sect_data_len / 12;
                        /* we could just store a pointer if we don't need to byteswap */
-                       clauses = g_malloc0 (sizeof (MonoExceptionClause) * (*num_clauses));
+                       clauses = (MonoExceptionClause *)g_malloc0 (sizeof (MonoExceptionClause) * (*num_clauses));
                        for (i = 0; i < *num_clauses; ++i) {
                                MonoExceptionClause *ec = &clauses [i];
                                guint32 tof_value;
@@ -3699,7 +3703,7 @@ mono_metadata_parse_mh_full (MonoImage *m, MonoGenericContainer *container, cons
 
        switch (format) {
        case METHOD_HEADER_TINY_FORMAT:
-               mh = g_malloc0 (MONO_SIZEOF_METHOD_HEADER);
+               mh = (MonoMethodHeader *)g_malloc0 (MONO_SIZEOF_METHOD_HEADER);
                ptr++;
                mh->max_stack = 8;
                mh->is_transient = TRUE;
@@ -3757,7 +3761,7 @@ mono_metadata_parse_mh_full (MonoImage *m, MonoGenericContainer *container, cons
                        g_warning ("wrong signature for locals blob");
                locals_ptr++;
                len = mono_metadata_decode_value (locals_ptr, &locals_ptr);
-               mh = g_malloc0 (MONO_SIZEOF_METHOD_HEADER + len * sizeof (MonoType*) + num_clauses * sizeof (MonoExceptionClause));
+               mh = (MonoMethodHeader *)g_malloc0 (MONO_SIZEOF_METHOD_HEADER + len * sizeof (MonoType*) + num_clauses * sizeof (MonoExceptionClause));
                mh->num_locals = len;
                for (i = 0; i < len; ++i) {
                        mh->locals [i] = mono_metadata_parse_type_internal (m, container,
@@ -3766,7 +3770,7 @@ mono_metadata_parse_mh_full (MonoImage *m, MonoGenericContainer *container, cons
                                goto fail;
                }
        } else {
-               mh = g_malloc0 (MONO_SIZEOF_METHOD_HEADER + num_clauses * sizeof (MonoExceptionClause));
+               mh = (MonoMethodHeader *)g_malloc0 (MONO_SIZEOF_METHOD_HEADER + num_clauses * sizeof (MonoExceptionClause));
        }
        mh->code = code;
        mh->code_size = code_size;
@@ -3913,7 +3917,7 @@ mono_method_header_get_clauses (MonoMethodHeader *header, MonoMethod *method, gp
                *clause = *sc;
                return TRUE;
        }
-       sc = *iter;
+       sc = (MonoExceptionClause *)*iter;
        sc++;
        if (sc < header->clauses + header->num_clauses) {
                *iter = sc;
@@ -4245,7 +4249,7 @@ mono_metadata_interfaces_from_typedef_full (MonoImage *meta, guint32 index, Mono
        if (heap_alloc_result)
                result = g_new0 (MonoClass*, pos - start);
        else
-               result = mono_image_alloc0 (meta, sizeof (MonoClass*) * (pos - start));
+               result = (MonoClass **)mono_image_alloc0 (meta, sizeof (MonoClass*) * (pos - start));
 
        pos = start;
        while (pos < tdef->rows) {
@@ -4931,12 +4935,8 @@ mono_metadata_generic_param_equal_internal (MonoGenericParam *p1, MonoGenericPar
         * image B gets that generic inst from the cache, image A is
         * unloaded, so the inst is deleted, but image B still retains
         * a pointer to it.
-        *
-        * The AOT runtime doesn't set the image when it's decoding
-        * types, so we only compare it when the owner is NULL.
         */
-       if (mono_generic_param_owner (p1) == mono_generic_param_owner (p2) &&
-           (mono_generic_param_owner (p1) || p1->image == p2->image))
+       if (mono_generic_param_owner (p1) == mono_generic_param_owner (p2))
                return TRUE;
 
        /*
@@ -5014,6 +5014,7 @@ mono_metadata_fnptr_equal (MonoMethodSignature *s1, MonoMethodSignature *s2, gbo
  * mono_metadata_type_equal:
  * @t1: a type
  * @t2: another type
+ * @signature_only: If true, treat ginsts as equal which are instantiated separately but have equal positional value
  *
  * Determine if @t1 and @t2 represent the same type.
  * Returns: #TRUE if @t1 and @t2 are equal.
@@ -5156,7 +5157,7 @@ mono_metadata_type_dup (MonoImage *image, const MonoType *o)
        if (o->num_mods)
                sizeof_o += o->num_mods  * sizeof (MonoCustomMod);
 
-       r = image ? mono_image_alloc0 (image, sizeof_o) : g_malloc (sizeof_o);
+       r = image ? (MonoType *)mono_image_alloc0 (image, sizeof_o) : (MonoType *)g_malloc (sizeof_o);
 
        memcpy (r, o, sizeof_o);
 
@@ -5574,7 +5575,7 @@ mono_type_create_from_typespec_checked (MonoImage *image, guint32 type_spec, Mon
        mono_error_init (error);
 
        mono_image_lock (image);
-       type = g_hash_table_lookup (image->typespec_cache, GUINT_TO_POINTER (type_spec));
+       type = (MonoType *)g_hash_table_lookup (image->typespec_cache, GUINT_TO_POINTER (type_spec));
        mono_image_unlock (image);
        if (type)
                return type;
@@ -5599,7 +5600,7 @@ mono_type_create_from_typespec_checked (MonoImage *image, guint32 type_spec, Mon
        mono_metadata_free_type (type);
 
        mono_image_lock (image);
-       type = g_hash_table_lookup (image->typespec_cache, GUINT_TO_POINTER (type_spec));
+       type = (MonoType *)g_hash_table_lookup (image->typespec_cache, GUINT_TO_POINTER (type_spec));
        /* We might leak some data in the image mempool if found */
        if (!type) {
                g_hash_table_insert (image->typespec_cache, GUINT_TO_POINTER (type_spec), type2);
@@ -5617,7 +5618,7 @@ mono_image_strndup (MonoImage *image, const char *data, guint len)
        char *res;
        if (!image)
                return g_strndup (data, len);
-       res = mono_image_alloc (image, len + 1);
+       res = (char *)mono_image_alloc (image, len + 1);
        memcpy (res, data, len);
        res [len] = 0;
        return res;
@@ -5643,12 +5644,12 @@ mono_metadata_parse_marshal_spec_full (MonoImage *image, MonoImage *parent_image
        /* fixme: this is incomplete, but I cant find more infos in the specs */
 
        if (image)
-               res = mono_image_alloc0 (image, sizeof (MonoMarshalSpec));
+               res = (MonoMarshalSpec *)mono_image_alloc0 (image, sizeof (MonoMarshalSpec));
        else
                res = g_new0 (MonoMarshalSpec, 1);
        
        len = mono_metadata_decode_value (ptr, &ptr);
-       res->native = *ptr++;
+       res->native = (MonoMarshalNative)*ptr++;
 
        if (res->native == MONO_NATIVE_LPARRAY) {
                res->data.array_data.param_num = -1;
@@ -5656,7 +5657,7 @@ mono_metadata_parse_marshal_spec_full (MonoImage *image, MonoImage *parent_image
                res->data.array_data.elem_mult = -1;
 
                if (ptr - start <= len)
-                       res->data.array_data.elem_type = *ptr++;
+                       res->data.array_data.elem_type = (MonoMarshalNative)*ptr++;
                if (ptr - start <= len)
                        res->data.array_data.param_num = mono_metadata_decode_value (ptr, &ptr);
                if (ptr - start <= len)
@@ -5703,10 +5704,10 @@ mono_metadata_parse_marshal_spec_full (MonoImage *image, MonoImage *parent_image
        }
 
        if (res->native == MONO_NATIVE_SAFEARRAY) {
-               res->data.safearray_data.elem_type = 0;
+               res->data.safearray_data.elem_type = (MonoMarshalVariant)0;
                res->data.safearray_data.num_elem = 0;
                if (ptr - start <= len)
-                       res->data.safearray_data.elem_type = *ptr++;
+                       res->data.safearray_data.elem_type = (MonoMarshalVariant)*ptr++;
                if (ptr - start <= len)
                        res->data.safearray_data.num_elem = *ptr++;
        }
@@ -6097,9 +6098,9 @@ get_constraints (MonoImage *image, int owner, MonoClass ***constraints, MonoGene
        }
        if (!found)
                return TRUE;
-       res = mono_image_alloc0 (image, sizeof (MonoClass*) * (found + 1));
+       res = (MonoClass **)mono_image_alloc0 (image, sizeof (MonoClass*) * (found + 1));
        for (i = 0, tmp = cons; i < found; ++i, tmp = tmp->next) {
-               res [i] = tmp->data;
+               res [i] = (MonoClass *)tmp->data;
        }
        g_slist_free (cons);
        *constraints = res;
@@ -6211,11 +6212,12 @@ mono_metadata_load_generic_params (MonoImage *image, guint32 token, MonoGenericC
        mono_metadata_decode_row (tdef, i - 1, cols, MONO_GENERICPARAM_SIZE);
        params = NULL;
        n = 0;
-       container = mono_image_alloc0 (image, sizeof (MonoGenericContainer));
-       container->image = image;
+       container = (MonoGenericContainer *)mono_image_alloc0 (image, sizeof (MonoGenericContainer));
+       container->owner.image = image; // Temporarily mark as anonymous, but this will be overriden by caller
+       container->is_anonymous = TRUE;
        do {
                n++;
-               params = g_realloc (params, sizeof (MonoGenericParamFull) * n);
+               params = (MonoGenericParamFull *)g_realloc (params, sizeof (MonoGenericParamFull) * n);
                memset (&params [n - 1], 0, sizeof (MonoGenericParamFull));
                params [n - 1].param.owner = container;
                params [n - 1].param.num = cols [MONO_GENERICPARAM_NUMBER];
@@ -6230,7 +6232,7 @@ mono_metadata_load_generic_params (MonoImage *image, guint32 token, MonoGenericC
        } while (cols [MONO_GENERICPARAM_OWNER] == owner);
 
        container->type_argc = n;
-       container->type_params = mono_image_alloc0 (image, sizeof (MonoGenericParamFull) * n);
+       container->type_params = (MonoGenericParamFull *)mono_image_alloc0 (image, sizeof (MonoGenericParamFull) * n);
        memcpy (container->type_params, params, sizeof (MonoGenericParamFull) * n);
        g_free (params);
        container->parent = parent_container;
@@ -6480,7 +6482,7 @@ mono_signature_get_params (MonoMethodSignature *sig, gpointer *iter)
                        return NULL;
                }
        }
-       type = *iter;
+       type = (MonoType **)*iter;
        type++;
        if (type < &sig->params [sig->param_count]) {
                *iter = type;
@@ -6638,3 +6640,32 @@ mono_method_get_wrapper_cache (MonoMethod *method)
                return &method->klass->image->wrapper_caches;
        }
 }
+
+// This is support for the mempool reference tracking feature in checked-build, but lives in metadata.c due to use of static variables of this file.
+
+/**
+ * mono_find_image_set_owner:
+ *
+ * Find the imageset, if any, which a given pointer is located in the memory of.
+ */
+MonoImageSet *
+mono_find_image_set_owner (void *ptr)
+{
+       MonoImageSet *owner = NULL;
+       int i;
+
+       image_sets_lock ();
+
+       if (image_sets)
+       {
+               for (i = 0; !owner && i < image_sets->len; ++i) {
+                       MonoImageSet *set = (MonoImageSet *)g_ptr_array_index (image_sets, i);
+                       if (mono_mempool_contains_addr (set->mempool, ptr))
+                               owner = set;
+               }
+       }
+
+       image_sets_unlock ();
+
+       return owner;
+}

diff --git a/mono/metadata/method-builder.c b/mono/metadata/method-builder.c
index 234598d496250d8026180410ecc8664aef17af11..23f8d5990952d0a176d19cbb1e26e1a0f305114a 100644 (file)
--- a/mono/metadata/method-builder.c
+++ b/mono/metadata/method-builder.c
@@ -67,7 +67,7 @@ mono_mb_new_base (MonoClass *klass, MonoWrapperType type)
 
 #ifndef DISABLE_JIT
        mb->code_size = 40;
-       mb->code = g_malloc (mb->code_size);
+       mb->code = (unsigned char *)g_malloc (mb->code_size);
 #endif
        /* placeholder for the wrapper always at index 1 */
        mono_mb_add_data (mb, NULL);
@@ -155,7 +155,7 @@ mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, in
        {
                /* Realloc the method info into a mempool */
 
-               method = mono_image_alloc0 (image, sizeof (MonoMethodWrapper));
+               method = (MonoMethod *)mono_image_alloc0 (image, sizeof (MonoMethodWrapper));
                memcpy (method, mb->method, sizeof (MonoMethodWrapper));
                mw = (MonoMethodWrapper*) method;
 
@@ -168,7 +168,7 @@ mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, in
                mw->header = header = (MonoMethodHeader *) 
                        mono_image_alloc0 (image, MONO_SIZEOF_METHOD_HEADER + mb->locals * sizeof (MonoType *));
 
-               header->code = mono_image_alloc (image, mb->pos);
+               header->code = (const unsigned char *)mono_image_alloc (image, mb->pos);
                memcpy ((char*)header->code, mb->code, mb->pos);
 
                for (i = 0, l = mb->locals_list; l; l = l->next, i++) {
@@ -197,15 +197,15 @@ mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, in
        method->skip_visibility = mb->skip_visibility;
 #endif
 
-       i = g_list_length (mw->method_data);
+       i = g_list_length ((GList *)mw->method_data);
        if (i) {
                GList *tmp;
                void **data;
-               l = g_list_reverse (mw->method_data);
+               l = g_list_reverse ((GList *)mw->method_data);
                if (method_is_dynamic (method))
-                       data = g_malloc (sizeof (gpointer) * (i + 1));
+                       data = (void **)g_malloc (sizeof (gpointer) * (i + 1));
                else
-                       data = mono_image_alloc (image, sizeof (gpointer) * (i + 1));
+                       data = (void **)mono_image_alloc (image, sizeof (gpointer) * (i + 1));
                /* store the size in the first element */
                data [0] = GUINT_TO_POINTER (i);
                i = 1;
@@ -232,7 +232,7 @@ mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, in
 #endif
 
        if (mb->param_names) {
-               char **param_names = mono_image_alloc0 (image, signature->param_count * sizeof (gpointer));
+               char **param_names = (char **)mono_image_alloc0 (image, signature->param_count * sizeof (gpointer));
                for (i = 0; i < signature->param_count; ++i)
                        param_names [i] = mono_image_strdup (image, mb->param_names [i]);
 
@@ -257,9 +257,9 @@ mono_mb_add_data (MonoMethodBuilder *mb, gpointer data)
        mw = (MonoMethodWrapper *)mb->method;
 
        /* one O(n) is enough */
-       mw->method_data = g_list_prepend (mw->method_data, data);
+       mw->method_data = g_list_prepend ((GList *)mw->method_data, data);
 
-       return g_list_length (mw->method_data);
+       return g_list_length ((GList *)mw->method_data);
 }
 
 #ifndef DISABLE_JIT
@@ -299,7 +299,7 @@ mono_mb_emit_byte (MonoMethodBuilder *mb, guint8 op)
 {
        if (mb->pos >= mb->code_size) {
                mb->code_size += mb->code_size >> 1;
-               mb->code = g_realloc (mb->code, mb->code_size);
+               mb->code = (unsigned char *)g_realloc (mb->code, mb->code_size);
        }
 
        mb->code [mb->pos++] = op;
@@ -322,7 +322,7 @@ mono_mb_emit_i4 (MonoMethodBuilder *mb, gint32 data)
 {
        if ((mb->pos + 4) >= mb->code_size) {
                mb->code_size += mb->code_size >> 1;
-               mb->code = g_realloc (mb->code, mb->code_size);
+               mb->code = (unsigned char *)g_realloc (mb->code, mb->code_size);
        }
 
        mono_mb_patch_addr (mb, mb->pos, data);
@@ -334,7 +334,7 @@ mono_mb_emit_i8 (MonoMethodBuilder *mb, gint64 data)
 {
        if ((mb->pos + 8) >= mb->code_size) {
                mb->code_size += mb->code_size >> 1;
-               mb->code = g_realloc (mb->code, mb->code_size);
+               mb->code = (unsigned char *)g_realloc (mb->code, mb->code_size);
        }
 
        mono_mb_patch_addr (mb, mb->pos, data);
@@ -347,7 +347,7 @@ mono_mb_emit_i2 (MonoMethodBuilder *mb, gint16 data)
 {
        if ((mb->pos + 2) >= mb->code_size) {
                mb->code_size += mb->code_size >> 1;
-               mb->code = g_realloc (mb->code, mb->code_size);
+               mb->code = (unsigned char *)g_realloc (mb->code, mb->code_size);
        }
 
        mb->code [mb->pos] = data & 0xff;

diff --git a/mono/metadata/monitor.c b/mono/metadata/monitor.c
index f86c4233baf90375a94ee5c248a54c3df585d88a..0c1d28130aff76741a2bc76e03d5cd84ea9dfdd8 100644 (file)
--- a/mono/metadata/monitor.c
+++ b/mono/metadata/monitor.c
@@ -76,8 +76,8 @@ struct _MonitorArray {
        MonoThreadsSync monitors [MONO_ZERO_LEN_ARRAY];
 };
 
-#define mono_monitor_allocator_lock() mono_mutex_lock (&monitor_mutex)
-#define mono_monitor_allocator_unlock() mono_mutex_unlock (&monitor_mutex)
+#define mono_monitor_allocator_lock() mono_os_mutex_lock (&monitor_mutex)
+#define mono_monitor_allocator_unlock() mono_os_mutex_unlock (&monitor_mutex)
 static mono_mutex_t monitor_mutex;
 static MonoThreadsSync *monitor_freelist;
 static MonitorArray *monitor_allocated;
@@ -248,7 +248,7 @@ lock_word_new_flat (gint32 owner)
 void
 mono_monitor_init (void)
 {
-       mono_mutex_init_recursive (&monitor_mutex);
+       mono_os_mutex_init_recursive (&monitor_mutex);
 }
  
 void
@@ -257,11 +257,11 @@ mono_monitor_cleanup (void)
        MonoThreadsSync *mon;
        /* MonitorArray *marray, *next = NULL; */
 
-       /*mono_mutex_destroy (&monitor_mutex);*/
+       /*mono_os_mutex_destroy (&monitor_mutex);*/
 
        /* The monitors on the freelist don't have weak links - mark them */
-       for (mon = monitor_freelist; mon; mon = mon->data)
-               mon->wait_list = (gpointer)-1;
+       for (mon = monitor_freelist; mon; mon = (MonoThreadsSync *)mon->data)
+               mon->wait_list = (GSList *)-1;
 
        /*
         * FIXME: This still crashes with sgen (async_read.exe)
@@ -319,7 +319,7 @@ mono_locks_dump (gboolean include_untaken)
        int used = 0, on_freelist = 0, to_recycle = 0, total = 0, num_arrays = 0;
        MonoThreadsSync *mon;
        MonitorArray *marray;
-       for (mon = monitor_freelist; mon; mon = mon->data)
+       for (mon = monitor_freelist; mon; mon = (MonoThreadsSync *)mon->data)
                on_freelist++;
        for (marray = monitor_allocated; marray; marray = marray->next) {
                total += marray->num_monitors;
@@ -330,7 +330,7 @@ mono_locks_dump (gboolean include_untaken)
                                if (i < marray->num_monitors - 1)
                                        to_recycle++;
                        } else {
-                               if (!monitor_is_on_freelist (mon->data)) {
+                               if (!monitor_is_on_freelist ((MonoThreadsSync *)mon->data)) {
                                        MonoObject *holder = (MonoObject *)mono_gchandle_get_target ((guint32)mon->data);
                                        if (mon_status_get_owner (mon->status)) {
                                                g_print ("Lock %p in object %p held by thread %d, nest level: %d\n",
@@ -378,39 +378,39 @@ mon_finalize (MonoThreadsSync *mon)
 static MonoThreadsSync *
 mon_new (gsize id)
 {
-       MonoThreadsSync *new;
+       MonoThreadsSync *new_;
 
        if (!monitor_freelist) {
                MonitorArray *marray;
                int i;
                /* see if any sync block has been collected */
-               new = NULL;
+               new_ = NULL;
                for (marray = monitor_allocated; marray; marray = marray->next) {
                        for (i = 0; i < marray->num_monitors; ++i) {
                                if (mono_gchandle_get_target ((guint32)marray->monitors [i].data) == NULL) {
-                                       new = &marray->monitors [i];
-                                       if (new->wait_list) {
+                                       new_ = &marray->monitors [i];
+                                       if (new_->wait_list) {
                                                /* Orphaned events left by aborted threads */
-                                               while (new->wait_list) {
+                                               while (new_->wait_list) {
                                                        LOCK_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%d): Closing orphaned event %d", mono_thread_info_get_small_id (), new->wait_list->data));
-                                                       CloseHandle (new->wait_list->data);
-                                                       new->wait_list = g_slist_remove (new->wait_list, new->wait_list->data);
+                                                       CloseHandle (new_->wait_list->data);
+                                                       new_->wait_list = g_slist_remove (new_->wait_list, new_->wait_list->data);
                                                }
                                        }
-                                       mono_gchandle_free ((guint32)new->data);
-                                       new->data = monitor_freelist;
-                                       monitor_freelist = new;
+                                       mono_gchandle_free ((guint32)new_->data);
+                                       new_->data = monitor_freelist;
+                                       monitor_freelist = new_;
                                }
                        }
                        /* small perf tweak to avoid scanning all the blocks */
-                       if (new)
+                       if (new_)
                                break;
                }
                /* need to allocate a new array of monitors */
                if (!monitor_freelist) {
                        MonitorArray *last;
                        LOCK_DEBUG (g_message ("%s: allocating more monitors: %d", __func__, array_size));
-                       marray = g_malloc0 (sizeof (MonoArray) + array_size * sizeof (MonoThreadsSync));
+                       marray = (MonitorArray *)g_malloc0 (MONO_SIZEOF_MONO_ARRAY + array_size * sizeof (MonoThreadsSync));
                        marray->num_monitors = array_size;
                        array_size *= 2;
                        /* link into the freelist */
@@ -433,18 +433,18 @@ mon_new (gsize id)
                }
        }
 
-       new = monitor_freelist;
-       monitor_freelist = new->data;
+       new_ = monitor_freelist;
+       monitor_freelist = (MonoThreadsSync *)new_->data;
 
-       new->status = mon_status_set_owner (0, id);
-       new->status = mon_status_init_entry_count (new->status);
-       new->nest = 1;
-       new->data = NULL;
+       new_->status = mon_status_set_owner (0, id);
+       new_->status = mon_status_init_entry_count (new_->status);
+       new_->nest = 1;
+       new_->data = NULL;
        
 #ifndef DISABLE_PERFCOUNTERS
        mono_perfcounters->gc_sync_blocks++;
 #endif
-       return new;
+       return new_;
 }
 
 static MonoThreadsSync*
@@ -493,7 +493,7 @@ mono_monitor_inflate_owned (MonoObject *obj, int id)
        nlw = lock_word_new_inflated (mon);
 
        mono_memory_write_barrier ();
-       tmp_lw.sync = InterlockedCompareExchangePointer ((gpointer*)&obj->synchronisation, nlw.sync, old_lw.sync);
+       tmp_lw.sync = (MonoThreadsSync *)InterlockedCompareExchangePointer ((gpointer*)&obj->synchronisation, nlw.sync, old_lw.sync);
        if (tmp_lw.sync != old_lw.sync) {
                /* Someone else inflated the lock in the meantime */
                discard_mon (mon);
@@ -536,7 +536,7 @@ mono_monitor_inflate (MonoObject *obj)
                        mon->nest = lock_word_get_nest (old_lw);
                }
                mono_memory_write_barrier ();
-               tmp_lw.sync = InterlockedCompareExchangePointer ((gpointer*)&obj->synchronisation, nlw.sync, old_lw.sync);
+               tmp_lw.sync = (MonoThreadsSync *)InterlockedCompareExchangePointer ((gpointer*)&obj->synchronisation, nlw.sync, old_lw.sync);
                if (tmp_lw.sync == old_lw.sync) {
                        /* Successfully inflated the lock */
                        return;
@@ -592,7 +592,7 @@ mono_object_hash (MonoObject* obj)
                LockWord old_lw;
                lw = lock_word_new_thin_hash (hash);
 
-               old_lw.sync = InterlockedCompareExchangePointer ((gpointer*)&obj->synchronisation, lw.sync, NULL);
+               old_lw.sync = (MonoThreadsSync *)InterlockedCompareExchangePointer ((gpointer*)&obj->synchronisation, lw.sync, NULL);
                if (old_lw.sync == NULL) {
                        return hash;
                }
@@ -707,7 +707,7 @@ mono_monitor_exit_flat (MonoObject *obj, LockWord old_lw)
        else
                new_lw.lock_word = 0;
 
-       tmp_lw.sync = InterlockedCompareExchangePointer ((gpointer*)&obj->synchronisation, new_lw.sync, old_lw.sync);
+       tmp_lw.sync = (MonoThreadsSync *)InterlockedCompareExchangePointer ((gpointer*)&obj->synchronisation, new_lw.sync, old_lw.sync);
        if (old_lw.sync != tmp_lw.sync) {
                /* Someone inflated the lock in the meantime */
                mono_monitor_exit_inflated (obj);
@@ -896,7 +896,7 @@ retry_contended:
                 * We have to obey a stop/suspend request even if 
                 * allow_interruption is FALSE to avoid hangs at shutdown.
                 */
-               if (!mono_thread_test_state (mono_thread_internal_current (), (ThreadState_StopRequested|ThreadState_SuspendRequested))) {
+               if (!mono_thread_test_state (mono_thread_internal_current (), (MonoThreadState)(ThreadState_StopRequested | ThreadState_SuspendRequested))) {
                        if (ms != INFINITE) {
                                now = mono_msec_ticks ();
                                if (now < then) {
@@ -981,7 +981,7 @@ mono_monitor_try_enter_internal (MonoObject *obj, guint32 ms, gboolean allow_int
                        } else {
                                LockWord nlw, old_lw;
                                nlw = lock_word_increment_nest (lw);
-                               old_lw.sync = InterlockedCompareExchangePointer ((gpointer*)&obj->synchronisation, nlw.sync, lw.sync);
+                               old_lw.sync = (MonoThreadsSync *)InterlockedCompareExchangePointer ((gpointer*)&obj->synchronisation, nlw.sync, lw.sync);
                                if (old_lw.sync != lw.sync) {
                                        /* Someone else inflated it in the meantime */
                                        g_assert (lock_word_is_inflated (old_lw));

diff --git a/mono/metadata/mono-basic-block.c b/mono/metadata/mono-basic-block.c
index a62c39868d18bf86f36539b771e5a2d676ec4110..53c74e8cf5bf442774e648c6a6a1d09680d807af 100644 (file)
--- a/mono/metadata/mono-basic-block.c
+++ b/mono/metadata/mono-basic-block.c
@@ -295,11 +295,11 @@ bb_liveness (MonoSimpleBasicBlock *bb)
        }
 
        while (mark_stack->len > 0) {
-               MonoSimpleBasicBlock *block = g_ptr_array_remove_index_fast (mark_stack, mark_stack->len - 1);
+               MonoSimpleBasicBlock *block = (MonoSimpleBasicBlock *)g_ptr_array_remove_index_fast (mark_stack, mark_stack->len - 1);
                block->dead = FALSE;
 
                for (tmp = block->out_bb; tmp; tmp = tmp->next) {
-                       MonoSimpleBasicBlock *to = tmp->data;
+                       MonoSimpleBasicBlock *to = (MonoSimpleBasicBlock *)tmp->data;
                        if (to->dead)
                                g_ptr_array_add (mark_stack, to);
                }

diff --git a/mono/metadata/mono-config.c b/mono/metadata/mono-config.c
index e29fe9d0fccf942479547318a64628afd60af3c4..e9aab32a48d4484e8de91a09909d2772561e6fc2 100644 (file)
--- a/mono/metadata/mono-config.c
+++ b/mono/metadata/mono-config.c
@@ -166,9 +166,9 @@ static void start_element (GMarkupParseContext *context,
                           gpointer             user_data,
                           GError             **error)
 {
-       ParseState *state = user_data;
+       ParseState *state = (ParseState *)user_data;
        if (!state->current) {
-               state->current = g_hash_table_lookup (config_handlers, element_name);
+               state->current = (MonoParseHandler *)g_hash_table_lookup (config_handlers, element_name);
                if (state->current && state->current->init)
                        state->user_data = state->current->init (state->assembly);
        }
@@ -181,7 +181,7 @@ static void end_element   (GMarkupParseContext *context,
                           gpointer             user_data,
                           GError             **error)
 {
-       ParseState *state = user_data;
+       ParseState *state = (ParseState *)user_data;
        if (state->current) {
                if (state->current->end)
                        state->current->end (state->user_data, element_name);
@@ -200,7 +200,7 @@ static void parse_text    (GMarkupParseContext *context,
                           gpointer             user_data,
                           GError             **error)
 {
-       ParseState *state = user_data;
+       ParseState *state = (ParseState *)user_data;
        if (state->current && state->current->text)
                state->current->text (state->user_data, text, text_len);
 }
@@ -218,7 +218,7 @@ static void parse_error   (GMarkupParseContext *context,
                            GError              *error,
                           gpointer             user_data)
 {
-       ParseState *state = user_data;
+       ParseState *state = (ParseState *)user_data;
        const gchar *msg;
        const gchar *filename;
 
@@ -267,7 +267,7 @@ dllmap_start (gpointer user_data,
               const gchar        **attribute_values)
 {
        int i;
-       DllInfo *info = user_data;
+       DllInfo *info = (DllInfo *)user_data;
        
        if (strcmp (element_name, "dllmap") == 0) {
                g_free (info->dll);
@@ -284,7 +284,7 @@ dllmap_start (gpointer user_data,
                                        size_t libdir_len = strlen (libdir);
                                        char *result;
                                        
-                                       result = g_malloc (libdir_len-strlen("$mono_libdir")+strlen(attribute_values[i])+1);
+                                       result = (char *)g_malloc (libdir_len-strlen("$mono_libdir")+strlen(attribute_values[i])+1);
                                        strncpy (result, attribute_names[i], p-attribute_values[i]);
                                        strcat (result, libdir);
                                        strcat (result, p+strlen("$mono_libdir"));
@@ -327,7 +327,7 @@ dllmap_start (gpointer user_data,
 static void
 dllmap_finish (gpointer user_data)
 {
-       DllInfo *info = user_data;
+       DllInfo *info = (DllInfo *)user_data;
 
        g_free (info->dll);
        g_free (info->target);
@@ -448,7 +448,7 @@ mono_config_parse_xml_with_context (ParseState *state, const char *text, gsize l
        if (!inited)
                mono_config_init ();
 
-       context = g_markup_parse_context_new (&mono_parser, 0, state, NULL);
+       context = g_markup_parse_context_new (&mono_parser, (GMarkupParseFlags)0, state, NULL);
        if (g_markup_parse_context_parse (context, text, len, NULL)) {
                g_markup_parse_context_end_parse (context, NULL);
        }
@@ -668,7 +668,7 @@ mono_get_machine_config (void)
 static void
 assembly_binding_end (gpointer user_data, const char *element_name)
 {
-       ParserUserData *pud = user_data;
+       ParserUserData *pud = (ParserUserData *)user_data;
 
        if (!strcmp (element_name, "dependentAssembly")) {
                if (pud->info_parsed && pud->info) {
@@ -689,7 +689,7 @@ publisher_policy_start (gpointer user_data,
        MonoAssemblyBindingInfo *info;
        int n;
 
-       pud = user_data;
+       pud = (ParserUserData *)user_data;
        info = pud->info;
        if (!strcmp (element_name, "dependentAssembly")) {
                info->name = NULL;

diff --git a/mono/metadata/mono-debug.c b/mono/metadata/mono-debug.c
index 04b5d647be15838b4ffb9a7024ad297c0af6592f..09c55b3bcc8486be2385d9e3ea800cd4f954af0c 100644 (file)
--- a/mono/metadata/mono-debug.c
+++ b/mono/metadata/mono-debug.c
@@ -100,7 +100,7 @@ lookup_data_table (MonoDomain *domain)
 {
        MonoDebugDataTable *table;
 
-       table = g_hash_table_lookup (data_table_hash, domain);
+       table = (MonoDebugDataTable *)g_hash_table_lookup (data_table_hash, domain);
        if (!table) {
                g_error ("lookup_data_table () failed for %p\n", domain);
                g_assert (table);
@@ -137,7 +137,7 @@ mono_debug_init (MonoDebugFormat format)
        mono_debug_initialized = TRUE;
        mono_debug_format = format;
 
-       mono_mutex_init_recursive (&debugger_lock_mutex);
+       mono_os_mutex_init_recursive (&debugger_lock_mutex);
 
        mono_debugger_lock ();
 
@@ -197,7 +197,7 @@ mono_debug_domain_unload (MonoDomain *domain)
 
        mono_debugger_lock ();
 
-       table = g_hash_table_lookup (data_table_hash, domain);
+       table = (MonoDebugDataTable *)g_hash_table_lookup (data_table_hash, domain);
        if (!table) {
                g_warning (G_STRLOC ": unloading unknown domain %p / %d",
                           domain, mono_domain_get_id (domain));
@@ -216,7 +216,7 @@ mono_debug_domain_unload (MonoDomain *domain)
 static MonoDebugHandle *
 mono_debug_get_image (MonoImage *image)
 {
-       return g_hash_table_lookup (mono_debug_handles, image);
+       return (MonoDebugHandle *)g_hash_table_lookup (mono_debug_handles, image);
 }
 
 void
@@ -444,7 +444,7 @@ mono_debug_add_method (MonoMethod *method, MonoDebugMethodJitInfo *jit, MonoDoma
                (25 + sizeof (gpointer)) * (1 + jit->num_params + jit->num_locals);
 
        if (max_size > BUFSIZ)
-               ptr = oldptr = g_malloc (max_size);
+               ptr = oldptr = (guint8 *)g_malloc (max_size);
        else
                ptr = oldptr = buffer;
 
@@ -482,9 +482,9 @@ mono_debug_add_method (MonoMethod *method, MonoDebugMethodJitInfo *jit, MonoDoma
        total_size = size + sizeof (MonoDebugMethodAddress);
 
        if (method_is_dynamic (method)) {
-               address = g_malloc0 (total_size);
+               address = (MonoDebugMethodAddress *)g_malloc0 (total_size);
        } else {
-               address = mono_mempool_alloc (table->mp, total_size);
+               address = (MonoDebugMethodAddress *)mono_mempool_alloc (table->mp, total_size);
        }
 
        address->code_start = jit->code_start;
@@ -515,7 +515,7 @@ mono_debug_remove_method (MonoMethod *method, MonoDomain *domain)
 
        table = lookup_data_table (domain);
 
-       address = g_hash_table_lookup (table->method_address_hash, method);
+       address = (MonoDebugMethodAddress *)g_hash_table_lookup (table->method_address_hash, method);
        if (address)
                g_free (address);
 
@@ -579,7 +579,7 @@ read_variable (MonoDebugVarInfo *var, guint8 *ptr, guint8 **rptr)
        var->size = read_leb128 (ptr, &ptr);
        var->begin_scope = read_leb128 (ptr, &ptr);
        var->end_scope = read_leb128 (ptr, &ptr);
-       READ_UNALIGNED (gpointer, ptr, var->type);
+       READ_UNALIGNED (MonoType *, ptr, var->type);
        ptr += sizeof (gpointer);
        *rptr = ptr;
 }
@@ -655,7 +655,7 @@ find_method (MonoMethod *method, MonoDomain *domain)
        MonoDebugMethodAddress *address;
 
        table = lookup_data_table (domain);
-       address = g_hash_table_lookup (table->method_address_hash, method);
+       address = (MonoDebugMethodAddress *)g_hash_table_lookup (table->method_address_hash, method);
 
        if (!address)
                return NULL;
@@ -775,6 +775,20 @@ mono_debug_lookup_source_location (MonoMethod *method, guint32 address, MonoDoma
        return location;
 }
 
+MonoDebugSourceLocation *
+mono_debug_method_lookup_location (MonoDebugMethodInfo *minfo, int il_offset)
+{
+       MonoDebugSourceLocation *location;
+
+       mono_debugger_lock ();
+       if (minfo->handle->ppdb)
+               location = mono_ppdb_lookup_location (minfo, il_offset);
+       else
+               location = mono_debug_symfile_lookup_location (minfo, il_offset);
+       mono_debugger_unlock ();
+       return location;
+}
+
 /*
  * mono_debug_lookup_locals:
  *
@@ -947,14 +961,14 @@ void
 mono_debugger_lock (void)
 {
        g_assert (mono_debug_initialized);
-       mono_mutex_lock (&debugger_lock_mutex);
+       mono_os_mutex_lock (&debugger_lock_mutex);
 }
 
 void
 mono_debugger_unlock (void)
 {
        g_assert (mono_debug_initialized);
-       mono_mutex_unlock (&debugger_lock_mutex);
+       mono_os_mutex_unlock (&debugger_lock_mutex);
 }
 
 /**

diff --git a/mono/metadata/mono-debug.h b/mono/metadata/mono-debug.h
index c2134bb2e03770a6238a2fb3ddd3b112fccb079d..8885e521bad3c652038b49d6492af7fa42f8f9f4 100644 (file)
--- a/mono/metadata/mono-debug.h
+++ b/mono/metadata/mono-debug.h
@@ -185,6 +185,9 @@ mono_debug_add_delegate_trampoline (void* code, int size);
 MONO_API MonoDebugLocalsInfo*
 mono_debug_lookup_locals (MonoMethod *method);
 
+MonoDebugSourceLocation *
+mono_debug_method_lookup_location (MonoDebugMethodInfo *minfo, int il_offset);
+
 /*
  * Line number support.
  */

diff --git a/mono/metadata/mono-hash.c b/mono/metadata/mono-hash.c
index bbfa757212bd7706345bf9b4de0851d14af76cc8..aaff73db581ffa249deeab394dfb93737e5b34e8 100644 (file)
--- a/mono/metadata/mono-hash.c
+++ b/mono/metadata/mono-hash.c
@@ -173,7 +173,7 @@ typedef struct {
 static void*
 do_rehash (void *_data)
 {
-       RehashData *data = _data;
+       RehashData *data = (RehashData *)_data;
        MonoGHashTable *hash = data->hash;
        int current_size, i;
        Slot **table;
@@ -425,17 +425,17 @@ mono_g_hash_table_insert_replace (MonoGHashTable *hash, gpointer key, gpointer v
                        if (replace){
                                if (hash->key_destroy_func != NULL)
                                        (*hash->key_destroy_func)(s->key);
-                               s->key = key;
+                               s->key = (MonoObject *)key;
                        }
                        if (hash->value_destroy_func != NULL)
                                (*hash->value_destroy_func) (s->value);
-                       s->value = value;
+                       s->value = (MonoObject *)value;
                        return;
                }
        }
        s = new_slot (hash);
-       s->key = key;
-       s->value = value;
+       s->key = (MonoObject *)key;
+       s->value = (MonoObject *)value;
        s->next = hash->table [hashcode];
        hash->table [hashcode] = s;
        hash->in_use++;

diff --git a/mono/metadata/mono-perfcounters.c b/mono/metadata/mono-perfcounters.c
index 2cc6a65a254ec3277b6520ace1d89af221a491a8..e622308066a44d2e8d632909c69007b00796381b 100644 (file)
--- a/mono/metadata/mono-perfcounters.c
+++ b/mono/metadata/mono-perfcounters.c
@@ -153,8 +153,8 @@ enum {
 };
 
 static mono_mutex_t perfctr_mutex;
-#define perfctr_lock() mono_mutex_lock (&perfctr_mutex)
-#define perfctr_unlock() mono_mutex_unlock (&perfctr_mutex)
+#define perfctr_lock() mono_os_mutex_lock (&perfctr_mutex)
+#define perfctr_unlock() mono_os_mutex_unlock (&perfctr_mutex)
 
 typedef struct {
        char reserved [16];
@@ -359,9 +359,9 @@ load_sarea_for_pid (int pid)
        perfctr_lock ();
        if (pid_to_shared_area == NULL)
                pid_to_shared_area = g_hash_table_new (NULL, NULL);
-       data = g_hash_table_lookup (pid_to_shared_area, GINT_TO_POINTER (pid));
+       data = (ExternalSArea *)g_hash_table_lookup (pid_to_shared_area, GINT_TO_POINTER (pid));
        if (!data) {
-               area = mono_shared_area_for_pid (GINT_TO_POINTER (pid));
+               area = (MonoSharedArea *)mono_shared_area_for_pid (GINT_TO_POINTER (pid));
                if (area) {
                        data = g_new (ExternalSArea, 1);
                        data->sarea = area;
@@ -369,7 +369,7 @@ load_sarea_for_pid (int pid)
                        g_hash_table_insert (pid_to_shared_area, GINT_TO_POINTER (pid), data);
                }
        } else {
-               area = data->sarea;
+               area = (MonoSharedArea *)data->sarea;
                data->refcount ++;
        }
        perfctr_unlock ();
@@ -380,7 +380,7 @@ static void
 unref_pid_unlocked (int pid)
 {
        ExternalSArea *data;
-       data = g_hash_table_lookup (pid_to_shared_area, GINT_TO_POINTER (pid));
+       data = (ExternalSArea *)g_hash_table_lookup (pid_to_shared_area, GINT_TO_POINTER (pid));
        if (data) {
                data->refcount--;
                if (!data->refcount) {
@@ -537,9 +537,9 @@ mono_perfcounters_init (void)
        d_offset += 7;
        d_offset &= ~7;
 
-       mono_mutex_init_recursive (&perfctr_mutex);
+       mono_os_mutex_init_recursive (&perfctr_mutex);
 
-       shared_area = mono_shared_area ();
+       shared_area = (MonoSharedArea *)mono_shared_area ();
        shared_area->counters_start = G_STRUCT_OFFSET (MonoSharedArea, counters);
        shared_area->counters_size = sizeof (MonoPerfCounters);
        shared_area->data_start = d_offset;
@@ -645,7 +645,7 @@ typedef struct {
 static gboolean
 category_search (SharedHeader *header, void *data)
 {
-       CatSearch *search = data;
+       CatSearch *search = (CatSearch *)data;
        if (header->ftype == FTYPE_CATEGORY) {
                SharedCategory *cat = (SharedCategory*)header;
                if (mono_string_compare_ascii (search->name, cat->name) == 0) {
@@ -669,7 +669,7 @@ find_custom_category (MonoString *name)
 static gboolean
 category_collect (SharedHeader *header, void *data)
 {
-       GSList **list = data;
+       GSList **list = (GSList **)data;
        if (header->ftype == FTYPE_CATEGORY) {
                *list = g_slist_prepend (*list, header);
        }
@@ -718,7 +718,7 @@ typedef struct {
 static gboolean
 instance_search (SharedHeader *header, void *data)
 {
-       InstanceSearch *search = data;
+       InstanceSearch *search = (InstanceSearch *)data;
        if (header->ftype == FTYPE_INSTANCE) {
                SharedInstance *ins = (SharedInstance*)header;
                if (search->cat_offset == ins->category_offset) {
@@ -890,7 +890,7 @@ network_cleanup (ImplVtable *vtable)
        if (vtable == NULL)
                return;
 
-       narg = vtable->arg;
+       narg = (NetworkVtableArg *)vtable->arg;
        if (narg == NULL)
                return;
 
@@ -1219,7 +1219,7 @@ static gint64
 custom_writable_update (ImplVtable *vtable, MonoBoolean do_incr, gint64 value)
 {
        /* FIXME: check writability */
-       guint64 *ptr = vtable->arg;
+       guint64 *ptr = (guint64 *)vtable->arg;
        if (ptr) {
                if (do_incr) {
                        /* FIXME: we need to do this atomically */
@@ -1304,7 +1304,7 @@ custom_get_impl (SharedCategory *cat, MonoString* counter, MonoString* instance,
        g_free (name);
        if (!inst)
                return NULL;
-       return custom_vtable (scounter, inst, custom_get_value_address (scounter, inst));
+       return custom_vtable (scounter, inst, (char *)custom_get_value_address (scounter, inst));
 }
 
 static const CategoryDesc*
@@ -1361,7 +1361,7 @@ mono_perfcounter_get_impl (MonoString* category, MonoString* counter, MonoString
 MonoBoolean
 mono_perfcounter_get_sample (void *impl, MonoBoolean only_value, MonoCounterSample *sample)
 {
-       ImplVtable *vtable = impl;
+       ImplVtable *vtable = (ImplVtable *)impl;
        if (vtable && vtable->sample)
                return vtable->sample (vtable, only_value, sample);
        return FALSE;
@@ -1370,7 +1370,7 @@ mono_perfcounter_get_sample (void *impl, MonoBoolean only_value, MonoCounterSamp
 gint64
 mono_perfcounter_update_value (void *impl, MonoBoolean do_incr, gint64 value)
 {
-       ImplVtable *vtable = impl;
+       ImplVtable *vtable = (ImplVtable *)impl;
        if (vtable && vtable->update)
                return vtable->update (vtable, do_incr, value);
        return 0;
@@ -1379,7 +1379,7 @@ mono_perfcounter_update_value (void *impl, MonoBoolean do_incr, gint64 value)
 void
 mono_perfcounter_free_data (void *impl)
 {
-       ImplVtable *vtable = impl;
+       ImplVtable *vtable = (ImplVtable *)impl;
        if (vtable && vtable->cleanup)
                vtable->cleanup (vtable);
        g_free (impl);
@@ -1596,7 +1596,7 @@ mono_perfcounter_category_names (MonoString *machine)
                mono_array_setref (res, i, mono_string_new (domain, cdesc->name));
        }
        for (tmp = custom_categories; tmp; tmp = tmp->next) {
-               SharedCategory *scat = tmp->data;
+               SharedCategory *scat = (SharedCategory *)tmp->data;
                mono_array_setref (res, i, mono_string_new (domain, scat->name));
                i++;
        }
@@ -1674,7 +1674,7 @@ get_string_array_of_strings (void **array, int count)
        MonoDomain *domain = mono_domain_get ();
        MonoArray * res = mono_array_new (mono_domain_get (), mono_get_string_class (), count);
        for (i = 0; i < count; ++i) {
-               char* p = array[i];
+               char* p = (char *)array[i];
                mono_array_setref (res, i, mono_string_new (domain, p));
        }
 
@@ -1753,7 +1753,7 @@ get_custom_instances (MonoString *category)
                int i = 0;
                MonoArray *array = mono_array_new (mono_domain_get (), mono_get_string_class (), g_slist_length (list));
                for (tmp = list; tmp; tmp = tmp->next) {
-                       SharedInstance *inst = tmp->data;
+                       SharedInstance *inst = (SharedInstance *)tmp->data;
                        mono_array_setref (array, i, mono_string_new (mono_domain_get (), inst->instance_name));
                        i++;
                }
@@ -1802,7 +1802,7 @@ mono_perfcounter_foreach_shared_item (SharedHeader *header, gpointer data)
        SharedCategory *cat;
        SharedCounter *counter;
        SharedInstance *inst;
-       PerfCounterForeachData *foreach_data = data;
+       PerfCounterForeachData *foreach_data = (PerfCounterForeachData *)data;
 
        if (header->ftype == FTYPE_CATEGORY) {
                cat = (SharedCategory*)header;

diff --git a/mono/metadata/mono-ptr-array.h b/mono/metadata/mono-ptr-array.h
index 8ecac9866101498875a7edbd1ee03fd176f72a6d..00b3b09c39288a69ad3b804845071c28c597a007 100644 (file)
--- a/mono/metadata/mono-ptr-array.h
+++ b/mono/metadata/mono-ptr-array.h
@@ -34,7 +34,9 @@ typedef struct {
        (ARRAY).capacity = MAX (INITIAL_SIZE, MONO_PTR_ARRAY_MAX_ON_STACK); \
        (ARRAY).source = SOURCE; \
        (ARRAY).msg = MSG; \
-       (ARRAY).data = INITIAL_SIZE > MONO_PTR_ARRAY_MAX_ON_STACK ? mono_gc_alloc_fixed (sizeof (void*) * INITIAL_SIZE, mono_gc_make_root_descr_all_refs (INITIAL_SIZE), SOURCE, MSG) : g_newa (void*, MONO_PTR_ARRAY_MAX_ON_STACK); \
+       (ARRAY).data = INITIAL_SIZE > MONO_PTR_ARRAY_MAX_ON_STACK \
+               ? (void **)mono_gc_alloc_fixed (sizeof (void*) * INITIAL_SIZE, mono_gc_make_root_descr_all_refs (INITIAL_SIZE), SOURCE, MSG) \
+               : g_newa (void*, MONO_PTR_ARRAY_MAX_ON_STACK); \
 } while (0)
 
 #define mono_ptr_array_destroy(ARRAY) do {\
@@ -44,8 +46,8 @@ typedef struct {
 
 #define mono_ptr_array_append(ARRAY, VALUE) do { \
        if ((ARRAY).size >= (ARRAY).capacity) {\
-       void *__tmp = mono_gc_alloc_fixed (sizeof (void*) * (ARRAY).capacity * 2, mono_gc_make_root_descr_all_refs ((ARRAY).capacity * 2), (ARRAY).source, (ARRAY).msg); \
-               mono_gc_memmove_aligned (__tmp, (ARRAY).data, (ARRAY).capacity * sizeof (void*)); \
+       void **__tmp = (void **)mono_gc_alloc_fixed (sizeof (void*) * (ARRAY).capacity * 2, mono_gc_make_root_descr_all_refs ((ARRAY).capacity * 2), (ARRAY).source, (ARRAY).msg); \
+               mono_gc_memmove_aligned ((void *)__tmp, (ARRAY).data, (ARRAY).capacity * sizeof (void*)); \
                if ((ARRAY).capacity > MONO_PTR_ARRAY_MAX_ON_STACK)     \
                        mono_gc_free_fixed ((ARRAY).data);      \
                (ARRAY).data = __tmp;   \

diff --git a/mono/metadata/mono-security.c b/mono/metadata/mono-security.c
index c5024b86a73b03ae7550c9d004c13cc5af7121b0..6dfa3d846ce7a0184249757f5f1e740859233f1e 100644 (file)
--- a/mono/metadata/mono-security.c
+++ b/mono/metadata/mono-security.c
@@ -153,7 +153,7 @@ GetTokenName (uid_t uid)
 #else
        fbufsize = MONO_SYSCONF_DEFAULT_SIZE;
 #endif
-       fbuf = g_malloc0 (fbufsize);
+       fbuf = (gchar *)g_malloc0 (fbufsize);
        retval = getpwuid_r (uid, &pwd, fbuf, fbufsize, &p);
        result = ((retval == 0) && (p == &pwd));
 #else
@@ -220,7 +220,7 @@ IsDefaultGroup (uid_t user, gid_t group)
        fbufsize = MONO_SYSCONF_DEFAULT_SIZE;
 #endif
 
-       fbuf = g_malloc0 (fbufsize);
+       fbuf = (gchar *)g_malloc0 (fbufsize);
        retval = getpwuid_r (user, &pwd, fbuf, fbufsize, &p);
        result = ((retval == 0) && (p == &pwd));
 #else
@@ -359,7 +359,7 @@ ves_icall_System_Security_Principal_WindowsIdentity_GetUserToken (MonoString *us
        fbufsize = MONO_SYSCONF_DEFAULT_SIZE;
 #endif
 
-       fbuf = g_malloc0 (fbufsize);
+       fbuf = (gchar *)g_malloc0 (fbufsize);
        retval = getpwnam_r (utf8_name, &pwd, fbuf, fbufsize, &p);
        result = ((retval == 0) && (p == &pwd));
 #else
@@ -500,7 +500,7 @@ ves_icall_System_Security_Principal_WindowsPrincipal_IsMemberOfGroupId (gpointer
 #else
        fbufsize = MONO_SYSCONF_DEFAULT_SIZE;
 #endif
-       fbuf = g_malloc0 (fbufsize);
+       fbuf = (gchar *)g_malloc0 (fbufsize);
        retval = getgrgid_r ((gid_t) GPOINTER_TO_INT (group), &grp, fbuf, fbufsize, &g);
        result = ((retval == 0) && (g == &grp));
 #else
@@ -547,7 +547,7 @@ ves_icall_System_Security_Principal_WindowsPrincipal_IsMemberOfGroupName (gpoint
 #else
                size_t fbufsize = MONO_SYSCONF_DEFAULT_SIZE;
 #endif
-               fbuf = g_malloc0 (fbufsize);
+               fbuf = (gchar *)g_malloc0 (fbufsize);
                retval = getgrnam_r (utf8_groupname, &grp, fbuf, fbufsize, &g);
                result = ((retval == 0) && (g == &grp));
 #else

diff --git a/mono/metadata/null-gc.c b/mono/metadata/null-gc.c
index 773410ad7b6fcfb9c073ebc42025e51dd1e22400..e5c16e1e9a46b2eab51c6249b54115f6ed82bad6 100644 (file)
--- a/mono/metadata/null-gc.c
+++ b/mono/metadata/null-gc.c
@@ -528,12 +528,6 @@ mono_gc_register_altstack (gpointer stack, gint32 stack_size, gpointer altstack,
 {
 }
 
-gboolean
-mono_gc_set_allow_synchronous_major (gboolean flag)
-{
-       return TRUE;
-}
-
 gboolean
 mono_gc_is_null (void)
 {

diff --git a/mono/metadata/object-internals.h b/mono/metadata/object-internals.h
index eb9e1c61a8c9d0e58ae4a84e29eaa806ce741306..d36dfc7207252e4e3651a05b4eab4f09b1165523 100644 (file)
--- a/mono/metadata/object-internals.h
+++ b/mono/metadata/object-internals.h
@@ -12,6 +12,7 @@
 #include "mono/utils/mono-error.h"
 #include "mono/utils/mono-stack-unwinding.h"
 #include "mono/utils/mono-tls.h"
+#include "mono/utils/mono-coop-mutex.h"
 
 #if 1
 #ifdef __GNUC__
@@ -163,6 +164,8 @@ struct _MonoArray {
        double vector [MONO_ZERO_LEN_ARRAY];
 };
 
+#define MONO_SIZEOF_MONO_ARRAY (sizeof (MonoArray) - MONO_ZERO_LEN_ARRAY * sizeof (double))
+
 struct _MonoString {
        MonoObject object;
        int32_t length;
@@ -406,7 +409,7 @@ struct _MonoInternalThread {
        gpointer appdomain_refs;
        /* This is modified using atomic ops, so keep it a gint32 */
        gint32 interruption_requested;
-       mono_mutex_t *synch_cs;
+       MonoCoopMutex *synch_cs;
        MonoBoolean threadpool_thread;
        MonoBoolean thread_interrupt_requested;
        int stack_size;

diff --git a/mono/metadata/object.c b/mono/metadata/object.c
index 938289bd8f85b8ce23dffe6e0cc52375aa52e0c7..a28c6f15d9dc322fa675fdbf0a8e76edb222c38b 100644 (file)
--- a/mono/metadata/object.c
+++ b/mono/metadata/object.c
@@ -59,8 +59,8 @@ static char *
 mono_string_to_utf8_internal (MonoMemPool *mp, MonoImage *image, MonoString *s, gboolean ignore_error, MonoError *error);
 
 
-#define ldstr_lock() mono_mutex_lock (&ldstr_section)
-#define ldstr_unlock() mono_mutex_unlock (&ldstr_section)
+#define ldstr_lock() mono_os_mutex_lock (&ldstr_section)
+#define ldstr_unlock() mono_os_mutex_unlock (&ldstr_section)
 static mono_mutex_t ldstr_section;
 
 void
@@ -76,7 +76,7 @@ mono_runtime_object_init (MonoObject *this_obj)
                g_error ("Could not lookup zero argument constructor for class %s", mono_type_get_full_name (klass));
 
        if (method->klass->valuetype)
-               this_obj = mono_object_unbox (this_obj);
+               this_obj = (MonoObject *)mono_object_unbox (this_obj);
        mono_runtime_invoke (method, this_obj, NULL, NULL);
 }
 
@@ -108,25 +108,23 @@ typedef struct
        MonoNativeThreadId initializing_tid;
        guint32 waiting_count;
        gboolean done;
-       mono_mutex_t initialization_section;
+       MonoCoopMutex initialization_section;
 } TypeInitializationLock;
 
 /* for locking access to type_initialization_hash and blocked_thread_hash */
-static mono_mutex_t type_initialization_section;
+static MonoCoopMutex type_initialization_section;
 
 static inline void
 mono_type_initialization_lock (void)
 {
        /* The critical sections protected by this lock in mono_runtime_class_init_full () can block */
-       MONO_PREPARE_BLOCKING;
-       mono_mutex_lock (&type_initialization_section);
-       MONO_FINISH_BLOCKING;
+       mono_coop_mutex_lock (&type_initialization_section);
 }
 
 static inline void
 mono_type_initialization_unlock (void)
 {
-       mono_mutex_unlock (&type_initialization_section);
+       mono_coop_mutex_unlock (&type_initialization_section);
 }
 
 static void
@@ -134,15 +132,13 @@ mono_type_init_lock (TypeInitializationLock *lock)
 {
        MONO_REQ_GC_NEUTRAL_MODE;
 
-       MONO_TRY_BLOCKING;
-       mono_mutex_lock (&lock->initialization_section);
-       MONO_FINISH_TRY_BLOCKING;
+       mono_coop_mutex_lock (&lock->initialization_section);
 }
 
 static void
 mono_type_init_unlock (TypeInitializationLock *lock)
 {
-       mono_mutex_unlock (&lock->initialization_section);
+       mono_coop_mutex_unlock (&lock->initialization_section);
 }
 
 /* from vtable to lock */
@@ -192,10 +188,10 @@ mono_thread_get_main (void)
 void
 mono_type_initialization_init (void)
 {
-       mono_mutex_init_recursive (&type_initialization_section);
+       mono_coop_mutex_init_recursive (&type_initialization_section);
        type_initialization_hash = g_hash_table_new (NULL, NULL);
        blocked_thread_hash = g_hash_table_new (NULL, NULL);
-       mono_mutex_init_recursive (&ldstr_section);
+       mono_os_mutex_init_recursive (&ldstr_section);
 }
 
 void
@@ -205,11 +201,11 @@ mono_type_initialization_cleanup (void)
        /* This is causing race conditions with
         * mono_release_type_locks
         */
-       mono_mutex_destroy (&type_initialization_section);
+       mono_coop_mutex_destroy (&type_initialization_section);
        g_hash_table_destroy (type_initialization_hash);
        type_initialization_hash = NULL;
 #endif
-       mono_mutex_destroy (&ldstr_section);
+       mono_os_mutex_destroy (&ldstr_section);
        g_hash_table_destroy (blocked_thread_hash);
        blocked_thread_hash = NULL;
 
@@ -241,7 +237,7 @@ get_type_init_exception_for_vtable (MonoVTable *vtable)
        ex = NULL;
        mono_domain_lock (domain);
        if (domain->type_init_exception_hash)
-               ex = mono_g_hash_table_lookup (domain->type_init_exception_hash, klass);
+               ex = (MonoException *)mono_g_hash_table_lookup (domain->type_init_exception_hash, klass);
        mono_domain_unlock (domain);
 
        if (!ex) {
@@ -342,7 +338,7 @@ mono_runtime_class_init_full (MonoVTable *vtable, gboolean raise_exception)
                        mono_raise_exception (get_type_init_exception_for_vtable (vtable));
                return get_type_init_exception_for_vtable (vtable);
        }
-       lock = g_hash_table_lookup (type_initialization_hash, vtable);
+       lock = (TypeInitializationLock *)g_hash_table_lookup (type_initialization_hash, vtable);
        if (lock == NULL) {
                /* This thread will get to do the initialization */
                if (mono_domain_get () != domain) {
@@ -356,8 +352,8 @@ mono_runtime_class_init_full (MonoVTable *vtable, gboolean raise_exception)
                                return mono_get_exception_appdomain_unloaded ();
                        }
                }
-               lock = g_malloc (sizeof(TypeInitializationLock));
-               mono_mutex_init_recursive (&lock->initialization_section);
+               lock = (TypeInitializationLock *)g_malloc (sizeof (TypeInitializationLock));
+               mono_coop_mutex_init_recursive (&lock->initialization_section);
                lock->initializing_tid = tid;
                lock->waiting_count = 1;
                lock->done = FALSE;
@@ -440,7 +436,7 @@ mono_runtime_class_init_full (MonoVTable *vtable, gboolean raise_exception)
                g_hash_table_remove (blocked_thread_hash, GUINT_TO_POINTER (tid));
        --lock->waiting_count;
        if (lock->waiting_count == 0) {
-               mono_mutex_destroy (&lock->initialization_section);
+               mono_coop_mutex_destroy (&lock->initialization_section);
                g_hash_table_remove (type_initialization_hash, vtable);
                g_free (lock);
        }
@@ -477,7 +473,7 @@ gboolean release_type_locks (gpointer key, gpointer value, gpointer user)
                mono_type_init_unlock (lock);
                --lock->waiting_count;
                if (lock->waiting_count == 0) {
-                       mono_mutex_destroy (&lock->initialization_section);
+                       mono_coop_mutex_destroy (&lock->initialization_section);
                        g_free (lock);
                        return TRUE;
                }
@@ -695,7 +691,7 @@ compute_class_bitmap (MonoClass *klass, gsize *bitmap, int size, int offset, int
                max_size = klass->instance_size / sizeof (gpointer);
        if (max_size > size) {
                g_assert (offset <= 0);
-               bitmap = g_malloc0 ((max_size + BITMAP_EL_SIZE - 1) / BITMAP_EL_SIZE * sizeof (gsize));
+               bitmap = (gsize *)g_malloc0 ((max_size + BITMAP_EL_SIZE - 1) / BITMAP_EL_SIZE * sizeof (gsize));
                size = max_size;
        }
 
@@ -1113,7 +1109,7 @@ mono_method_get_imt_slot (MonoMethod *method)
 
        sig = mono_method_signature (method);
        hashes_count = sig->param_count + 4;
-       hashes_start = malloc (hashes_count * sizeof (guint32));
+       hashes_start = (guint32 *)malloc (hashes_count * sizeof (guint32));
        hashes = hashes_start;
 
        if (! MONO_CLASS_IS_INTERFACE (method->klass)) {
@@ -1175,7 +1171,7 @@ add_imt_builder_entry (MonoImtBuilderEntry **imt_builder, MonoMethod *method, gu
                return;
        }
 
-       entry = g_malloc0 (sizeof (MonoImtBuilderEntry));
+       entry = (MonoImtBuilderEntry *)g_malloc0 (sizeof (MonoImtBuilderEntry));
        entry->key = method;
        entry->value.vtable_slot = vtable_slot;
        entry->next = imt_builder [imt_slot];
@@ -1265,7 +1261,7 @@ imt_sort_slot_entries (MonoImtBuilderEntry *entries) {
        MONO_REQ_GC_NEUTRAL_MODE;
 
        int number_of_entries = entries->children + 1;
-       MonoImtBuilderEntry **sorted_array = malloc (sizeof (MonoImtBuilderEntry*) * number_of_entries);
+       MonoImtBuilderEntry **sorted_array = (MonoImtBuilderEntry **)malloc (sizeof (MonoImtBuilderEntry*) * number_of_entries);
        GPtrArray *result = g_ptr_array_new ();
        MonoImtBuilderEntry *current_entry;
        int i;
@@ -1330,7 +1326,7 @@ build_imt_slots (MonoClass *klass, MonoVTable *vt, MonoDomain *domain, gpointer*
        int i;
        GSList *list_item;
        guint32 imt_collisions_bitmap = 0;
-       MonoImtBuilderEntry **imt_builder = calloc (MONO_IMT_SIZE, sizeof (MonoImtBuilderEntry*));
+       MonoImtBuilderEntry **imt_builder = (MonoImtBuilderEntry **)calloc (MONO_IMT_SIZE, sizeof (MonoImtBuilderEntry*));
        int method_count = 0;
        gboolean record_method_count_for_max_collisions = FALSE;
        gboolean has_generic_virtual = FALSE, has_variant_iface = FALSE;
@@ -1381,7 +1377,7 @@ build_imt_slots (MonoClass *klass, MonoVTable *vt, MonoDomain *domain, gpointer*
                int interface_offset = klass->vtable_size;
 
                for (list_item = extra_interfaces; list_item != NULL; list_item=list_item->next) {
-                       MonoClass* iface = list_item->data;
+                       MonoClass* iface = (MonoClass *)list_item->data;
                        int method_slot_in_interface;
                        for (method_slot_in_interface = 0; method_slot_in_interface < iface->method.count; method_slot_in_interface++) {
                                MonoMethod *method = mono_class_get_method_by_index (iface, method_slot_in_interface);
@@ -1533,7 +1529,7 @@ init_thunk_free_lists (MonoDomain *domain)
 
        if (domain->thunk_free_lists)
                return;
-       domain->thunk_free_lists = mono_domain_alloc0 (domain, sizeof (gpointer) * NUM_FREE_LISTS);
+       domain->thunk_free_lists = (MonoThunkFreeList **)mono_domain_alloc0 (domain, sizeof (gpointer) * NUM_FREE_LISTS);
 }
 
 static int
@@ -1606,7 +1602,7 @@ mono_method_alloc_generic_virtual_thunk (MonoDomain *domain, int size)
        }
        generic_virtual_thunks_size += size;
 
-       p = mono_domain_code_reserve (domain, size);
+       p = (guint32 *)mono_domain_code_reserve (domain, size);
        *p = size;
 
        mono_domain_lock (domain);
@@ -1626,7 +1622,7 @@ invalidate_generic_virtual_thunk (MonoDomain *domain, gpointer code)
 {
        MONO_REQ_GC_NEUTRAL_MODE;
 
-       guint32 *p = code;
+       guint32 *p = (guint32 *)code;
        MonoThunkFreeList *l = (MonoThunkFreeList*)(p - 1);
        gboolean found = FALSE;
 
@@ -1696,7 +1692,7 @@ get_generic_virtual_entries (MonoDomain *domain, gpointer *vtable_slot)
        if (!domain->generic_virtual_cases)
                domain->generic_virtual_cases = g_hash_table_new (mono_aligned_addr_hash, NULL);
  
-       list = g_hash_table_lookup (domain->generic_virtual_cases, vtable_slot);
+       list = (GenericVirtualCase *)g_hash_table_lookup (domain->generic_virtual_cases, vtable_slot);
  
        entries = NULL;
        for (; list; list = list->next) {
@@ -1753,7 +1749,7 @@ mono_method_add_generic_virtual_invocation (MonoDomain *domain, MonoVTable *vtab
                domain->generic_virtual_cases = g_hash_table_new (mono_aligned_addr_hash, NULL);
 
        /* Check whether the case was already added */
-       list = g_hash_table_lookup (domain->generic_virtual_cases, vtable_slot);
+       list = (GenericVirtualCase *)g_hash_table_lookup (domain->generic_virtual_cases, vtable_slot);
        gvc = list;
        while (gvc) {
                if (gvc->method == method)
@@ -1763,11 +1759,11 @@ mono_method_add_generic_virtual_invocation (MonoDomain *domain, MonoVTable *vtab
 
        /* If not found, make a new one */
        if (!gvc) {
-               gvc = mono_domain_alloc (domain, sizeof (GenericVirtualCase));
+               gvc = (GenericVirtualCase *)mono_domain_alloc (domain, sizeof (GenericVirtualCase));
                gvc->method = method;
                gvc->code = code;
                gvc->count = 0;
-               gvc->next = g_hash_table_lookup (domain->generic_virtual_cases, vtable_slot);
+               gvc->next = (GenericVirtualCase *)g_hash_table_lookup (domain->generic_virtual_cases, vtable_slot);
 
                g_hash_table_insert (domain->generic_virtual_cases, vtable_slot, gvc);
 
@@ -1779,7 +1775,7 @@ mono_method_add_generic_virtual_invocation (MonoDomain *domain, MonoVTable *vtab
        }
 
        if (++gvc->count == THUNK_THRESHOLD) {
-               gpointer *old_thunk = *vtable_slot;
+               gpointer *old_thunk = (void **)*vtable_slot;
                gpointer vtable_trampoline = NULL;
                gpointer imt_trampoline = NULL;
 
@@ -2168,7 +2164,7 @@ mono_class_create_runtime_vtable (MonoDomain *domain, MonoClass *klass, gboolean
        if (klass != mono_defaults.monotype_class) {
                /*FIXME check for OOM*/
                vt->type = mono_type_get_object (domain, &klass->byval_arg);
-               if (mono_object_get_class (vt->type) != mono_defaults.monotype_class)
+               if (mono_object_get_class ((MonoObject *)vt->type) != mono_defaults.monotype_class)
                        /* This is unregistered in
                           unregister_vtable_reflection_type() in
                           domain.c. */
@@ -2207,7 +2203,7 @@ mono_class_create_runtime_vtable (MonoDomain *domain, MonoClass *klass, gboolean
                /* this is a bounded memory retention issue: may want to 
                 * handle it differently when we'll have a rcu-like system.
                 */
-               runtime_info = mono_image_alloc0 (klass->image, MONO_SIZEOF_CLASS_RUNTIME_INFO + new_size * sizeof (gpointer));
+               runtime_info = (MonoClassRuntimeInfo *)mono_image_alloc0 (klass->image, MONO_SIZEOF_CLASS_RUNTIME_INFO + new_size * sizeof (gpointer));
                runtime_info->max_domain = new_size - 1;
                /* copy the stuff from the older info */
                if (old_info) {
@@ -2222,7 +2218,7 @@ mono_class_create_runtime_vtable (MonoDomain *domain, MonoClass *klass, gboolean
        if (klass == mono_defaults.monotype_class) {
                /*FIXME check for OOM*/
                vt->type = mono_type_get_object (domain, &klass->byval_arg);
-               if (mono_object_get_class (vt->type) != mono_defaults.monotype_class)
+               if (mono_object_get_class ((MonoObject *)vt->type) != mono_defaults.monotype_class)
                        /* This is unregistered in
                           unregister_vtable_reflection_type() in
                           domain.c. */
@@ -2295,7 +2291,7 @@ mono_class_proxy_vtable (MonoDomain *domain, MonoRemoteClass *remote_class, Mono
                g_assert (mono_error_ok (&error)); /*FIXME do proper error handling*/
                if (ifaces) {
                        for (i = 0; i < ifaces->len; ++i) {
-                               MonoClass *ic = g_ptr_array_index (ifaces, i);
+                               MonoClass *ic = (MonoClass *)g_ptr_array_index (ifaces, i);
                                /*FIXME test for interfaces with variant generic arguments*/
                                if (MONO_CLASS_IMPLEMENTS_INTERFACE (klass, ic->interface_id))
                                        continue;       /* interface implemented by the class */
@@ -2354,9 +2350,9 @@ mono_class_proxy_vtable (MonoDomain *domain, MonoRemoteClass *remote_class, Mono
        pvt->max_interface_id = max_interface_id;
        bsize = sizeof (guint8) * (max_interface_id/8 + 1 );
 #ifdef COMPRESSED_INTERFACE_BITMAP
-       bitmap = g_malloc0 (bsize);
+       bitmap = (uint8_t *)g_malloc0 (bsize);
 #else
-       bitmap = mono_domain_alloc0 (domain, bsize);
+       bitmap = (uint8_t *)mono_domain_alloc0 (domain, bsize);
 #endif
 
        for (i = 0; i < klass->interface_offsets_count; ++i) {
@@ -2373,7 +2369,7 @@ mono_class_proxy_vtable (MonoDomain *domain, MonoRemoteClass *remote_class, Mono
 
                /* Create trampolines for the methods of the interfaces */
                for (list_item = extra_interfaces; list_item != NULL; list_item=list_item->next) {
-                       interf = list_item->data;
+                       interf = (MonoClass *)list_item->data;
                        
                        bitmap [interf->interface_id >> 3] |= (1 << (interf->interface_id & 7));
 
@@ -2486,18 +2482,18 @@ create_remote_class_key (MonoRemoteClass *remote_class, MonoClass *extra_class)
        
        if (remote_class == NULL) {
                if (extra_class->flags & TYPE_ATTRIBUTE_INTERFACE) {
-                       key = g_malloc (sizeof(gpointer) * 3);
+                       key = (void **)g_malloc (sizeof(gpointer) * 3);
                        key [0] = GINT_TO_POINTER (2);
                        key [1] = mono_defaults.marshalbyrefobject_class;
                        key [2] = extra_class;
                } else {
-                       key = g_malloc (sizeof(gpointer) * 2);
+                       key = (void **)g_malloc (sizeof(gpointer) * 2);
                        key [0] = GINT_TO_POINTER (1);
                        key [1] = extra_class;
                }
        } else {
                if (extra_class != NULL && (extra_class->flags & TYPE_ATTRIBUTE_INTERFACE)) {
-                       key = g_malloc (sizeof(gpointer) * (remote_class->interface_count + 3));
+                       key = (void **)g_malloc (sizeof(gpointer) * (remote_class->interface_count + 3));
                        key [0] = GINT_TO_POINTER (remote_class->interface_count + 2);
                        key [1] = remote_class->proxy_class;
 
@@ -2513,7 +2509,7 @@ create_remote_class_key (MonoRemoteClass *remote_class, MonoClass *extra_class)
                                key [j] = extra_class;
                } else {
                        // Replace the old class. The interface list is the same
-                       key = g_malloc (sizeof(gpointer) * (remote_class->interface_count + 2));
+                       key = (void **)g_malloc (sizeof(gpointer) * (remote_class->interface_count + 2));
                        key [0] = GINT_TO_POINTER (remote_class->interface_count + 1);
                        key [1] = extra_class != NULL ? extra_class : remote_class->proxy_class;
                        for (i = 0; i < remote_class->interface_count; i++)
@@ -2535,7 +2531,7 @@ copy_remote_class_key (MonoDomain *domain, gpointer *key)
        MONO_REQ_GC_NEUTRAL_MODE
 
        int key_size = (GPOINTER_TO_UINT (key [0]) + 1) * sizeof (gpointer);
-       gpointer *mp_key = mono_domain_alloc (domain, key_size);
+       gpointer *mp_key = (gpointer *)mono_domain_alloc (domain, key_size);
 
        memcpy (mp_key, key, key_size);
 
@@ -2564,7 +2560,7 @@ mono_remote_class (MonoDomain *domain, MonoString *class_name, MonoClass *proxy_
        key = create_remote_class_key (NULL, proxy_class);
        
        mono_domain_lock (domain);
-       rc = g_hash_table_lookup (domain->proxy_vtable_hash, key);
+       rc = (MonoRemoteClass *)g_hash_table_lookup (domain->proxy_vtable_hash, key);
 
        if (rc) {
                g_free (key);
@@ -2584,12 +2580,12 @@ mono_remote_class (MonoDomain *domain, MonoString *class_name, MonoClass *proxy_
        key = mp_key;
 
        if (proxy_class->flags & TYPE_ATTRIBUTE_INTERFACE) {
-               rc = mono_domain_alloc (domain, MONO_SIZEOF_REMOTE_CLASS + sizeof(MonoClass*));
+               rc = (MonoRemoteClass *)mono_domain_alloc (domain, MONO_SIZEOF_REMOTE_CLASS + sizeof(MonoClass*));
                rc->interface_count = 1;
                rc->interfaces [0] = proxy_class;
                rc->proxy_class = mono_defaults.marshalbyrefobject_class;
        } else {
-               rc = mono_domain_alloc (domain, MONO_SIZEOF_REMOTE_CLASS);
+               rc = (MonoRemoteClass *)mono_domain_alloc (domain, MONO_SIZEOF_REMOTE_CLASS);
                rc->interface_count = 0;
                rc->proxy_class = proxy_class;
        }
@@ -2620,7 +2616,7 @@ clone_remote_class (MonoDomain *domain, MonoRemoteClass* remote_class, MonoClass
        gpointer* key, *mp_key;
        
        key = create_remote_class_key (remote_class, extra_class);
-       rc = g_hash_table_lookup (domain->proxy_vtable_hash, key);
+       rc = (MonoRemoteClass *)g_hash_table_lookup (domain->proxy_vtable_hash, key);
        if (rc != NULL) {
                g_free (key);
                return rc;
@@ -2632,7 +2628,7 @@ clone_remote_class (MonoDomain *domain, MonoRemoteClass* remote_class, MonoClass
 
        if (extra_class->flags & TYPE_ATTRIBUTE_INTERFACE) {
                int i,j;
-               rc = mono_domain_alloc (domain, MONO_SIZEOF_REMOTE_CLASS + sizeof(MonoClass*) * (remote_class->interface_count + 1));
+               rc = (MonoRemoteClass *)mono_domain_alloc (domain, MONO_SIZEOF_REMOTE_CLASS + sizeof(MonoClass*) * (remote_class->interface_count + 1));
                rc->proxy_class = remote_class->proxy_class;
                rc->interface_count = remote_class->interface_count + 1;
                
@@ -2647,7 +2643,7 @@ clone_remote_class (MonoDomain *domain, MonoRemoteClass* remote_class, MonoClass
                        rc->interfaces [j] = extra_class;
        } else {
                // Replace the old class. The interface array is the same
-               rc = mono_domain_alloc (domain, MONO_SIZEOF_REMOTE_CLASS + sizeof(MonoClass*) * remote_class->interface_count);
+               rc = (MonoRemoteClass *)mono_domain_alloc (domain, MONO_SIZEOF_REMOTE_CLASS + sizeof(MonoClass*) * remote_class->interface_count);
                rc->proxy_class = extra_class;
                rc->interface_count = remote_class->interface_count;
                if (rc->interface_count > 0)
@@ -2733,7 +2729,7 @@ mono_upgrade_remote_class (MonoDomain *domain, MonoObject *proxy_object, MonoCla
 
        if (redo_vtable) {
                tproxy->remote_class = clone_remote_class (domain, remote_class, klass);
-               proxy_object->vtable = mono_remote_class_vtable (domain, tproxy->remote_class, tproxy->rp);
+               proxy_object->vtable = (MonoVTable *)mono_remote_class_vtable (domain, tproxy->remote_class, tproxy->rp);
        }
        
        mono_domain_unlock (domain);
@@ -2954,10 +2950,10 @@ mono_method_get_unmanaged_thunk (MonoMethod *method)
 
        gpointer res;
 
-       MONO_PREPARE_RESET_BLOCKING
+       MONO_PREPARE_RESET_BLOCKING;
        method = mono_marshal_get_thunk_invoke_wrapper (method);
        res = mono_compile_method (method);
-       MONO_FINISH_RESET_BLOCKING
+       MONO_FINISH_RESET_BLOCKING;
 
        return res;
 }
@@ -3027,7 +3023,7 @@ handle_enum:
        case MONO_TYPE_CLASS:
        case MONO_TYPE_OBJECT:
        case MONO_TYPE_ARRAY:
-               mono_gc_wbarrier_generic_store (dest, deref_pointer? *(gpointer*)value: value);
+               mono_gc_wbarrier_generic_store (dest, deref_pointer ? *(MonoObject **)value : (MonoObject *)value);
                return;
        case MONO_TYPE_FNPTR:
        case MONO_TYPE_PTR: {
@@ -3149,7 +3145,7 @@ mono_field_get_addr (MonoObject *obj, MonoVTable *vt, MonoClassField *field)
                        mono_domain_lock (vt->domain);
                        addr = g_hash_table_lookup (vt->domain->special_static_fields, field);
                        mono_domain_unlock (vt->domain);
-                       src = mono_get_special_static_data (GPOINTER_TO_UINT (addr));
+                       src = (guint8 *)mono_get_special_static_data (GPOINTER_TO_UINT (addr));
                } else {
                        src = (guint8*)mono_vtable_get_static_field_data (vt) + field->offset;
                }
@@ -4300,7 +4296,7 @@ mono_runtime_invoke_array (MonoMethod *method, void *obj, MonoArray *params,
        gboolean has_byref_nullables = FALSE;
 
        if (NULL != params) {
-               pa = alloca (sizeof (gpointer) * mono_array_length (params));
+               pa = (void **)alloca (sizeof (gpointer) * mono_array_length (params));
                for (i = 0; i < mono_array_length (params); i++) {
                        MonoType *t = sig->params [i];
 
@@ -4405,7 +4401,7 @@ mono_runtime_invoke_array (MonoMethod *method, void *obj, MonoArray *params,
                        }
 #endif
                        if (method->klass->valuetype)
-                               o = mono_object_unbox (obj);
+                               o = (MonoObject *)mono_object_unbox ((MonoObject *)obj);
                        else
                                o = obj;
                } else if (method->klass->valuetype) {
@@ -4413,7 +4409,7 @@ mono_runtime_invoke_array (MonoMethod *method, void *obj, MonoArray *params,
                }
 
                mono_runtime_invoke (method, o, pa, exc);
-               return obj;
+               return (MonoObject *)obj;
        } else {
                if (mono_class_is_nullable (method->klass)) {
                        MonoObject *nullable;
@@ -4421,7 +4417,7 @@ mono_runtime_invoke_array (MonoMethod *method, void *obj, MonoArray *params,
                        /* Convert the unboxed vtype into a Nullable structure */
                        nullable = mono_object_new (mono_domain_get (), method->klass);
 
-                       mono_nullable_init (mono_object_unbox (nullable), mono_value_box (mono_domain_get (), method->klass->cast_class, obj), method->klass);
+                       mono_nullable_init ((guint8 *)mono_object_unbox (nullable), mono_value_box (mono_domain_get (), method->klass->cast_class, obj), method->klass);
                        obj = mono_object_unbox (nullable);
                }
 
@@ -4517,7 +4513,7 @@ mono_object_new_pinned (MonoDomain *domain, MonoClass *klass)
                return NULL;
 
 #ifdef HAVE_SGEN_GC
-       return mono_gc_alloc_pinned_obj (vtable, mono_class_instance_size (klass));
+       return (MonoObject *)mono_gc_alloc_pinned_obj (vtable, mono_class_instance_size (klass));
 #else
        return mono_object_new_specific (vtable);
 #endif
@@ -4569,7 +4565,7 @@ mono_object_new_alloc_specific (MonoVTable *vtable)
 {
        MONO_REQ_GC_UNSAFE_MODE;
 
-       MonoObject *o = mono_gc_alloc_obj (vtable, vtable->klass->instance_size);
+       MonoObject *o = (MonoObject *)mono_gc_alloc_obj (vtable, vtable->klass->instance_size);
 
        if (G_UNLIKELY (vtable->klass->has_finalize))
                mono_object_register_finalizer (o);
@@ -4582,7 +4578,7 @@ mono_object_new_fast (MonoVTable *vtable)
 {
        MONO_REQ_GC_UNSAFE_MODE;
 
-       return mono_gc_alloc_obj (vtable, vtable->klass->instance_size);
+       return (MonoObject *)mono_gc_alloc_obj (vtable, vtable->klass->instance_size);
 }
 
 /**
@@ -4665,7 +4661,7 @@ mono_object_clone (MonoObject *obj)
        if (obj->vtable->klass->rank)
                return (MonoObject*)mono_array_clone ((MonoArray*)obj);
 
-       o = mono_gc_alloc_obj (obj->vtable, size);
+       o = (MonoObject *)mono_gc_alloc_obj (obj->vtable, size);
 
        /* If the object doesn't contain references this will do a simple memmove. */
        mono_gc_wbarrier_object_copy (o, obj);
@@ -4747,7 +4743,7 @@ mono_array_clone_in_domain (MonoDomain *domain, MonoArray *array)
                return o;
        }
        
-       sizes = alloca (klass->rank * sizeof(intptr_t) * 2);
+       sizes = (uintptr_t *)alloca (klass->rank * sizeof(intptr_t) * 2);
        size = mono_array_element_size (klass);
        for (i = 0; i < klass->rank; ++i) {
                sizes [i] = array->bounds [i].length;
@@ -4815,9 +4811,9 @@ mono_array_calc_byte_len (MonoClass *klass, uintptr_t len, uintptr_t *res)
        if (CHECK_MUL_OVERFLOW_UN (byte_len, len))
                return FALSE;
        byte_len *= len;
-       if (CHECK_ADD_OVERFLOW_UN (byte_len, sizeof (MonoArray)))
+       if (CHECK_ADD_OVERFLOW_UN (byte_len, MONO_SIZEOF_MONO_ARRAY))
                return FALSE;
-       byte_len += sizeof (MonoArray);
+       byte_len += MONO_SIZEOF_MONO_ARRAY;
 
        *res = byte_len;
 
@@ -4887,9 +4883,9 @@ mono_array_new_full (MonoDomain *domain, MonoClass *array_class, uintptr_t *leng
         */
        vtable = mono_class_vtable_full (domain, array_class, TRUE);
        if (bounds_size)
-               o = mono_gc_alloc_array (vtable, byte_len, len, bounds_size);
+               o = (MonoObject *)mono_gc_alloc_array (vtable, byte_len, len, bounds_size);
        else
-               o = mono_gc_alloc_vector (vtable, byte_len, len);
+               o = (MonoObject *)mono_gc_alloc_vector (vtable, byte_len, len);
        array = (MonoArray*)o;
 
        bounds = array->bounds;
@@ -4952,7 +4948,7 @@ mono_array_new_specific (MonoVTable *vtable, uintptr_t n)
                mono_gc_out_of_memory (MONO_ARRAY_MAX_SIZE);
                return NULL;
        }
-       o = mono_gc_alloc_vector (vtable, byte_len, n);
+       o = (MonoObject *)mono_gc_alloc_vector (vtable, byte_len, n);
        ao = (MonoArray*)o;
 
        return ao;
@@ -5041,7 +5037,7 @@ mono_string_new_size (MonoDomain *domain, gint32 len)
        vtable = mono_class_vtable (domain, mono_defaults.string_class);
        g_assert (vtable);
 
-       s = mono_gc_alloc_string (vtable, size, len);
+       s = (MonoString *)mono_gc_alloc_string (vtable, size, len);
 
        return s;
 }
@@ -5161,7 +5157,7 @@ mono_value_box (MonoDomain *domain, MonoClass *klass, gpointer value)
 
        g_assert (klass->valuetype);
        if (mono_class_is_nullable (klass))
-               return mono_nullable_box (value, klass);
+               return mono_nullable_box ((guint8 *)value, klass);
 
        vtable = mono_class_vtable (domain, klass);
        if (!vtable)
@@ -5283,7 +5279,7 @@ mono_object_get_size (MonoObject* o)
                return sizeof (MonoString) + 2 * mono_string_length ((MonoString*) o) + 2;
        } else if (o->vtable->rank) {
                MonoArray *array = (MonoArray*)o;
-               size_t size = sizeof (MonoArray) + mono_array_element_size (klass) * mono_array_length (array);
+               size_t size = MONO_SIZEOF_MONO_ARRAY + mono_array_element_size (klass) * mono_array_length (array);
                if (array->bounds) {
                        size += 3;
                        size &= ~3;
@@ -5430,10 +5426,10 @@ str_lookup (MonoDomain *domain, gpointer user_data)
 {
        MONO_REQ_GC_UNSAFE_MODE;
 
-       LDStrInfo *info = user_data;
+       LDStrInfo *info = (LDStrInfo *)user_data;
        if (info->res || domain == info->orig_domain)
                return;
-       info->res = mono_g_hash_table_lookup (domain->ldstr_table, info->ins);
+       info->res = (MonoString *)mono_g_hash_table_lookup (domain->ldstr_table, info->ins);
 }
 
 #ifdef HAVE_SGEN_GC
@@ -5446,7 +5442,7 @@ mono_string_get_pinned (MonoString *str)
        int size;
        MonoString *news;
        size = sizeof (MonoString) + 2 * (mono_string_length (str) + 1);
-       news = mono_gc_alloc_pinned_obj (((MonoObject*)str)->vtable, size);
+       news = (MonoString *)mono_gc_alloc_pinned_obj (((MonoObject*)str)->vtable, size);
        if (news) {
                memcpy (mono_string_chars (news), mono_string_chars (str), mono_string_length (str) * 2);
                news->length = mono_string_length (str);
@@ -5470,7 +5466,7 @@ mono_string_is_interned_lookup (MonoString *str, int insert)
        domain = ((MonoObject *)str)->vtable->domain;
        ldstr_table = domain->ldstr_table;
        ldstr_lock ();
-       res = mono_g_hash_table_lookup (ldstr_table, str);
+       res = (MonoString *)mono_g_hash_table_lookup (ldstr_table, str);
        if (res) {
                ldstr_unlock ();
                return res;
@@ -5481,7 +5477,7 @@ mono_string_is_interned_lookup (MonoString *str, int insert)
                s = mono_string_get_pinned (str);
                if (s) {
                        ldstr_lock ();
-                       res = mono_g_hash_table_lookup (ldstr_table, str);
+                       res = (MonoString *)mono_g_hash_table_lookup (ldstr_table, str);
                        if (res) {
                                ldstr_unlock ();
                                return res;
@@ -5555,7 +5551,7 @@ mono_ldstr (MonoDomain *domain, MonoImage *image, guint32 idx)
        MONO_REQ_GC_UNSAFE_MODE;
 
        if (image->dynamic) {
-               MonoString *str = mono_lookup_dynamic_token (image, MONO_TOKEN_STRING | idx, NULL);
+               MonoString *str = (MonoString *)mono_lookup_dynamic_token (image, MONO_TOKEN_STRING | idx, NULL);
                return str;
        } else {
                if (!mono_verifier_verify_string_signature (image, idx, NULL))
@@ -5595,7 +5591,7 @@ mono_ldstr_metadata_sig (MonoDomain *domain, const char* sig)
        }
 #endif
        ldstr_lock ();
-       interned = mono_g_hash_table_lookup (domain->ldstr_table, o);
+       interned = (MonoString *)mono_g_hash_table_lookup (domain->ldstr_table, o);
        ldstr_unlock ();
        if (interned)
                return interned; /* o will get garbage collected */
@@ -5603,7 +5599,7 @@ mono_ldstr_metadata_sig (MonoDomain *domain, const char* sig)
        o = mono_string_get_pinned (o);
        if (o) {
                ldstr_lock ();
-               interned = mono_g_hash_table_lookup (domain->ldstr_table, o);
+               interned = (MonoString *)mono_g_hash_table_lookup (domain->ldstr_table, o);
                if (!interned) {
                        mono_g_hash_table_insert (domain->ldstr_table, o, o);
                        interned = o;
@@ -5671,7 +5667,7 @@ mono_string_to_utf8_checked (MonoString *s, MonoError *error)
        /* g_utf16_to_utf8  may not be able to complete the convertion (e.g. NULL values were found, #335488) */
        if (s->length > written) {
                /* allocate the total length and copy the part of the string that has been converted */
-               char *as2 = g_malloc0 (s->length);
+               char *as2 = (char *)g_malloc0 (s->length);
                memcpy (as2, as, written);
                g_free (as);
                as = as2;
@@ -5708,7 +5704,7 @@ mono_string_to_utf8_ignore (MonoString *s)
        /* g_utf16_to_utf8  may not be able to complete the convertion (e.g. NULL values were found, #335488) */
        if (s->length > written) {
                /* allocate the total length and copy the part of the string that has been converted */
-               char *as2 = g_malloc0 (s->length);
+               char *as2 = (char *)g_malloc0 (s->length);
                memcpy (as2, as, written);
                g_free (as);
                as = as2;
@@ -5765,7 +5761,7 @@ mono_string_to_utf16 (MonoString *s)
        if (s == NULL)
                return NULL;
 
-       as = g_malloc ((s->length * 2) + 2);
+       as = (char *)g_malloc ((s->length * 2) + 2);
        as [(s->length * 2)] = '\0';
        as [(s->length * 2) + 1] = '\0';
 
@@ -5884,9 +5880,9 @@ mono_string_to_utf8_internal (MonoMemPool *mp, MonoImage *image, MonoString *s,
 
        len = strlen (r) + 1;
        if (mp)
-               mp_s = mono_mempool_alloc (mp, len);
+               mp_s = (char *)mono_mempool_alloc (mp, len);
        else
-               mp_s = mono_image_alloc (image, len);
+               mp_s = (char *)mono_image_alloc (image, len);
 
        memcpy (mp_s, r, len);
 
@@ -6036,7 +6032,7 @@ mono_runtime_capture_context (MonoDomain *domain)
                domain->capture_context_method = mono_compile_method (method);
        }
 
-       runtime_invoke = domain->capture_context_runtime_invoke;
+       runtime_invoke = (RuntimeInvokeFunction)domain->capture_context_runtime_invoke;
 
        return runtime_invoke (NULL, NULL, NULL, domain->capture_context_method);
 }
@@ -6064,7 +6060,7 @@ mono_async_result_new (MonoDomain *domain, HANDLE handle, MonoObject *state, gpo
                /* note: result may be null if the flow is suppressed */
        }
 
-       res->data = data;
+       res->data = (void **)data;
        MONO_OBJECT_SETREF (res, object_data, object_data);
        MONO_OBJECT_SETREF (res, async_state, state);
        if (handle != NULL)
@@ -6172,7 +6168,7 @@ mono_message_init (MonoDomain *domain,
        for (i = 0, j = 0; i < sig->param_count; i++) {
                if (sig->params [i]->byref) {
                        if (out_args) {
-                               MonoObject* arg = mono_array_get (out_args, gpointer, j);
+                               MonoObject* arg = (MonoObject *)mono_array_get (out_args, gpointer, j);
                                mono_array_setref (this_obj->args, i, arg);
                                j++;
                        }
@@ -6281,7 +6277,7 @@ mono_message_invoke (MonoObject *target, MonoMethodMessage *msg,
        for (i = 0, j = 0; i < sig->param_count; i++) {
                if (sig->params [i]->byref) {
                        MonoObject* arg;
-                       arg = mono_array_get (msg->args, gpointer, i);
+                       arg = (MonoObject *)mono_array_get (msg->args, gpointer, i);
                        mono_array_setref (*out_args, j, arg);
                        j++;
                }
@@ -6447,10 +6443,10 @@ mono_delegate_ctor (MonoObject *this_obj, MonoObject *target, gpointer addr)
 
        g_assert (addr);
 
-       ji = mono_jit_info_table_find (domain, mono_get_addr_from_ftnptr (addr));
+       ji = mono_jit_info_table_find (domain, (char *)mono_get_addr_from_ftnptr (addr));
        /* Shared code */
        if (!ji && domain != mono_get_root_domain ())
-               ji = mono_jit_info_table_find (mono_get_root_domain (), mono_get_addr_from_ftnptr (addr));
+               ji = mono_jit_info_table_find (mono_get_root_domain (), (char *)mono_get_addr_from_ftnptr (addr));
        if (ji) {
                method = mono_jit_info_get_method (ji);
                g_assert (!method->klass->generic_container);
@@ -6546,7 +6542,7 @@ mono_method_return_message_restore (MonoMethod *method, gpointer *params, MonoAr
                        if (j >= out_len)
                                mono_raise_exception (mono_get_exception_execution_engine ("The proxy call returned an incorrect number of output arguments"));
 
-                       arg = mono_array_get (out_args, gpointer, j);
+                       arg = (char *)mono_array_get (out_args, gpointer, j);
                        type = pt->type;
 
                        g_assert (type != MONO_TYPE_VOID);

diff --git a/mono/metadata/opcodes.c b/mono/metadata/opcodes.c
index e534d33b42239c659f083813f3a06176d3682af8..6cfbe5cbcce2fe85df1a6912fbcb024ad8401d8e 100644 (file)
--- a/mono/metadata/opcodes.c
+++ b/mono/metadata/opcodes.c
@@ -72,19 +72,19 @@ mono_opcode_value (const mono_byte **ip, const mono_byte *end)
        const mono_byte *p = *ip;
 
        if (p >= end)
-               return -1;
+               return (MonoOpcodeEnum)-1;
        if (*p == 0xfe) {
                ++p;
                if (p >= end)
-                       return -1;
-               res = *p + MONO_PREFIX1_OFFSET;
+                       return (MonoOpcodeEnum)-1;
+               res = (MonoOpcodeEnum)(*p + MONO_PREFIX1_OFFSET);
        } else if (*p == MONO_CUSTOM_PREFIX) {
                ++p;
                if (p >= end)
-                       return -1;
-               res = *p + MONO_CUSTOM_PREFIX_OFFSET;
+                       return (MonoOpcodeEnum)-1;
+               res = (MonoOpcodeEnum)(*p + MONO_CUSTOM_PREFIX_OFFSET);
        } else {
-               res = *p;
+               res = (MonoOpcodeEnum)*p;
        }
        *ip = p;
        return res;

diff --git a/mono/metadata/pedump.c b/mono/metadata/pedump.c
index e2e3fdff79fe388496a7fd12b060b1e037f1787a..eacaa657785eacec163dbf70a251599b45f62454 100644 (file)
--- a/mono/metadata/pedump.c
+++ b/mono/metadata/pedump.c
@@ -333,7 +333,7 @@ dump_methoddef (MonoImage *metadata, guint32 token)
 static void
 dump_dotnet_iinfo (MonoImage *image)
 {
-       MonoCLIImageInfo *iinfo = image->image_info;
+       MonoCLIImageInfo *iinfo = (MonoCLIImageInfo *)image->image_info;
 
        dump_dotnet_header (&iinfo->cli_header);
        dump_sections (iinfo);
@@ -385,7 +385,7 @@ dump_verify_info (MonoImage *image, int flags)
                        }
 
                        for (tmp = errors; tmp; tmp = tmp->next) {
-                               MonoVerifyInfo *info = tmp->data;
+                               MonoVerifyInfo *info = (MonoVerifyInfo *)tmp->data;
                                g_print ("%s: %s\n", desc [info->status], info->message);
                                if (info->status == MONO_VERIFY_ERROR) {
                                        count++;
@@ -504,7 +504,7 @@ verify_image_file (const char *fname)
 
 invalid_image:
        for (tmp = errors; tmp; tmp = tmp->next) {
-               MonoVerifyInfo *info = tmp->data;
+               MonoVerifyInfo *info = (MonoVerifyInfo *)tmp->data;
                g_print ("%s: %s\n", desc [info->status], info->message);
                if (info->status == MONO_VERIFY_ERROR)
                        count++;
@@ -610,7 +610,7 @@ pedump_assembly_search_hook (MonoAssemblyName *aname, gpointer user_data)
         GList *tmp;
 
        for (tmp = loaded_assemblies; tmp; tmp = tmp->next) {
-               MonoAssembly *ass = tmp->data;
+               MonoAssembly *ass = (MonoAssembly *)tmp->data;
                if (mono_assembly_names_equal (aname, &ass->aname))
                       return ass;
        }

diff --git a/mono/metadata/process.c b/mono/metadata/process.c
index 53e762d0a2886686b7299696c10686f66a3776ce..24d33ee89c86a283f21b4270967fd9083ec50af7 100644 (file)
--- a/mono/metadata/process.c
+++ b/mono/metadata/process.c
@@ -464,7 +464,7 @@ static GPtrArray* get_domain_assemblies (MonoDomain *domain)
        assemblies = g_ptr_array_new ();
        mono_domain_assemblies_lock (domain);
        for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
-               MonoAssembly *ass = tmp->data;
+               MonoAssembly *ass = (MonoAssembly *)tmp->data;
                if (ass->image->fileio_used)
                        continue;
                g_ptr_array_add (assemblies, ass);
@@ -522,7 +522,7 @@ MonoArray *ves_icall_System_Diagnostics_Process_GetModules_internal (MonoObject
 
        if (assemblies) {
                for (i = 0; i < assembly_count; i++) {
-                       MonoAssembly *ass = g_ptr_array_index (assemblies, i);
+                       MonoAssembly *ass = (MonoAssembly *)g_ptr_array_index (assemblies, i);
                        MonoObject *module = get_process_module (ass, proc_class);
                        mono_array_setref (temp_arr, num_added++, module);
                }
@@ -623,9 +623,9 @@ MonoBoolean ves_icall_System_Diagnostics_Process_ShellExecuteEx_internal (MonoPr
        gboolean ret;
 
        shellex.cbSize = sizeof(SHELLEXECUTEINFO);
-       shellex.fMask = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_NOCLOSEPROCESS | SEE_MASK_UNICODE;
-       shellex.nShow = proc_start_info->window_style;
-       shellex.nShow = (shellex.nShow == 0) ? 1 : (shellex.nShow == 1 ? 0 : shellex.nShow);
+       shellex.fMask = (gulong)(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_NOCLOSEPROCESS | SEE_MASK_UNICODE);
+       shellex.nShow = (gulong)proc_start_info->window_style;
+       shellex.nShow = (gulong)((shellex.nShow == 0) ? 1 : (shellex.nShow == 1 ? 0 : shellex.nShow));
        
        
        if (proc_start_info->filename != NULL) {
@@ -649,7 +649,7 @@ MonoBoolean ves_icall_System_Diagnostics_Process_ShellExecuteEx_internal (MonoPr
        if (proc_start_info->error_dialog) {    
                shellex.hwnd = proc_start_info->error_dialog_parent_handle;
        } else {
-               shellex.fMask |= SEE_MASK_FLAG_NO_UI;
+               shellex.fMask = (gulong)(shellex.fMask | SEE_MASK_FLAG_NO_UI);
        }
 
        ret = ShellExecuteEx (&shellex);
@@ -771,7 +771,12 @@ MonoBoolean ves_icall_System_Diagnostics_Process_CreateProcess_internal (MonoPro
 
        if (process_info->username) {
                logon_flags = process_info->load_user_profile ? LOGON_WITH_PROFILE : 0;
-               ret=CreateProcessWithLogonW (mono_string_chars (process_info->username), process_info->domain ? mono_string_chars (process_info->domain) : NULL, process_info->password, logon_flags, shell_path, cmd? mono_string_chars (cmd): NULL, creation_flags, env_vars, dir, &startinfo, &procinfo);
+               ret = CreateProcessWithLogonW (
+                       mono_string_chars (process_info->username),
+                       process_info->domain ? mono_string_chars (process_info->domain) : NULL,
+                       (const gunichar2 *)process_info->password, logon_flags, shell_path,
+                       cmd ? mono_string_chars (cmd) : NULL,
+                       creation_flags, env_vars, dir, &startinfo, &procinfo);
        } else {
                ret=CreateProcess (shell_path, cmd? mono_string_chars (cmd): NULL, NULL, NULL, TRUE, creation_flags, env_vars, dir, &startinfo, &procinfo);
        }
@@ -1063,7 +1068,7 @@ ves_icall_System_Diagnostics_Process_GetProcessData (int pid, gint32 data_type,
        MonoProcessError perror;
        guint64 res;
 
-       res = mono_process_get_data_with_error (GINT_TO_POINTER (pid), data_type, &perror);
+       res = mono_process_get_data_with_error (GINT_TO_POINTER (pid), (MonoProcessData)data_type, &perror);
        if (error)
                *error = perror;
        return res;

diff --git a/mono/metadata/profiler.c b/mono/metadata/profiler.c
index 435e4671a2bbd129403bdccd99daeb9af5525ccd..af9ac55ec7ce7a4c7ca46cb63544bb12818632d4 100644 (file)
--- a/mono/metadata/profiler.c
+++ b/mono/metadata/profiler.c
@@ -109,8 +109,8 @@ struct _ProfilerDesc {
 
 static ProfilerDesc *prof_list = NULL;
 
-#define mono_profiler_coverage_lock() mono_mutex_lock (&profiler_coverage_mutex)
-#define mono_profiler_coverage_unlock() mono_mutex_unlock (&profiler_coverage_mutex)
+#define mono_profiler_coverage_lock() mono_os_mutex_lock (&profiler_coverage_mutex)
+#define mono_profiler_coverage_unlock() mono_os_mutex_unlock (&profiler_coverage_mutex)
 static mono_mutex_t profiler_coverage_mutex;
 
 /* this is directly accessible to other mono libs.
@@ -134,7 +134,7 @@ mono_profiler_install (MonoProfiler *prof, MonoProfileFunc callback)
 {
        ProfilerDesc *desc = g_new0 (ProfilerDesc, 1);
        if (!prof_list)
-               mono_mutex_init_recursive (&profiler_coverage_mutex);
+               mono_os_mutex_init_recursive (&profiler_coverage_mutex);
        desc->profiler = prof;
        desc->shutdown_callback = callback;
        desc->next = prof_list;
@@ -159,11 +159,11 @@ void
 mono_profiler_set_events (MonoProfileFlags events)
 {
        ProfilerDesc *prof;
-       MonoProfileFlags value = 0;
+       MonoProfileFlags value = (MonoProfileFlags)0;
        if (prof_list)
                prof_list->events = events;
        for (prof = prof_list; prof; prof = prof->next)
-               value |= prof->events;
+               value = (MonoProfileFlags)(value | prof->events);
        mono_profiler_events = value;
 }
 
@@ -813,7 +813,7 @@ mono_profiler_shutdown (void)
                        prof->shutdown_callback (prof->profiler);
        }
 
-       mono_profiler_set_events (0);
+       mono_profiler_set_events ((MonoProfileFlags)0);
 }
 
 void
@@ -1018,7 +1018,7 @@ mono_profiler_coverage_alloc (MonoMethod *method, int entries)
        if (!coverage_hash)
                coverage_hash = g_hash_table_new (NULL, NULL);
 
-       res = g_malloc0 (sizeof (MonoProfileCoverageInfo) + sizeof (void*) * 2 * entries);
+       res = (MonoProfileCoverageInfo *)g_malloc0 (sizeof (MonoProfileCoverageInfo) + sizeof (void*) * 2 * entries);
 
        res->entries = entries;
 
@@ -1040,7 +1040,7 @@ mono_profiler_coverage_free (MonoMethod *method)
                return;
        }
 
-       info = g_hash_table_lookup (coverage_hash, method);
+       info = (MonoProfileCoverageInfo *)g_hash_table_lookup (coverage_hash, method);
        if (info) {
                g_free (info);
                g_hash_table_remove (coverage_hash, method);
@@ -1073,7 +1073,7 @@ mono_profiler_coverage_get (MonoProfiler *prof, MonoMethod *method, MonoProfileC
 
        mono_profiler_coverage_lock ();
        if (coverage_hash)
-               info = g_hash_table_lookup (coverage_hash, method);
+               info = (MonoProfileCoverageInfo *)g_hash_table_lookup (coverage_hash, method);
        mono_profiler_coverage_unlock ();
 
        if (!info)
@@ -1240,7 +1240,7 @@ mono_profiler_load (const char *desc)
                gboolean res = FALSE;
 
                if (col != NULL) {
-                       mname = g_memdup (desc, col - desc + 1);
+                       mname = (char *)g_memdup (desc, col - desc + 1);
                        mname [col - desc] = 0;
                } else {
                        mname = g_strdup (desc);

diff --git a/mono/metadata/reflection-internals.h b/mono/metadata/reflection-internals.h
index dc8141bbdbfbc468815ac40c82d779d04c2467c7..54eee9f0c73230f7b600c64c6f46a7238abfad7d 100644 (file)
--- a/mono/metadata/reflection-internals.h
+++ b/mono/metadata/reflection-internals.h
@@ -14,4 +14,7 @@ mono_custom_attrs_get_attr_checked (MonoCustomAttrInfo *ainfo, MonoClass *attr_k
 char*
 mono_identifier_unescape_type_name_chars (char* identifier);
 
+MonoImage *
+mono_find_dynamic_image_owner (void *ptr);
+
 #endif /* __MONO_METADATA_REFLECTION_INTERNALS_H__ */

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index 3d34adb29f1e17c9ab403fde6200c5a422f820d2..4f1f6d8405494b51c21655a4fdc9c7dd7f213fd9 100644 (file)
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -194,7 +194,7 @@ static MonoMethod * inflate_method (MonoReflectionType *type, MonoObject *obj);
 static guint32 create_typespec (MonoDynamicImage *assembly, MonoType *type);
 static void init_type_builder_generics (MonoObject *type);
 
-#define RESOLVE_TYPE(type) do { type = (void*)mono_reflection_type_resolve_user_types ((MonoReflectionType*)type); } while (0)
+#define RESOLVE_TYPE(type) do { type = (MonoObject *)mono_reflection_type_resolve_user_types ((MonoReflectionType*)type); } while (0)
 #define RESOLVE_ARRAY_TYPE_ELEMENT(array, index) do {  \
        MonoReflectionType *__type = mono_array_get (array, MonoReflectionType*, index);        \
        __type = mono_reflection_type_resolve_user_types (__type);      \
@@ -215,18 +215,61 @@ static void init_type_builder_generics (MonoObject *type);
 #define ADDP_IS_GREATER_OR_OVF(a, b, c) (((a) + (b) > (c)) || CHECK_ADDP_OVERFLOW_UN (a, b))
 #define ADD_IS_GREATER_OR_OVF(a, b, c) (((a) + (b) > (c)) || CHECK_ADD4_OVERFLOW_UN (a, b))
 
+// The dynamic images list is only needed to support the mempool reference tracking feature in checked-build.
+static GPtrArray *dynamic_images;
+static mono_mutex_t dynamic_images_mutex;
+
+static inline void
+dynamic_images_lock (void)
+{
+       mono_os_mutex_lock (&dynamic_images_mutex);
+}
+
+static inline void
+dynamic_images_unlock (void)
+{
+       mono_os_mutex_unlock (&dynamic_images_mutex);
+}
+
+/**
+ * mono_find_dynamic_image_owner:
+ *
+ * Find the dynamic image, if any, which a given pointer is located in the memory of.
+ */
+MonoImage *
+mono_find_dynamic_image_owner (void *ptr)
+{
+       MonoImage *owner = NULL;
+       int i;
+
+       dynamic_images_lock ();
+
+       if (dynamic_images)
+       {
+               for (i = 0; !owner && i < dynamic_images->len; ++i) {
+                       MonoImage *image = (MonoImage *)g_ptr_array_index (dynamic_images, i);
+                       if (mono_mempool_contains_addr (image->mempool, ptr))
+                               owner = image;
+               }
+       }
+
+       dynamic_images_unlock ();
+
+       return owner;
+}
 
 void
 mono_reflection_init (void)
 {
+       mono_os_mutex_init (&dynamic_images_mutex);
 }
 
 static inline void
 dynamic_image_lock (MonoDynamicImage *image)
 {
-       MONO_TRY_BLOCKING;
+       MONO_PREPARE_BLOCKING;
        mono_image_lock ((MonoImage*)image);
-       MONO_FINISH_TRY_BLOCKING;
+       MONO_FINISH_BLOCKING;
 }
 
 static inline void
@@ -253,7 +296,7 @@ lookup_dyn_token (MonoDynamicImage *assembly, guint32 token)
        MonoObject *obj;
 
        dynamic_image_lock (assembly);
-       obj = mono_g_hash_table_lookup (assembly->tokens, GUINT_TO_POINTER (token));
+       obj = (MonoObject *)mono_g_hash_table_lookup (assembly->tokens, GUINT_TO_POINTER (token));
        dynamic_image_unlock (assembly);
 
        return obj;
@@ -264,7 +307,7 @@ sigbuffer_init (SigBuffer *buf, int size)
 {
        MONO_REQ_GC_NEUTRAL_MODE;
 
-       buf->buf = g_malloc (size);
+       buf->buf = (char *)g_malloc (size);
        buf->p = buf->buf;
        buf->end = buf->buf + size;
 }
@@ -276,7 +319,7 @@ sigbuffer_make_room (SigBuffer *buf, int size)
 
        if (buf->end - buf->p < size) {
                int new_size = buf->end - buf->buf + size + 32;
-               char *p = g_realloc (buf->buf, new_size);
+               char *p = (char *)g_realloc (buf->buf, new_size);
                size = buf->p - buf->buf;
                buf->buf = p;
                buf->p = p + size;
@@ -392,7 +435,7 @@ alloc_table (MonoDynamicTable *table, guint nrows)
                                table->alloc_rows *= 2;
                }
 
-               table->values = g_renew (guint32, table->values, (table->alloc_rows) * table->columns);
+               table->values = (guint32 *)g_renew (guint32, table->values, (table->alloc_rows) * table->columns);
        }
 }
 
@@ -411,7 +454,7 @@ make_room_in_stream (MonoDynamicStream *stream, int size)
                        stream->alloc_size *= 2;
        }
        
-       stream->data = g_realloc (stream->data, stream->alloc_size);
+       stream->data = (char *)g_realloc (stream->data, stream->alloc_size);
 }
 
 static guint32
@@ -462,7 +505,7 @@ string_heap_init (MonoDynamicStream *sh)
 
        sh->index = 0;
        sh->alloc_size = 4096;
-       sh->data = g_malloc (4096);
+       sh->data = (char *)g_malloc (4096);
        sh->hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
        string_heap_insert (sh, "");
 }
@@ -556,7 +599,7 @@ add_to_blob_cached (MonoDynamicImage *assembly, char *b1, int s1, char *b2, int
        char *copy;
        gpointer oldkey, oldval;
 
-       copy = g_malloc (s1+s2);
+       copy = (char *)g_malloc (s1+s2);
        memcpy (copy, b1, s1);
        memcpy (copy + s1, b2, s2);
        if (g_hash_table_lookup_extended (assembly->blob_cache, copy, &oldkey, &oldval)) {
@@ -1287,12 +1330,12 @@ lookup_custom_attr (MonoImage *image, gpointer member)
 
        MonoCustomAttrInfo* res;
 
-       res = mono_image_property_lookup (image, member, MONO_PROP_DYNAMIC_CATTR);
+       res = (MonoCustomAttrInfo *)mono_image_property_lookup (image, member, MONO_PROP_DYNAMIC_CATTR);
 
        if (!res)
                return NULL;
 
-       res = g_memdup (res, MONO_SIZEOF_CUSTOM_ATTR_INFO + sizeof (MonoCustomAttrEntry) * res->num_attrs);
+       res = (MonoCustomAttrInfo *)g_memdup (res, MONO_SIZEOF_CUSTOM_ATTR_INFO + sizeof (MonoCustomAttrEntry) * res->num_attrs);
        res->cached = 0;
        return res;
 }
@@ -1338,7 +1381,7 @@ mono_custom_attrs_from_builders (MonoImage *alloc_img, MonoImage *image, MonoArr
        }
        count -= not_visible;
 
-       ainfo = image_g_malloc0 (alloc_img, MONO_SIZEOF_CUSTOM_ATTR_INFO + sizeof (MonoCustomAttrEntry) * count);
+       ainfo = (MonoCustomAttrInfo *)image_g_malloc0 (alloc_img, MONO_SIZEOF_CUSTOM_ATTR_INFO + sizeof (MonoCustomAttrEntry) * count);
 
        ainfo->image = image;
        ainfo->num_attrs = count;
@@ -1347,7 +1390,7 @@ mono_custom_attrs_from_builders (MonoImage *alloc_img, MonoImage *image, MonoArr
        for (i = 0; i < count; ++i) {
                cattr = (MonoReflectionCustomAttr*)mono_array_get (cattrs, gpointer, i);
                if (custom_attr_visible (image, cattr)) {
-                       unsigned char *saved = mono_image_alloc (image, mono_array_length (cattr->data));
+                       unsigned char *saved = (unsigned char *)mono_image_alloc (image, mono_array_length (cattr->data));
                        memcpy (saved, mono_array_addr (cattr->data, char, 0), mono_array_length (cattr->data));
                        ainfo->attrs [index].ctor = cattr->ctor->method;
                        ainfo->attrs [index].data = saved;
@@ -1376,7 +1419,7 @@ mono_save_custom_attrs (MonoImage *image, void *obj, MonoArray *cattrs)
        ainfo = mono_custom_attrs_from_builders (image, image, cattrs);
 
        mono_loader_lock ();
-       tmp = mono_image_property_lookup (image, obj, MONO_PROP_DYNAMIC_CATTR);
+       tmp = (MonoCustomAttrInfo *)mono_image_property_lookup (image, obj, MONO_PROP_DYNAMIC_CATTR);
        if (tmp)
                mono_custom_attrs_free (tmp);
        mono_image_property_insert (image, obj, MONO_PROP_DYNAMIC_CATTR, ainfo);
@@ -1780,7 +1823,7 @@ mono_image_get_method_info (MonoReflectionMethodBuilder *mb, MonoDynamicImage *a
                        guint32 owner = MONO_TYPEORMETHOD_METHOD | (mb->table_idx << MONO_TYPEORMETHOD_BITS);
 
                        mono_image_get_generic_param_info (
-                               mono_array_get (mb->generic_params, gpointer, i), owner, assembly);
+                               (MonoReflectionGenericParam *)mono_array_get (mb->generic_params, gpointer, i), owner, assembly);
                }
        }
 
@@ -1913,7 +1956,7 @@ field_encode_signature (MonoDynamicImage *assembly, MonoReflectionFieldBuilder *
 }
 
 static guint32
-encode_constant (MonoDynamicImage *assembly, MonoObject *val, guint32 *ret_type)
+encode_constant (MonoDynamicImage *assembly, MonoObject *val, MonoTypeEnum *ret_type)
 {
        MONO_REQ_GC_UNSAFE_MODE;
 
@@ -1923,7 +1966,7 @@ encode_constant (MonoDynamicImage *assembly, MonoObject *val, guint32 *ret_type)
        char* buf;
        guint32 idx = 0, len = 0, dummy = 0;
 
-       buf = g_malloc (64);
+       buf = (char *)g_malloc (64);
        if (!val) {
                *ret_type = MONO_TYPE_CLASS;
                len = 4;
@@ -2118,7 +2161,7 @@ mono_image_get_field_info (MonoReflectionFieldBuilder *fb, MonoDynamicImage *ass
                values [MONO_FIELD_LAYOUT_OFFSET] = fb->offset;
        }
        if (fb->attrs & FIELD_ATTRIBUTE_LITERAL) {
-               guint32 field_type = 0;
+               MonoTypeEnum field_type = (MonoTypeEnum)0;
                table = &assembly->tables [MONO_TABLE_CONSTANT];
                table->rows ++;
                alloc_table (table, table->rows);
@@ -2247,7 +2290,7 @@ mono_image_get_property_info (MonoReflectionPropertyBuilder *pb, MonoDynamicImag
                values [MONO_METHOD_SEMA_ASSOCIATION] = (pb->table_idx << MONO_HAS_SEMANTICS_BITS) | MONO_HAS_SEMANTICS_PROPERTY;
        }
        if (pb->attrs & PROPERTY_ATTRIBUTE_HAS_DEFAULT) {
-               guint32 field_type = 0;
+               MonoTypeEnum field_type = (MonoTypeEnum)0;
                table = &assembly->tables [MONO_TABLE_CONSTANT];
                table->rows ++;
                alloc_table (table, table->rows);
@@ -2345,7 +2388,7 @@ encode_constraints (MonoReflectionGenericParam *gparam, guint32 owner, MonoDynam
        }
 
        for (i = 0; i < num_constraints; i++) {
-               MonoReflectionType *constraint = mono_array_get (
+               MonoReflectionType *constraint = (MonoReflectionType *)mono_array_get (
                        gparam->iface_constraints, gpointer, i);
 
                table_idx = table->next_idx ++;
@@ -2557,9 +2600,9 @@ mono_image_typedef_or_ref_full (MonoDynamicImage *assembly, MonoType *type, gboo
         */
        if ((klass->image == &assembly->image) && (type->type != MONO_TYPE_VAR) && 
                        (type->type != MONO_TYPE_MVAR)) {
-               MonoReflectionTypeBuilder *tb = mono_class_get_ref_info (klass);
+               MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)mono_class_get_ref_info (klass);
                token = MONO_TYPEDEFORREF_TYPEDEF | (tb->table_idx << MONO_TYPEDEFORREF_BITS);
-               register_dyn_token (assembly, token, mono_class_get_ref_info (klass));
+               register_dyn_token (assembly, token, (MonoObject *)mono_class_get_ref_info (klass));
                return token;
        }
 
@@ -2582,7 +2625,7 @@ mono_image_typedef_or_ref_full (MonoDynamicImage *assembly, MonoType *type, gboo
        token = MONO_TYPEDEFORREF_TYPEREF | (table->next_idx << MONO_TYPEDEFORREF_BITS); /* typeref */
        g_hash_table_insert (assembly->typeref, type, GUINT_TO_POINTER(token));
        table->next_idx ++;
-       register_dyn_token (assembly, token, mono_class_get_ref_info (klass));
+       register_dyn_token (assembly, token, (MonoObject *)mono_class_get_ref_info (klass));
        return token;
 }
 
@@ -3069,7 +3112,7 @@ mono_reflection_method_on_tb_inst_get_handle (MonoReflectionMethodOnTypeBuilderI
 
        type_argv = g_new0 (MonoType *, count);
        for (i = 0; i < count; i++) {
-               MonoReflectionType *garg = mono_array_get (m->method_args, gpointer, i);
+               MonoReflectionType *garg = (MonoReflectionType *)mono_array_get (m->method_args, gpointer, i);
                type_argv [i] = mono_reflection_type_get_handle (garg);
        }
        ginst = mono_metadata_get_generic_inst (count, type_argv);
@@ -3332,7 +3375,7 @@ add_custom_modifiers (MonoDynamicImage *assembly, MonoType *type, MonoArray *mod
                return mono_metadata_type_dup (NULL, type);
 
        len = MONO_SIZEOF_TYPE + ((gint32)count) * sizeof (MonoCustomMod);
-       t = g_malloc (len);
+       t = (MonoType *)g_malloc (len);
        memcpy (t, type, MONO_SIZEOF_TYPE);
 
        t->num_mods = count;
@@ -3534,7 +3577,7 @@ mono_image_get_array_token (MonoDynamicImage *assembly, MonoReflectionArrayMetho
 
        name = mono_string_to_utf8 (m->name);
        nparams = mono_array_length (m->parameters);
-       sig = g_malloc0 (MONO_SIZEOF_METHOD_SIGNATURE + sizeof (MonoType*) * nparams);
+       sig = (MonoMethodSignature *)g_malloc0 (MONO_SIZEOF_METHOD_SIGNATURE + sizeof (MonoType*) * nparams);
        sig->hasthis = 1;
        sig->sentinelpos = -1;
        sig->call_convention = reflection_cc_to_file (m->call_conv);
@@ -3545,7 +3588,7 @@ mono_image_get_array_token (MonoDynamicImage *assembly, MonoReflectionArrayMetho
                sig->params [i] = mono_type_array_get_and_resolve (m->parameters, i);
 
        for (tmp = assembly->array_methods; tmp; tmp = tmp->next) {
-               am = tmp->data;
+               am = (ArrayMethod *)tmp->data;
                if (strcmp (name, am->name) == 0 && 
                                mono_metadata_type_equal (am->parent, mtype) &&
                                mono_metadata_signature_equal (am->sig, sig)) {
@@ -3937,7 +3980,7 @@ mono_image_fill_export_table_from_class (MonoDomain *domain, MonoClass *klass,
                GList *tmp;
 
                for (tmp = klass->ext->nested_classes; tmp; tmp = tmp->next)
-                       mono_image_fill_export_table_from_class (domain, tmp->data, module_index, table->next_idx - 1, assembly);
+                       mono_image_fill_export_table_from_class (domain, (MonoClass *)tmp->data, module_index, table->next_idx - 1, assembly);
        }
 
        return res;
@@ -4060,16 +4103,16 @@ mono_image_fill_export_table_from_type_forwarders (MonoReflectionAssemblyBuilder
 static int
 compare_constants (const void *a, const void *b)
 {
-       const guint32 *a_values = a;
-       const guint32 *b_values = b;
+       const guint32 *a_values = (const guint32 *)a;
+       const guint32 *b_values = (const guint32 *)b;
        return a_values [MONO_CONSTANT_PARENT] - b_values [MONO_CONSTANT_PARENT];
 }
 
 static int
 compare_semantics (const void *a, const void *b)
 {
-       const guint32 *a_values = a;
-       const guint32 *b_values = b;
+       const guint32 *a_values = (const guint32 *)a;
+       const guint32 *b_values = (const guint32 *)b;
        int assoc = a_values [MONO_METHOD_SEMA_ASSOCIATION] - b_values [MONO_METHOD_SEMA_ASSOCIATION];
        if (assoc)
                return assoc;
@@ -4079,8 +4122,8 @@ compare_semantics (const void *a, const void *b)
 static int
 compare_custom_attrs (const void *a, const void *b)
 {
-       const guint32 *a_values = a;
-       const guint32 *b_values = b;
+       const guint32 *a_values = (const guint32 *)a;
+       const guint32 *b_values = (const guint32 *)b;
 
        return a_values [MONO_CUSTOM_ATTR_PARENT] - b_values [MONO_CUSTOM_ATTR_PARENT];
 }
@@ -4088,8 +4131,8 @@ compare_custom_attrs (const void *a, const void *b)
 static int
 compare_field_marshal (const void *a, const void *b)
 {
-       const guint32 *a_values = a;
-       const guint32 *b_values = b;
+       const guint32 *a_values = (const guint32 *)a;
+       const guint32 *b_values = (const guint32 *)b;
 
        return a_values [MONO_FIELD_MARSHAL_PARENT] - b_values [MONO_FIELD_MARSHAL_PARENT];
 }
@@ -4097,8 +4140,8 @@ compare_field_marshal (const void *a, const void *b)
 static int
 compare_nested (const void *a, const void *b)
 {
-       const guint32 *a_values = a;
-       const guint32 *b_values = b;
+       const guint32 *a_values = (const guint32 *)a;
+       const guint32 *b_values = (const guint32 *)b;
 
        return a_values [MONO_NESTED_CLASS_NESTED] - b_values [MONO_NESTED_CLASS_NESTED];
 }
@@ -4120,8 +4163,8 @@ compare_genericparam (const void *a, const void *b)
 static int
 compare_declsecurity_attrs (const void *a, const void *b)
 {
-       const guint32 *a_values = a;
-       const guint32 *b_values = b;
+       const guint32 *a_values = (const guint32 *)a;
+       const guint32 *b_values = (const guint32 *)b;
 
        return a_values [MONO_DECL_SECURITY_PARENT] - b_values [MONO_DECL_SECURITY_PARENT];
 }
@@ -4129,8 +4172,8 @@ compare_declsecurity_attrs (const void *a, const void *b)
 static int
 compare_interface_impl (const void *a, const void *b)
 {
-       const guint32 *a_values = a;
-       const guint32 *b_values = b;
+       const guint32 *a_values = (const guint32 *)a;
+       const guint32 *b_values = (const guint32 *)b;
 
        int klass = a_values [MONO_INTERFACEIMPL_CLASS] - b_values [MONO_INTERFACEIMPL_CLASS];
        if (klass)
@@ -4180,7 +4223,7 @@ build_compressed_metadata (MonoDynamicImage *assembly)
 
        qsort (assembly->gen_params->pdata, assembly->gen_params->len, sizeof (gpointer), compare_genericparam);
        for (i = 0; i < assembly->gen_params->len; i++){
-               GenericParamTableEntry *entry = g_ptr_array_index (assembly->gen_params, i);
+               GenericParamTableEntry *entry = (GenericParamTableEntry *)g_ptr_array_index (assembly->gen_params, i);
                write_generic_param_entry (assembly, entry);
        }
 
@@ -4242,7 +4285,7 @@ build_compressed_metadata (MonoDynamicImage *assembly)
        heapt_size += 3;
        heapt_size &= ~3;
        meta_size += heapt_size;
-       meta->raw_metadata = g_malloc0 (meta_size);
+       meta->raw_metadata = (char *)g_malloc0 (meta_size);
        p = (unsigned char*)meta->raw_metadata;
        /* the metadata signature */
        *p++ = 'B'; *p++ = 'S'; *p++ = 'J'; *p++ = 'B';
@@ -4515,7 +4558,7 @@ fixup_cattrs (MonoDynamicImage *assembly)
                if ((type & MONO_CUSTOM_ATTR_TYPE_MASK) == MONO_CUSTOM_ATTR_TYPE_METHODDEF) {
                        idx = type >> MONO_CUSTOM_ATTR_TYPE_BITS;
                        token = mono_metadata_make_token (MONO_TABLE_METHOD, idx);
-                       ctor = mono_g_hash_table_lookup (assembly->remapped_tokens, GUINT_TO_POINTER (token));
+                       ctor = (MonoObject *)mono_g_hash_table_lookup (assembly->remapped_tokens, GUINT_TO_POINTER (token));
                        g_assert (ctor);
 
                        if (!strcmp (ctor->vtable->klass->name, "MonoCMethod")) {
@@ -4654,7 +4697,7 @@ load_public_key (MonoArray *pkey, MonoDynamicImage *assembly) {
        token = mono_image_add_stream_data (&assembly->blob, blob_size, b - blob_size);
        mono_image_add_stream_data (&assembly->blob, mono_array_addr (pkey, char, 0), len);
 
-       assembly->public_key = g_malloc (len);
+       assembly->public_key = (guint8 *)g_malloc (len);
        memcpy (assembly->public_key, mono_array_addr (pkey, char, 0), len);
        assembly->public_key_len = len;
 
@@ -4670,7 +4713,7 @@ load_public_key (MonoArray *pkey, MonoDynamicImage *assembly) {
                g_warning ("Invalid public key length: %d bits (total: %d)", (int)MONO_PUBLIC_KEY_BIT_SIZE (len), (int)len);
                assembly->strong_name_size = MONO_DEFAULT_PUBLIC_KEY_LENGTH; /* to be safe */
        }
-       assembly->strong_name = g_malloc0 (assembly->strong_name_size);
+       assembly->strong_name = (char *)g_malloc0 (assembly->strong_name_size);
 
        return token;
 }
@@ -4835,7 +4878,7 @@ mono_image_build_metadata (MonoReflectionModuleBuilder *moduleb)
                        collect_types (&types, type);
                }
 
-       mono_ptr_array_sort (types, (gpointer)compare_types_by_table_idx);
+       mono_ptr_array_sort (types, (int (*)(const void *, const void *))compare_types_by_table_idx);
        table = &assembly->tables [MONO_TABLE_TYPEDEF];
        table->rows += mono_ptr_array_size (types);
        alloc_table (table, table->rows);
@@ -4845,16 +4888,16 @@ mono_image_build_metadata (MonoReflectionModuleBuilder *moduleb)
         * so load_class_names () needs to touch fewer pages.
         */
        for (i = 0; i < mono_ptr_array_size (types); ++i) {
-               MonoReflectionTypeBuilder *tb = mono_ptr_array_get (types, i);
+               MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)mono_ptr_array_get (types, i);
                string_heap_insert_mstring (&assembly->sheap, tb->nspace);
        }
        for (i = 0; i < mono_ptr_array_size (types); ++i) {
-               MonoReflectionTypeBuilder *tb = mono_ptr_array_get (types, i);
+               MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)mono_ptr_array_get (types, i);
                string_heap_insert_mstring (&assembly->sheap, tb->name);
        }
 
        for (i = 0; i < mono_ptr_array_size (types); ++i) {
-               MonoReflectionTypeBuilder *type = mono_ptr_array_get (types, i);
+               MonoReflectionTypeBuilder *type = (MonoReflectionTypeBuilder *)mono_ptr_array_get (types, i);
                mono_image_get_type_info (domain, type, assembly);
        }
 
@@ -4889,7 +4932,7 @@ mono_image_build_metadata (MonoReflectionModuleBuilder *moduleb)
        }
 
        for (i = 0; i < mono_ptr_array_size (types); ++i) {
-               MonoReflectionTypeBuilder *type = mono_ptr_array_get (types, i);
+               MonoReflectionTypeBuilder *type = (MonoReflectionTypeBuilder *)mono_ptr_array_get (types, i);
                if (type->methods) {
                        for (j = 0; j < type->num_methods; ++j) {
                                MonoReflectionMethodBuilder *mb = mono_array_get (
@@ -5245,7 +5288,7 @@ mono_image_register_token (MonoDynamicImage *assembly, guint32 token, MonoObject
        MonoObject *prev;
 
        dynamic_image_lock (assembly);
-       prev = mono_g_hash_table_lookup (assembly->tokens, GUINT_TO_POINTER (token));
+       prev = (MonoObject *)mono_g_hash_table_lookup (assembly->tokens, GUINT_TO_POINTER (token));
        if (prev) {
                /* There could be multiple MethodInfo objects with the same token */
                //g_assert (prev == obj);
@@ -5271,7 +5314,7 @@ create_dynamic_mono_image (MonoDynamicAssembly *assembly, char *assembly_name, c
 
 #if HAVE_BOEHM_GC
        /* The MonoGHashTable's need GC tracking */
-       image = GC_MALLOC (sizeof (MonoDynamicImage));
+       image = (MonoDynamicImage *)GC_MALLOC (sizeof (MonoDynamicImage));
 #else
        image = g_new0 (MonoDynamicImage, 1);
 #endif
@@ -5338,6 +5381,15 @@ create_dynamic_mono_image (MonoDynamicAssembly *assembly, char *assembly_name, c
        
        mono_profiler_module_loaded (&image->image, MONO_PROFILE_OK);
 
+       dynamic_images_lock ();
+
+       if (!dynamic_images)
+               dynamic_images = g_ptr_array_new ();
+
+       g_ptr_array_add (dynamic_images, image);
+
+       dynamic_images_unlock ();
+
        return image;
 }
 #endif
@@ -5368,6 +5420,7 @@ mono_dynamic_image_release_gc_roots (MonoDynamicImage *image)
        release_hashtable (&image->methodspec);
 }
 
+// Free dynamic image pass one: Free resources but not image itself
 void
 mono_dynamic_image_free (MonoDynamicImage *image)
 {
@@ -5406,7 +5459,7 @@ mono_dynamic_image_free (MonoDynamicImage *image)
        g_list_free (di->array_methods);
        if (di->gen_params) {
                for (i = 0; i < di->gen_params->len; i++) {
-                       GenericParamTableEntry *entry = g_ptr_array_index (di->gen_params, i);
+                       GenericParamTableEntry *entry = (GenericParamTableEntry *)g_ptr_array_index (di->gen_params, i);
                        mono_gc_deregister_root ((char*) &entry->gparam);
                        g_free (entry);
                }
@@ -5438,8 +5491,16 @@ mono_dynamic_image_free (MonoDynamicImage *image)
        for (i = 0; i < MONO_TABLE_NUM; ++i) {
                g_free (di->tables [i].values);
        }
-}      
 
+       dynamic_images_lock ();
+
+       if (dynamic_images)
+               g_ptr_array_remove (dynamic_images, di);
+
+       dynamic_images_unlock ();
+}
+
+// Free dynamic image pass two: Free image itself (might never get called in some debug modes)
 void
 mono_dynamic_image_free_image (MonoDynamicImage *image)
 {
@@ -5472,7 +5533,7 @@ mono_image_basic_init (MonoReflectionAssemblyBuilder *assemblyb)
 
 #if HAVE_BOEHM_GC
        /* assembly->assembly.image might be GC allocated */
-       assembly = assemblyb->dynamic_assembly = GC_MALLOC (sizeof (MonoDynamicAssembly));
+       assembly = assemblyb->dynamic_assembly = (MonoDynamicAssembly *)GC_MALLOC (sizeof (MonoDynamicAssembly));
 #else
        assembly = assemblyb->dynamic_assembly = g_new0 (MonoDynamicAssembly, 1);
 #endif
@@ -5771,13 +5832,13 @@ assembly_add_win32_resources (MonoDynamicImage *assembly, MonoReflectionAssembly
        }
        /* Directory structure */
        size += mono_array_length (assemblyb->win32_resources) * 256;
-       p = buf = g_malloc (size);
+       p = buf = (char *)g_malloc (size);
 
        resource_tree_encode (tree, p, p, &p);
 
        g_assert (p - buf <= size);
 
-       assembly->win32_res = g_malloc (p - buf);
+       assembly->win32_res = (char *)g_malloc (p - buf);
        assembly->win32_res_size = p - buf;
        memcpy (assembly->win32_res, buf, p - buf);
 
@@ -6254,15 +6315,15 @@ typedef struct {
 
 static gboolean
 reflected_equal (gconstpointer a, gconstpointer b) {
-       const ReflectedEntry *ea = a;
-       const ReflectedEntry *eb = b;
+       const ReflectedEntry *ea = (const ReflectedEntry *)a;
+       const ReflectedEntry *eb = (const ReflectedEntry *)b;
 
        return (ea->item == eb->item) && (ea->refclass == eb->refclass);
 }
 
 static guint
 reflected_hash (gconstpointer a) {
-       const ReflectedEntry *ea = a;
+       const ReflectedEntry *ea = (const ReflectedEntry *)a;
        return mono_aligned_addr_hash (ea->item);
 }
 
@@ -6275,7 +6336,7 @@ reflected_hash (gconstpointer a) {
                mono_domain_lock (domain);      \
                if (!domain->refobject_hash)    \
                        domain->refobject_hash = mono_g_hash_table_new_type (reflected_hash, reflected_equal, MONO_HASH_VALUE_GC, MONO_ROOT_SOURCE_DOMAIN, "domain reflection objects table");  \
-               if ((_obj = mono_g_hash_table_lookup (domain->refobject_hash, &e))) {   \
+               if ((_obj = (t)mono_g_hash_table_lookup (domain->refobject_hash, &e))) {        \
                        mono_domain_unlock (domain);    \
                        return _obj;    \
                }       \
@@ -6288,7 +6349,7 @@ reflected_hash (gconstpointer a) {
 #define FREE_REFENTRY(entry) g_free ((entry))
 #define REFENTRY_REQUIRES_CLEANUP
 #else
-#define ALLOC_REFENTRY mono_mempool_alloc (domain->mp, sizeof (ReflectedEntry))
+#define ALLOC_REFENTRY (ReflectedEntry *)mono_mempool_alloc (domain->mp, sizeof (ReflectedEntry))
 /* FIXME: */
 #define FREE_REFENTRY(entry)
 #endif
@@ -6302,7 +6363,7 @@ reflected_hash (gconstpointer a) {
         mono_domain_lock (domain); \
                if (!domain->refobject_hash)    \
                        domain->refobject_hash = mono_g_hash_table_new_type (reflected_hash, reflected_equal, MONO_HASH_VALUE_GC, MONO_ROOT_SOURCE_DOMAIN, "domain reflection objects table");  \
-        _obj = mono_g_hash_table_lookup (domain->refobject_hash, &pe); \
+        _obj = (t)mono_g_hash_table_lookup (domain->refobject_hash, &pe); \
         if (!_obj) { \
                    ReflectedEntry *e = ALLOC_REFENTRY;         \
                    e->item = (p);      \
@@ -6649,7 +6710,7 @@ mono_type_get_object (MonoDomain *domain, MonoType *type)
        if (type == &klass->byval_arg && !image_is_dynamic (klass->image)) {
                MonoVTable *vtable = mono_class_try_get_vtable (domain, klass);
                if (vtable && vtable->type)
-                       return vtable->type;
+                       return (MonoReflectionType *)vtable->type;
        }
 
        mono_loader_lock (); /*FIXME mono_class_init and mono_class_vtable acquire it*/
@@ -6657,7 +6718,7 @@ mono_type_get_object (MonoDomain *domain, MonoType *type)
        if (!domain->type_hash)
                domain->type_hash = mono_g_hash_table_new_type ((GHashFunc)mono_metadata_type_hash, 
                                (GCompareFunc)mono_metadata_type_equal, MONO_HASH_VALUE_GC, MONO_ROOT_SOURCE_DOMAIN, "domain reflection types table");
-       if ((res = mono_g_hash_table_lookup (domain->type_hash, type))) {
+       if ((res = (MonoReflectionType *)mono_g_hash_table_lookup (domain->type_hash, type))) {
                mono_domain_unlock (domain);
                mono_loader_unlock ();
                return res;
@@ -6714,7 +6775,7 @@ mono_type_get_object (MonoDomain *domain, MonoType *type)
                if (is_type_done && !type->byref) {
                        mono_domain_unlock (domain);
                        mono_loader_unlock ();
-                       return mono_class_get_ref_info (klass);
+                       return (MonoReflectionType *)mono_class_get_ref_info (klass);
                }
        }
        /* This is stored in vtables/JITted code so it has to be pinned */
@@ -7034,7 +7095,7 @@ mono_param_get_objects_internal (MonoDomain *domain, MonoMethod *method, MonoCla
                        /* Build MonoType for the type from the Constant Table */
                        if (!type)
                                type = g_new0 (MonoType, 1);
-                       type->type = types [i];
+                       type->type = (MonoTypeEnum)types [i];
                        type->data.klass = NULL;
                        if (types [i] == MONO_TYPE_CLASS)
                                type->data.klass = mono_defaults.object_class;
@@ -7240,7 +7301,7 @@ get_default_param_value_blobs (MonoMethod *method, char **blobs, guint32 *types)
                MonoReflectionMethodAux *aux;
                if (method->is_inflated)
                        method = ((MonoMethodInflated*)method)->declaring;
-               aux = g_hash_table_lookup (((MonoDynamicImage*)method->klass->image)->method_aux_hash, method);
+               aux = (MonoReflectionMethodAux *)g_hash_table_lookup (((MonoDynamicImage*)method->klass->image)->method_aux_hash, method);
                if (aux && aux->param_defaults) {
                        memcpy (blobs, &(aux->param_defaults [1]), methodsig->param_count * sizeof (char*));
                        memcpy (types, &(aux->param_default_types [1]), methodsig->param_count * sizeof (guint32));
@@ -7276,7 +7337,7 @@ get_default_param_value_blobs (MonoMethod *method, char **blobs, guint32 *types)
                }
        
                mono_metadata_decode_row (constt, crow - 1, const_cols, MONO_CONSTANT_SIZE);
-               blobs [paramseq - 1] = (gpointer) mono_metadata_blob_heap (image, const_cols [MONO_CONSTANT_VALUE]);
+               blobs [paramseq - 1] = (char *)mono_metadata_blob_heap (image, const_cols [MONO_CONSTANT_VALUE]);
                types [paramseq - 1] = const_cols [MONO_CONSTANT_TYPE];
        }
 
@@ -7786,19 +7847,19 @@ mono_reflection_get_type_internal (MonoImage *rootimage, MonoImage* image, MonoT
                        char *nested_name, *nested_nspace;
                        gboolean match = TRUE;
 
-                       lastp = strrchr (mod->data, '.');
+                       lastp = strrchr ((const char *)mod->data, '.');
                        if (lastp) {
                                /* Nested classes can have namespaces */
                                int nspace_len;
 
                                nested_name = g_strdup (lastp + 1);
                                nspace_len = lastp - (char*)mod->data;
-                               nested_nspace = g_malloc (nspace_len + 1);
+                               nested_nspace = (char *)g_malloc (nspace_len + 1);
                                memcpy (nested_nspace, mod->data, nspace_len);
                                nested_nspace [nspace_len] = '\0';
 
                        } else {
-                               nested_name = mod->data;
+                               nested_name = (char *)mod->data;
                                nested_nspace = NULL;
                        }
 
@@ -7841,7 +7902,7 @@ mono_reflection_get_type_internal (MonoImage *rootimage, MonoImage* image, MonoT
                int i;
 
                for (i = 0; i < info->type_arguments->len; i++) {
-                       MonoTypeNameParse *subinfo = g_ptr_array_index (info->type_arguments, i);
+                       MonoTypeNameParse *subinfo = (MonoTypeNameParse *)g_ptr_array_index (info->type_arguments, i);
 
                        type_args [i] = _mono_reflection_get_type_from_info (subinfo, rootimage, ignorecase);
                        if (!type_args [i]) {
@@ -7983,7 +8044,7 @@ mono_reflection_free_type_info (MonoTypeNameParse *info)
                int i;
 
                for (i = 0; i < info->type_arguments->len; i++) {
-                       MonoTypeNameParse *subinfo = g_ptr_array_index (info->type_arguments, i);
+                       MonoTypeNameParse *subinfo = (MonoTypeNameParse *)g_ptr_array_index (info->type_arguments, i);
 
                        mono_reflection_free_type_info (subinfo);
                        /*We free the subinfo since it is allocated by _mono_reflection_parse_type*/
@@ -8126,7 +8187,7 @@ load_cattr_enum_type (MonoImage *image, const char *p, const char **end, MonoErr
 
        mono_error_init (error);
 
-       n = g_memdup (p, slen + 1);
+       n = (char *)g_memdup (p, slen + 1);
        n [slen] = 0;
        t = mono_reflection_type_from_name (n, image);
        if (!t) {
@@ -8154,7 +8215,7 @@ handle_enum:
        case MONO_TYPE_U1:
        case MONO_TYPE_I1:
        case MONO_TYPE_BOOLEAN: {
-               MonoBoolean *bval = g_malloc (sizeof (MonoBoolean));
+               MonoBoolean *bval = (MonoBoolean *)g_malloc (sizeof (MonoBoolean));
                *bval = *p;
                *end = p + 1;
                return bval;
@@ -8162,7 +8223,7 @@ handle_enum:
        case MONO_TYPE_CHAR:
        case MONO_TYPE_U2:
        case MONO_TYPE_I2: {
-               guint16 *val = g_malloc (sizeof (guint16));
+               guint16 *val = (guint16 *)g_malloc (sizeof (guint16));
                *val = read16 (p);
                *end = p + 2;
                return val;
@@ -8174,7 +8235,7 @@ handle_enum:
        case MONO_TYPE_R4:
        case MONO_TYPE_U4:
        case MONO_TYPE_I4: {
-               guint32 *val = g_malloc (sizeof (guint32));
+               guint32 *val = (guint32 *)g_malloc (sizeof (guint32));
                *val = read32 (p);
                *end = p + 4;
                return val;
@@ -8185,13 +8246,13 @@ handle_enum:
 #endif
        case MONO_TYPE_U8:
        case MONO_TYPE_I8: {
-               guint64 *val = g_malloc (sizeof (guint64));
+               guint64 *val = (guint64 *)g_malloc (sizeof (guint64));
                *val = read64 (p);
                *end = p + 8;
                return val;
        }
        case MONO_TYPE_R8: {
-               double *val = g_malloc (sizeof (double));
+               double *val = (double *)g_malloc (sizeof (double));
                readr8 (p, val);
                *end = p + 8;
                return val;
@@ -8204,7 +8265,7 @@ handle_enum:
                        MonoClass *k =  t->data.klass;
                        
                        if (mono_is_corlib_image (k->image) && strcmp (k->name_space, "System") == 0 && strcmp (k->name, "DateTime") == 0){
-                               guint64 *val = g_malloc (sizeof (guint64));
+                               guint64 *val = (guint64 *)g_malloc (sizeof (guint64));
                                *val = read64 (p);
                                *end = p + 8;
                                return val;
@@ -8230,7 +8291,7 @@ handle_enum:
                }
 handle_type:
                slen = mono_metadata_decode_value (p, &p);
-               n = g_memdup (p, slen + 1);
+               n = (char *)g_memdup (p, slen + 1);
                n [slen] = 0;
                t = mono_reflection_type_from_name (n, image);
                if (!t) {
@@ -8270,7 +8331,7 @@ handle_type:
                                if (etype == 0x51)
                                        /* See Partition II, Appendix B3 */
                                        etype = MONO_TYPE_OBJECT;
-                               simple_type.type = etype;
+                               simple_type.type = (MonoTypeEnum)etype;
                                tklass = mono_class_from_mono_type (&simple_type);
                        }
                        goto handle_enum;
@@ -8278,7 +8339,7 @@ handle_type:
                        char *n;
                        MonoType *t;
                        slen = mono_metadata_decode_value (p, &p);
-                       n = g_memdup (p, slen + 1);
+                       n = (char *)g_memdup (p, slen + 1);
                        n [slen] = 0;
                        t = mono_reflection_type_from_name (n, image);
                        if (!t) {
@@ -8292,7 +8353,7 @@ handle_type:
                        subc = mono_class_from_mono_type (t);
                } else if (subt >= MONO_TYPE_BOOLEAN && subt <= MONO_TYPE_R8) {
                        MonoType simple_type = {{0}};
-                       simple_type.type = subt;
+                       simple_type.type = (MonoTypeEnum)subt;
                        subc = mono_class_from_mono_type (&simple_type);
                } else {
                        g_error ("Unknown type 0x%02x for object type encoding in custom attr", subt);
@@ -8370,7 +8431,7 @@ handle_type:
                        case MONO_TYPE_STRING:
                        case MONO_TYPE_SZARRAY:
                                for (i = 0; i < alen; i++) {
-                                       MonoObject *item = load_cattr_value (image, &tklass->byval_arg, p, &p, error);
+                                       MonoObject *item = (MonoObject *)load_cattr_value (image, &tklass->byval_arg, p, &p, error);
                                        if (!mono_error_ok (error))
                                                return NULL;
                                        mono_array_setref (arr, i, item);
@@ -8546,7 +8607,7 @@ create_custom_attr (MonoImage *image, MonoMethod *method, const guchar *data, gu
                memset (params, 0, sizeof (void*) * sig->param_count);
        } else {
                /* Allocate using GC so it gets GC tracking */
-               params = mono_gc_alloc_fixed (sig->param_count * sizeof (void*), MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_REFLECTION, "custom attribute parameters");
+               params = (void **)mono_gc_alloc_fixed (sig->param_count * sizeof (void*), MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_REFLECTION, "custom attribute parameters");
        }
 
        /* skip prolog */
@@ -8576,7 +8637,7 @@ create_custom_attr (MonoImage *image, MonoMethod *method, const guchar *data, gu
                        gint type_len;
                        char *type_name;
                        type_len = mono_metadata_decode_blob_size (named, &named);
-                       type_name = g_malloc (type_len + 1);
+                       type_name = (char *)g_malloc (type_len + 1);
                        memcpy (type_name, named, type_len);
                        type_name [type_len] = 0;
                        named += type_len;
@@ -8584,7 +8645,7 @@ create_custom_attr (MonoImage *image, MonoMethod *method, const guchar *data, gu
                        g_free (type_name);
                }
                name_len = mono_metadata_decode_blob_size (named, &named);
-               name = g_malloc (name_len + 1);
+               name = (char *)g_malloc (name_len + 1);
                memcpy (name, named, name_len);
                name [name_len] = 0;
                named += name_len;
@@ -8716,8 +8777,8 @@ mono_reflection_create_custom_attr_data_args (MonoImage *image, MonoMethod *meth
                        return;
                }
 
-               obj = type_is_reference (mono_method_signature (method)->params [i]) ? 
-                       val : mono_value_box (domain, mono_class_from_mono_type (mono_method_signature (method)->params [i]), val);
+               obj = (MonoObject *)(type_is_reference (mono_method_signature (method)->params [i]) ?
+                       val : mono_value_box (domain, mono_class_from_mono_type (mono_method_signature (method)->params [i]), val));
                mono_array_setref (typedargs, i, obj);
 
                if (!type_is_reference (mono_method_signature (method)->params [i]))
@@ -8747,7 +8808,7 @@ mono_reflection_create_custom_attr_data_args (MonoImage *image, MonoMethod *meth
                        if (ADDP_IS_GREATER_OR_OVF ((const guchar*)named, type_len, data + len))
                                goto fail;
 
-                       type_name = g_malloc (type_len + 1);
+                       type_name = (char *)g_malloc (type_len + 1);
                        memcpy (type_name, named, type_len);
                        type_name [type_len] = 0;
                        named += type_len;
@@ -8757,7 +8818,7 @@ mono_reflection_create_custom_attr_data_args (MonoImage *image, MonoMethod *meth
                name_len = mono_metadata_decode_blob_size (named, &named);
                if (ADDP_IS_GREATER_OR_OVF ((const guchar*)named, name_len, data + len))
                        goto fail;
-               name = g_malloc (name_len + 1);
+               name = (char *)g_malloc (name_len + 1);
                memcpy (name, named, name_len);
                name [name_len] = 0;
                named += name_len;
@@ -8782,7 +8843,7 @@ mono_reflection_create_custom_attr_data_args (MonoImage *image, MonoMethod *meth
                                return;
                        }
 
-                       obj = type_is_reference (field->type) ? val : mono_value_box (domain, mono_class_from_mono_type (field->type), val);
+                       obj = (MonoObject *)(type_is_reference (field->type) ? val : mono_value_box (domain, mono_class_from_mono_type (field->type), val));
                        mono_array_setref (namedargs, j, obj);
                        if (!type_is_reference (field->type))
                                g_free (val);
@@ -8811,7 +8872,7 @@ mono_reflection_create_custom_attr_data_args (MonoImage *image, MonoMethod *meth
                                return;
                        }
 
-                       obj = type_is_reference (prop_type) ? val : mono_value_box (domain, mono_class_from_mono_type (prop_type), val);
+                       obj = (MonoObject *)(type_is_reference (prop_type) ? val : mono_value_box (domain, mono_class_from_mono_type (prop_type), val));
                        mono_array_setref (namedargs, j, obj);
                        if (!type_is_reference (prop_type))
                                g_free (val);
@@ -8852,7 +8913,7 @@ mono_reflection_resolve_custom_attribute_data (MonoReflectionMethod *ref_method,
        if (!mono_class_init (method->klass))
                mono_raise_exception (mono_class_get_exception_for_failure (method->klass));
 
-       mono_reflection_create_custom_attr_data_args (image, method, data, len, &typedargs, &namedargs, &arginfo, &error);
+       mono_reflection_create_custom_attr_data_args (image, method, (const guchar *)data, len, &typedargs, &namedargs, &arginfo, &error);
        if (!mono_error_ok (&error))
                mono_error_raise_exception (&error);
        if (mono_loader_get_last_error ())
@@ -9003,7 +9064,7 @@ mono_custom_attrs_from_index (MonoImage *image, guint32 idx)
        len = g_list_length (list);
        if (!len)
                return NULL;
-       ainfo = g_malloc0 (MONO_SIZEOF_CUSTOM_ATTR_INFO + sizeof (MonoCustomAttrEntry) * len);
+       ainfo = (MonoCustomAttrInfo *)g_malloc0 (MONO_SIZEOF_CUSTOM_ATTR_INFO + sizeof (MonoCustomAttrEntry) * len);
        ainfo->num_attrs = len;
        ainfo->image = image;
        for (i = len, tmp = list; i != 0; --i, tmp = tmp->next) {
@@ -9196,7 +9257,7 @@ mono_custom_attrs_from_param (MonoMethod *method, guint32 param)
                MonoCustomAttrInfo *res, *ainfo;
                int size;
 
-               aux = g_hash_table_lookup (((MonoDynamicImage*)method->klass->image)->method_aux_hash, method);
+               aux = (MonoReflectionMethodAux *)g_hash_table_lookup (((MonoDynamicImage*)method->klass->image)->method_aux_hash, method);
                if (!aux || !aux->param_cattr)
                        return NULL;
 
@@ -9205,7 +9266,7 @@ mono_custom_attrs_from_param (MonoMethod *method, guint32 param)
                if (!ainfo)
                        return NULL;
                size = MONO_SIZEOF_CUSTOM_ATTR_INFO + sizeof (MonoCustomAttrEntry) * ainfo->num_attrs;
-               res = g_malloc0 (size);
+               res = (MonoCustomAttrInfo *)g_malloc0 (size);
                memcpy (res, ainfo, size);
                return res;
        }
@@ -9617,7 +9678,7 @@ mono_reflection_type_get_handle (MonoReflectionType* ref)
                count = mono_array_length (gclass->type_arguments);
                types = g_new0 (MonoType*, count);
                for (i = 0; i < count; ++i) {
-                       MonoReflectionType *t = mono_array_get (gclass->type_arguments, gpointer, i);
+                       MonoReflectionType *t = (MonoReflectionType *)mono_array_get (gclass->type_arguments, gpointer, i);
                        types [i] = mono_reflection_type_get_handle (t);
                        if (!types[i]) {
                                g_free (types);
@@ -9681,7 +9742,7 @@ parameters_to_signature (MonoImage *image, MonoArray *parameters) {
 
        count = parameters? mono_array_length (parameters): 0;
 
-       sig = image_g_malloc0 (image, MONO_SIZEOF_METHOD_SIGNATURE + sizeof (MonoType*) * count);
+       sig = (MonoMethodSignature *)image_g_malloc0 (image, MONO_SIZEOF_METHOD_SIGNATURE + sizeof (MonoType*) * count);
        sig->param_count = count;
        sig->sentinelpos = -1; /* FIXME */
        for (i = 0; i < count; ++i)
@@ -9871,7 +9932,7 @@ encode_cattr_value (MonoAssembly *assembly, char *buffer, char *p, char **retbuf
        if ((p-buffer) + 10 >= *buflen) {
                char *newbuf;
                *buflen *= 2;
-               newbuf = g_realloc (buffer, *buflen);
+               newbuf = (char *)g_realloc (buffer, *buflen);
                p = newbuf + (p-buffer);
                buffer = newbuf;
        }
@@ -9927,7 +9988,7 @@ handle_enum:
                        char *newbuf;
                        *buflen *= 2;
                        *buflen += slen;
-                       newbuf = g_realloc (buffer, *buflen);
+                       newbuf = (char *)g_realloc (buffer, *buflen);
                        p = newbuf + (p-buffer);
                        buffer = newbuf;
                }
@@ -9951,7 +10012,7 @@ handle_type:
                        char *newbuf;
                        *buflen *= 2;
                        *buflen += slen;
-                       newbuf = g_realloc (buffer, *buflen);
+                       newbuf = (char *)g_realloc (buffer, *buflen);
                        p = newbuf + (p-buffer);
                        buffer = newbuf;
                }
@@ -10053,7 +10114,7 @@ handle_type:
                        char *newbuf;
                        *buflen *= 2;
                        *buflen += slen;
-                       newbuf = g_realloc (buffer, *buflen);
+                       newbuf = (char *)g_realloc (buffer, *buflen);
                        p = newbuf + (p-buffer);
                        buffer = newbuf;
                }
@@ -10125,7 +10186,7 @@ encode_named_val (MonoReflectionAssembly *assembly, char *buffer, char *p, char
                char *newbuf;
                *buflen *= 2;
                *buflen += len;
-               newbuf = g_realloc (buffer, *buflen);
+               newbuf = (char *)g_realloc (buffer, *buflen);
                p = newbuf + (p-buffer);
                buffer = newbuf;
        }
@@ -10172,7 +10233,7 @@ mono_reflection_get_custom_attrs_blob (MonoReflectionAssembly *assembly, MonoObj
 
        g_assert (mono_array_length (ctorArgs) == sig->param_count);
        buflen = 256;
-       p = buffer = g_malloc (buflen);
+       p = buffer = (char *)g_malloc (buflen);
        /* write the prolog */
        *p++ = 1;
        *p++ = 0;
@@ -10193,7 +10254,7 @@ mono_reflection_get_custom_attrs_blob (MonoReflectionAssembly *assembly, MonoObj
                        MonoType *ptype;
                        char *pname;
 
-                       prop = mono_array_get (properties, gpointer, i);
+                       prop = (MonoObject *)mono_array_get (properties, gpointer, i);
                        get_prop_name_and_type (prop, &pname, &ptype);
                        *p++ = 0x54; /* PROPERTY signature */
                        encode_named_val (assembly, buffer, p, &buffer, &p, &buflen, ptype, pname, (MonoObject*)mono_array_get (propValues, gpointer, i));
@@ -10207,7 +10268,7 @@ mono_reflection_get_custom_attrs_blob (MonoReflectionAssembly *assembly, MonoObj
                        MonoType *ftype;
                        char *fname;
 
-                       field = mono_array_get (fields, gpointer, i);
+                       field = (MonoObject *)mono_array_get (fields, gpointer, i);
                        get_field_name_and_type (field, &fname, &ftype);
                        *p++ = 0x53; /* FIELD signature */
                        encode_named_val (assembly, buffer, p, &buffer, &p, &buflen, ftype, fname, (MonoObject*)mono_array_get (fieldValues, gpointer, i));
@@ -10268,7 +10329,7 @@ mono_reflection_setup_internal_class (MonoReflectionTypeBuilder *tb)
                return;
        }
 
-       klass = mono_image_alloc0 (&tb->module->dynamic_image->image, sizeof (MonoClass));
+       klass = (MonoClass *)mono_image_alloc0 (&tb->module->dynamic_image->image, sizeof (MonoClass));
 
        klass->image = &tb->module->dynamic_image->image;
 
@@ -10385,16 +10446,16 @@ mono_reflection_create_generic_class (MonoReflectionTypeBuilder *tb)
 
        g_assert (tb->generic_container && (tb->generic_container->owner.klass == klass));
 
-       klass->generic_container = mono_image_alloc0 (klass->image, sizeof (MonoGenericContainer));
+       klass->generic_container = (MonoGenericContainer *)mono_image_alloc0 (klass->image, sizeof (MonoGenericContainer));
 
        klass->generic_container->owner.klass = klass;
        klass->generic_container->type_argc = count;
-       klass->generic_container->type_params = mono_image_alloc0 (klass->image, sizeof (MonoGenericParamFull) * count);
+       klass->generic_container->type_params = (MonoGenericParamFull *)mono_image_alloc0 (klass->image, sizeof (MonoGenericParamFull) * count);
 
        klass->is_generic = 1;
 
        for (i = 0; i < count; i++) {
-               MonoReflectionGenericParam *gparam = mono_array_get (tb->generic_params, gpointer, i);
+               MonoReflectionGenericParam *gparam = (MonoReflectionGenericParam *)mono_array_get (tb->generic_params, gpointer, i);
                MonoGenericParamFull *param = (MonoGenericParamFull *) mono_reflection_type_get_handle ((MonoReflectionType*)gparam)->data.generic_param;
                klass->generic_container->type_params [i] = *param;
                /*Make sure we are a diferent type instance */
@@ -10465,11 +10526,11 @@ mono_marshal_spec_from_builder (MonoImage *image, MonoAssembly *assembly,
        MonoMarshalSpec *res;
 
        res = image_g_new0 (image, MonoMarshalSpec, 1);
-       res->native = minfo->type;
+       res->native = (MonoMarshalNative)minfo->type;
 
        switch (minfo->type) {
        case MONO_NATIVE_LPARRAY:
-               res->data.array_data.elem_type = minfo->eltype;
+               res->data.array_data.elem_type = (MonoMarshalNative)minfo->eltype;
                if (minfo->has_size) {
                        res->data.array_data.param_num = minfo->param_num;
                        res->data.array_data.num_elem = minfo->count;
@@ -10654,9 +10715,9 @@ reflection_methodbuilder_to_mono_method (MonoClass *klass,
                        }
                }
 
-               header = image_g_malloc0 (image, MONO_SIZEOF_METHOD_HEADER + num_locals * sizeof (MonoType*));
+               header = (MonoMethodHeader *)image_g_malloc0 (image, MONO_SIZEOF_METHOD_HEADER + num_locals * sizeof (MonoType*));
                header->code_size = code_size;
-               header->code = image_g_malloc (image, code_size);
+               header->code = (const unsigned char *)image_g_malloc (image, code_size);
                memcpy ((char*)header->code, code, code_size);
                header->max_stack = max_stack;
                header->init_locals = rmb->init_locals;
@@ -10688,6 +10749,7 @@ reflection_methodbuilder_to_mono_method (MonoClass *klass,
                container->type_argc = count;
                container->type_params = image_g_new0 (image, MonoGenericParamFull, count);
                container->owner.method = m;
+               container->is_anonymous = FALSE; // Method is now known, container is no longer anonymous
 
                m->is_generic = TRUE;
                mono_method_set_generic_container (m, container);
@@ -10754,7 +10816,8 @@ reflection_methodbuilder_to_mono_method (MonoClass *klass,
 
                                if (pb->attrs & PARAM_ATTRIBUTE_HAS_DEFAULT) {
                                        MonoDynamicImage *assembly;
-                                       guint32 idx, def_type, len;
+                                       guint32 idx, len;
+                                       MonoTypeEnum def_type;
                                        char *p;
                                        const char *p2;
 
@@ -10768,7 +10831,7 @@ reflection_methodbuilder_to_mono_method (MonoClass *klass,
                                        p = assembly->blob.data + idx;
                                        len = mono_metadata_decode_blob_size (p, &p2);
                                        len += p2 - p;
-                                       method_aux->param_defaults [i] = image_g_malloc (image, len);
+                                       method_aux->param_defaults [i] = (uint8_t *)image_g_malloc (image, len);
                                        method_aux->param_default_types [i] = def_type;
                                        memcpy ((gpointer)method_aux->param_defaults [i], p, len);
                                }
@@ -10999,7 +11062,7 @@ mono_reflection_bind_generic_method_parameters (MonoReflectionMethod *rmethod, M
 
        type_argv = g_new0 (MonoType *, count);
        for (i = 0; i < count; i++) {
-               MonoReflectionType *garg = mono_array_get (types, gpointer, i);
+               MonoReflectionType *garg = (MonoReflectionType *)mono_array_get (types, gpointer, i);
                type_argv [i] = mono_reflection_type_get_handle (garg);
        }
        ginst = mono_metadata_get_generic_inst (count, type_argv);
@@ -11144,7 +11207,7 @@ mono_reflection_generic_class_initialize (MonoReflectionGenericClass *type, Mono
        dgclass->field_generic_types = mono_image_set_new0 (gclass->owner, MonoType*, dgclass->count_fields);
 
        for (i = 0; i < dgclass->count_fields; i++) {
-               MonoObject *obj = mono_array_get (fields, gpointer, i);
+               MonoObject *obj = (MonoObject *)mono_array_get (fields, gpointer, i);
                MonoClassField *field, *inflated_field = NULL;
 
                if (!strcmp (obj->vtable->klass->name, "FieldBuilder"))
@@ -11227,7 +11290,7 @@ fix_partial_generic_class (MonoClass *klass)
 
        if (klass->method.count != gklass->method.count) {
                klass->method.count = gklass->method.count;
-               klass->methods = mono_image_alloc (klass->image, sizeof (MonoMethod*) * (klass->method.count + 1));
+               klass->methods = (MonoMethod **)mono_image_alloc (klass->image, sizeof (MonoMethod*) * (klass->method.count + 1));
 
                for (i = 0; i < klass->method.count; i++) {
                        MonoError error;
@@ -11239,7 +11302,7 @@ fix_partial_generic_class (MonoClass *klass)
 
        if (klass->interface_count && klass->interface_count != gklass->interface_count) {
                klass->interface_count = gklass->interface_count;
-               klass->interfaces = mono_image_alloc (klass->image, sizeof (MonoClass*) * gklass->interface_count);
+               klass->interfaces = (MonoClass **)mono_image_alloc (klass->image, sizeof (MonoClass*) * gklass->interface_count);
                klass->interfaces_packed = NULL; /*make setup_interface_offsets happy*/
 
                for (i = 0; i < gklass->interface_count; ++i) {
@@ -11282,7 +11345,7 @@ ensure_generic_class_runtime_vtable (MonoClass *klass)
 static void
 ensure_runtime_vtable (MonoClass *klass)
 {
-       MonoReflectionTypeBuilder *tb = mono_class_get_ref_info (klass);
+       MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)mono_class_get_ref_info (klass);
        int i, num, j;
 
        if (!image_is_dynamic (klass->image) || (!tb && !klass->generic_class) || klass->wastypebuilder)
@@ -11294,7 +11357,7 @@ ensure_runtime_vtable (MonoClass *klass)
                num = tb->ctors? mono_array_length (tb->ctors): 0;
                num += tb->num_methods;
                klass->method.count = num;
-               klass->methods = mono_image_alloc (klass->image, sizeof (MonoMethod*) * num);
+               klass->methods = (MonoMethod **)mono_image_alloc (klass->image, sizeof (MonoMethod*) * num);
                num = tb->ctors? mono_array_length (tb->ctors): 0;
                for (i = 0; i < num; ++i)
                        klass->methods [i] = ctorbuilder_to_mono_method (klass, mono_array_get (tb->ctors, MonoReflectionCtorBuilder*, i));
@@ -11305,7 +11368,7 @@ ensure_runtime_vtable (MonoClass *klass)
        
                if (tb->interfaces) {
                        klass->interface_count = mono_array_length (tb->interfaces);
-                       klass->interfaces = mono_image_alloc (klass->image, sizeof (MonoClass*) * klass->interface_count);
+                       klass->interfaces = (MonoClass **)mono_image_alloc (klass->image, sizeof (MonoClass*) * klass->interface_count);
                        for (i = 0; i < klass->interface_count; ++i) {
                                MonoType *iface = mono_type_array_get_and_resolve (tb->interfaces, i);
                                klass->interfaces [i] = mono_class_from_mono_type (iface);
@@ -11438,7 +11501,7 @@ mono_reflection_get_dynamic_overrides (MonoClass *klass, MonoMethod ***overrides
 static void
 typebuilder_setup_fields (MonoClass *klass, MonoError *error)
 {
-       MonoReflectionTypeBuilder *tb = mono_class_get_ref_info (klass);
+       MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)mono_class_get_ref_info (klass);
        MonoReflectionFieldBuilder *fb;
        MonoClassField *field;
        MonoImage *image = klass->image;
@@ -11480,7 +11543,7 @@ typebuilder_setup_fields (MonoClass *klass, MonoError *error)
 
        for (i = 0; i < klass->field.count; ++i) {
                MonoArray *rva_data;
-               fb = mono_array_get (tb->fields, gpointer, i);
+               fb = (MonoReflectionFieldBuilder *)mono_array_get (tb->fields, gpointer, i);
                field = &klass->fields [i];
                field->name = mono_string_to_utf8_image (image, fb->name, error);
                if (!mono_error_ok (error))
@@ -11495,7 +11558,7 @@ typebuilder_setup_fields (MonoClass *klass, MonoError *error)
                if ((fb->attrs & FIELD_ATTRIBUTE_HAS_FIELD_RVA) && (rva_data = fb->rva_data)) {
                        char *base = mono_array_addr (rva_data, char, 0);
                        size_t size = mono_array_length (rva_data);
-                       char *data = mono_image_alloc (klass->image, size);
+                       char *data = (char *)mono_image_alloc (klass->image, size);
                        memcpy (data, base, size);
                        klass->ext->field_def_values [i].data = data;
                }
@@ -11516,7 +11579,7 @@ typebuilder_setup_fields (MonoClass *klass, MonoError *error)
                        p = assembly->blob.data + idx;
                        len = mono_metadata_decode_blob_size (p, &p2);
                        len += p2 - p;
-                       klass->ext->field_def_values [i].data = mono_image_alloc (image, len);
+                       klass->ext->field_def_values [i].data = (const char *)mono_image_alloc (image, len);
                        memcpy ((gpointer)klass->ext->field_def_values [i].data, p, len);
                }
        }
@@ -11528,7 +11591,7 @@ typebuilder_setup_fields (MonoClass *klass, MonoError *error)
 static void
 typebuilder_setup_properties (MonoClass *klass, MonoError *error)
 {
-       MonoReflectionTypeBuilder *tb = mono_class_get_ref_info (klass);
+       MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)mono_class_get_ref_info (klass);
        MonoReflectionPropertyBuilder *pb;
        MonoImage *image = klass->image;
        MonoProperty *properties;
@@ -11569,7 +11632,7 @@ typebuilder_setup_properties (MonoClass *klass, MonoError *error)
                        p = assembly->blob.data + idx;
                        len = mono_metadata_decode_blob_size (p, &p2);
                        len += p2 - p;
-                       klass->ext->prop_def_values [i].data = mono_image_alloc (image, len);
+                       klass->ext->prop_def_values [i].data = (const char *)mono_image_alloc (image, len);
                        memcpy ((gpointer)klass->ext->prop_def_values [i].data, p, len);
                }
        }
@@ -11612,7 +11675,7 @@ mono_reflection_event_builder_get_event_info (MonoReflectionTypeBuilder *tb, Mon
 static void
 typebuilder_setup_events (MonoClass *klass, MonoError *error)
 {
-       MonoReflectionTypeBuilder *tb = mono_class_get_ref_info (klass);
+       MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)mono_class_get_ref_info (klass);
        MonoReflectionEventBuilder *eb;
        MonoImage *image = klass->image;
        MonoEvent *events;
@@ -11704,7 +11767,7 @@ mono_reflection_create_runtime_class (MonoReflectionTypeBuilder *tb)
        check_array_for_usertypes (tb->interfaces);
        if (tb->fields) {
                for (i = 0; i < mono_array_length (tb->fields); ++i) {
-                       MonoReflectionFieldBuilder *fb = mono_array_get (tb->fields, gpointer, i);
+                       MonoReflectionFieldBuilder *fb = (MonoReflectionFieldBuilder *)mono_array_get (tb->fields, gpointer, i);
                        if (fb) {
                                RESOLVE_TYPE (fb->type);
                                check_array_for_usertypes (fb->modreq);
@@ -11716,7 +11779,7 @@ mono_reflection_create_runtime_class (MonoReflectionTypeBuilder *tb)
        }
        if (tb->methods) {
                for (i = 0; i < mono_array_length (tb->methods); ++i) {
-                       MonoReflectionMethodBuilder *mb = mono_array_get (tb->methods, gpointer, i);
+                       MonoReflectionMethodBuilder *mb = (MonoReflectionMethodBuilder *)mono_array_get (tb->methods, gpointer, i);
                        if (mb) {
                                RESOLVE_TYPE (mb->rtype);
                                check_array_for_usertypes (mb->return_modreq);
@@ -11733,7 +11796,7 @@ mono_reflection_create_runtime_class (MonoReflectionTypeBuilder *tb)
        }
        if (tb->ctors) {
                for (i = 0; i < mono_array_length (tb->ctors); ++i) {
-                       MonoReflectionCtorBuilder *mb = mono_array_get (tb->ctors, gpointer, i);
+                       MonoReflectionCtorBuilder *mb = (MonoReflectionCtorBuilder *)mono_array_get (tb->ctors, gpointer, i);
                        if (mb) {
                                check_array_for_usertypes (mb->parameters);
                                if (mb->param_modreq)
@@ -11882,25 +11945,26 @@ mono_reflection_initialize_generic_parameter (MonoReflectionGenericParam *gparam
                if (!gparam->mbuilder->generic_container) {
                        MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)gparam->mbuilder->type;
                        MonoClass *klass = mono_class_from_mono_type (mono_reflection_type_get_handle ((MonoReflectionType*)tb));
-                       gparam->mbuilder->generic_container = mono_image_alloc0 (klass->image, sizeof (MonoGenericContainer));
+                       gparam->mbuilder->generic_container = (MonoGenericContainer *)mono_image_alloc0 (klass->image, sizeof (MonoGenericContainer));
                        gparam->mbuilder->generic_container->is_method = TRUE;
                        /* 
                         * Cannot set owner.method, since the MonoMethod is not created yet.
                         * Set the image field instead, so type_in_image () works.
                         */
-                       gparam->mbuilder->generic_container->image = klass->image;
+                       gparam->mbuilder->generic_container->is_anonymous = TRUE;
+                       gparam->mbuilder->generic_container->owner.image = klass->image;
                }
                param->param.owner = gparam->mbuilder->generic_container;
        } else if (gparam->tbuilder) {
                if (!gparam->tbuilder->generic_container) {
                        MonoClass *klass = mono_class_from_mono_type (mono_reflection_type_get_handle ((MonoReflectionType*)gparam->tbuilder));
-                       gparam->tbuilder->generic_container = mono_image_alloc0 (klass->image, sizeof (MonoGenericContainer));
+                       gparam->tbuilder->generic_container = (MonoGenericContainer *)mono_image_alloc0 (klass->image, sizeof (MonoGenericContainer));
                        gparam->tbuilder->generic_container->owner.klass = klass;
                }
                param->param.owner = gparam->tbuilder->generic_container;
        }
 
-       pklass = mono_class_from_generic_parameter ((MonoGenericParam *) param, image, gparam->mbuilder != NULL);
+       pklass = mono_class_from_generic_parameter_internal ((MonoGenericParam *) param);
 
        gparam->type.type = &pklass->byval_arg;
 
@@ -11979,7 +12043,7 @@ static MonoReferenceQueue *dynamic_method_queue;
 static void
 free_dynamic_method (void *dynamic_method)
 {
-       DynamicMethodReleaseData *data = dynamic_method;
+       DynamicMethodReleaseData *data = (DynamicMethodReleaseData *)dynamic_method;
        MonoDomain *domain = data->domain;
        MonoMethod *method = data->handle;
        guint32 dis_link;
@@ -12134,7 +12198,7 @@ mono_reflection_lookup_signature (MonoImage *image, MonoMethod *method, guint32
 
        mono_error_init (error);
 
-       sig = g_hash_table_lookup (((MonoDynamicImage*)image)->vararg_aux_hash, GUINT_TO_POINTER (token));
+       sig = (MonoMethodSignature *)g_hash_table_lookup (((MonoDynamicImage*)image)->vararg_aux_hash, GUINT_TO_POINTER (token));
        if (sig)
                return sig;
 
@@ -12183,7 +12247,7 @@ static void
 ensure_complete_type (MonoClass *klass)
 {
        if (image_is_dynamic (klass->image) && !klass->wastypebuilder && mono_class_get_ref_info (klass)) {
-               MonoReflectionTypeBuilder *tb = mono_class_get_ref_info (klass);
+               MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)mono_class_get_ref_info (klass);
 
                mono_domain_try_type_resolve (mono_domain_get (), NULL, (MonoObject*)tb);
 
@@ -12232,7 +12296,7 @@ resolve_object (MonoImage *image, MonoObject *obj, MonoClass **handle_class, Mon
                result = ((MonoReflectionMethod*)obj)->method;
                if (context) {
                        MonoError error;
-                       result = mono_class_inflate_generic_method_checked (result, context, &error);
+                       result = mono_class_inflate_generic_method_checked ((MonoMethod *)result, context, &error);
                        g_assert (mono_error_ok (&error)); /* FIXME don't swallow the error */
                }
                *handle_class = mono_defaults.methodhandle_class;
@@ -12258,7 +12322,7 @@ resolve_object (MonoImage *image, MonoObject *obj, MonoClass **handle_class, Mon
                }
                if (context) {
                        MonoError error;
-                       result = mono_class_inflate_generic_method_checked (result, context, &error);
+                       result = mono_class_inflate_generic_method_checked ((MonoMethod *)result, context, &error);
                        g_assert (mono_error_ok (&error)); /* FIXME don't swallow the error */
                }
                *handle_class = mono_defaults.methodhandle_class;
@@ -12274,7 +12338,7 @@ resolve_object (MonoImage *image, MonoObject *obj, MonoClass **handle_class, Mon
                }
                if (context) {
                        MonoError error;
-                       result = mono_class_inflate_generic_method_checked (result, context, &error);
+                       result = mono_class_inflate_generic_method_checked ((MonoMethod *)result, context, &error);
                        g_assert (mono_error_ok (&error)); /* FIXME don't swallow the error */
                }
                *handle_class = mono_defaults.methodhandle_class;
@@ -12430,7 +12494,7 @@ resolve_object (MonoImage *image, MonoObject *obj, MonoClass **handle_class, Mon
                        result = mono_reflection_method_on_tb_inst_get_handle (m);
                        if (context) {
                                MonoError error;
-                               result = mono_class_inflate_generic_method_checked (result, context, &error);
+                               result = mono_class_inflate_generic_method_checked ((MonoMethod *)result, context, &error);
                                g_assert (mono_error_ok (&error)); /* FIXME don't swallow the error */
                        }
                } else {

diff --git a/mono/metadata/remoting.c b/mono/metadata/remoting.c
index 22ab5cc7a6ecdcb5777d1e8e2e54ed3af10b78f5..cbe8b3add942c42519b415dfbec92474e5ae30f1 100644 (file)
--- a/mono/metadata/remoting.c
+++ b/mono/metadata/remoting.c
@@ -86,14 +86,14 @@ static inline void
 remoting_lock (void)
 {
        g_assert (remoting_mutex_inited);
-       mono_mutex_lock (&remoting_mutex);
+       mono_os_mutex_lock (&remoting_mutex);
 }
 
 static inline void
 remoting_unlock (void)
 {
        g_assert (remoting_mutex_inited);
-       mono_mutex_unlock (&remoting_mutex);
+       mono_os_mutex_unlock (&remoting_mutex);
 }
 
 /*
@@ -134,7 +134,7 @@ get_cache_full (GHashTable **var, GHashFunc hash_func, GCompareFunc equal_func,
 void
 mono_remoting_init (void)
 {
-       mono_mutex_init (&remoting_mutex);
+       mono_os_mutex_init (&remoting_mutex);
        remoting_mutex_inited = TRUE;
 }
 
@@ -266,7 +266,7 @@ mono_marshal_remoting_find_in_cache (MonoMethod *method, int wrapper_type)
 
        mono_marshal_lock_internal ();
        if (mono_method_get_wrapper_cache (method)->remoting_invoke_cache)
-               wrps = g_hash_table_lookup (mono_method_get_wrapper_cache (method)->remoting_invoke_cache, method);
+               wrps = (MonoRemotingMethods *)g_hash_table_lookup (mono_method_get_wrapper_cache (method)->remoting_invoke_cache, method);
 
        if (wrps) {
                switch (wrapper_type) {
@@ -297,7 +297,7 @@ mono_remoting_mb_create_and_cache (MonoMethod *key, MonoMethodBuilder *mb,
        cache = get_cache_full (&mono_method_get_wrapper_cache (key)->remoting_invoke_cache, mono_aligned_addr_hash, NULL, NULL, g_free);
 
        mono_marshal_lock_internal ();
-       wrps = g_hash_table_lookup (cache, key);
+       wrps = (MonoRemotingMethods *)g_hash_table_lookup (cache, key);
        if (!wrps) {
                wrps = g_new0 (MonoRemotingMethods, 1);
                g_hash_table_insert (cache, key, wrps);
@@ -361,7 +361,7 @@ mono_remoting_wrapper (MonoMethod *method, gpointer *params)
                                } else {
                                        /* runtime_invoke expects a boxed instance */
                                        if (mono_class_is_nullable (mono_class_from_mono_type (sig->params [i])))
-                                               mparams[i] = mono_nullable_box (params [i], klass);
+                                               mparams[i] = mono_nullable_box ((guint8 *)params [i], klass);
                                        else
                                                mparams[i] = params [i];
                                }
@@ -469,7 +469,7 @@ mono_marshal_xdomain_copy_out_value (MonoObject *src, MonoObject *dst)
                if (mt == MONO_MARSHAL_COPY) {
                        int i, len = mono_array_length ((MonoArray *)dst);
                        for (i = 0; i < len; i++) {
-                               MonoObject *item = mono_array_get ((MonoArray *)src, gpointer, i);
+                               MonoObject *item = (MonoObject *)mono_array_get ((MonoArray *)src, gpointer, i);
                                mono_array_setref ((MonoArray *)dst, i, mono_marshal_xdomain_copy_value (item));
                        }
                } else {
@@ -564,7 +564,7 @@ mono_marshal_check_domain_image (gint32 domain_id, MonoImage *image)
        
        mono_domain_assemblies_lock (domain);
        for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
-               ass = tmp->data;
+               ass = (MonoAssembly *)tmp->data;
                if (ass->image == image)
                        break;
        }
@@ -629,7 +629,7 @@ mono_marshal_get_xappdomain_dispatch (MonoMethod *method, int *marshal_types, in
 
        /* try */
 
-       main_clause = mono_image_alloc0 (method->klass->image, sizeof (MonoExceptionClause));
+       main_clause = (MonoExceptionClause *)mono_image_alloc0 (method->klass->image, sizeof (MonoExceptionClause));
        main_clause->try_offset = mono_mb_get_label (mb);
 
        /* Clean the call context */
@@ -880,7 +880,7 @@ mono_marshal_get_xappdomain_invoke (MonoMethod *method)
 
        /* Count the number of parameters that need to be serialized */
 
-       marshal_types = alloca (sizeof (int) * sig->param_count);
+       marshal_types = (int *)alloca (sizeof (int) * sig->param_count);
        complex_count = complex_out_count = 0;
        for (i = 0; i < sig->param_count; i++) {
                MonoType *ptype = sig->params[i];
@@ -2006,7 +2006,7 @@ mono_marshal_xdomain_copy_value (MonoObject *val)
                if (mt == MONO_MARSHAL_COPY) {
                        int i, len = mono_array_length (acopy);
                        for (i = 0; i < len; i++) {
-                               MonoObject *item = mono_array_get (acopy, gpointer, i);
+                               MonoObject *item = (MonoObject *)mono_array_get (acopy, gpointer, i);
                                mono_array_setref (acopy, i, mono_marshal_xdomain_copy_value (item));
                        }
                }

diff --git a/mono/metadata/security-core-clr.c b/mono/metadata/security-core-clr.c
index 6ec8cbe1ea8b8f90b88af1a1bebc0d65115a2ef6..de9ec6a79c993c20b6f1f3f08893461f1226d722 100644 (file)
--- a/mono/metadata/security-core-clr.c
+++ b/mono/metadata/security-core-clr.c
@@ -332,7 +332,7 @@ mono_security_core_clr_check_override (MonoClass *klass, MonoMethod *override, M
 static gboolean
 get_caller_no_reflection_related (MonoMethod *m, gint32 no, gint32 ilo, gboolean managed, gpointer data)
 {
-       MonoMethod **dest = data;
+       MonoMethod **dest = (MonoMethod **)data;
        const char *ns;
 
        /* skip unmanaged frames */
@@ -436,7 +436,7 @@ typedef struct {
 static gboolean
 get_caller_of_elevated_trust_code (MonoMethod *m, gint32 no, gint32 ilo, gboolean managed, gpointer data)
 {
-       ElevatedTrustCookie *cookie = data;
+       ElevatedTrustCookie *cookie = (ElevatedTrustCookie *)data;
 
        /* skip unmanaged frames and wrappers */
        if (!managed || (m->wrapper_type != MONO_WRAPPER_NONE))
@@ -917,7 +917,7 @@ mono_security_core_clr_level_from_cinfo (MonoCustomAttrInfo *cinfo, MonoImage *i
        if (cinfo && mono_custom_attrs_has_attr (cinfo, security_critical_attribute ()))
                level = MONO_SECURITY_CORE_CLR_CRITICAL;
 
-       return level;
+       return (MonoSecurityCoreCLRLevel)level;
 }
 
 /*

diff --git a/mono/metadata/seq-points-data.c b/mono/metadata/seq-points-data.c
index b8b1bcdb6f45dc7115067857bf3362efe2c8cd13..b6b594071296138a7fed75f03e6d122a98c82767 100644 (file)
--- a/mono/metadata/seq-points-data.c
+++ b/mono/metadata/seq-points-data.c
@@ -372,7 +372,7 @@ mono_seq_point_data_init (SeqPointData *data, int entry_capacity)
 {
        data->entry_count = 0;
        data->entry_capacity = entry_capacity;
-       data->entries = g_malloc (sizeof (SeqPointDataEntry) * entry_capacity);
+       data->entries = (SeqPointDataEntry *)g_malloc (sizeof (SeqPointDataEntry) * entry_capacity);
 }
 
 void
@@ -402,7 +402,7 @@ mono_seq_point_data_read (SeqPointData *data, char *path)
        fsize = ftell(f);
        fseek(f, 0, SEEK_SET);
 
-       buffer_orig = buffer = g_malloc(fsize + 1);
+       buffer_orig = buffer = (guint8 *)g_malloc (fsize + 1);
        fread(buffer_orig, fsize, 1, f);
        fclose(f);
 
@@ -438,7 +438,7 @@ mono_seq_point_data_write (SeqPointData *data, char *path)
        // Add size of entry_count and native_base_offsets
        size += 4 + data->entry_count * 4;
 
-       buffer_orig = buffer = g_malloc (size);
+       buffer_orig = buffer = (guint8 *)g_malloc (size);
 
        encode_var_int (buffer, &buffer, data->entry_count);
 

diff --git a/mono/metadata/seq-points-data.h b/mono/metadata/seq-points-data.h
index babdea43c861f9efa0580747ec19822f0a90ff0f..3f72f3f338a59069bf0323c4d7f47e035d394e4c 100644 (file)
--- a/mono/metadata/seq-points-data.h
+++ b/mono/metadata/seq-points-data.h
@@ -28,7 +28,7 @@ typedef struct {
 } SeqPoint;
 
 typedef struct MonoSeqPointInfo {
-       int dummy[0];
+       int dummy [1];
 } MonoSeqPointInfo;
 
 typedef struct {

diff --git a/mono/metadata/sgen-bridge.c b/mono/metadata/sgen-bridge.c
index 67e6a05bf30af7889765dfbd9699b322dcbe02eb..5e4fa165ab0efc72fd2d09482953ab52b8ee1289 100644 (file)
--- a/mono/metadata/sgen-bridge.c
+++ b/mono/metadata/sgen-bridge.c
@@ -151,8 +151,8 @@ sgen_bridge_processing_stw_step (void)
 static gboolean
 is_bridge_object_dead (GCObject *obj, void *data)
 {
-       SgenHashTable *table = data;
-       unsigned char *value = sgen_hash_table_lookup (table, obj);
+       SgenHashTable *table = (SgenHashTable *)data;
+       unsigned char *value = (unsigned char *)sgen_hash_table_lookup (table, obj);
        if (!value)
                return FALSE;
        return !*value;
@@ -216,8 +216,8 @@ free_callback_data (SgenBridgeProcessor *processor)
 static int
 compare_xrefs (const void *a_ptr, const void *b_ptr)
 {
-       const MonoGCBridgeXRef *a = a_ptr;
-       const MonoGCBridgeXRef *b = b_ptr;
+       const MonoGCBridgeXRef *a = (const MonoGCBridgeXRef *)a_ptr;
+       const MonoGCBridgeXRef *b = (const MonoGCBridgeXRef *)b_ptr;
 
        if (a->src_scc_index < b->src_scc_index)
                return -1;
@@ -309,7 +309,7 @@ sgen_compare_bridge_processor_results (SgenBridgeProcessor *a, SgenBridgeProcess
                gboolean new_entry;
 
                g_assert (scc->num_objs > 0);
-               a_scc_index_ptr = sgen_hash_table_lookup (&obj_to_a_scc, scc->objs [0]);
+               a_scc_index_ptr = (int *)sgen_hash_table_lookup (&obj_to_a_scc, scc->objs [0]);
                g_assert (a_scc_index_ptr);
                a_scc_index = *a_scc_index_ptr;
 
@@ -319,7 +319,7 @@ sgen_compare_bridge_processor_results (SgenBridgeProcessor *a, SgenBridgeProcess
                g_assert (a_scc->num_objs == scc->num_objs);
 
                for (j = 1; j < scc->num_objs; ++j) {
-                       a_scc_index_ptr = sgen_hash_table_lookup (&obj_to_a_scc, scc->objs [j]);
+                       a_scc_index_ptr = (int *)sgen_hash_table_lookup (&obj_to_a_scc, scc->objs [j]);
                        g_assert (a_scc_index_ptr);
                        g_assert (*a_scc_index_ptr == a_scc_index);
                }
@@ -339,8 +339,8 @@ sgen_compare_bridge_processor_results (SgenBridgeProcessor *a, SgenBridgeProcess
         */
 
        xrefs_alloc_size = a->num_xrefs * sizeof (MonoGCBridgeXRef);
-       a_xrefs = sgen_alloc_internal_dynamic (xrefs_alloc_size, INTERNAL_MEM_BRIDGE_DEBUG, TRUE);
-       b_xrefs = sgen_alloc_internal_dynamic (xrefs_alloc_size, INTERNAL_MEM_BRIDGE_DEBUG, TRUE);
+       a_xrefs = (MonoGCBridgeXRef *)sgen_alloc_internal_dynamic (xrefs_alloc_size, INTERNAL_MEM_BRIDGE_DEBUG, TRUE);
+       b_xrefs = (MonoGCBridgeXRef *)sgen_alloc_internal_dynamic (xrefs_alloc_size, INTERNAL_MEM_BRIDGE_DEBUG, TRUE);
 
        memcpy (a_xrefs, a->api_xrefs, xrefs_alloc_size);
        for (i = 0; i < b->num_xrefs; ++i) {
@@ -349,11 +349,11 @@ sgen_compare_bridge_processor_results (SgenBridgeProcessor *a, SgenBridgeProcess
 
                g_assert (xref->src_scc_index != xref->dst_scc_index);
 
-               scc_index_ptr = sgen_hash_table_lookup (&b_scc_to_a_scc, GINT_TO_POINTER (xref->src_scc_index));
+               scc_index_ptr = (int *)sgen_hash_table_lookup (&b_scc_to_a_scc, GINT_TO_POINTER (xref->src_scc_index));
                g_assert (scc_index_ptr);
                b_xrefs [i].src_scc_index = *scc_index_ptr;
 
-               scc_index_ptr = sgen_hash_table_lookup (&b_scc_to_a_scc, GINT_TO_POINTER (xref->dst_scc_index));
+               scc_index_ptr = (int *)sgen_hash_table_lookup (&b_scc_to_a_scc, GINT_TO_POINTER (xref->dst_scc_index));
                g_assert (scc_index_ptr);
                b_xrefs [i].dst_scc_index = *scc_index_ptr;
        }

diff --git a/mono/metadata/sgen-client-mono.h b/mono/metadata/sgen-client-mono.h
index ab0cedf6ad6d6fa1a27749b87a43bd9788bb3da2..71906968539f8ebb845ab1f53f5de001d4b8b222 100644 (file)
--- a/mono/metadata/sgen-client-mono.h
+++ b/mono/metadata/sgen-client-mono.h
@@ -90,7 +90,7 @@ struct _SgenClientThreadInfo {
 #include "utils/mono-counters.h"
 #include "utils/mono-logger-internals.h"
 #include "utils/mono-time.h"
-#include "utils/mono-semaphore.h"
+#include "utils/mono-os-semaphore.h"
 #include "metadata/sgen-bridge-internals.h"
 
 extern void mono_sgen_register_moved_object (void *obj, void *destination);
@@ -114,7 +114,7 @@ sgen_mono_array_size (GCVTable vtable, MonoArray *array, mword *bounds_size, mwo
        else
                element_size = vtable->klass->sizes.element_size;
 
-       size_without_bounds = size = sizeof (MonoArray) + element_size * mono_array_length_fast (array);
+       size_without_bounds = size = MONO_SIZEOF_MONO_ARRAY + element_size * mono_array_length_fast (array);
 
        if (G_UNLIKELY (array->bounds)) {
                size += sizeof (mono_array_size_t) - 1;
@@ -401,7 +401,7 @@ sgen_client_binary_protocol_block_free (gpointer addr, size_t size)
 }
 
 static void G_GNUC_UNUSED
-sgen_client_binary_protocol_block_set_state (gpointer addr, size_t size, int old, int new)
+sgen_client_binary_protocol_block_set_state (gpointer addr, size_t size, int old, int new_)
 {
 }
 
@@ -560,6 +560,11 @@ sgen_client_binary_protocol_global_remset (gpointer ptr, gpointer value, gpointe
 #endif
 }
 
+static void G_GNUC_UNUSED
+sgen_client_binary_protocol_mod_union_remset (gpointer obj, gpointer ptr, gpointer value, gpointer value_vtable)
+{
+}
+
 static void G_GNUC_UNUSED
 sgen_client_binary_protocol_ptr_update (gpointer ptr, gpointer old_value, gpointer new_value, gpointer vtable, size_t size)
 {
@@ -694,9 +699,9 @@ extern MonoNativeTlsKey thread_info_key;
 
 typedef MonoSemType SgenSemaphore;
 
-#define SGEN_SEMAPHORE_INIT(sem,initial)       MONO_SEM_INIT ((sem), (initial))
-#define SGEN_SEMAPHORE_POST(sem)               MONO_SEM_POST ((sem))
-#define SGEN_SEMAPHORE_WAIT(sem)               MONO_SEM_WAIT ((sem))
+#define SGEN_SEMAPHORE_INIT(sem,initial)       mono_os_sem_init ((sem), (initial))
+#define SGEN_SEMAPHORE_POST(sem)               mono_os_sem_post ((sem))
+#define SGEN_SEMAPHORE_WAIT(sem)               mono_os_sem_wait ((sem), MONO_SEM_FLAGS_NONE)
 
 gboolean sgen_has_critical_method (void);
 gboolean sgen_is_critical_method (MonoMethod *method);

diff --git a/mono/metadata/sgen-mono.c b/mono/metadata/sgen-mono.c
index 2783e1af8fa6dd6967a4bc8312a2b4f2974ced7e..f6ae431afde262f5a525b75c5a8505e8ef23090d 100644 (file)
--- a/mono/metadata/sgen-mono.c
+++ b/mono/metadata/sgen-mono.c
@@ -376,7 +376,7 @@ get_array_fill_vtable (void)
 
                klass.element_class = mono_defaults.byte_class;
                klass.rank = 1;
-               klass.instance_size = sizeof (MonoArray);
+               klass.instance_size = MONO_SIZEOF_MONO_ARRAY;
                klass.sizes.element_size = 1;
                klass.name = "array_filler_type";
 
@@ -395,7 +395,7 @@ sgen_client_array_fill_range (char *start, size_t size)
 {
        MonoArray *o;
 
-       if (size < sizeof (MonoArray)) {
+       if (size < MONO_SIZEOF_MONO_ARRAY) {
                memset (start, 0, size);
                return FALSE;
        }
@@ -403,9 +403,9 @@ sgen_client_array_fill_range (char *start, size_t size)
        o = (MonoArray*)start;
        o->obj.vtable = (MonoVTable*)get_array_fill_vtable ();
        /* Mark this as not a real object */
-       o->obj.synchronisation = GINT_TO_POINTER (-1);
+       o->obj.synchronisation = (MonoThreadsSync *)GINT_TO_POINTER (-1);
        o->bounds = NULL;
-       o->max_length = (mono_array_size_t)(size - sizeof (MonoArray));
+       o->max_length = (mono_array_size_t)(size - MONO_SIZEOF_MONO_ARRAY);
 
        return TRUE;
 }
@@ -413,10 +413,10 @@ sgen_client_array_fill_range (char *start, size_t size)
 void
 sgen_client_zero_array_fill_header (void *p, size_t size)
 {
-       if (size >= sizeof (MonoArray)) {
-               memset (p, 0, sizeof (MonoArray));
+       if (size >= MONO_SIZEOF_MONO_ARRAY) {
+               memset (p, 0, MONO_SIZEOF_MONO_ARRAY);
        } else {
-               static guint8 zeros [sizeof (MonoArray)];
+               static guint8 zeros [MONO_SIZEOF_MONO_ARRAY];
 
                SGEN_ASSERT (0, !memcmp (p, zeros, size), "TLAB segment must be zeroed out.");
        }
@@ -519,7 +519,7 @@ mono_gc_register_for_finalization (MonoObject *obj, void *user_data)
 static gboolean
 object_in_domain_predicate (MonoObject *obj, void *user_data)
 {
-       MonoDomain *domain = user_data;
+       MonoDomain *domain = (MonoDomain *)user_data;
        if (mono_object_domain (obj) == domain) {
                SGEN_LOG (5, "Unregistering finalizer for object: %p (%s)", obj, sgen_client_vtable_get_name (SGEN_LOAD_VTABLE (obj)));
                return TRUE;
@@ -717,7 +717,7 @@ mono_gc_ephemeron_array_add (MonoObject *obj)
 
        LOCK_GC;
 
-       node = sgen_alloc_internal (INTERNAL_MEM_EPHEMERON_LINK);
+       node = (EphemeronLinkNode *)sgen_alloc_internal (INTERNAL_MEM_EPHEMERON_LINK);
        if (!node) {
                UNLOCK_GC;
                return FALSE;
@@ -973,7 +973,7 @@ mono_gc_alloc_fixed (size_t size, MonoGCDescriptor descr, MonoGCRootSource sourc
        void *res = calloc (1, size);
        if (!res)
                return NULL;
-       if (!mono_gc_register_root (res, size, descr, source, msg)) {
+       if (!mono_gc_register_root ((char *)res, size, descr, source, msg)) {
                free (res);
                res = NULL;
        }
@@ -983,7 +983,7 @@ mono_gc_alloc_fixed (size_t size, MonoGCDescriptor descr, MonoGCRootSource sourc
 void
 mono_gc_free_fixed (void* addr)
 {
-       mono_gc_deregister_root (addr);
+       mono_gc_deregister_root ((char *)addr);
        free (addr);
 }
 
@@ -1168,7 +1168,7 @@ create_allocator (int atype, gboolean slowpath)
 
                mono_mb_patch_short_branch (mb, pos);
 
-               clause = mono_image_alloc0 (mono_defaults.corlib, sizeof (MonoExceptionClause));
+               clause = (MonoExceptionClause *)mono_image_alloc0 (mono_defaults.corlib, sizeof (MonoExceptionClause));
                clause->try_offset = mono_mb_get_label (mb);
 
                /* vtable->klass->sizes.element_size */
@@ -1185,7 +1185,7 @@ create_allocator (int atype, gboolean slowpath)
                mono_mb_emit_ldarg (mb, 1);
                mono_mb_emit_byte (mb, CEE_MUL_OVF_UN);
                /* + sizeof (MonoArray) */
-               mono_mb_emit_icon (mb, sizeof (MonoArray));
+               mono_mb_emit_icon (mb, MONO_SIZEOF_MONO_ARRAY);
                mono_mb_emit_byte (mb, CEE_ADD_OVF_UN);
                mono_mb_emit_stloc (mb, size_var);
 
@@ -1602,7 +1602,7 @@ sgen_client_cardtable_scan_object (GCObject *obj, mword block_obj_size, guint8 *
                MonoArray *arr = (MonoArray*)obj;
                guint8 *card_data, *card_base;
                guint8 *card_data_end;
-               char *obj_start = sgen_card_table_align_pointer (obj);
+               char *obj_start = (char *)sgen_card_table_align_pointer (obj);
                mword bounds_size;
                mword obj_size = sgen_mono_array_size (vt, arr, &bounds_size, sgen_vtable_get_descriptor (vt));
                /* We don't want to scan the bounds entries at the end of multidimensional arrays */
@@ -1675,13 +1675,14 @@ LOOP_HEAD:
 
                                HEAVY_STAT (++los_array_cards);
                                for (; elem < card_end; elem += SIZEOF_VOID_P) {
-                                       gpointer new, old = *(gpointer*)elem;
+                                       GCObject *new_;
+                                       gpointer old = *(gpointer*)elem;
                                        if ((mod_union && old) || G_UNLIKELY (sgen_ptr_in_nursery (old))) {
                                                HEAVY_STAT (++los_array_remsets);
                                                copy_func ((GCObject**)elem, ctx.queue);
-                                               new = *(gpointer*)elem;
-                                               if (G_UNLIKELY (sgen_ptr_in_nursery (new)))
-                                                       sgen_add_to_global_remset (elem, new);
+                                               new_ = *(GCObject **)elem;
+                                               if (G_UNLIKELY (sgen_ptr_in_nursery (new_)))
+                                                       sgen_add_to_global_remset (elem, new_);
                                        }
                                }
                        }
@@ -1951,7 +1952,7 @@ precisely_report_roots_from (GCRootReport *report, void** start_root, void** end
                }
                return;
        case ROOT_DESC_COMPLEX: {
-               gsize *bitmap_data = sgen_get_complex_descriptor_bitmap (desc);
+               gsize *bitmap_data = (gsize *)sgen_get_complex_descriptor_bitmap (desc);
                gsize bwords = (*bitmap_data) - 1;
                void **start_run = start_root;
                bitmap_data++;
@@ -1989,7 +1990,7 @@ report_registered_roots_by_type (int root_type)
        void **start_root;
        RootRecord *root;
        report.count = 0;
-       SGEN_HASH_TABLE_FOREACH (&roots_hash [root_type], start_root, root) {
+       SGEN_HASH_TABLE_FOREACH (&roots_hash [root_type], void **, start_root, RootRecord *, root) {
                SGEN_LOG (6, "Precise root scan %p-%p (desc: %p)", start_root, root->end_root, (void*)root->root_desc);
                precisely_report_roots_from (&report, start_root, (void**)root->end_root, root->root_desc);
        } SGEN_HASH_TABLE_FOREACH_END;
@@ -2112,7 +2113,7 @@ collect_references (HeapWalkInfo *hwi, GCObject *obj, size_t size)
 static void
 walk_references (GCObject *start, size_t size, void *data)
 {
-       HeapWalkInfo *hwi = data;
+       HeapWalkInfo *hwi = (HeapWalkInfo *)data;
        hwi->called = 0;
        hwi->count = 0;
        collect_references (hwi, start, size);
@@ -2320,13 +2321,13 @@ static void *scan_area_arg_start, *scan_area_arg_end;
 void
 mono_gc_conservatively_scan_area (void *start, void *end)
 {
-       sgen_conservatively_pin_objects_from (start, end, scan_area_arg_start, scan_area_arg_end, PIN_TYPE_STACK);
+       sgen_conservatively_pin_objects_from ((void **)start, (void **)end, scan_area_arg_start, scan_area_arg_end, PIN_TYPE_STACK);
 }
 
 void*
 mono_gc_scan_object (void *obj, void *gc_data)
 {
-       ScanCopyContext *ctx = gc_data;
+       ScanCopyContext *ctx = (ScanCopyContext *)gc_data;
        ctx->ops->copy_or_mark_object ((GCObject**)&obj, ctx->queue);
        return obj;
 }
@@ -2365,13 +2366,13 @@ sgen_client_scan_thread_data (void *start_nursery, void *end_nursery, gboolean p
                g_assert (info->client_info.suspend_done);
                SGEN_LOG (3, "Scanning thread %p, range: %p-%p, size: %zd, pinned=%zd", info, info->client_info.stack_start, info->client_info.stack_end, (char*)info->client_info.stack_end - (char*)info->client_info.stack_start, sgen_get_pinned_count ());
                if (mono_gc_get_gc_callbacks ()->thread_mark_func && !conservative_stack_mark) {
-                       mono_gc_get_gc_callbacks ()->thread_mark_func (info->client_info.runtime_data, aligned_stack_start, info->client_info.stack_end, precise, &ctx);
+                       mono_gc_get_gc_callbacks ()->thread_mark_func (info->client_info.runtime_data, (guint8 *)aligned_stack_start, (guint8 *)info->client_info.stack_end, precise, &ctx);
                } else if (!precise) {
                        if (!conservative_stack_mark) {
                                fprintf (stderr, "Precise stack mark not supported - disabling.\n");
                                conservative_stack_mark = TRUE;
                        }
-                       sgen_conservatively_pin_objects_from (aligned_stack_start, info->client_info.stack_end, start_nursery, end_nursery, PIN_TYPE_STACK);
+                       sgen_conservatively_pin_objects_from ((void **)aligned_stack_start, (void **)info->client_info.stack_end, start_nursery, end_nursery, PIN_TYPE_STACK);
                }
 
                if (!precise) {
@@ -2387,7 +2388,7 @@ sgen_client_scan_thread_data (void *start_nursery, void *end_nursery, gboolean p
                                // We force a spill of all registers into the stack and pass a chunk of data into sgen.
                                MonoThreadUnwindState *state = &info->client_info.info.thread_saved_state [SELF_SUSPEND_STATE_INDEX];
                                if (state && state->gc_stackdata) {
-                                       sgen_conservatively_pin_objects_from (state->gc_stackdata, (void**)((char*)state->gc_stackdata + state->gc_stackdata_size),
+                                       sgen_conservatively_pin_objects_from ((void **)state->gc_stackdata, (void**)((char*)state->gc_stackdata + state->gc_stackdata_size),
                                                start_nursery, end_nursery, PIN_TYPE_STACK);
                                }
                        }
@@ -2604,7 +2605,7 @@ sgen_client_metadata_for_object (GCObject *obj)
 gboolean
 mono_gchandle_is_in_domain (guint32 gchandle, MonoDomain *domain)
 {
-       MonoDomain *gchandle_domain = sgen_gchandle_get_metadata (gchandle);
+       MonoDomain *gchandle_domain = (MonoDomain *)sgen_gchandle_get_metadata (gchandle);
        return domain->domain_id == gchandle_domain->domain_id;
 }
 
@@ -2623,14 +2624,14 @@ mono_gchandle_free_domain (MonoDomain *unloading)
 static gpointer
 null_link_if_in_domain (gpointer hidden, GCHandleType handle_type, int max_generation, gpointer user)
 {
-       MonoDomain *unloading_domain = user;
+       MonoDomain *unloading_domain = (MonoDomain *)user;
        MonoDomain *obj_domain;
        gboolean is_weak = MONO_GC_HANDLE_TYPE_IS_WEAK (handle_type);
        if (MONO_GC_HANDLE_IS_OBJECT_POINTER (hidden)) {
-               MonoObject *obj = MONO_GC_REVEAL_POINTER (hidden, is_weak);
+               MonoObject *obj = (MonoObject *)MONO_GC_REVEAL_POINTER (hidden, is_weak);
                obj_domain = mono_object_domain (obj);
        } else {
-               obj_domain = MONO_GC_REVEAL_POINTER (hidden, is_weak);
+               obj_domain = (MonoDomain *)MONO_GC_REVEAL_POINTER (hidden, is_weak);
        }
        if (unloading_domain->domain_id == obj_domain->domain_id)
                return NULL;
@@ -2642,7 +2643,7 @@ sgen_null_links_for_domain (MonoDomain *domain)
 {
        guint type;
        for (type = HANDLE_TYPE_MIN; type < HANDLE_TYPE_MAX; ++type)
-               sgen_gchandle_iterate (type, GENERATION_OLD, null_link_if_in_domain, domain);
+               sgen_gchandle_iterate ((GCHandleType)type, GENERATION_OLD, null_link_if_in_domain, domain);
 }
 
 void
@@ -2687,12 +2688,6 @@ sgen_client_ensure_weak_gchandles_accessible (void)
                mono_gc_wait_for_bridge_processing ();
 }
 
-gboolean
-mono_gc_set_allow_synchronous_major (gboolean flag)
-{
-       return sgen_set_allow_synchronous_major (flag);
-}
-
 void*
 mono_gc_invoke_with_gc_lock (MonoGCLockedCallbackFunc func, void *data)
 {
@@ -2840,7 +2835,7 @@ sgen_client_init (void)
        cb.thread_detach = sgen_thread_detach;
        cb.thread_unregister = sgen_thread_unregister;
        cb.thread_attach = sgen_thread_attach;
-       cb.mono_method_is_critical = (gpointer)is_critical_method;
+       cb.mono_method_is_critical = (gboolean (*)(void *))is_critical_method;
        cb.mono_thread_in_critical_region = thread_in_critical_region;
 
        mono_threads_init (&cb, sizeof (SgenThreadInfo));

diff --git a/mono/metadata/sgen-new-bridge.c b/mono/metadata/sgen-new-bridge.c
index 65981ccc665f6708c3786cb94674375572d5367a..20fdb460adde86c416d941f2625f335516b3e1bb 100644 (file)
--- a/mono/metadata/sgen-new-bridge.c
+++ b/mono/metadata/sgen-new-bridge.c
@@ -199,7 +199,7 @@ dyn_array_ensure_capacity (DynArray *da, int capacity, int elem_size)
        while (capacity > da->capacity)
                da->capacity *= 2;
 
-       new_data = sgen_alloc_internal_dynamic (elem_size * da->capacity, INTERNAL_MEM_BRIDGE_DATA, TRUE);
+       new_data = (char *)sgen_alloc_internal_dynamic (elem_size * da->capacity, INTERNAL_MEM_BRIDGE_DATA, TRUE);
        memcpy (new_data, da->data, elem_size * da->size);
        if (old_capacity > 0)
                sgen_free_internal_dynamic (da->data, elem_size * old_capacity, INTERNAL_MEM_BRIDGE_DATA);
@@ -276,7 +276,7 @@ dyn_array_int_empty (DynIntArray *da)
 static void
 dyn_array_int_add (DynIntArray *da, int x)
 {
-       int *p = dyn_array_add (&da->array, sizeof (int));
+       int *p = (int *)dyn_array_add (&da->array, sizeof (int));
        *p = x;
 }
 
@@ -374,13 +374,13 @@ dyn_array_ptr_add (DynPtrArray *da, void *ptr)
                void *ptr0 = da->array.data;
                void **p0;
                dyn_array_init (&da->array);
-               p0 = dyn_array_add (&da->array, sizeof (void*));
+               p0 = (void **)dyn_array_add (&da->array, sizeof (void*));
                *p0 = ptr0;
-               p = dyn_array_add (&da->array, sizeof (void*));
+               p = (void **)dyn_array_add (&da->array, sizeof (void*));
        } else
 #endif
        {
-               p = dyn_array_add (&da->array, sizeof (void*));
+               p = (void **)dyn_array_add (&da->array, sizeof (void*));
        }
        *p = ptr;
 }
@@ -431,7 +431,7 @@ dyn_array_scc_size (DynSCCArray *da)
 static SCC*
 dyn_array_scc_add (DynSCCArray *da)
 {
-       return dyn_array_add (&da->array, sizeof (SCC));
+       return (SCC *)dyn_array_add (&da->array, sizeof (SCC));
 }
 
 static SCC*
@@ -497,7 +497,7 @@ class_kind (MonoClass *klass)
 static HashEntry*
 get_hash_entry (MonoObject *obj, gboolean *existing)
 {
-       HashEntry *entry = sgen_hash_table_lookup (&hash_table, obj);
+       HashEntry *entry = (HashEntry *)sgen_hash_table_lookup (&hash_table, obj);
        HashEntry new_entry;
 
        if (entry) {
@@ -515,7 +515,7 @@ get_hash_entry (MonoObject *obj, gboolean *existing)
 
        sgen_hash_table_replace (&hash_table, obj, &new_entry, NULL);
 
-       return sgen_hash_table_lookup (&hash_table, obj);
+       return (HashEntry *)sgen_hash_table_lookup (&hash_table, obj);
 }
 
 static void
@@ -532,7 +532,7 @@ free_data (void)
        int total_srcs = 0;
        int max_srcs = 0;
 
-       SGEN_HASH_TABLE_FOREACH (&hash_table, obj, entry) {
+       SGEN_HASH_TABLE_FOREACH (&hash_table, MonoObject *, obj, HashEntry *, entry) {
                int entry_size = dyn_array_ptr_size (&entry->srcs);
                total_srcs += entry_size;
                if (entry_size > max_srcs)
@@ -647,10 +647,10 @@ dfs1 (HashEntry *obj_entry)
                char *start;
                ++dfs1_passes;
 
-               obj_entry = dyn_array_ptr_pop (&dfs_stack);
+               obj_entry = (HashEntry *)dyn_array_ptr_pop (&dfs_stack);
                if (obj_entry) {
                        /* obj_entry needs to be expanded */
-                       src = dyn_array_ptr_pop (&dfs_stack);
+                       src = (HashEntry *)dyn_array_ptr_pop (&dfs_stack);
 
                        if (src)
                                g_assert (!src->v.dfs1.forwarded_to);
@@ -686,8 +686,8 @@ dfs1 (HashEntry *obj_entry)
                                 */
 #ifdef OPTIMIZATION_FORWARD
                                if (!obj_entry->is_bridge && num_links == 1) {
-                                       HashEntry *dst_entry = dyn_array_ptr_pop (&dfs_stack);
-                                       HashEntry *obj_entry_again = dyn_array_ptr_pop (&dfs_stack);
+                                       HashEntry *dst_entry = (HashEntry *)dyn_array_ptr_pop (&dfs_stack);
+                                       HashEntry *obj_entry_again = (HashEntry *)dyn_array_ptr_pop (&dfs_stack);
                                        g_assert (obj_entry_again == obj_entry);
                                        g_assert (!dst_entry->v.dfs1.forwarded_to);
                                        if (obj_entry != dst_entry) {
@@ -709,7 +709,7 @@ dfs1 (HashEntry *obj_entry)
                } else {
                        /* obj_entry needs to be finished */
 
-                       obj_entry = dyn_array_ptr_pop (&dfs_stack);
+                       obj_entry = (HashEntry *)dyn_array_ptr_pop (&dfs_stack);
 
                        //g_print ("finish %s\n", sgen_safe_name (obj_entry->obj));
                        register_finishing_time (obj_entry, ++current_time);
@@ -838,7 +838,7 @@ dfs2 (HashEntry *entry)
        dyn_array_ptr_push (&dfs_stack, entry);
 
        do {
-               entry = dyn_array_ptr_pop (&dfs_stack);
+               entry = (HashEntry *)dyn_array_ptr_pop (&dfs_stack);
                ++dfs2_passes;
 
                if (entry->v.dfs2.scc_index >= 0) {
@@ -910,7 +910,7 @@ dump_graph (void)
        MonoObject *obj;
        HashEntry *entry;
        size_t prefix_len = strlen (dump_prefix);
-       char *filename = alloca(prefix_len + 64);
+       char *filename = (char *)alloca (prefix_len + 64);
        FILE *file;
        int edge_id = 0;
 
@@ -931,7 +931,7 @@ dump_graph (void)
                        "</attributes>\n");
 
        fprintf (file, "<nodes>\n");
-       SGEN_HASH_TABLE_FOREACH (&hash_table, obj, entry) {
+       SGEN_HASH_TABLE_FOREACH (&hash_table, MonoObject *, obj, HashEntry *, entry) {
                MonoVTable *vt = SGEN_LOAD_VTABLE (obj);
                fprintf (file, "<node id=\"%p\"><attvalues><attvalue for=\"0\" value=\"%s.%s\"/><attvalue for=\"1\" value=\"%s\"/></attvalues></node>\n",
                                obj, vt->klass->name_space, vt->klass->name, entry->is_bridge ? "true" : "false");
@@ -939,10 +939,10 @@ dump_graph (void)
        fprintf (file, "</nodes>\n");
 
        fprintf (file, "<edges>\n");
-       SGEN_HASH_TABLE_FOREACH (&hash_table, obj, entry) {
+       SGEN_HASH_TABLE_FOREACH (&hash_table, MonoObject *, obj, HashEntry *, entry) {
                int i;
                for (i = 0; i < dyn_array_ptr_size (&entry->srcs); ++i) {
-                       HashEntry *src = dyn_array_ptr_get (&entry->srcs, i);
+                       HashEntry *src = (HashEntry *)dyn_array_ptr_get (&entry->srcs, i);
                        fprintf (file, "<edge id=\"%d\" source=\"%p\" target=\"%p\"/>\n", edge_id++, sgen_hash_table_key_for_value_pointer (src), obj);
                }
        } SGEN_HASH_TABLE_FOREACH_END;
@@ -1017,13 +1017,13 @@ processing_stw_step (void)
        */
        bridge_count = dyn_array_ptr_size (&registered_bridges);
        for (i = 0; i < bridge_count ; ++i)
-               register_bridge_object (dyn_array_ptr_get (&registered_bridges, i));
+               register_bridge_object ((MonoObject *)dyn_array_ptr_get (&registered_bridges, i));
 
        for (i = 0; i < bridge_count; ++i)
-               dfs1 (get_hash_entry (dyn_array_ptr_get (&registered_bridges, i), NULL));
+               dfs1 (get_hash_entry ((MonoObject *)dyn_array_ptr_get (&registered_bridges, i), NULL));
 
        /* Remove all forwarded objects. */
-       SGEN_HASH_TABLE_FOREACH (&hash_table, obj, entry) {
+       SGEN_HASH_TABLE_FOREACH (&hash_table, MonoObject *, obj, HashEntry *, entry) {
                if (entry->v.dfs1.forwarded_to) {
                        g_assert (dyn_array_ptr_size (&entry->srcs) == 0);
                        SGEN_HASH_TABLE_FOREACH_REMOVE (TRUE);
@@ -1066,10 +1066,10 @@ processing_build_callback_data (int generation)
 
        /* alloc and fill array of all entries */
 
-       all_entries = sgen_alloc_internal_dynamic (sizeof (HashEntry*) * hash_table.num_entries, INTERNAL_MEM_BRIDGE_DATA, TRUE);
+       all_entries = (HashEntry **)sgen_alloc_internal_dynamic (sizeof (HashEntry*) * hash_table.num_entries, INTERNAL_MEM_BRIDGE_DATA, TRUE);
 
        j = 0;
-       SGEN_HASH_TABLE_FOREACH (&hash_table, obj, entry) {
+       SGEN_HASH_TABLE_FOREACH (&hash_table, MonoObject *, obj, HashEntry *, entry) {
                g_assert (entry->v.dfs1.finishing_time > 0);
                all_entries [j++] = entry;
                fist_pass_links += dyn_array_ptr_size (&entry->srcs);
@@ -1080,7 +1080,7 @@ processing_build_callback_data (int generation)
        /* sort array according to decreasing finishing time */
        qsort_hash_entries (all_entries, hash_table.num_entries);
 
-       SGEN_HASH_TABLE_FOREACH (&hash_table, obj, entry) {
+       SGEN_HASH_TABLE_FOREACH (&hash_table, MonoObject *, obj, HashEntry *, entry) {
                entry->v.dfs2.scc_index = -1;
        } SGEN_HASH_TABLE_FOREACH_END;
 
@@ -1231,7 +1231,7 @@ processing_build_callback_data (int generation)
                max_sccs_links = MAX (max_sccs_links, dyn_array_int_size (&scc->XREFS));
        }
 
-       api_sccs = sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeSCC*) * num_sccs, INTERNAL_MEM_BRIDGE_DATA, TRUE);
+       api_sccs = (MonoGCBridgeSCC **)sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeSCC*) * num_sccs, INTERNAL_MEM_BRIDGE_DATA, TRUE);
        num_xrefs = 0;
        j = 0;
        for (i = 0; i < dyn_array_scc_size (&sccs); ++i) {
@@ -1239,7 +1239,7 @@ processing_build_callback_data (int generation)
                if (!scc->num_bridge_entries)
                        continue;
 
-               api_sccs [j] = sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeSCC) + sizeof (MonoObject*) * scc->num_bridge_entries, INTERNAL_MEM_BRIDGE_DATA, TRUE);
+               api_sccs [j] = (MonoGCBridgeSCC *)sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeSCC) + sizeof (MonoObject*) * scc->num_bridge_entries, INTERNAL_MEM_BRIDGE_DATA, TRUE);
                api_sccs [j]->is_alive = FALSE;
                api_sccs [j]->num_objs = scc->num_bridge_entries;
                scc->num_bridge_entries = 0;
@@ -1248,14 +1248,14 @@ processing_build_callback_data (int generation)
                num_xrefs += dyn_array_int_size (&scc->XREFS);
        }
 
-       SGEN_HASH_TABLE_FOREACH (&hash_table, obj, entry) {
+       SGEN_HASH_TABLE_FOREACH (&hash_table, MonoObject *, obj, HashEntry *, entry) {
                if (entry->is_bridge) {
                        SCC *scc = dyn_array_scc_get_ptr (&sccs, entry->v.dfs2.scc_index);
                        api_sccs [scc->api_index]->objs [scc->num_bridge_entries++] = sgen_hash_table_key_for_value_pointer (entry);
                }
        } SGEN_HASH_TABLE_FOREACH_END;
 
-       api_xrefs = sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeXRef) * num_xrefs, INTERNAL_MEM_BRIDGE_DATA, TRUE);
+       api_xrefs = (MonoGCBridgeXRef *)sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeXRef) * num_xrefs, INTERNAL_MEM_BRIDGE_DATA, TRUE);
        j = 0;
        for (i = 0; i < dyn_array_scc_size (&sccs); ++i) {
                int k;
@@ -1364,7 +1364,7 @@ describe_pointer (GCObject *obj)
                }
        }
 
-       entry = sgen_hash_table_lookup (&hash_table, obj);
+       entry = (HashEntry *)sgen_hash_table_lookup (&hash_table, obj);
        if (!entry)
                return;
 

diff --git a/mono/metadata/sgen-old-bridge.c b/mono/metadata/sgen-old-bridge.c
index 63b39f4946ab644eb84cc1b6ea2cae9cfb4f0485..83f991d5b867ce64bd230021fe7a96381fc09158 100644 (file)
--- a/mono/metadata/sgen-old-bridge.c
+++ b/mono/metadata/sgen-old-bridge.c
@@ -147,7 +147,7 @@ dyn_array_ensure_capacity (DynArray *da, int capacity, int elem_size)
        while (capacity > da->capacity)
                da->capacity *= 2;
 
-       new_data = sgen_alloc_internal_dynamic (elem_size * da->capacity, INTERNAL_MEM_BRIDGE_DATA, TRUE);
+       new_data = (char *)sgen_alloc_internal_dynamic (elem_size * da->capacity, INTERNAL_MEM_BRIDGE_DATA, TRUE);
        memcpy (new_data, da->data, elem_size * da->size);
        sgen_free_internal_dynamic (da->data, elem_size * old_capacity, INTERNAL_MEM_BRIDGE_DATA);
        da->data = new_data;
@@ -193,7 +193,7 @@ dyn_array_int_set_size (DynIntArray *da, int size)
 static void
 dyn_array_int_add (DynIntArray *da, int x)
 {
-       int *p = dyn_array_add (&da->array, sizeof (int));
+       int *p = (int *)dyn_array_add (&da->array, sizeof (int));
        *p = x;
 }
 
@@ -258,7 +258,7 @@ dyn_array_ptr_get (DynPtrArray *da, int x)
 static void
 dyn_array_ptr_add (DynPtrArray *da, void *ptr)
 {
-       void **p = dyn_array_add (&da->array, sizeof (void*));
+       void **p = (void **)dyn_array_add (&da->array, sizeof (void*));
        *p = ptr;
 }
 
@@ -298,7 +298,7 @@ dyn_array_scc_size (DynSCCArray *da)
 static SCC*
 dyn_array_scc_add (DynSCCArray *da)
 {
-       return dyn_array_add (&da->array, sizeof (SCC));
+       return (SCC *)dyn_array_add (&da->array, sizeof (SCC));
 }
 
 static SCC*
@@ -408,7 +408,7 @@ class_kind (MonoClass *klass)
 static HashEntry*
 get_hash_entry (GCObject *obj, gboolean *existing)
 {
-       HashEntry *entry = sgen_hash_table_lookup (&hash_table, obj);
+       HashEntry *entry = (HashEntry *)sgen_hash_table_lookup (&hash_table, obj);
        HashEntry new_entry;
 
        if (entry) {
@@ -428,7 +428,7 @@ get_hash_entry (GCObject *obj, gboolean *existing)
 
        sgen_hash_table_replace (&hash_table, obj, &new_entry, NULL);
 
-       return sgen_hash_table_lookup (&hash_table, obj);
+       return (HashEntry *)sgen_hash_table_lookup (&hash_table, obj);
 }
 
 static void
@@ -445,7 +445,7 @@ free_data (void)
        int total_srcs = 0;
        int max_srcs = 0;
 
-       SGEN_HASH_TABLE_FOREACH (&hash_table, obj, entry) {
+       SGEN_HASH_TABLE_FOREACH (&hash_table, GCObject *, obj, HashEntry *, entry) {
                int entry_size = dyn_array_ptr_size (&entry->srcs);
                total_srcs += entry_size;
                if (entry_size > max_srcs)
@@ -516,11 +516,11 @@ dfs1 (HashEntry *obj_entry)
                GCObject *obj;
                ++dfs1_passes;
 
-               obj_entry = dyn_array_ptr_pop (&dfs_stack);
+               obj_entry = (HashEntry *)dyn_array_ptr_pop (&dfs_stack);
                if (obj_entry) {
                        char *start;
                        mword desc;
-                       src = dyn_array_ptr_pop (&dfs_stack);
+                       src = (HashEntry *)dyn_array_ptr_pop (&dfs_stack);
 
                        obj = obj_entry->obj;
                        desc = sgen_obj_get_descriptor_safe (obj);
@@ -544,7 +544,7 @@ dfs1 (HashEntry *obj_entry)
                        start = (char*)obj;
 #include "sgen/sgen-scan-object.h"
                } else {
-                       obj_entry = dyn_array_ptr_pop (&dfs_stack);
+                       obj_entry = (HashEntry *)dyn_array_ptr_pop (&dfs_stack);
 
                        //g_print ("finish %s\n", sgen_safe_name (obj_entry->obj));
                        register_finishing_time (obj_entry, current_time++);
@@ -592,7 +592,7 @@ dfs2 (HashEntry *entry)
        dyn_array_ptr_push (&dfs_stack, entry);
 
        do {
-               entry = dyn_array_ptr_pop (&dfs_stack);
+               entry = (HashEntry *)dyn_array_ptr_pop (&dfs_stack);
                ++dfs2_passes;
 
                if (entry->scc_index >= 0) {
@@ -663,10 +663,10 @@ processing_stw_step (void)
        */
        bridge_count = dyn_array_ptr_size (&registered_bridges);
        for (i = 0; i < bridge_count ; ++i)
-               register_bridge_object (dyn_array_ptr_get (&registered_bridges, i));
+               register_bridge_object ((GCObject *)dyn_array_ptr_get (&registered_bridges, i));
 
        for (i = 0; i < bridge_count; ++i)
-               dfs1 (get_hash_entry (dyn_array_ptr_get (&registered_bridges, i), NULL));
+               dfs1 (get_hash_entry ((GCObject *)dyn_array_ptr_get (&registered_bridges, i), NULL));
 
        SGEN_TV_GETTIME (atv);
        step_2 = SGEN_TV_ELAPSED (btv, atv);
@@ -700,10 +700,10 @@ processing_build_callback_data (int generation)
 
        /* alloc and fill array of all entries */
 
-       all_entries = sgen_alloc_internal_dynamic (sizeof (HashEntry*) * hash_table.num_entries, INTERNAL_MEM_BRIDGE_DATA, TRUE);
+       all_entries = (HashEntry **)sgen_alloc_internal_dynamic (sizeof (HashEntry*) * hash_table.num_entries, INTERNAL_MEM_BRIDGE_DATA, TRUE);
 
        j = 0;
-       SGEN_HASH_TABLE_FOREACH (&hash_table, obj, entry) {
+       SGEN_HASH_TABLE_FOREACH (&hash_table, GCObject *, obj, HashEntry *, entry) {
                g_assert (entry->finishing_time >= 0);
                all_entries [j++] = entry;
                fist_pass_links += dyn_array_ptr_size (&entry->srcs);
@@ -795,7 +795,7 @@ processing_build_callback_data (int generation)
                max_sccs_links = MAX (max_sccs_links, dyn_array_int_size (&scc->xrefs));
        }
 
-       api_sccs = sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeSCC*) * num_sccs, INTERNAL_MEM_BRIDGE_DATA, TRUE);
+       api_sccs = (MonoGCBridgeSCC **)sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeSCC*) * num_sccs, INTERNAL_MEM_BRIDGE_DATA, TRUE);
        num_xrefs = 0;
        j = 0;
        for (i = 0; i < dyn_array_scc_size (&sccs); ++i) {
@@ -803,7 +803,7 @@ processing_build_callback_data (int generation)
                if (!scc->num_bridge_entries)
                        continue;
 
-               api_sccs [j] = sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeSCC) + sizeof (MonoObject*) * scc->num_bridge_entries, INTERNAL_MEM_BRIDGE_DATA, TRUE);
+               api_sccs [j] = (MonoGCBridgeSCC *)sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeSCC) + sizeof (MonoObject*) * scc->num_bridge_entries, INTERNAL_MEM_BRIDGE_DATA, TRUE);
                api_sccs [j]->is_alive = FALSE;
                api_sccs [j]->num_objs = scc->num_bridge_entries;
                scc->num_bridge_entries = 0;
@@ -812,14 +812,14 @@ processing_build_callback_data (int generation)
                num_xrefs += dyn_array_int_size (&scc->xrefs);
        }
 
-       SGEN_HASH_TABLE_FOREACH (&hash_table, obj, entry) {
+       SGEN_HASH_TABLE_FOREACH (&hash_table, GCObject *, obj, HashEntry *, entry) {
                if (entry->is_bridge) {
                        SCC *scc = dyn_array_scc_get_ptr (&sccs, entry->scc_index);
                        api_sccs [scc->api_index]->objs [scc->num_bridge_entries++] = (MonoObject*)entry->obj;
                }
        } SGEN_HASH_TABLE_FOREACH_END;
 
-       api_xrefs = sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeXRef) * num_xrefs, INTERNAL_MEM_BRIDGE_DATA, TRUE);
+       api_xrefs = (MonoGCBridgeXRef *)sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeXRef) * num_xrefs, INTERNAL_MEM_BRIDGE_DATA, TRUE);
        j = 0;
        for (i = 0; i < dyn_array_scc_size (&sccs); ++i) {
                int k;
@@ -923,7 +923,7 @@ describe_pointer (GCObject *obj)
                }
        }
 
-       entry = sgen_hash_table_lookup (&hash_table, obj);
+       entry = (HashEntry *)sgen_hash_table_lookup (&hash_table, obj);
        if (!entry)
                return;
 

diff --git a/mono/metadata/sgen-os-posix.c b/mono/metadata/sgen-os-posix.c
index dbf2eddb1c707311e2d3b846efe4402158b02691..2a8b7ad10f4420ca8d2a0cec1f3e1de393044337 100644 (file)
--- a/mono/metadata/sgen-os-posix.c
+++ b/mono/metadata/sgen-os-posix.c
@@ -246,7 +246,7 @@ sgen_os_init (void)
                g_error ("failed sigaction");
        }
 
-       sinfo.sa_handler = (void*) restart_handler;
+       sinfo.sa_handler = (void (*)(int))restart_handler;
        if (sigaction (restart_signal_num, &sinfo, NULL) != 0) {
                g_error ("failed sigaction");
        }

diff --git a/mono/metadata/sgen-stw.c b/mono/metadata/sgen-stw.c
index 1d23bc6373246f80d1ce5a0e4fb18764e587dad5..651dbb59de190cef0863ee60ba3ca6f95bad872b 100644 (file)
--- a/mono/metadata/sgen-stw.c
+++ b/mono/metadata/sgen-stw.c
@@ -103,7 +103,7 @@ is_ip_in_managed_allocator (MonoDomain *domain, gpointer ip)
         * missing methods (#13951). To work around this, we disable the AOT fallback. For this to work, the JIT needs
         * to register the jit info for all GC critical methods after they are JITted/loaded.
         */
-       ji = mono_jit_info_table_find_internal (domain, ip, FALSE, FALSE);
+       ji = mono_jit_info_table_find_internal (domain, (char *)ip, FALSE, FALSE);
        if (!ji)
                return FALSE;
 
@@ -367,7 +367,7 @@ update_sgen_info (SgenThreadInfo *info)
        char *stack_start;
 
        /* Once we remove the old suspend code, we should move sgen to directly access the state in MonoThread */
-       info->client_info.stopped_domain = mono_thread_info_tls_get (info, TLS_KEY_DOMAIN);
+       info->client_info.stopped_domain = (MonoDomain *)mono_thread_info_tls_get (info, TLS_KEY_DOMAIN);
        info->client_info.stopped_ip = (gpointer) MONO_CONTEXT_GET_IP (&mono_thread_info_get_suspend_state (info)->ctx);
        stack_start = (char*)MONO_CONTEXT_GET_SP (&mono_thread_info_get_suspend_state (info)->ctx) - REDZONE_SIZE;
 

diff --git a/mono/metadata/sgen-tarjan-bridge.c b/mono/metadata/sgen-tarjan-bridge.c
index 10cf234c4268382f35a2c94a62a99c4100346aea..e6bd1f17aa7082cdddc7f8a486aabed036c08946 100644 (file)
--- a/mono/metadata/sgen-tarjan-bridge.c
+++ b/mono/metadata/sgen-tarjan-bridge.c
@@ -88,7 +88,7 @@ dyn_array_ensure_capacity (DynArray *da, int capacity, int elem_size)
        while (capacity > da->capacity)
                da->capacity *= 2;
 
-       new_data = sgen_alloc_internal_dynamic (elem_size * da->capacity, INTERNAL_MEM_BRIDGE_DATA, TRUE);
+       new_data = (char *)sgen_alloc_internal_dynamic (elem_size * da->capacity, INTERNAL_MEM_BRIDGE_DATA, TRUE);
        if (da->data) {
                memcpy (new_data, da->data, elem_size * da->size);
                sgen_free_internal_dynamic (da->data, elem_size * old_capacity, INTERNAL_MEM_BRIDGE_DATA);
@@ -137,7 +137,7 @@ dyn_array_ptr_get (DynPtrArray *da, int x)
 static void
 dyn_array_ptr_add (DynPtrArray *da, void *ptr)
 {
-       void **p = dyn_array_add (&da->array, sizeof (void*));
+       void **p = (void **)dyn_array_add (&da->array, sizeof (void*));
        *p = ptr;
 }
 
@@ -276,7 +276,7 @@ static int object_data_count;
 static ObjectBucket*
 new_object_bucket (void)
 {
-       ObjectBucket *res = sgen_alloc_internal (INTERNAL_MEM_TARJAN_OBJ_BUCKET);
+       ObjectBucket *res = (ObjectBucket *)sgen_alloc_internal (INTERNAL_MEM_TARJAN_OBJ_BUCKET);
        res->next_data = &res->data [0];
        return res;
 }
@@ -340,7 +340,7 @@ static int color_data_count;
 static ColorBucket*
 new_color_bucket (void)
 {
-       ColorBucket *res = sgen_alloc_internal (INTERNAL_MEM_TARJAN_OBJ_BUCKET);
+       ColorBucket *res = (ColorBucket *)sgen_alloc_internal (INTERNAL_MEM_TARJAN_OBJ_BUCKET);
        res->next_data = &res->data [0];
        return res;
 }
@@ -724,7 +724,7 @@ reduce_color (void)
        if (size == 0)
                color = NULL;
        else if (size == 1) {
-               color = dyn_array_ptr_get (&color_merge_array, 0);
+               color = (ColorData *)dyn_array_ptr_get (&color_merge_array, 0);
        } else
                color = new_color (FALSE);
 
@@ -740,7 +740,7 @@ create_scc (ScanData *data)
        ColorData *color_data = NULL;
 
        for (i = dyn_array_ptr_size (&loop_stack) - 1; i >= 0; --i) {
-               ScanData *other = dyn_array_ptr_get (&loop_stack, i);
+               ScanData *other = (ScanData *)dyn_array_ptr_get (&loop_stack, i);
                found_bridge |= other->is_bridge;
                if (found_bridge || other == data)
                        break;
@@ -769,7 +769,7 @@ create_scc (ScanData *data)
        }
 
        while (dyn_array_ptr_size (&loop_stack) > 0) {
-               ScanData *other = dyn_array_ptr_pop (&loop_stack);
+               ScanData *other = (ScanData *)dyn_array_ptr_pop (&loop_stack);
 
 #if DUMP_GRAPH
                printf ("\tmember %s (%p) index %d low-index %d color %p state %d\n", safe_name_bridge (other->obj), other->obj, other->index, other->low_index, other->color, other->state);
@@ -797,7 +797,7 @@ create_scc (ScanData *data)
        g_assert (found);
 
        for (i = 0; i < dyn_array_ptr_size (&color_merge_array); ++i) {
-               ColorData *cd  = dyn_array_ptr_get (&color_merge_array, i);
+               ColorData *cd  = (ColorData *)dyn_array_ptr_get (&color_merge_array, i);
                g_assert (cd->visited);
                cd->visited = FALSE;
        }
@@ -814,7 +814,7 @@ dfs (void)
        dyn_array_ptr_set_size (&color_merge_array, 0);
 
        while (dyn_array_ptr_size (&scan_stack) > 0) {
-               ScanData *data = dyn_array_ptr_pop (&scan_stack);
+               ScanData *data = (ScanData *)dyn_array_ptr_pop (&scan_stack);
 
                /**
                 * Ignore finished objects on stack, they happen due to loops. For example:
@@ -963,12 +963,12 @@ processing_stw_step (void)
 
        bridge_count = dyn_array_ptr_size (&registered_bridges);
        for (i = 0; i < bridge_count ; ++i)
-               register_bridge_object (dyn_array_ptr_get (&registered_bridges, i));
+               register_bridge_object ((GCObject *)dyn_array_ptr_get (&registered_bridges, i));
 
        setup_time = step_timer (&curtime);
 
        for (i = 0; i < bridge_count; ++i) {
-               ScanData *sd = find_data (dyn_array_ptr_get (&registered_bridges, i));
+               ScanData *sd = find_data ((GCObject *)dyn_array_ptr_get (&registered_bridges, i));
                if (sd->state == INITIAL) {
                        dyn_array_ptr_push (&scan_stack, sd);
                        dfs ();
@@ -999,7 +999,7 @@ gather_xrefs (ColorData *color)
 {
        int i;
        for (i = 0; i < dyn_array_ptr_size (&color->other_colors); ++i) {
-               ColorData *src = dyn_array_ptr_get (&color->other_colors, i);
+               ColorData *src = (ColorData *)dyn_array_ptr_get (&color->other_colors, i);
                if (src->visited)
                        continue;
                src->visited = TRUE;
@@ -1015,7 +1015,7 @@ reset_xrefs (ColorData *color)
 {
        int i;
        for (i = 0; i < dyn_array_ptr_size (&color->other_colors); ++i) {
-               ColorData *src = dyn_array_ptr_get (&color->other_colors, i);
+               ColorData *src = (ColorData *)dyn_array_ptr_get (&color->other_colors, i);
                if (!src->visited)
                        continue;
                src->visited = FALSE;
@@ -1049,7 +1049,7 @@ processing_build_callback_data (int generation)
 #endif
 
        /* This is a straightforward translation from colors to the bridge callback format. */
-       api_sccs = sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeSCC*) * num_colors_with_bridges, INTERNAL_MEM_BRIDGE_DATA, TRUE);
+       api_sccs = (MonoGCBridgeSCC **)sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeSCC*) * num_colors_with_bridges, INTERNAL_MEM_BRIDGE_DATA, TRUE);
        api_index = xref_count = 0;
 
        for (cur = root_color_bucket; cur; cur = cur->next) {
@@ -1059,14 +1059,14 @@ processing_build_callback_data (int generation)
                        if (!bridges)
                                continue;
 
-                       api_sccs [api_index] = sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeSCC) + sizeof (MonoObject*) * bridges, INTERNAL_MEM_BRIDGE_DATA, TRUE);
+                       api_sccs [api_index] = (MonoGCBridgeSCC *)sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeSCC) + sizeof (MonoObject*) * bridges, INTERNAL_MEM_BRIDGE_DATA, TRUE);
                        api_sccs [api_index]->is_alive = FALSE;
                        api_sccs [api_index]->num_objs = bridges;
 
                        cd->api_index = api_index;
 
                        for (j = 0; j < bridges; ++j)
-                               api_sccs [api_index]->objs [j] = dyn_array_ptr_get (&cd->bridges, j);
+                               api_sccs [api_index]->objs [j] = (MonoObject *)dyn_array_ptr_get (&cd->bridges, j);
                        api_index++;
                }
        }
@@ -1095,7 +1095,7 @@ processing_build_callback_data (int generation)
        dump_color_table (" after xref pass", TRUE);
 #endif
 
-       api_xrefs = sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeXRef) * xref_count, INTERNAL_MEM_BRIDGE_DATA, TRUE);
+       api_xrefs = (MonoGCBridgeXRef *)sgen_alloc_internal_dynamic (sizeof (MonoGCBridgeXRef) * xref_count, INTERNAL_MEM_BRIDGE_DATA, TRUE);
        api_index = 0;
        for (cur = root_color_bucket; cur; cur = cur->next) {
                ColorData *src;
@@ -1105,7 +1105,7 @@ processing_build_callback_data (int generation)
                                continue;
 
                        for (j = 0; j < dyn_array_ptr_size (&src->other_colors); ++j) {
-                               ColorData *dest = dyn_array_ptr_get (&src->other_colors, j);
+                               ColorData *dest = (ColorData *)dyn_array_ptr_get (&src->other_colors, j);
                                g_assert (dyn_array_ptr_size (&dest->bridges)); /* We flattened the color graph, so this must never happen. */
 
                                api_xrefs [api_index].src_scc_index = src->api_index;

diff --git a/mono/metadata/sgen-toggleref.c b/mono/metadata/sgen-toggleref.c
index 9622c7599dd75da07b8c5e65794f240bbaf00923..d9afbfa868dc9efe8a6a2eb0a31c151bb82215e2 100644 (file)
--- a/mono/metadata/sgen-toggleref.c
+++ b/mono/metadata/sgen-toggleref.c
@@ -142,7 +142,7 @@ ensure_toggleref_capacity (int capacity)
 {
        if (!toggleref_array) {
                toggleref_array_capacity = 32;
-               toggleref_array = sgen_alloc_internal_dynamic (
+               toggleref_array = (MonoGCToggleRef *)sgen_alloc_internal_dynamic (
                        toggleref_array_capacity * sizeof (MonoGCToggleRef),
                        INTERNAL_MEM_TOGGLEREF_DATA,
                        TRUE);
@@ -153,7 +153,7 @@ ensure_toggleref_capacity (int capacity)
                while (toggleref_array_capacity < toggleref_array_size + capacity)
                        toggleref_array_capacity *= 2;
 
-               tmp = sgen_alloc_internal_dynamic (
+               tmp = (MonoGCToggleRef *)sgen_alloc_internal_dynamic (
                        toggleref_array_capacity * sizeof (MonoGCToggleRef),
                        INTERNAL_MEM_TOGGLEREF_DATA,
                        TRUE);
@@ -210,7 +210,7 @@ static MonoToggleRefStatus
 test_toggleref_callback (MonoObject *obj)
 {
        static MonoClassField *mono_toggleref_test_field;
-       int status = MONO_TOGGLE_REF_DROP;
+       MonoToggleRefStatus status = MONO_TOGGLE_REF_DROP;
 
        if (!mono_toggleref_test_field) {
                mono_toggleref_test_field = mono_class_get_field_from_name (mono_object_get_class (obj), "__test");

diff --git a/mono/metadata/socket-io.c b/mono/metadata/socket-io.c
index 0b2efc361d21baaf7fc61ef5187342d269333282..55c766fbe09c6ba032ac26563c4d43d73a6f9943 100644 (file)
--- a/mono/metadata/socket-io.c
+++ b/mono/metadata/socket-io.c
@@ -648,19 +648,19 @@ ves_icall_System_Net_Sockets_Socket_Socket_internal (MonoObject *this_obj, gint3
        
        *error = 0;
        
-       sock_family=convert_family(family);
+       sock_family = convert_family ((MonoAddressFamily)family);
        if(sock_family==-1) {
                *error = WSAEAFNOSUPPORT;
                return(NULL);
        }
 
-       sock_proto=convert_proto(proto);
+       sock_proto = convert_proto ((MonoProtocolType)proto);
        if(sock_proto==-1) {
                *error = WSAEPROTONOSUPPORT;
                return(NULL);
        }
        
-       sock_type=convert_type(type);
+       sock_type = convert_type ((MonoSocketType)type);
        if(sock_type==-1) {
                *error = WSAESOCKTNOSUPPORT;
                return(NULL);
@@ -690,7 +690,10 @@ ves_icall_System_Net_Sockets_Socket_Close_internal (SOCKET sock, gint32 *error)
        /* Clear any pending work item from this socket if the underlying
         * polling system does not notify when the socket is closed */
        mono_threadpool_ms_io_remove_socket (GPOINTER_TO_INT (sock));
+
+       MONO_PREPARE_BLOCKING;
        closesocket(sock);
+       MONO_FINISH_BLOCKING;
 }
 
 gint32
@@ -964,12 +967,12 @@ ves_icall_System_Net_Sockets_Socket_LocalEndPoint_internal (SOCKET sock, gint32
        
        *error = 0;
        
-       salen = get_sockaddr_size (convert_family (af));
+       salen = get_sockaddr_size (convert_family ((MonoAddressFamily)af));
        if (salen == 0) {
                *error = WSAEAFNOSUPPORT;
                return NULL;
        }
-       sa = (salen <= 128) ? alloca (salen) : g_malloc0 (salen);
+       sa = (salen <= 128) ? (gchar *)alloca (salen) : (gchar *)g_malloc0 (salen);
 
        MONO_PREPARE_BLOCKING;
 
@@ -1002,12 +1005,12 @@ ves_icall_System_Net_Sockets_Socket_RemoteEndPoint_internal (SOCKET sock, gint32
        
        *error = 0;
        
-       salen = get_sockaddr_size (convert_family (af));
+       salen = get_sockaddr_size (convert_family ((MonoAddressFamily)af));
        if (salen == 0) {
                *error = WSAEAFNOSUPPORT;
                return NULL;
        }
-       sa = (salen <= 128) ? alloca (salen) : g_malloc0 (salen);
+       sa = (salen <= 128) ? (gchar *)alloca (salen) : (gchar *)g_malloc0 (salen);
        /* Note: linux returns just 2 for AF_UNIX. Always. */
 
        MONO_PREPARE_BLOCKING;
@@ -1057,7 +1060,7 @@ create_sockaddr_from_object(MonoObject *saddr_obj, socklen_t *sa_size, gint32 *e
                mono_raise_exception (mono_exception_from_name(mono_get_corlib (), "System", "SystemException"));
        }
        
-       family = convert_family (mono_array_get (data, guint8, 0) + (mono_array_get (data, guint8, 1) << 8));
+       family = convert_family ((MonoAddressFamily)(mono_array_get (data, guint8, 0) + (mono_array_get (data, guint8, 1) << 8)));
        if (family == AF_INET) {
                struct sockaddr_in *sa;
                guint16 port;
@@ -1230,7 +1233,7 @@ ves_icall_System_Net_Sockets_Socket_Poll_internal (SOCKET sock, gint mode,
                }
 
                if (ret == -1 && errno == EINTR) {
-                       if (mono_thread_test_state (thread, ThreadState_AbortRequested | ThreadState_StopRequested)) {
+                       if (mono_thread_test_state (thread, (MonoThreadState)(ThreadState_AbortRequested | ThreadState_StopRequested))) {
                                g_free (pfds);
                                return FALSE;
                        }
@@ -1332,8 +1335,8 @@ ves_icall_System_Net_Sockets_Socket_Disconnect_internal (SOCKET sock, MonoBoolea
         * pointers to functions in managed objects that still works
         * on 64bit platforms.
         */
-       ret = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER, (void *)&disco_guid, sizeof(GUID),
-                       (void *)&_wapi_disconnectex, sizeof(void *), &output_bytes, NULL, NULL);
+       ret = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER, (gchar *)&disco_guid, sizeof(GUID),
+                       (gchar *)&_wapi_disconnectex, sizeof(void *), &output_bytes, NULL, NULL);
 
        MONO_FINISH_BLOCKING;
 
@@ -1353,8 +1356,8 @@ ves_icall_System_Net_Sockets_Socket_Disconnect_internal (SOCKET sock, MonoBoolea
                 * For an explanation of why this is done, you can read
                 * the article at http://www.codeproject.com/internet/jbsocketserver3.asp
                 */
-               ret = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER, (void *)&trans_guid, sizeof(GUID),
-                               (void *)&_wapi_transmitfile, sizeof(void *), &output_bytes, NULL, NULL);
+               ret = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER, (gchar *)&trans_guid, sizeof(GUID),
+                               (gchar *)&_wapi_transmitfile, sizeof(void *), &output_bytes, NULL, NULL);
 
                MONO_FINISH_BLOCKING;
 
@@ -1817,7 +1820,7 @@ ves_icall_System_Net_Sockets_Socket_Select_internal (MonoArray **sockets, gint32
                }
 
                if (ret == -1 && errno == EINTR) {
-                       if (mono_thread_test_state (thread, ThreadState_AbortRequested | ThreadState_StopRequested)) {
+                       if (mono_thread_test_state (thread, (MonoThreadState)(ThreadState_AbortRequested | ThreadState_StopRequested))) {
                                g_free (pfds);
                                *sockets = NULL;
                                return;
@@ -1921,7 +1924,7 @@ ves_icall_System_Net_Sockets_Socket_GetSocketOption_obj_internal (SOCKET sock, g
 #endif
        {
 
-               ret = convert_sockopt_level_and_name (level, name, &system_level, &system_name);
+               ret = convert_sockopt_level_and_name ((MonoSocketOptionLevel)level, (MonoSocketOptionName)name, &system_level, &system_name);
        }
 
        if(ret==-1) {
@@ -2051,7 +2054,7 @@ ves_icall_System_Net_Sockets_Socket_GetSocketOption_arr_internal (SOCKET sock, g
        
        *error = 0;
        
-       ret=convert_sockopt_level_and_name(level, name, &system_level,
+       ret=convert_sockopt_level_and_name((MonoSocketOptionLevel)level, (MonoSocketOptionName)name, &system_level,
                                           &system_name);
        if(ret==-1) {
                *error = WSAENOPROTOOPT;
@@ -2167,7 +2170,7 @@ ves_icall_System_Net_Sockets_Socket_SetSocketOption_internal (SOCKET sock, gint3
        sol_ipv6 = mono_networking_get_ipv6_protocol ();
        sol_ip = mono_networking_get_ip_protocol ();
 
-       ret=convert_sockopt_level_and_name(level, name, &system_level,
+       ret=convert_sockopt_level_and_name((MonoSocketOptionLevel)level, (MonoSocketOptionName)name, &system_level,
                                           &system_name);
 
 #if !defined(SO_EXCLUSIVEADDRUSE) && defined(SO_REUSEADDR)
@@ -2218,7 +2221,7 @@ ves_icall_System_Net_Sockets_Socket_SetSocketOption_internal (SOCKET sock, gint3
                                 *      Get group address
                                 */
                                field = mono_class_get_field_from_name (obj_val->vtable->klass, "group");
-                               address = *(gpointer *)(((char *)obj_val) + field->offset);
+                               address = *(MonoObject **)(((char *)obj_val) + field->offset);
                                
                                if(address) {
                                        mreq6.ipv6mr_multiaddr = ipaddress_to_struct_in6_addr (address);
@@ -2257,7 +2260,7 @@ ves_icall_System_Net_Sockets_Socket_SetSocketOption_internal (SOCKET sock, gint3
                                 * those :-(
                                 */
                                field = mono_class_get_field_from_name (obj_val->vtable->klass, "group");
-                               address = *(gpointer *)(((char *)obj_val) + field->offset);
+                               address = *(MonoObject **)(((char *)obj_val) + field->offset);
 
                                /* address might not be defined and if so, set the address to ADDR_ANY.
                                 */
@@ -2266,7 +2269,7 @@ ves_icall_System_Net_Sockets_Socket_SetSocketOption_internal (SOCKET sock, gint3
                                }
 
                                field = mono_class_get_field_from_name (obj_val->vtable->klass, "local");
-                               address = *(gpointer *)(((char *)obj_val) + field->offset);
+                               address = *(MonoObject **)(((char *)obj_val) + field->offset);
 
 #ifdef HAVE_STRUCT_IP_MREQN
                                if(address) {

diff --git a/mono/metadata/threadpool-ms-io-poll.c b/mono/metadata/threadpool-ms-io-poll.c
index f7ae6246f2fe1b0464f342c08562fd32e3a350c7..4adae56791b40af7ffab900966b10c267a908000 100644 (file)
--- a/mono/metadata/threadpool-ms-io-poll.c
+++ b/mono/metadata/threadpool-ms-io-poll.c
@@ -74,7 +74,7 @@ poll_register_fd (gint fd, gint events, gboolean is_new)
                poll_fds_capacity *= 2;
                g_assert (poll_fds_size <= poll_fds_capacity);
 
-               poll_fds = g_renew (mono_pollfd, poll_fds, poll_fds_capacity);
+               poll_fds = (mono_pollfd *)g_renew (mono_pollfd, poll_fds, poll_fds_capacity);
        }
 
        POLL_INIT_FD (&poll_fds [poll_fds_size - 1], fd, poll_event);

diff --git a/mono/metadata/threadpool-ms-io.c b/mono/metadata/threadpool-ms-io.c
index 6ac26ed033c111604bba586cfa527ea766b8e8dd..3c931eb7b3d1fee75441268c0ff174c930029ce9 100644 (file)
--- a/mono/metadata/threadpool-ms-io.c
+++ b/mono/metadata/threadpool-ms-io.c
@@ -92,8 +92,8 @@ typedef struct {
 
        ThreadPoolIOUpdate updates [UPDATES_CAPACITY];
        gint updates_size;
-       mono_mutex_t updates_lock;
-       mono_cond_t updates_cond;
+       MonoCoopMutex updates_lock;
+       MonoCoopCond updates_cond;
 
 #if !defined(HOST_WIN32)
        gint wakeup_pipes [2];
@@ -203,12 +203,12 @@ static void
 filter_jobs_for_domain (gpointer key, gpointer value, gpointer user_data)
 {
        FilterSockaresForDomainData *data;
-       MonoMList *list = value, *element;
+       MonoMList *list = (MonoMList *)value, *element;
        MonoDomain *domain;
        MonoGHashTable *states;
 
        g_assert (user_data);
-       data = user_data;
+       data = (FilterSockaresForDomainData *)user_data;
        domain = data->domain;
        states = data->states;
 
@@ -259,7 +259,7 @@ wait_callback (gint fd, gint events, gpointer user_data)
                gint operations;
 
                g_assert (user_data);
-               states = user_data;
+               states = (MonoGHashTable *)user_data;
 
                mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_THREADPOOL, "io threadpool: cal fd %3d, events = %2s | %2s | %3s",
                        fd, (events & EVENT_IN) ? "RD" : "..", (events & EVENT_OUT) ? "WR" : "..", (events & EVENT_ERR) ? "ERR" : "...");
@@ -316,7 +316,7 @@ selector_thread (gpointer data)
                gint i, j;
                gint res;
 
-               mono_mutex_lock (&threadpool_io->updates_lock);
+               mono_coop_mutex_lock (&threadpool_io->updates_lock);
 
                for (i = 0; i < threadpool_io->updates_size; ++i) {
                        ThreadPoolIOUpdate *update = &threadpool_io->updates [i];
@@ -399,14 +399,14 @@ selector_thread (gpointer data)
                        }
                }
 
-               mono_cond_broadcast (&threadpool_io->updates_cond);
+               mono_coop_cond_broadcast (&threadpool_io->updates_cond);
 
                if (threadpool_io->updates_size > 0) {
                        threadpool_io->updates_size = 0;
                        memset (&threadpool_io->updates, 0, UPDATES_CAPACITY * sizeof (ThreadPoolIOUpdate));
                }
 
-               mono_mutex_unlock (&threadpool_io->updates_lock);
+               mono_coop_mutex_unlock (&threadpool_io->updates_lock);
 
                mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_THREADPOOL, "io threadpool: wai");
 
@@ -432,7 +432,7 @@ update_get_new (void)
                /* we wait for updates to be applied in the selector_thread and we loop
                 * as long as none are available. if it happends too much, then we need
                 * to increase UPDATES_CAPACITY */
-               mono_cond_wait (&threadpool_io->updates_cond, &threadpool_io->updates_lock);
+               mono_coop_cond_wait (&threadpool_io->updates_cond, &threadpool_io->updates_lock);
        }
 
        g_assert (threadpool_io->updates_size < UPDATES_CAPACITY);
@@ -506,9 +506,9 @@ initialize (void)
        threadpool_io = g_new0 (ThreadPoolIO, 1);
        g_assert (threadpool_io);
 
-       mono_mutex_init_recursive (&threadpool_io->updates_lock);
-       mono_cond_init (&threadpool_io->updates_cond, 0);
-       mono_gc_register_root ((void*)&threadpool_io->updates [0], sizeof (threadpool_io->updates), MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_THREAD_POOL, "i/o thread pool updates list");
+       mono_coop_mutex_init (&threadpool_io->updates_lock);
+       mono_coop_cond_init (&threadpool_io->updates_cond);
+       mono_gc_register_root ((char *)&threadpool_io->updates [0], sizeof (threadpool_io->updates), MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_THREAD_POOL, "i/o thread pool updates list");
 
        threadpool_io->updates_size = 0;
 
@@ -541,8 +541,8 @@ cleanup (void)
        while (io_selector_running)
                g_usleep (1000);
 
-       mono_mutex_destroy (&threadpool_io->updates_lock);
-       mono_cond_destroy (&threadpool_io->updates_cond);
+       mono_coop_mutex_destroy (&threadpool_io->updates_lock);
+       mono_coop_cond_destroy (&threadpool_io->updates_cond);
 
        threadpool_io->backend.cleanup ();
 
@@ -583,7 +583,7 @@ ves_icall_System_IOSelector_Add (gpointer handle, MonoIOSelectorJob *job)
 
        mono_lazy_initialize (&io_status, initialize);
 
-       mono_mutex_lock (&threadpool_io->updates_lock);
+       mono_coop_mutex_lock (&threadpool_io->updates_lock);
 
        update = update_get_new ();
        update->type = UPDATE_ADD;
@@ -593,7 +593,7 @@ ves_icall_System_IOSelector_Add (gpointer handle, MonoIOSelectorJob *job)
 
        selector_thread_wakeup ();
 
-       mono_mutex_unlock (&threadpool_io->updates_lock);
+       mono_coop_mutex_unlock (&threadpool_io->updates_lock);
 }
 
 void
@@ -610,7 +610,7 @@ mono_threadpool_ms_io_remove_socket (int fd)
        if (!mono_lazy_is_initialized (&io_status))
                return;
 
-       mono_mutex_lock (&threadpool_io->updates_lock);
+       mono_coop_mutex_lock (&threadpool_io->updates_lock);
 
        update = update_get_new ();
        update->type = UPDATE_REMOVE_SOCKET;
@@ -619,9 +619,9 @@ mono_threadpool_ms_io_remove_socket (int fd)
 
        selector_thread_wakeup ();
 
-       mono_cond_wait (&threadpool_io->updates_cond, &threadpool_io->updates_lock);
+       mono_coop_cond_wait (&threadpool_io->updates_cond, &threadpool_io->updates_lock);
 
-       mono_mutex_unlock (&threadpool_io->updates_lock);
+       mono_coop_mutex_unlock (&threadpool_io->updates_lock);
 }
 
 void
@@ -632,7 +632,7 @@ mono_threadpool_ms_io_remove_domain_jobs (MonoDomain *domain)
        if (!mono_lazy_is_initialized (&io_status))
                return;
 
-       mono_mutex_lock (&threadpool_io->updates_lock);
+       mono_coop_mutex_lock (&threadpool_io->updates_lock);
 
        update = update_get_new ();
        update->type = UPDATE_REMOVE_DOMAIN;
@@ -641,9 +641,9 @@ mono_threadpool_ms_io_remove_domain_jobs (MonoDomain *domain)
 
        selector_thread_wakeup ();
 
-       mono_cond_wait (&threadpool_io->updates_cond, &threadpool_io->updates_lock);
+       mono_coop_cond_wait (&threadpool_io->updates_cond, &threadpool_io->updates_lock);
 
-       mono_mutex_unlock (&threadpool_io->updates_lock);
+       mono_coop_mutex_unlock (&threadpool_io->updates_lock);
 }
 
 #else

diff --git a/mono/metadata/threadpool-ms.c b/mono/metadata/threadpool-ms.c
index fd6fe24d461212d60f5ef72d90a8c46e2f39f436..17936001106381195303b13ea8c3ed9b0dc88863 100644 (file)
--- a/mono/metadata/threadpool-ms.c
+++ b/mono/metadata/threadpool-ms.c
@@ -49,6 +49,8 @@
 #define MONITOR_INTERVAL 100 // ms
 #define MONITOR_MINIMAL_LIFETIME 60 * 1000 // ms
 
+#define WORKER_CREATION_MAX_PER_SEC 10
+
 /* The exponent to apply to the gain. 1.0 means to use linear gain,
  * higher values will enhance large moves and damp small ones.
  * default: 2.0 */
@@ -125,12 +127,16 @@ typedef struct {
        ThreadPoolCounter counters;
 
        GPtrArray *domains; // ThreadPoolDomain* []
-       mono_mutex_t domains_lock;
+       MonoCoopMutex domains_lock;
 
        GPtrArray *working_threads; // ThreadPoolWorkingThread* []
        gint32 parked_threads_count;
-       mono_cond_t parked_threads_cond;
-       mono_mutex_t active_threads_lock; /* protect access to working_threads and parked_threads */
+       MonoCoopCond parked_threads_cond;
+       MonoCoopMutex active_threads_lock; /* protect access to working_threads and parked_threads */
+
+       guint32 worker_creation_current_second;
+       guint32 worker_creation_current_count;
+       MonoCoopMutex worker_creation_lock;
 
        gint32 heuristic_completions;
        guint32 heuristic_sample_start;
@@ -138,7 +144,7 @@ typedef struct {
        guint32 heuristic_last_adjustment; // ms
        guint32 heuristic_adjustment_interval; // ms
        ThreadPoolHillClimbing heuristic_hill_climbing;
-       mono_mutex_t heuristic_lock;
+       MonoCoopMutex heuristic_lock;
 
        gint32 limit_worker_min;
        gint32 limit_worker_max;
@@ -248,15 +254,18 @@ initialize (void)
        g_assert (threadpool);
 
        threadpool->domains = g_ptr_array_new ();
-       mono_mutex_init_recursive (&threadpool->domains_lock);
+       mono_coop_mutex_init (&threadpool->domains_lock);
 
        threadpool->parked_threads_count = 0;
-       mono_cond_init (&threadpool->parked_threads_cond, NULL);
+       mono_coop_cond_init (&threadpool->parked_threads_cond);
        threadpool->working_threads = g_ptr_array_new ();
-       mono_mutex_init_recursive (&threadpool->active_threads_lock);
+       mono_coop_mutex_init (&threadpool->active_threads_lock);
+
+       threadpool->worker_creation_current_second = -1;
+       mono_coop_mutex_init (&threadpool->worker_creation_lock);
 
        threadpool->heuristic_adjustment_interval = 10;
-       mono_mutex_init (&threadpool->heuristic_lock);
+       mono_coop_mutex_init (&threadpool->heuristic_lock);
 
        mono_rand_open ();
 
@@ -295,7 +304,12 @@ initialize (void)
        threads_count = mono_cpu_count () * threads_per_cpu;
 
        threadpool->limit_worker_min = threadpool->limit_io_min = threads_count;
+
+#if defined (PLATFORM_ANDROID) || defined (HOST_IOS)
+       threadpool->limit_worker_max = threadpool->limit_io_max = CLAMP (threads_count * 100, MIN (threads_count, 200), MAX (threads_count, 200));
+#else
        threadpool->limit_worker_max = threadpool->limit_io_max = threads_count * 100;
+#endif
 
        threadpool->counters._.max_working = threadpool->limit_worker_min;
 
@@ -315,23 +329,19 @@ cleanup (void)
         * cleaning up only if the runtime is shutting down */
        g_assert (mono_runtime_is_shutting_down ());
 
-       MONO_PREPARE_BLOCKING;
        while (monitor_status != MONITOR_STATUS_NOT_RUNNING)
-               g_usleep (1000);
-       MONO_FINISH_BLOCKING;
+               mono_thread_info_sleep (1, NULL);
 
-       MONO_PREPARE_BLOCKING;
-       mono_mutex_lock (&threadpool->active_threads_lock);
-       MONO_FINISH_BLOCKING;
+       mono_coop_mutex_lock (&threadpool->active_threads_lock);
 
        /* stop all threadpool->working_threads */
        for (i = 0; i < threadpool->working_threads->len; ++i)
                worker_kill ((ThreadPoolWorkingThread*) g_ptr_array_index (threadpool->working_threads, i));
 
        /* unpark all threadpool->parked_threads */
-       mono_cond_broadcast (&threadpool->parked_threads_cond);
+       mono_coop_cond_broadcast (&threadpool->parked_threads_cond);
 
-       mono_mutex_unlock (&threadpool->active_threads_lock);
+       mono_coop_mutex_unlock (&threadpool->active_threads_lock);
 }
 
 void
@@ -371,6 +381,7 @@ mono_threadpool_ms_enqueue_work_item (MonoDomain *domain, MonoObject *work_item)
        }
 }
 
+/* LOCKING: threadpool->domains_lock must be held */
 static void
 domain_add (ThreadPoolDomain *tpdomain)
 {
@@ -378,31 +389,25 @@ domain_add (ThreadPoolDomain *tpdomain)
 
        g_assert (tpdomain);
 
-       mono_mutex_lock (&threadpool->domains_lock);
        len = threadpool->domains->len;
        for (i = 0; i < len; ++i) {
                if (g_ptr_array_index (threadpool->domains, i) == tpdomain)
                        break;
        }
+
        if (i == len)
                g_ptr_array_add (threadpool->domains, tpdomain);
-       mono_mutex_unlock (&threadpool->domains_lock);
 }
 
+/* LOCKING: threadpool->domains_lock must be held */
 static gboolean
 domain_remove (ThreadPoolDomain *tpdomain)
 {
-       gboolean res;
-
        g_assert (tpdomain);
-
-       mono_mutex_lock (&threadpool->domains_lock);
-       res = g_ptr_array_remove (threadpool->domains, tpdomain);
-       mono_mutex_unlock (&threadpool->domains_lock);
-
-       return res;
+       return g_ptr_array_remove (threadpool->domains, tpdomain);
 }
 
+/* LOCKING: threadpool->domains_lock must be held */
 static ThreadPoolDomain *
 domain_get (MonoDomain *domain, gboolean create)
 {
@@ -411,20 +416,18 @@ domain_get (MonoDomain *domain, gboolean create)
 
        g_assert (domain);
 
-       mono_mutex_lock (&threadpool->domains_lock);
        for (i = 0; i < threadpool->domains->len; ++i) {
-               ThreadPoolDomain *tmp = g_ptr_array_index (threadpool->domains, i);
-               if (tmp->domain == domain) {
-                       tpdomain = tmp;
-                       break;
-               }
+               tpdomain = (ThreadPoolDomain *)g_ptr_array_index (threadpool->domains, i);
+               if (tpdomain->domain == domain)
+                       return tpdomain;
        }
-       if (!tpdomain && create) {
+
+       if (create) {
                tpdomain = g_new0 (ThreadPoolDomain, 1);
                tpdomain->domain = domain;
                domain_add (tpdomain);
        }
-       mono_mutex_unlock (&threadpool->domains_lock);
+
        return tpdomain;
 }
 
@@ -434,31 +437,28 @@ domain_free (ThreadPoolDomain *tpdomain)
        g_free (tpdomain);
 }
 
+/* LOCKING: threadpool->domains_lock must be held */
 static gboolean
 domain_any_has_request (void)
 {
-       gboolean res = FALSE;
        guint i;
 
-       mono_mutex_lock (&threadpool->domains_lock);
        for (i = 0; i < threadpool->domains->len; ++i) {
-               ThreadPoolDomain *tmp = g_ptr_array_index (threadpool->domains, i);
-               if (tmp->outstanding_request > 0) {
-                       res = TRUE;
-                       break;
-               }
+               ThreadPoolDomain *tmp = (ThreadPoolDomain *)g_ptr_array_index (threadpool->domains, i);
+               if (tmp->outstanding_request > 0)
+                       return TRUE;
        }
-       mono_mutex_unlock (&threadpool->domains_lock);
-       return res;
+
+       return FALSE;
 }
 
+/* LOCKING: threadpool->domains_lock must be held */
 static ThreadPoolDomain *
 domain_get_next (ThreadPoolDomain *current)
 {
        ThreadPoolDomain *tpdomain = NULL;
        guint len;
 
-       mono_mutex_lock (&threadpool->domains_lock);
        len = threadpool->domains->len;
        if (len > 0) {
                guint i, current_idx = -1;
@@ -472,23 +472,23 @@ domain_get_next (ThreadPoolDomain *current)
                        g_assert (current_idx >= 0);
                }
                for (i = current_idx + 1; i < len + current_idx + 1; ++i) {
-                       ThreadPoolDomain *tmp = g_ptr_array_index (threadpool->domains, i % len);
+                       ThreadPoolDomain *tmp = (ThreadPoolDomain *)g_ptr_array_index (threadpool->domains, i % len);
                        if (tmp->outstanding_request > 0) {
                                tpdomain = tmp;
                                break;
                        }
                }
        }
-       mono_mutex_unlock (&threadpool->domains_lock);
+
        return tpdomain;
 }
 
 static void
 worker_wait_interrupt (gpointer data)
 {
-       mono_mutex_lock (&threadpool->active_threads_lock);
-       mono_cond_signal (&threadpool->parked_threads_cond);
-       mono_mutex_unlock (&threadpool->active_threads_lock);
+       mono_coop_mutex_lock (&threadpool->active_threads_lock);
+       mono_coop_cond_signal (&threadpool->parked_threads_cond);
+       mono_coop_mutex_unlock (&threadpool->active_threads_lock);
 }
 
 /* return TRUE if timeout, FALSE otherwise (worker unpark or interrupt) */
@@ -501,9 +501,7 @@ worker_park (void)
 
        mono_gc_set_skip_thread (TRUE);
 
-       MONO_PREPARE_BLOCKING;
-
-       mono_mutex_lock (&threadpool->active_threads_lock);
+       mono_coop_mutex_lock (&threadpool->active_threads_lock);
 
        if (!mono_runtime_is_shutting_down ()) {
                static gpointer rand_handle = NULL;
@@ -524,7 +522,7 @@ worker_park (void)
                if (interrupted)
                        goto done;
 
-               if (mono_cond_timedwait_ms (&threadpool->parked_threads_cond, &threadpool->active_threads_lock, rand_next (rand_handle, 5 * 1000, 60 * 1000)) != 0)
+               if (mono_coop_cond_timedwait (&threadpool->parked_threads_cond, &threadpool->active_threads_lock, rand_next ((void **)rand_handle, 5 * 1000, 60 * 1000)) != 0)
                        timeout = TRUE;
 
                mono_thread_info_uninstall_interrupt (&interrupted);
@@ -534,9 +532,7 @@ done:
                threadpool->parked_threads_count -= 1;
        }
 
-       mono_mutex_unlock (&threadpool->active_threads_lock);
-
-       MONO_FINISH_BLOCKING;
+       mono_coop_mutex_unlock (&threadpool->active_threads_lock);
 
        mono_gc_set_skip_thread (FALSE);
 
@@ -552,16 +548,12 @@ worker_try_unpark (void)
 
        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try unpark worker", mono_native_thread_id_get ());
 
-       MONO_PREPARE_BLOCKING;
-
-       mono_mutex_lock (&threadpool->active_threads_lock);
+       mono_coop_mutex_lock (&threadpool->active_threads_lock);
        if (threadpool->parked_threads_count > 0) {
-               mono_cond_signal (&threadpool->parked_threads_cond);
+               mono_coop_cond_signal (&threadpool->parked_threads_cond);
                res = TRUE;
        }
-       mono_mutex_unlock (&threadpool->active_threads_lock);
-
-       MONO_FINISH_BLOCKING;
+       mono_coop_mutex_unlock (&threadpool->active_threads_lock);
 
        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try unpark worker, success? %s", mono_native_thread_id_get (), res ? "yes" : "no");
 
@@ -594,23 +586,21 @@ worker_thread (gpointer data)
 
        mono_thread_set_name_internal (thread, mono_string_new (mono_domain_get (), "Threadpool worker"), FALSE);
 
-       MONO_PREPARE_BLOCKING;
-       mono_mutex_lock (&threadpool->active_threads_lock);
+       mono_coop_mutex_lock (&threadpool->active_threads_lock);
        g_ptr_array_add (threadpool->working_threads, thread);
-       mono_mutex_unlock (&threadpool->active_threads_lock);
-       MONO_FINISH_BLOCKING;
+       mono_coop_mutex_unlock (&threadpool->active_threads_lock);
 
        previous_tpdomain = NULL;
 
-       mono_mutex_lock (&threadpool->domains_lock);
+       mono_coop_mutex_lock (&threadpool->domains_lock);
 
        while (!mono_runtime_is_shutting_down ()) {
                tpdomain = NULL;
 
                if ((thread->state & (ThreadState_StopRequested | ThreadState_SuspendRequested)) != 0) {
-                       mono_mutex_unlock (&threadpool->domains_lock);
+                       mono_coop_mutex_unlock (&threadpool->domains_lock);
                        mono_thread_interruption_checkpoint ();
-                       mono_mutex_lock (&threadpool->domains_lock);
+                       mono_coop_mutex_lock (&threadpool->domains_lock);
                }
 
                if (retire || !(tpdomain = domain_get_next (previous_tpdomain))) {
@@ -621,9 +611,9 @@ worker_thread (gpointer data)
                                counter._.parked ++;
                        });
 
-                       mono_mutex_unlock (&threadpool->domains_lock);
+                       mono_coop_mutex_unlock (&threadpool->domains_lock);
                        timeout = worker_park ();
-                       mono_mutex_lock (&threadpool->domains_lock);
+                       mono_coop_mutex_lock (&threadpool->domains_lock);
 
                        COUNTER_ATOMIC (counter, {
                                counter._.working ++;
@@ -649,7 +639,7 @@ worker_thread (gpointer data)
                g_assert (tpdomain->domain->threadpool_jobs >= 0);
                tpdomain->domain->threadpool_jobs ++;
 
-               mono_mutex_unlock (&threadpool->domains_lock);
+               mono_coop_mutex_unlock (&threadpool->domains_lock);
 
                mono_thread_push_appdomain_ref (tpdomain->domain);
                if (mono_domain_set (tpdomain->domain, FALSE)) {
@@ -660,7 +650,7 @@ worker_thread (gpointer data)
                        else if (res && *(MonoBoolean*) mono_object_unbox (res) == FALSE)
                                retire = TRUE;
 
-                       mono_thread_clr_state (thread , ~ThreadState_Background);
+                       mono_thread_clr_state (thread, (MonoThreadState)~ThreadState_Background);
                        if (!mono_thread_test_state (thread , ThreadState_Background))
                                ves_icall_System_Threading_Thread_SetState (thread, ThreadState_Background);
 
@@ -668,7 +658,7 @@ worker_thread (gpointer data)
                }
                mono_thread_pop_appdomain_ref ();
 
-               mono_mutex_lock (&threadpool->domains_lock);
+               mono_coop_mutex_lock (&threadpool->domains_lock);
 
                tpdomain->domain->threadpool_jobs --;
                g_assert (tpdomain->domain->threadpool_jobs >= 0);
@@ -685,13 +675,11 @@ worker_thread (gpointer data)
                previous_tpdomain = tpdomain;
        }
 
-       mono_mutex_unlock (&threadpool->domains_lock);
+       mono_coop_mutex_unlock (&threadpool->domains_lock);
 
-       MONO_PREPARE_BLOCKING;
-       mono_mutex_lock (&threadpool->active_threads_lock);
+       mono_coop_mutex_lock (&threadpool->active_threads_lock);
        g_ptr_array_remove_fast (threadpool->working_threads, thread);
-       mono_mutex_unlock (&threadpool->active_threads_lock);
-       MONO_FINISH_BLOCKING;
+       mono_coop_mutex_unlock (&threadpool->active_threads_lock);
 
        COUNTER_ATOMIC (counter, {
                counter._.working--;
@@ -706,29 +694,56 @@ worker_try_create (void)
 {
        ThreadPoolCounter counter;
        MonoInternalThread *thread;
+       gint32 now;
+
+       mono_coop_mutex_lock (&threadpool->worker_creation_lock);
 
        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try create worker", mono_native_thread_id_get ());
 
+       if ((now = mono_100ns_ticks () / 10 / 1000 / 1000) == 0) {
+               g_warning ("failed to get 100ns ticks");
+       } else {
+               if (threadpool->worker_creation_current_second != now) {
+                       threadpool->worker_creation_current_second = now;
+                       threadpool->worker_creation_current_count = 0;
+               } else {
+                       g_assert (threadpool->worker_creation_current_count <= WORKER_CREATION_MAX_PER_SEC);
+                       if (threadpool->worker_creation_current_count == WORKER_CREATION_MAX_PER_SEC) {
+                               mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try create worker, failed: maximum number of worker created per second reached, current count = %d",
+                                       mono_native_thread_id_get (), threadpool->worker_creation_current_count);
+                               mono_coop_mutex_unlock (&threadpool->worker_creation_lock);
+                               return FALSE;
+                       }
+               }
+       }
+
        COUNTER_ATOMIC (counter, {
-               if (counter._.working >= counter._.max_working)
+               if (counter._.working >= counter._.max_working) {
+                       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try create worker, failed: maximum number of working threads reached",
+                               mono_native_thread_id_get ());
+                       mono_coop_mutex_unlock (&threadpool->worker_creation_lock);
                        return FALSE;
+               }
                counter._.working ++;
                counter._.active ++;
        });
 
        if ((thread = mono_thread_create_internal (mono_get_root_domain (), worker_thread, NULL, TRUE, 0)) != NULL) {
-               mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try create worker, created %p",
-                       mono_native_thread_id_get (), thread->tid);
+               threadpool->worker_creation_current_count += 1;
+
+               mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try create worker, created %p, now = %d count = %d", mono_native_thread_id_get (), thread->tid, now, threadpool->worker_creation_current_count);
+               mono_coop_mutex_unlock (&threadpool->worker_creation_lock);
                return TRUE;
        }
 
-       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try create worker, failed", mono_native_thread_id_get ());
+       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] try create worker, failed: could not create thread", mono_native_thread_id_get ());
 
        COUNTER_ATOMIC (counter, {
                counter._.working --;
                counter._.active --;
        });
 
+       mono_coop_mutex_unlock (&threadpool->worker_creation_lock);
        return FALSE;
 }
 
@@ -745,11 +760,11 @@ worker_request (MonoDomain *domain)
        if (mono_runtime_is_shutting_down ())
                return FALSE;
 
-       mono_mutex_lock (&threadpool->domains_lock);
+       mono_coop_mutex_lock (&threadpool->domains_lock);
 
        /* synchronize check with worker_thread */
        if (mono_domain_is_unloading (domain)) {
-               mono_mutex_unlock (&threadpool->domains_lock);
+               mono_coop_mutex_unlock (&threadpool->domains_lock);
                return FALSE;
        }
 
@@ -760,7 +775,7 @@ worker_request (MonoDomain *domain)
        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] request worker, domain = %p, outstanding_request = %d",
                mono_native_thread_id_get (), tpdomain->domain, tpdomain->outstanding_request);
 
-       mono_mutex_unlock (&threadpool->domains_lock);
+       mono_coop_mutex_unlock (&threadpool->domains_lock);
 
        if (threadpool->suspended)
                return FALSE;
@@ -794,8 +809,10 @@ monitor_should_keep_running (void)
                if (mono_runtime_is_shutting_down ()) {
                        should_keep_running = FALSE;
                } else {
+                       mono_coop_mutex_lock (&threadpool->domains_lock);
                        if (!domain_any_has_request ())
                                should_keep_running = FALSE;
+                       mono_coop_mutex_unlock (&threadpool->domains_lock);
 
                        if (!should_keep_running) {
                                if (last_should_keep_running == -1 || mono_100ns_ticks () - last_should_keep_running < MONITOR_MINIMAL_LIFETIME * 1000 * 10) {
@@ -882,25 +899,41 @@ monitor_thread (void)
                if (threadpool->suspended)
                        continue;
 
-               if (mono_runtime_is_shutting_down () || !domain_any_has_request ())
+               if (mono_runtime_is_shutting_down ())
                        continue;
 
-               MONO_PREPARE_BLOCKING;
-               mono_mutex_lock (&threadpool->active_threads_lock);
+               mono_coop_mutex_lock (&threadpool->domains_lock);
+               if (!domain_any_has_request ()) {
+                       mono_coop_mutex_unlock (&threadpool->domains_lock);
+                       continue;
+               }
+               mono_coop_mutex_unlock (&threadpool->domains_lock);
+
+
+               mono_coop_mutex_lock (&threadpool->active_threads_lock);
                for (i = 0; i < threadpool->working_threads->len; ++i) {
-                       thread = g_ptr_array_index (threadpool->working_threads, i);
+                       thread = (MonoInternalThread *)g_ptr_array_index (threadpool->working_threads, i);
                        if ((thread->state & ThreadState_WaitSleepJoin) == 0) {
                                all_waitsleepjoin = FALSE;
                                break;
                        }
                }
-               mono_mutex_unlock (&threadpool->active_threads_lock);
-               MONO_FINISH_BLOCKING;
+               mono_coop_mutex_unlock (&threadpool->active_threads_lock);
 
                if (all_waitsleepjoin) {
                        ThreadPoolCounter counter;
-                       COUNTER_ATOMIC (counter, { counter._.max_working ++; });
-                       hill_climbing_force_change (counter._.max_working, TRANSITION_STARVATION);
+                       gboolean limit_worker_max_reached = FALSE;
+
+                       COUNTER_ATOMIC (counter, {
+                               if (counter._.max_working >= threadpool->limit_worker_max) {
+                                       limit_worker_max_reached = TRUE;
+                                       break;
+                               }
+                               counter._.max_working ++;
+                       });
+
+                       if (!limit_worker_max_reached)
+                               hill_climbing_force_change (counter._.max_working, TRANSITION_STARVATION);
                }
 
                threadpool->cpu_usage = mono_cpu_usage (threadpool->cpu_usage_state);
@@ -1249,7 +1282,7 @@ heuristic_adjust (void)
 {
        g_assert (threadpool);
 
-       if (mono_mutex_trylock (&threadpool->heuristic_lock) == 0) {
+       if (mono_coop_mutex_trylock (&threadpool->heuristic_lock) == 0) {
                gint32 completions = InterlockedExchange (&threadpool->heuristic_completions, 0);
                guint32 sample_end = mono_msec_ticks ();
                guint32 sample_duration = sample_end - threadpool->heuristic_sample_start;
@@ -1270,7 +1303,7 @@ heuristic_adjust (void)
                        threadpool->heuristic_last_adjustment = mono_msec_ticks ();
                }
 
-               mono_mutex_unlock (&threadpool->heuristic_lock);
+               mono_coop_mutex_unlock (&threadpool->heuristic_lock);
        }
 }
 
@@ -1439,12 +1472,16 @@ mono_threadpool_ms_resume (void)
 void
 ves_icall_System_Threading_ThreadPool_GetAvailableThreadsNative (gint32 *worker_threads, gint32 *completion_port_threads)
 {
+       ThreadPoolCounter counter;
+
        if (!worker_threads || !completion_port_threads)
                return;
 
        mono_lazy_initialize (&status, initialize);
 
-       *worker_threads = threadpool->limit_worker_max;
+       counter.as_gint64 = COUNTER_READ ();
+
+       *worker_threads = MAX (0, threadpool->limit_worker_max - counter._.active);
        *completion_port_threads = threadpool->limit_io_max;
 }
 
@@ -1482,8 +1519,8 @@ ves_icall_System_Threading_ThreadPool_SetMinThreadsNative (gint32 worker_threads
        if (completion_port_threads <= 0 || completion_port_threads > threadpool->limit_io_max)
                return FALSE;
 
-       threadpool->limit_worker_max = worker_threads;
-       threadpool->limit_io_max = completion_port_threads;
+       threadpool->limit_worker_min = worker_threads;
+       threadpool->limit_io_min = completion_port_threads;
 
        return TRUE;
 }

diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
index 588cafd10fc4d6642bce9c6c53c998c753dc2556..9e7e8ff34afb56be69e98da5a2b6e534c1fe04fc 100644 (file)
--- a/mono/metadata/threads.c
+++ b/mono/metadata/threads.c
@@ -128,11 +128,11 @@ typedef struct {
 /* Controls access to the 'threads' hash table */
 static void mono_threads_lock (void);
 static void mono_threads_unlock (void);
-static mono_mutex_t threads_mutex;
+static MonoCoopMutex threads_mutex;
 
 /* Controls access to the 'joinable_threads' hash table */
-#define joinable_threads_lock() mono_mutex_lock (&joinable_threads_mutex)
-#define joinable_threads_unlock() mono_mutex_unlock (&joinable_threads_mutex)
+#define joinable_threads_lock() mono_os_mutex_lock (&joinable_threads_mutex)
+#define joinable_threads_unlock() mono_os_mutex_unlock (&joinable_threads_mutex)
 static mono_mutex_t joinable_threads_mutex;
 
 /* Holds current status of static data heap */
@@ -204,14 +204,13 @@ static gboolean mono_thread_resume (MonoInternalThread* thread);
 static void abort_thread_internal (MonoInternalThread *thread, gboolean can_raise_exception, gboolean install_async_abort);
 static void suspend_thread_internal (MonoInternalThread *thread, gboolean interrupt);
 static void self_suspend_internal (MonoInternalThread *thread);
-static gboolean resume_thread_internal (MonoInternalThread *thread);
 
 static MonoException* mono_thread_execute_interruption ();
 static void ref_stack_destroy (gpointer rs);
 
 /* Spin lock for InterlockedXXX 64 bit functions */
-#define mono_interlocked_lock() mono_mutex_lock (&interlocked_mutex)
-#define mono_interlocked_unlock() mono_mutex_unlock (&interlocked_mutex)
+#define mono_interlocked_lock() mono_os_mutex_lock (&interlocked_mutex)
+#define mono_interlocked_unlock() mono_os_mutex_unlock (&interlocked_mutex)
 static mono_mutex_t interlocked_mutex;
 
 /* global count of thread interruptions requested */
@@ -227,15 +226,13 @@ static gint32 managed_thread_id_counter = 0;
 static void
 mono_threads_lock (void)
 {
-       MONO_TRY_BLOCKING;
-       mono_locks_acquire (&threads_mutex, ThreadsLock);
-       MONO_FINISH_TRY_BLOCKING;
+       mono_locks_coop_acquire (&threads_mutex, ThreadsLock);
 }
 
 static void
 mono_threads_unlock (void)
 {
-       mono_locks_release (&threads_mutex, ThreadsLock);
+       mono_locks_coop_release (&threads_mutex, ThreadsLock);
 }
 
 
@@ -349,19 +346,19 @@ static gboolean handle_remove(MonoInternalThread *thread)
 
 static void ensure_synch_cs_set (MonoInternalThread *thread)
 {
-       mono_mutex_t *synch_cs;
+       MonoCoopMutex *synch_cs;
 
        if (thread->synch_cs != NULL) {
                return;
        }
 
-       synch_cs = g_new0 (mono_mutex_t, 1);
-       mono_mutex_init_recursive (synch_cs);
+       synch_cs = g_new0 (MonoCoopMutex, 1);
+       mono_coop_mutex_init_recursive (synch_cs);
 
        if (InterlockedCompareExchangePointer ((gpointer *)&thread->synch_cs,
                                               synch_cs, NULL) != NULL) {
                /* Another thread must have installed this CS */
-               mono_mutex_destroy (synch_cs);
+               mono_coop_mutex_destroy (synch_cs);
                g_free (synch_cs);
        }
 }
@@ -374,15 +371,13 @@ lock_thread (MonoInternalThread *thread)
 
        g_assert (thread->synch_cs);
 
-       MONO_TRY_BLOCKING;
-       mono_mutex_lock (thread->synch_cs);
-       MONO_FINISH_TRY_BLOCKING;
+       mono_coop_mutex_lock (thread->synch_cs);
 }
 
 static inline void
 unlock_thread (MonoInternalThread *thread)
 {
-       mono_mutex_unlock (thread->synch_cs);
+       mono_coop_mutex_unlock (thread->synch_cs);
 }
 
 /*
@@ -554,7 +549,7 @@ get_current_thread_ptr_for_domain (MonoDomain *domain, MonoInternalThread *threa
        mono_domain_unlock (domain);
        g_assert (offset);
 
-       return get_thread_static_data (thread, offset);
+       return (MonoThread **)get_thread_static_data (thread, offset);
 }
 
 static void
@@ -592,8 +587,8 @@ create_internal_thread (void)
        vt = mono_class_vtable (mono_get_root_domain (), mono_defaults.internal_thread_class);
        thread = (MonoInternalThread*)mono_gc_alloc_mature (vt);
 
-       thread->synch_cs = g_new0 (mono_mutex_t, 1);
-       mono_mutex_init_recursive (thread->synch_cs);
+       thread->synch_cs = g_new0 (MonoCoopMutex, 1);
+       mono_coop_mutex_init_recursive (thread->synch_cs);
 
        thread->apartment_state = ThreadApartmentState_Unknown;
        thread->managed_id = get_next_managed_thread_id ();
@@ -816,10 +811,8 @@ create_thread (MonoThread *thread, MonoInternalThread *internal, StartInfo *star
         */
        create_flags = CREATE_SUSPENDED;
 
-       MONO_PREPARE_BLOCKING;
        thread_handle = mono_threads_create_thread ((LPTHREAD_START_ROUTINE)start_wrapper, start_info,
                                                                                                stack_size, create_flags, &tid);
-       MONO_FINISH_BLOCKING;
 
        if (thread_handle == NULL) {
                /* The thread couldn't be created, so throw an exception */
@@ -851,9 +844,7 @@ create_thread (MonoThread *thread, MonoInternalThread *internal, StartInfo *star
        if (!handle_store (thread, FALSE))
                return FALSE;
 
-       MONO_PREPARE_BLOCKING;
        mono_thread_info_resume (tid);
-       MONO_FINISH_BLOCKING;
 
        if (internal->start_notify) {
                /*
@@ -912,7 +903,7 @@ mono_thread_create_internal (MonoDomain *domain, gpointer func, gpointer arg, gb
        MONO_OBJECT_SETREF (thread, internal_thread, internal);
 
        start_info = g_new0 (StartInfo, 1);
-       start_info->func = func;
+       start_info->func = (guint32 (*)(void *))func;
        start_info->obj = thread;
        start_info->start_arg = arg;
 
@@ -1087,7 +1078,7 @@ ves_icall_System_Threading_Thread_ConstructInternalThread (MonoThread *this_obj)
 
        internal->state = ThreadState_Unstarted;
 
-       InterlockedCompareExchangePointer ((gpointer)&this_obj->internal_thread, internal, NULL);
+       InterlockedCompareExchangePointer ((volatile gpointer *)&this_obj->internal_thread, internal, NULL);
 }
 
 HANDLE
@@ -1155,9 +1146,9 @@ ves_icall_System_Threading_InternalThread_Thread_free_internal (MonoInternalThre
                CloseHandle (thread);
 
        if (this_obj->synch_cs) {
-               mono_mutex_t *synch_cs = this_obj->synch_cs;
+               MonoCoopMutex *synch_cs = this_obj->synch_cs;
                this_obj->synch_cs = NULL;
-               mono_mutex_destroy (synch_cs);
+               mono_coop_mutex_destroy (synch_cs);
                g_free (synch_cs);
        }
 
@@ -1183,9 +1174,7 @@ ves_icall_System_Threading_Thread_Sleep_internal(gint32 ms)
 
                mono_thread_set_state (thread, ThreadState_WaitSleepJoin);
 
-               MONO_PREPARE_BLOCKING
                res = mono_thread_info_sleep (ms, &alerted);
-               MONO_FINISH_BLOCKING
 
                mono_thread_clr_state (thread, ThreadState_WaitSleepJoin);
 
@@ -1929,7 +1918,7 @@ MonoObject*
 ves_icall_System_Threading_Interlocked_CompareExchange_T (MonoObject **location, MonoObject *value, MonoObject *comparand)
 {
        MonoObject *res;
-       res = InterlockedCompareExchangePointer ((gpointer *)location, value, comparand);
+       res = (MonoObject *)InterlockedCompareExchangePointer ((volatile gpointer *)location, value, comparand);
        mono_gc_wbarrier_generic_nostore (location);
        return res;
 }
@@ -1938,7 +1927,7 @@ MonoObject*
 ves_icall_System_Threading_Interlocked_Exchange_T (MonoObject **location, MonoObject *value)
 {
        MonoObject *res;
-       res = InterlockedExchangePointer ((gpointer *)location, value);
+       res = (MonoObject *)InterlockedExchangePointer ((volatile gpointer *)location, value);
        mono_gc_wbarrier_generic_nostore (location);
        return res;
 }
@@ -1987,9 +1976,9 @@ ves_icall_System_Threading_Thread_MemoryBarrier (void)
 }
 
 void
-ves_icall_System_Threading_Thread_ClrState (MonoInternalThread* this, guint32 state)
+ves_icall_System_Threading_Thread_ClrState (MonoInternalThread* this_obj, guint32 state)
 {
-       mono_thread_clr_state (this, state);
+       mono_thread_clr_state (this_obj, (MonoThreadState)state);
 
        if (state & ThreadState_Background) {
                /* If the thread changes the background mode, the main thread has to
@@ -2001,9 +1990,9 @@ ves_icall_System_Threading_Thread_ClrState (MonoInternalThread* this, guint32 st
 }
 
 void
-ves_icall_System_Threading_Thread_SetState (MonoInternalThread* this, guint32 state)
+ves_icall_System_Threading_Thread_SetState (MonoInternalThread* this_obj, guint32 state)
 {
-       mono_thread_set_state (this, state);
+       mono_thread_set_state (this_obj, (MonoThreadState)state);
        
        if (state & ThreadState_Background) {
                /* If the thread changes the background mode, the main thread has to
@@ -2015,15 +2004,15 @@ ves_icall_System_Threading_Thread_SetState (MonoInternalThread* this, guint32 st
 }
 
 guint32
-ves_icall_System_Threading_Thread_GetState (MonoInternalThread* this)
+ves_icall_System_Threading_Thread_GetState (MonoInternalThread* this_obj)
 {
        guint32 state;
 
-       LOCK_THREAD (this);
+       LOCK_THREAD (this_obj);
        
-       state = this->state;
+       state = this_obj->state;
 
-       UNLOCK_THREAD (this);
+       UNLOCK_THREAD (this_obj);
        
        return state;
 }
@@ -2031,7 +2020,7 @@ ves_icall_System_Threading_Thread_GetState (MonoInternalThread* this)
 void ves_icall_System_Threading_Thread_Interrupt_internal (MonoThread *this_obj)
 {
        MonoInternalThread *current;
-       gboolean throw;
+       gboolean throw_;
        MonoInternalThread *thread = this_obj->internal_thread;
 
        LOCK_THREAD (thread);
@@ -2039,11 +2028,11 @@ void ves_icall_System_Threading_Thread_Interrupt_internal (MonoThread *this_obj)
        current = mono_thread_internal_current ();
 
        thread->thread_interrupt_requested = TRUE;
-       throw = current != thread && (thread->state & ThreadState_WaitSleepJoin);
+       throw_ = current != thread && (thread->state & ThreadState_WaitSleepJoin);
 
        UNLOCK_THREAD (thread);
        
-       if (throw) {
+       if (throw_) {
                abort_thread_internal (thread, TRUE, FALSE);
        }
 }
@@ -2051,18 +2040,18 @@ void ves_icall_System_Threading_Thread_Interrupt_internal (MonoThread *this_obj)
 void mono_thread_current_check_pending_interrupt ()
 {
        MonoInternalThread *thread = mono_thread_internal_current ();
-       gboolean throw = FALSE;
+       gboolean throw_ = FALSE;
 
        LOCK_THREAD (thread);
        
        if (thread->thread_interrupt_requested) {
-               throw = TRUE;
+               throw_ = TRUE;
                thread->thread_interrupt_requested = FALSE;
        }
        
        UNLOCK_THREAD (thread);
 
-       if (throw) {
+       if (throw_) {
                mono_raise_exception (mono_get_exception_thread_interrupted ());
        }
 }
@@ -2097,15 +2086,15 @@ ves_icall_System_Threading_Thread_Abort (MonoInternalThread *thread, MonoObject
        }
        thread->abort_exc = NULL;
 
-       UNLOCK_THREAD (thread);
-
        THREAD_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Abort requested for %p (%"G_GSIZE_FORMAT")", __func__, mono_native_thread_id_get (), thread, (gsize)thread->tid));
 
        /* During shutdown, we can't wait for other threads */
        if (!shutting_down)
                /* Make sure the thread is awake */
                mono_thread_resume (thread);
-       
+
+       UNLOCK_THREAD (thread);
+
        abort_thread_internal (thread, TRUE, TRUE);
 }
 
@@ -2222,14 +2211,12 @@ ves_icall_System_Threading_Thread_Suspend (MonoThread *this_obj)
        }
 }
 
+/* LOCKING: LOCK_THREAD(thread) must be held */
 static gboolean
 mono_thread_resume (MonoInternalThread *thread)
 {
-       LOCK_THREAD (thread);
-
        if ((thread->state & ThreadState_SuspendRequested) != 0) {
                thread->state &= ~ThreadState_SuspendRequested;
-               UNLOCK_THREAD (thread);
                return TRUE;
        }
 
@@ -2238,19 +2225,32 @@ mono_thread_resume (MonoInternalThread *thread)
                (thread->state & ThreadState_Aborted) != 0 || 
                (thread->state & ThreadState_Stopped) != 0)
        {
-               UNLOCK_THREAD (thread);
                return FALSE;
        }
 
-       return resume_thread_internal (thread);
+       UNLOCK_THREAD (thread);
+
+       /* Awake the thread */
+       if (!mono_thread_info_resume (thread_get_tid (thread)))
+               return FALSE;
+
+       LOCK_THREAD (thread);
+
+       thread->state &= ~ThreadState_Suspended;
+
+       return TRUE;
 }
 
 void
 ves_icall_System_Threading_Thread_Resume (MonoThread *thread)
 {
-       if (!thread->internal_thread || !mono_thread_resume (thread->internal_thread)) {
+       if (!thread->internal_thread) {
                mono_set_pending_exception (mono_get_exception_thread_state ("Thread has not been started, or is dead."));
-               return;
+       } else {
+               LOCK_THREAD (thread->internal_thread);
+               if (!mono_thread_resume (thread->internal_thread))
+                       mono_set_pending_exception (mono_get_exception_thread_state ("Thread has not been started, or is dead."));
+               UNLOCK_THREAD (thread->internal_thread);
        }
 }
 
@@ -2381,19 +2381,19 @@ ves_icall_System_Threading_Thread_VolatileReadFloat (void *ptr)
 gint8
 ves_icall_System_Threading_Volatile_Read1 (void *ptr)
 {
-       return InterlockedRead8 (ptr);
+       return InterlockedRead8 ((volatile gint8 *)ptr);
 }
 
 gint16
 ves_icall_System_Threading_Volatile_Read2 (void *ptr)
 {
-       return InterlockedRead16 (ptr);
+       return InterlockedRead16 ((volatile gint16 *)ptr);
 }
 
 gint32
 ves_icall_System_Threading_Volatile_Read4 (void *ptr)
 {
-       return InterlockedRead (ptr);
+       return InterlockedRead ((volatile gint32 *)ptr);
 }
 
 gint64
@@ -2408,13 +2408,13 @@ ves_icall_System_Threading_Volatile_Read8 (void *ptr)
                return val;
        }
 #endif
-       return InterlockedRead64 (ptr);
+       return InterlockedRead64 ((volatile gint64 *)ptr);
 }
 
 void *
 ves_icall_System_Threading_Volatile_ReadIntPtr (void *ptr)
 {
-       return InterlockedReadPointer (ptr);
+       return InterlockedReadPointer ((volatile gpointer *)ptr);
 }
 
 double
@@ -2432,7 +2432,7 @@ ves_icall_System_Threading_Volatile_ReadDouble (void *ptr)
        }
 #endif
 
-       u.ival = InterlockedRead64 (ptr);
+       u.ival = InterlockedRead64 ((volatile gint64 *)ptr);
 
        return u.fval;
 }
@@ -2442,7 +2442,7 @@ ves_icall_System_Threading_Volatile_ReadFloat (void *ptr)
 {
        IntFloatUnion u;
 
-       u.ival = InterlockedRead (ptr);
+       u.ival = InterlockedRead ((volatile gint32 *)ptr);
 
        return u.fval;
 }
@@ -2450,7 +2450,7 @@ ves_icall_System_Threading_Volatile_ReadFloat (void *ptr)
 MonoObject*
 ves_icall_System_Threading_Volatile_Read_T (void *ptr)
 {
-       return InterlockedReadPointer (ptr);
+       return (MonoObject *)InterlockedReadPointer ((volatile gpointer *)ptr);
 }
 
 void
@@ -2504,19 +2504,19 @@ ves_icall_System_Threading_Thread_VolatileWriteFloat (void *ptr, float value)
 void
 ves_icall_System_Threading_Volatile_Write1 (void *ptr, gint8 value)
 {
-       InterlockedWrite8 (ptr, value);
+       InterlockedWrite8 ((volatile gint8 *)ptr, value);
 }
 
 void
 ves_icall_System_Threading_Volatile_Write2 (void *ptr, gint16 value)
 {
-       InterlockedWrite16 (ptr, value);
+       InterlockedWrite16 ((volatile gint16 *)ptr, value);
 }
 
 void
 ves_icall_System_Threading_Volatile_Write4 (void *ptr, gint32 value)
 {
-       InterlockedWrite (ptr, value);
+       InterlockedWrite ((volatile gint32 *)ptr, value);
 }
 
 void
@@ -2531,13 +2531,13 @@ ves_icall_System_Threading_Volatile_Write8 (void *ptr, gint64 value)
        }
 #endif
 
-       InterlockedWrite64 (ptr, value);
+       InterlockedWrite64 ((volatile gint64 *)ptr, value);
 }
 
 void
 ves_icall_System_Threading_Volatile_WriteIntPtr (void *ptr, void *value)
 {
-       InterlockedWritePointer (ptr, value);
+       InterlockedWritePointer ((volatile gpointer *)ptr, value);
 }
 
 void
@@ -2556,7 +2556,7 @@ ves_icall_System_Threading_Volatile_WriteDouble (void *ptr, double value)
 
        u.fval = value;
 
-       InterlockedWrite64 (ptr, u.ival);
+       InterlockedWrite64 ((volatile gint64 *)ptr, u.ival);
 }
 
 void
@@ -2566,7 +2566,7 @@ ves_icall_System_Threading_Volatile_WriteFloat (void *ptr, float value)
 
        u.fval = value;
 
-       InterlockedWrite (ptr, u.ival);
+       InterlockedWrite ((volatile gint32 *)ptr, u.ival);
 }
 
 void
@@ -2620,9 +2620,10 @@ mono_thread_init_tls (void)
 void mono_thread_init (MonoThreadStartCB start_cb,
                       MonoThreadAttachCB attach_cb)
 {
-       mono_mutex_init_recursive(&threads_mutex);
-       mono_mutex_init_recursive(&interlocked_mutex);
-       mono_mutex_init_recursive(&joinable_threads_mutex);
+       mono_coop_mutex_init_recursive (&threads_mutex);
+
+       mono_os_mutex_init_recursive(&interlocked_mutex);
+       mono_os_mutex_init_recursive(&joinable_threads_mutex);
        
        background_change_event = CreateEvent (NULL, TRUE, FALSE, NULL);
        g_assert(background_change_event != NULL);
@@ -2663,10 +2664,10 @@ void mono_thread_cleanup (void)
         * critical sections can be locked when mono_thread_cleanup is
         * called.
         */
-       mono_mutex_destroy (&threads_mutex);
-       mono_mutex_destroy (&interlocked_mutex);
-       mono_mutex_destroy (&delayed_free_table_mutex);
-       mono_mutex_destroy (&small_id_mutex);
+       mono_coop_mutex_destroy (&threads_mutex);
+       mono_os_mutex_destroy (&interlocked_mutex);
+       mono_os_mutex_destroy (&delayed_free_table_mutex);
+       mono_os_mutex_destroy (&small_id_mutex);
        CloseHandle (background_change_event);
 #endif
 
@@ -2872,7 +2873,7 @@ remove_and_abort_threads (gpointer key, gpointer value, gpointer user)
 {
        struct wait_data *wait=(struct wait_data *)user;
        MonoNativeThreadId self = mono_native_thread_id_get ();
-       MonoInternalThread *thread = value;
+       MonoInternalThread *thread = (MonoInternalThread *)value;
        HANDLE handle;
 
        if (wait->num >= MAXIMUM_WAIT_OBJECTS)
@@ -3175,7 +3176,7 @@ static gboolean thread_dump_requested;
 static gboolean
 collect_frame (MonoStackFrameInfo *frame, MonoContext *ctx, gpointer data)
 {
-       ThreadDumpUserData *ud = data;
+       ThreadDumpUserData *ud = (ThreadDumpUserData *)data;
 
        if (ud->nframes < ud->max_frames) {
                memcpy (&ud->frames [ud->nframes], frame, sizeof (MonoStackFrameInfo));
@@ -3189,7 +3190,7 @@ collect_frame (MonoStackFrameInfo *frame, MonoContext *ctx, gpointer data)
 static SuspendThreadResult
 get_thread_dump (MonoThreadInfo *info, gpointer ud)
 {
-       ThreadDumpUserData *user_data = ud;
+       ThreadDumpUserData *user_data = (ThreadDumpUserData *)ud;
        MonoInternalThread *thread = user_data->thread;
 
 #if 0
@@ -3217,8 +3218,8 @@ typedef struct {
 static void
 collect_thread (gpointer key, gpointer value, gpointer user)
 {
-       CollectThreadsUserData *ud = user;
-       MonoInternalThread *thread = value;
+       CollectThreadsUserData *ud = (CollectThreadsUserData *)user;
+       MonoInternalThread *thread = (MonoInternalThread *)value;
 
        if (ud->nthreads < ud->max_threads)
                ud->threads [ud->nthreads ++] = thread;
@@ -3446,7 +3447,7 @@ ref_stack_new (gint initial_size)
 static void
 ref_stack_destroy (gpointer ptr)
 {
-       RefStack *rs = ptr;
+       RefStack *rs = (RefStack *)ptr;
 
        if (rs != NULL) {
                g_free (rs->refs);
@@ -3460,7 +3461,7 @@ ref_stack_push (RefStack *rs, gpointer ptr)
        g_assert (rs != NULL);
 
        if (rs->bottom >= rs->allocated) {
-               rs->refs = g_realloc (rs->refs, rs->allocated * 2 * sizeof (gpointer) + 1);
+               rs->refs = (void **)g_realloc (rs->refs, rs->allocated * 2 * sizeof (gpointer) + 1);
                rs->allocated <<= 1;
                rs->refs [rs->allocated] = NULL;
        }
@@ -3509,7 +3510,7 @@ mono_thread_push_appdomain_ref (MonoDomain *domain)
                SPIN_LOCK (thread->lock_thread_id);
                if (thread->appdomain_refs == NULL)
                        thread->appdomain_refs = ref_stack_new (16);
-               ref_stack_push (thread->appdomain_refs, domain);
+               ref_stack_push ((RefStack *)thread->appdomain_refs, domain);
                SPIN_UNLOCK (thread->lock_thread_id);
        }
 }
@@ -3522,7 +3523,7 @@ mono_thread_pop_appdomain_ref (void)
        if (thread) {
                /* printf ("POP REF: %"G_GSIZE_FORMAT" -> %s.\n", (gsize)thread->tid, ((MonoDomain*)(thread->appdomain_refs->data))->friendly_name); */
                SPIN_LOCK (thread->lock_thread_id);
-               ref_stack_pop (thread->appdomain_refs);
+               ref_stack_pop ((RefStack *)thread->appdomain_refs);
                SPIN_UNLOCK (thread->lock_thread_id);
        }
 }
@@ -3532,7 +3533,7 @@ mono_thread_internal_has_appdomain_ref (MonoInternalThread *thread, MonoDomain *
 {
        gboolean res;
        SPIN_LOCK (thread->lock_thread_id);
-       res = ref_stack_find (thread->appdomain_refs, domain);
+       res = ref_stack_find ((RefStack *)thread->appdomain_refs, domain);
        SPIN_UNLOCK (thread->lock_thread_id);
        return res;
 }
@@ -3703,10 +3704,10 @@ static MonoBitSet *context_reference_bitmaps [NUM_STATIC_DATA_IDX];
 static void
 mark_slots (void *addr, MonoBitSet **bitmaps, MonoGCMarkFunc mark_func, void *gc_data)
 {
-       gpointer *static_data = addr;
+       gpointer *static_data = (gpointer *)addr;
 
        for (int i = 0; i < NUM_STATIC_DATA_IDX; ++i) {
-               void **ptr = static_data [i];
+               void **ptr = (void **)static_data [i];
 
                if (!ptr)
                        continue;
@@ -3756,7 +3757,7 @@ mono_alloc_static_data (gpointer **static_data_ptr, guint32 offset, gboolean thr
                                ctx_desc = mono_gc_make_root_descr_user (mark_ctx_slots);
                }
 
-               static_data = mono_gc_alloc_fixed (static_data_size [0], threadlocal ? tls_desc : ctx_desc,
+               static_data = (void **)mono_gc_alloc_fixed (static_data_size [0], threadlocal ? tls_desc : ctx_desc,
                        threadlocal ? MONO_ROOT_SOURCE_THREAD_STATIC : MONO_ROOT_SOURCE_CONTEXT_STATIC,
                        threadlocal ? "managed thread-static variables" : "managed context-static variables");
                *static_data_ptr = static_data;
@@ -3876,7 +3877,7 @@ context_adjust_static_data (MonoAppContext *ctx)
 static void 
 alloc_thread_static_data_helper (gpointer key, gpointer value, gpointer user)
 {
-       MonoInternalThread *thread = value;
+       MonoInternalThread *thread = (MonoInternalThread *)value;
        guint32 offset = GPOINTER_TO_UINT (user);
 
        mono_alloc_static_data (&(thread->static_data), offset, TRUE);
@@ -4030,8 +4031,8 @@ typedef struct {
 static void 
 free_thread_static_data_helper (gpointer key, gpointer value, gpointer user)
 {
-       MonoInternalThread *thread = value;
-       OffsetSize *data = user;
+       MonoInternalThread *thread = (MonoInternalThread *)value;
+       OffsetSize *data = (OffsetSize *)user;
        int idx = ACCESS_SPECIAL_STATIC_OFFSET (data->offset, index);
        int off = ACCESS_SPECIAL_STATIC_OFFSET (data->offset, offset);
        char *ptr;
@@ -4056,7 +4057,7 @@ free_context_static_data_helper (gpointer key, gpointer value, gpointer user)
                return TRUE; // Remove this key/value pair
        }
 
-       OffsetSize *data = user;
+       OffsetSize *data = (OffsetSize *)user;
        int idx = ACCESS_SPECIAL_STATIC_OFFSET (data->offset, index);
        int off = ACCESS_SPECIAL_STATIC_OFFSET (data->offset, offset);
        char *ptr;
@@ -4113,7 +4114,7 @@ do_free_special_slot (guint32 offset, guint32 size)
 static void
 do_free_special (gpointer key, gpointer value, gpointer data)
 {
-       MonoClassField *field = key;
+       MonoClassField *field = (MonoClassField *)key;
        guint32 offset = GPOINTER_TO_UINT (value);
        gint32 align;
        guint32 size;
@@ -4522,7 +4523,7 @@ mono_jit_info_match (MonoJitInfo *ji, gpointer ip)
 static gboolean
 last_managed (MonoStackFrameInfo *frame, MonoContext *ctx, gpointer data)
 {
-       MonoJitInfo **dest = data;
+       MonoJitInfo **dest = (MonoJitInfo **)data;
        *dest = frame->ji;
        return TRUE;
 }
@@ -4546,7 +4547,7 @@ typedef struct {
 static SuspendThreadResult
 abort_thread_critical (MonoThreadInfo *info, gpointer ud)
 {
-       AbortThreadData *data = ud;
+       AbortThreadData *data = (AbortThreadData *)ud;
        MonoInternalThread *thread = data->thread;
        MonoJitInfo *ji = NULL;
        gboolean protected_wrapper;
@@ -4626,7 +4627,7 @@ typedef struct{
 static SuspendThreadResult
 suspend_thread_critical (MonoThreadInfo *info, gpointer ud)
 {
-       SuspendThreadData *data = ud;
+       SuspendThreadData *data = (SuspendThreadData *)ud;
        MonoInternalThread *thread = data->thread;
        MonoJitInfo *ji = NULL;
        gboolean protected_wrapper;
@@ -4644,7 +4645,7 @@ suspend_thread_critical (MonoThreadInfo *info, gpointer ud)
                if (InterlockedCompareExchange (&thread->interruption_requested, 1, 0) == 0)
                        InterlockedIncrement (&thread_interruption_requested);
                if (data->interrupt)
-                       data->interrupt_token = mono_thread_info_prepare_interrupt (thread->thread_info);
+                       data->interrupt_token = mono_thread_info_prepare_interrupt ((MonoThreadInfo *)thread->thread_info);
                
                if (mono_thread_notify_pending_exc_fn && !running_managed)
                        /* The JIT will notify the thread about the interruption */
@@ -4687,20 +4688,6 @@ self_suspend_internal (MonoInternalThread *thread)
        mono_thread_info_end_self_suspend ();
 }
 
-/*This is called with @thread synch_cs held and it must release it*/
-static gboolean
-resume_thread_internal (MonoInternalThread *thread)
-{
-       UNLOCK_THREAD (thread);
-       /* Awake the thread */
-       if (!mono_thread_info_resume (thread_get_tid (thread)))
-               return FALSE;
-       LOCK_THREAD (thread);
-       thread->state &= ~ThreadState_Suspended;
-       UNLOCK_THREAD (thread);
-       return TRUE;
-}
-
 
 /*
  * mono_thread_is_foreign:
@@ -4714,7 +4701,7 @@ resume_thread_internal (MonoInternalThread *thread)
 mono_bool
 mono_thread_is_foreign (MonoThread *thread)
 {
-       MonoThreadInfo *info = thread->internal_thread->thread_info;
+       MonoThreadInfo *info = (MonoThreadInfo *)thread->internal_thread->thread_info;
        return info->runtime_thread == FALSE;
 }
 

diff --git a/mono/metadata/verify.c b/mono/metadata/verify.c
index 5a4a9a02c0dedc4814c76282467001b67a328345..e9af9516a1b4652f3e43ca9b3dd254addad43a0f 100644 (file)
--- a/mono/metadata/verify.c
+++ b/mono/metadata/verify.c
@@ -409,10 +409,10 @@ mono_type_is_enum_type (MonoType *type)
  * 
  */
 static gboolean
-mono_type_is_value_type (MonoType *type, const char *namespace, const char *name)
+mono_type_is_value_type (MonoType *type, const char *namespace_, const char *name)
 {
        return type->type == MONO_TYPE_VALUETYPE &&
-               !strcmp (namespace, type->data.klass->name_space) &&
+               !strcmp (namespace_, type->data.klass->name_space) &&
                !strcmp (name, type->data.klass->name);
 }
 
@@ -941,7 +941,7 @@ verifier_load_field (VerifyContext *ctx, int token, MonoClass **out_klass, const
        MonoClass *klass = NULL;
 
        if (ctx->method->wrapper_type != MONO_WRAPPER_NONE) {
-               field = mono_method_get_wrapper_data (ctx->method, (guint32)token);
+               field = (MonoClassField *)mono_method_get_wrapper_data (ctx->method, (guint32)token);
                klass = field ? field->parent : NULL;
        } else {
                if (!IS_FIELD_DEF_OR_REF (token) || !token_bounds_check (ctx->image, token)) {
@@ -978,7 +978,7 @@ verifier_load_method (VerifyContext *ctx, int token, const char *opcode) {
 
 
        if (ctx->method->wrapper_type != MONO_WRAPPER_NONE) {
-               method = mono_method_get_wrapper_data (ctx->method, (guint32)token);
+               method = (MonoMethod *)mono_method_get_wrapper_data (ctx->method, (guint32)token);
        } else {
                MonoError error;
                if (!IS_METHOD_DEF_OR_REF_OR_SPEC (token) || !token_bounds_check (ctx->image, token)) {
@@ -1006,7 +1006,7 @@ verifier_load_type (VerifyContext *ctx, int token, const char *opcode) {
        MonoType* type;
        
        if (ctx->method->wrapper_type != MONO_WRAPPER_NONE) {
-               MonoClass *klass = mono_method_get_wrapper_data (ctx->method, (guint32)token);
+               MonoClass *klass = (MonoClass *)mono_method_get_wrapper_data (ctx->method, (guint32)token);
                type = klass ? &klass->byval_arg : NULL;
        } else {
                MonoError error;
@@ -1175,7 +1175,7 @@ mono_free_verify_list (GSList *list)
        GSList *tmp;
 
        for (tmp = list; tmp; tmp = tmp->next) {
-               info = tmp->data;
+               info = (MonoVerifyInfoExtended *)tmp->data;
                g_free (info->info.message);
                g_free (info);
        }
@@ -2444,11 +2444,11 @@ recursive_boxed_constraint_type_check (VerifyContext *ctx, MonoType *type, MonoC
 
        if (mono_type_is_generic_argument (constraint_type)) {
                MonoGenericParam *param = get_generic_param (ctx, constraint_type);
-               MonoClass **class;
+               MonoClass **klass;
                if (!param)
                        return FALSE;
-               for (class = mono_generic_param_info (param)->constraints; class && *class; ++class) {
-                       if (recursive_boxed_constraint_type_check (ctx, type, *class, recursion_level - 1))
+               for (klass = mono_generic_param_info (param)->constraints; klass && *klass; ++klass) {
+                       if (recursive_boxed_constraint_type_check (ctx, type, *klass, recursion_level - 1))
                                return TRUE;
                }
        }
@@ -2476,13 +2476,13 @@ is_compatible_boxed_valuetype (VerifyContext *ctx, MonoType *type, MonoType *can
 
        if (mono_type_is_generic_argument (candidate)) {
                MonoGenericParam *param = get_generic_param (ctx, candidate);
-               MonoClass **class;
+               MonoClass **klass;
                if (!param)
                        return FALSE;
 
-               for (class = mono_generic_param_info (param)->constraints; class && *class; ++class) {
+               for (klass = mono_generic_param_info (param)->constraints; klass && *klass; ++klass) {
                        /*256 should be enough since there can't be more than 255 generic arguments.*/
-                       if (recursive_boxed_constraint_type_check (ctx, type, *class, 256))
+                       if (recursive_boxed_constraint_type_check (ctx, type, *klass, 256))
                                return TRUE;
                }
        }
@@ -3148,7 +3148,7 @@ do_ret (VerifyContext *ctx)
  * TODO handle calling .ctor outside one or calling the .ctor for other class but super  
  */
 static void
-do_invoke_method (VerifyContext *ctx, int method_token, gboolean virtual)
+do_invoke_method (VerifyContext *ctx, int method_token, gboolean virtual_)
 {
        MonoError error;
        int param_count, i;
@@ -3158,10 +3158,10 @@ do_invoke_method (VerifyContext *ctx, int method_token, gboolean virtual)
        gboolean virt_check_this = FALSE;
        gboolean constrained = ctx->prefix_set & PREFIX_CONSTRAINED;
 
-       if (!(method = verifier_load_method (ctx, method_token, virtual ? "callvirt" : "call")))
+       if (!(method = verifier_load_method (ctx, method_token, virtual_ ? "callvirt" : "call")))
                return;
 
-       if (virtual) {
+       if (virtual_) {
                CLEAR_PREFIX (ctx, PREFIX_CONSTRAINED);
 
                if (method->klass->valuetype) // && !constrained ???
@@ -3209,10 +3209,10 @@ do_invoke_method (VerifyContext *ctx, int method_token, gboolean virtual)
                }
 
                if (stack_slot_is_managed_mutability_pointer (value))
-                       CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Cannot use a readonly pointer as argument of %s at 0x%04x", virtual ? "callvirt" : "call",  ctx->ip_offset));
+                       CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Cannot use a readonly pointer as argument of %s at 0x%04x", virtual_ ? "callvirt" : "call",  ctx->ip_offset));
 
                if ((ctx->prefix_set & PREFIX_TAIL) && stack_slot_is_managed_pointer (value)) {
-                       ADD_VERIFY_ERROR (ctx, g_strdup_printf ("Cannot  pass a byref argument to a tail %s at 0x%04x", virtual ? "callvirt" : "call",  ctx->ip_offset));
+                       ADD_VERIFY_ERROR (ctx, g_strdup_printf ("Cannot  pass a byref argument to a tail %s at 0x%04x", virtual_ ? "callvirt" : "call",  ctx->ip_offset));
                        return;
                }
        }
@@ -3244,7 +3244,7 @@ do_invoke_method (VerifyContext *ctx, int method_token, gboolean virtual)
                if (virt_check_this && !stack_slot_is_this_pointer (value) && !(method->klass->valuetype || stack_slot_is_boxed_value (value)))
                        CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Cannot use the call opcode with a non-final virtual method on an object different than the 'this' pointer at 0x%04x", ctx->ip_offset));
 
-               if (constrained && virtual) {
+               if (constrained && virtual_) {
                        if (!stack_slot_is_managed_pointer (value))
                                CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Object is not a managed pointer for a constrained call at 0x%04x", ctx->ip_offset));
                        if (!mono_metadata_type_equal_full (mono_type_get_type_byval (value->type), mono_type_get_underlying_type (ctx->constrained_type), TRUE))
@@ -3255,10 +3255,10 @@ do_invoke_method (VerifyContext *ctx, int method_token, gboolean virtual)
                        if (stack_slot_is_managed_pointer (value) && !mono_class_from_mono_type (value->type)->valuetype)
                                CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Cannot call a reference type using a managed pointer to the this arg at 0x%04x", ctx->ip_offset));
        
-                       if (!virtual && mono_class_from_mono_type (value->type)->valuetype && !method->klass->valuetype && !stack_slot_is_boxed_value (value))
+                       if (!virtual_ && mono_class_from_mono_type (value->type)->valuetype && !method->klass->valuetype && !stack_slot_is_boxed_value (value))
                                CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Cannot call a valuetype baseclass at 0x%04x", ctx->ip_offset));
        
-                       if (virtual && mono_class_from_mono_type (value->type)->valuetype && !stack_slot_is_boxed_value (value))
+                       if (virtual_ && mono_class_from_mono_type (value->type)->valuetype && !stack_slot_is_boxed_value (value))
                                CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Cannot use a valuetype with callvirt at 0x%04x", ctx->ip_offset));
        
                        if (method->klass->valuetype && (stack_slot_is_boxed_value (value) || !stack_slot_is_managed_pointer (value)))
@@ -3627,7 +3627,7 @@ do_load_token (VerifyContext *ctx, int token)
 
        if (ctx->method->wrapper_type != MONO_WRAPPER_NONE) {
                handle = mono_method_get_wrapper_data (ctx->method, token);
-               handle_class = mono_method_get_wrapper_data (ctx->method, token + 1);
+               handle_class = (MonoClass *)mono_method_get_wrapper_data (ctx->method, token + 1);
                if (handle_class == mono_defaults.typehandle_class)
                        handle = &((MonoClass*)handle)->byval_arg;
        } else {
@@ -4353,19 +4353,19 @@ do_switch (VerifyContext *ctx, int count, const unsigned char *data)
 }
 
 static void
-do_load_function_ptr (VerifyContext *ctx, guint32 token, gboolean virtual)
+do_load_function_ptr (VerifyContext *ctx, guint32 token, gboolean virtual_)
 {
        ILStackDesc *top;
        MonoMethod *method;
 
-       if (virtual && !check_underflow (ctx, 1))
+       if (virtual_ && !check_underflow (ctx, 1))
                return;
 
-       if (!virtual && !check_overflow (ctx))
+       if (!virtual_ && !check_overflow (ctx))
                return;
 
        if (ctx->method->wrapper_type != MONO_WRAPPER_NONE) {
-               method = mono_method_get_wrapper_data (ctx->method, (guint32)token);
+               method = (MonoMethod *)mono_method_get_wrapper_data (ctx->method, (guint32)token);
                if (!method) {
                        ADD_VERIFY_ERROR2 (ctx, g_strdup_printf ("Invalid token %x for ldftn  at 0x%04x", token, ctx->ip_offset), MONO_EXCEPTION_BAD_IMAGE);
                        return;
@@ -4376,14 +4376,14 @@ do_load_function_ptr (VerifyContext *ctx, guint32 token, gboolean virtual)
                        return;
                }
 
-               if (!(method = verifier_load_method (ctx, token, virtual ? "ldvirtfrn" : "ldftn")))
+               if (!(method = verifier_load_method (ctx, token, virtual_ ? "ldvirtfrn" : "ldftn")))
                        return;
        }
 
        if (mono_method_is_constructor (method))
                CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Cannot use ldftn with a constructor at 0x%04x", ctx->ip_offset));
 
-       if (virtual) {
+       if (virtual_) {
                ILStackDesc *top = stack_pop (ctx);
        
                if (stack_slot_get_type (top) != TYPE_COMPLEX || top->type->type == MONO_TYPE_VALUETYPE)
@@ -4886,7 +4886,7 @@ mono_method_verify (MonoMethod *method, int level)
        memset(ctx.code, 0, sizeof (ILCodeDesc) * ctx.header->code_size);
 
        ctx.num_locals = ctx.header->num_locals;
-       ctx.locals = g_memdup (ctx.header->locals, sizeof (MonoType*) * ctx.header->num_locals);
+       ctx.locals = (MonoType **)g_memdup (ctx.header->locals, sizeof (MonoType*) * ctx.header->num_locals);
        _MEM_ALLOC (sizeof (MonoType*) * ctx.header->num_locals);
 
        if (ctx.num_locals > 0 && !ctx.header->init_locals)
@@ -5988,7 +5988,7 @@ cleanup:
        g_slist_free (ctx.funptrs);
 
        for (tmp = ctx.exception_types; tmp; tmp = tmp->next)
-               mono_metadata_free_type (tmp->data);
+               mono_metadata_free_type ((MonoType *)tmp->data);
        g_slist_free (ctx.exception_types);
 
        for (i = 0; i < ctx.num_locals; ++i) {
@@ -6137,15 +6137,15 @@ verify_class_for_overlapping_reference_fields (MonoClass *klass)
 static guint
 field_hash (gconstpointer key)
 {
-       const MonoClassField *field = key;
+       const MonoClassField *field = (const MonoClassField *)key;
        return g_str_hash (field->name) ^ mono_metadata_type_hash (field->type); /**/
 }
 
 static gboolean
 field_equals (gconstpointer _a, gconstpointer _b)
 {
-       const MonoClassField *a = _a;
-       const MonoClassField *b = _b;
+       const MonoClassField *a = (const MonoClassField *)_a;
+       const MonoClassField *b = (const MonoClassField *)_b;
        return !strcmp (a->name, b->name) && mono_metadata_type_equal (a->type, b->type);
 }
 

diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in
index d9fa2e2c9c381dcda55ed6b602514ec13102aa27..348cfcf6f8d632941d699b2bbbbc12019346ba20 100755 (executable)
--- a/mono/mini/Makefile.am.in
+++ b/mono/mini/Makefile.am.in
@@ -147,7 +147,7 @@ endif
 
 if LOADED_LLVM
 lib_LTLIBRARIES += libmono-llvm.la
-libmono_llvm_la_SOURCES = mini-llvm.c mini-llvm-cpp.cpp
+libmono_llvm_la_SOURCES = mini-llvm.c mini-llvm-cpp.cpp llvm-jit.cpp
 libmono_llvm_la_LIBADD = $(GLIB_LIBS) $(LLVM_LIBS) $(LLVM_LDFLAGS)
 if PLATFORM_DARWIN
 libmono_llvm_la_LDFLAGS=-Wl,-undefined -Wl,suppress -Wl,-flat_namespace
@@ -363,7 +363,8 @@ else
 llvm_sources = \
        mini-llvm.c             \
        mini-llvm-loaded.c \
-       mini-llvm-cpp.cpp
+       mini-llvm-cpp.cpp \
+       llvm-jit.cpp
 endif
 endif
 

diff --git a/mono/mini/abcremoval.c b/mono/mini/abcremoval.c
index 45d5394a6679a188dd8435e8311e12ae11523d4e..fddbef9d9cb64556dc4f726d1adfb3a5a9260bce 100644 (file)
--- a/mono/mini/abcremoval.c
+++ b/mono/mini/abcremoval.c
@@ -62,8 +62,8 @@ static int verbose_level;
                (r)->next = NULL;\
        } while (0)
 
-#define MONO_NEGATED_RELATION(r) ((~(r))&MONO_ANY_RELATION)
-#define MONO_SYMMETRIC_RELATION(r) (((r)&MONO_EQ_RELATION)|(((r)&MONO_LT_RELATION)<<1)|((r&MONO_GT_RELATION)>>1))
+#define MONO_NEGATED_RELATION(r) ((MonoValueRelation)((~(r))&MONO_ANY_RELATION))
+#define MONO_SYMMETRIC_RELATION(r) ((MonoValueRelation)(((r)&MONO_EQ_RELATION)|(((r)&MONO_LT_RELATION)<<1)|((r&MONO_GT_RELATION)>>1)))
 
 
 
@@ -905,7 +905,7 @@ evaluate_relation_with_target_variable (MonoVariableRelationsEvaluationArea *are
                        
                        current_context = father_context;
                        while (current_context != last_context) {
-                               current_context->status |= recursive_status;
+                               current_context->status = (MonoRelationsEvaluationStatus)(current_context->status | recursive_status);
                                current_context = current_context->father;
                        }
                } else {
@@ -1029,7 +1029,7 @@ add_non_null (MonoVariableRelationsEvaluationArea *area, MonoCompile *cfg, int r
 {
        MonoAdditionalVariableRelation *rel;
 
-       rel = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoAdditionalVariableRelation));
+       rel = (MonoAdditionalVariableRelation *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoAdditionalVariableRelation));
        rel->variable = reg;
        rel->relation.relation = MONO_GT_RELATION;
        rel->relation.related_value.type = MONO_CONSTANT_SUMMARIZED_VALUE;
@@ -1106,7 +1106,7 @@ process_block (MonoCompile *cfg, MonoBasicBlock *bb, MonoVariableRelationsEvalua
 
                        /* We can derive additional relations from the bounds check */
                        if (ins->opcode != OP_NOP) {
-                               rel = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoAdditionalVariableRelation));
+                               rel = (MonoAdditionalVariableRelation *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoAdditionalVariableRelation));
                                rel->variable = index_var;
                                rel->relation.relation = MONO_LT_RELATION;
                                rel->relation.related_value.type = MONO_VARIABLE_SUMMARIZED_VALUE;
@@ -1117,7 +1117,7 @@ process_block (MonoCompile *cfg, MonoBasicBlock *bb, MonoVariableRelationsEvalua
 
                                check_relations = g_slist_append_mempool (cfg->mempool, check_relations, rel);
 
-                               rel = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoAdditionalVariableRelation));
+                               rel = (MonoAdditionalVariableRelation *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoAdditionalVariableRelation));
                                rel->variable = index_var;
                                rel->relation.relation = MONO_GE_RELATION;
                                rel->relation.related_value.type = MONO_CONSTANT_SUMMARIZED_VALUE;
@@ -1193,7 +1193,7 @@ process_block (MonoCompile *cfg, MonoBasicBlock *bb, MonoVariableRelationsEvalua
        }
 
        for (l = check_relations; l; l = l->next)
-               remove_change_from_evaluation_area (l->data);
+               remove_change_from_evaluation_area ((MonoAdditionalVariableRelation *)l->data);
        
        remove_change_from_evaluation_area (&(additional_relations.relation1));
        remove_change_from_evaluation_area (&(additional_relations.relation2));
@@ -1224,10 +1224,10 @@ type_to_value_kind (MonoType *type)
                return MONO_UNSIGNED_INTEGER_VALUE_SIZE_4;
                break;
        case MONO_TYPE_I:
-               return SIZEOF_VOID_P;
+               return (MonoIntegerValueKind)SIZEOF_VOID_P;
                break;
        case MONO_TYPE_U:
-               return (MONO_UNSIGNED_VALUE_FLAG|SIZEOF_VOID_P);
+               return (MonoIntegerValueKind)(MONO_UNSIGNED_VALUE_FLAG | SIZEOF_VOID_P);
                break;
        case MONO_TYPE_I8:
                return MONO_INTEGER_VALUE_SIZE_8;
@@ -1275,7 +1275,7 @@ mono_perform_abc_removal (MonoCompile *cfg)
                mono_mempool_alloc (cfg->mempool, sizeof (MonoRelationsEvaluationContext) * (cfg->next_vreg));
        area.variable_value_kind = (MonoIntegerValueKind *)
                mono_mempool_alloc (cfg->mempool, sizeof (MonoIntegerValueKind) * (cfg->next_vreg));
-       area.defs = mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * cfg->next_vreg);
+       area.defs = (MonoInst **)mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * cfg->next_vreg);
        for (i = 0; i < cfg->next_vreg; i++) {
                area.variable_value_kind [i] = MONO_UNKNOWN_INTEGER_VALUE;
                area.relations [i].relation = MONO_EQ_RELATION;

diff --git a/mono/mini/alias-analysis.c b/mono/mini/alias-analysis.c
index c260dae2c7abcf706b005ef0fc5f7e10ea103c50..f40070aeb38b9f2212c5f674aa1f346923938158 100644 (file)
--- a/mono/mini/alias-analysis.c
+++ b/mono/mini/alias-analysis.c
@@ -40,7 +40,7 @@ is_long_stack_size (int type)
 static gboolean
 lower_load (MonoCompile *cfg, MonoInst *load, MonoInst *ldaddr)
 {
-       MonoInst *var = ldaddr->inst_p0;
+       MonoInst *var = (MonoInst *)ldaddr->inst_p0;
        MonoType *type = &var->klass->byval_arg;
        int replaced_op = mono_type_to_load_membase (cfg, type);
 
@@ -70,7 +70,7 @@ lower_load (MonoCompile *cfg, MonoInst *load, MonoInst *ldaddr)
 static gboolean
 lower_store (MonoCompile *cfg, MonoInst *store, MonoInst *ldaddr)
 {
-       MonoInst *var = ldaddr->inst_p0;
+       MonoInst *var = (MonoInst *)ldaddr->inst_p0;
        MonoType *type = &var->klass->byval_arg;
        int replaced_op = mono_type_to_store_membase (cfg, type);
 
@@ -101,7 +101,7 @@ lower_store (MonoCompile *cfg, MonoInst *store, MonoInst *ldaddr)
 static gboolean
 lower_store_imm (MonoCompile *cfg, MonoInst *store, MonoInst *ldaddr)
 {
-       MonoInst *var = ldaddr->inst_p0;
+       MonoInst *var = (MonoInst *)ldaddr->inst_p0;
        MonoType *type = &var->klass->byval_arg;
        int store_op = mono_type_to_store_membase (cfg, type);
        if (store_op == OP_STOREV_MEMBASE || store_op == OP_STOREX_MEMBASE)
@@ -195,7 +195,7 @@ handle_instruction:
                        case OP_LOADR8_MEMBASE:
                                if (ins->inst_offset != 0)
                                        continue;
-                               tmp = g_hash_table_lookup (addr_loads, GINT_TO_POINTER (ins->sreg1));
+                               tmp = (MonoInst *)g_hash_table_lookup (addr_loads, GINT_TO_POINTER (ins->sreg1));
                                if (tmp) {
                                        if (cfg->verbose_level > 2) { printf ("Found candidate load:"); mono_print_ins (ins); }
                                        if (lower_load (cfg, ins, tmp)) {
@@ -216,7 +216,7 @@ handle_instruction:
                        case OP_STOREV_MEMBASE:
                                if (ins->inst_offset != 0)
                                        continue;
-                               tmp = g_hash_table_lookup (addr_loads, GINT_TO_POINTER (ins->dreg));
+                               tmp = (MonoInst *)g_hash_table_lookup (addr_loads, GINT_TO_POINTER (ins->dreg));
                                if (tmp) {
                                        if (cfg->verbose_level > 2) { printf ("Found candidate store:"); mono_print_ins (ins); }
                                        if (lower_store (cfg, ins, tmp)) {
@@ -232,7 +232,7 @@ handle_instruction:
                        case OP_STOREI8_MEMBASE_IMM:
                                if (ins->inst_offset != 0)
                                        continue;
-                               tmp = g_hash_table_lookup (addr_loads, GINT_TO_POINTER (ins->dreg));
+                               tmp = (MonoInst *)g_hash_table_lookup (addr_loads, GINT_TO_POINTER (ins->dreg));
                                if (tmp) {
                                        if (cfg->verbose_level > 2) { printf ("Found candidate store-imm:"); mono_print_ins (ins); }
                                        needs_dce |= lower_store_imm (cfg, ins, tmp);
@@ -240,7 +240,7 @@ handle_instruction:
                                break;
                        case OP_CHECK_THIS:
                        case OP_NOT_NULL:
-                               tmp = g_hash_table_lookup (addr_loads, GINT_TO_POINTER (ins->sreg1));
+                               tmp = (MonoInst *)g_hash_table_lookup (addr_loads, GINT_TO_POINTER (ins->sreg1));
                                if (tmp) {
                                        if (cfg->verbose_level > 2) { printf ("Found null check over local: "); mono_print_ins (ins); }
                                        NULLIFY_INS (ins);

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 49fb87c222d85c528497109c1c0c4dab3fe46e21..20a63a6c9279df4832735a4c1d4ca29de7fef459 100644 (file)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -251,8 +251,8 @@ typedef struct {
        gboolean jit_used, llvm_used;
 } MonoPltEntry;
 
-#define mono_acfg_lock(acfg) mono_mutex_lock (&((acfg)->mutex))
-#define mono_acfg_unlock(acfg) mono_mutex_unlock (&((acfg)->mutex))
+#define mono_acfg_lock(acfg) mono_os_mutex_lock (&((acfg)->mutex))
+#define mono_acfg_unlock(acfg) mono_os_mutex_unlock (&((acfg)->mutex))
 
 /* This points to the current acfg in LLVM mode */
 static MonoAotCompile *llvm_acfg;
@@ -1858,7 +1858,7 @@ arch_emit_imt_thunk (MonoAotCompile *acfg, int offset, int *tramp_size)
 
        const int kSizeOfMove = 7;
 #if defined(__default_codegen__)
-       code = buf = g_malloc (256);
+       code = buf = (guint8 *)g_malloc (256);
 #elif defined(__native_client_codegen__)
        buf_alloc = g_malloc (256 + kNaClAlignment + kSizeOfMove);
        buf = ((guint)buf_alloc + kNaClAlignment) & ~kNaClAlignmentMask;
@@ -2252,7 +2252,7 @@ stream_init (MonoDynamicStream *sh)
 {
        sh->index = 0;
        sh->alloc_size = 4096;
-       sh->data = g_malloc (4096);
+       sh->data = (char *)g_malloc (4096);
 
        /* So offsets are > 0 */
        sh->data [0] = 0;
@@ -2272,7 +2272,7 @@ make_room_in_stream (MonoDynamicStream *stream, int size)
                        stream->alloc_size *= 2;
        }
        
-       stream->data = g_realloc (stream->data, stream->alloc_size);
+       stream->data = (char *)g_realloc (stream->data, stream->alloc_size);
 }
 
 static guint32
@@ -2342,7 +2342,7 @@ emit_offset_table (MonoAotCompile *acfg, const char *symbol, int noffsets, int g
        index_offsets = g_new0 (guint32, ngroups);
 
        buf_size = noffsets * 4;
-       p = buf = g_malloc0 (buf_size);
+       p = buf = (guint8 *)g_malloc0 (buf_size);
 
        current_offset = 0;
        for (i = 0; i < noffsets; ++i) {
@@ -2367,7 +2367,7 @@ emit_offset_table (MonoAotCompile *acfg, const char *symbol, int noffsets, int g
                index_entry_size = 4;
 
        buf_size = (data_p - data_buf) + (ngroups * 4) + 16;
-       p = buf = g_malloc0 (buf_size);
+       p = buf = (guint8 *)g_malloc0 (buf_size);
 
        /* Emit the header */
        encode_int (noffsets, p, &p);
@@ -2427,7 +2427,7 @@ find_typespec_for_class (MonoAotCompile *acfg, MonoClass *klass)
 
        /* FIXME: Search referenced images as well */
        if (!acfg->typespec_classes) {
-               acfg->typespec_classes = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoClass*) * len);
+               acfg->typespec_classes = (MonoClass **)mono_mempool_alloc0 (acfg->mempool, sizeof (MonoClass*) * len);
                for (i = 0; i < len; ++i) {
                        MonoError error;
                        acfg->typespec_classes [i] = mono_class_get_and_inflate_typespec_checked (acfg->image, MONO_TOKEN_TYPE_SPEC | (i + 1), NULL, &error);
@@ -2505,23 +2505,24 @@ encode_klass_ref_inner (MonoAotCompile *acfg, MonoClass *klass, guint8 *buf, gui
                MonoGenericParam *par = klass->byval_arg.data.generic_param;
 
                encode_value (MONO_AOT_TYPEREF_VAR, p, &p);
-               encode_value (klass->byval_arg.type, p, &p);
-               encode_value (mono_type_get_generic_param_num (&klass->byval_arg), p, &p);
-
-               encode_value (container ? 1 : 0, p, &p);
-               if (container) {
-                       encode_value (container->is_method, p, &p);
-                       g_assert (!par->gshared_constraint);
-                       if (container->is_method)
-                               encode_method_ref (acfg, container->owner.method, p, &p);
-                       else
-                               encode_klass_ref (acfg, container->owner.klass, p, &p);
+
+               encode_value (par->gshared_constraint ? 1 : 0, p, &p);
+               if (par->gshared_constraint) {
+                       MonoGSharedGenericParam *gpar = (MonoGSharedGenericParam*)par;
+                       encode_type (acfg, par->gshared_constraint, p, &p);
+                       encode_klass_ref (acfg, mono_class_from_generic_parameter (gpar->parent, NULL, klass->byval_arg.type == MONO_TYPE_MVAR), p, &p);
                } else {
-                       encode_value (par->gshared_constraint ? 1 : 0, p, &p);
-                       if (par->gshared_constraint) {
-                               MonoGSharedGenericParam *gpar = (MonoGSharedGenericParam*)par;
-                               encode_type (acfg, par->gshared_constraint, p, &p);
-                               encode_klass_ref (acfg, mono_class_from_generic_parameter (gpar->parent, NULL, klass->byval_arg.type == MONO_TYPE_MVAR), p, &p);
+                       encode_value (klass->byval_arg.type, p, &p);
+                       encode_value (mono_type_get_generic_param_num (&klass->byval_arg), p, &p);
+
+                       encode_value (container->is_anonymous ? 0 : 1, p, &p);
+
+                       if (!container->is_anonymous) {
+                               encode_value (container->is_method, p, &p);
+                               if (container->is_method)
+                                       encode_method_ref (acfg, container->owner.method, p, &p);
+                               else
+                                       encode_klass_ref (acfg, container->owner.klass, p, &p);
                        }
                }
        } else if (klass->byval_arg.type == MONO_TYPE_PTR) {
@@ -2568,7 +2569,7 @@ encode_klass_ref (MonoAotCompile *acfg, MonoClass *klass, guint8 *buf, guint8 **
                guint8 *buf2, *p;
 
                if (!offset) {
-                       buf2 = g_malloc (1024);
+                       buf2 = (guint8 *)g_malloc (1024);
                        p = buf2;
 
                        encode_klass_ref_inner (acfg, klass, p, &p);
@@ -2926,7 +2927,7 @@ encode_method_ref (MonoAotCompile *acfg, MonoMethod *method, guint8 *buf, guint8
                 * encode that.
                 * Obtain the token from information recorded by the JIT.
                 */
-               ji = g_hash_table_lookup (acfg->token_info_hash, method);
+               ji = (MonoJumpInfoToken *)g_hash_table_lookup (acfg->token_info_hash, method);
                if (ji) {
                        image_index = get_image_index (acfg, ji->image);
                        g_assert (image_index < MAX_IMAGE_INDEX);
@@ -2963,7 +2964,7 @@ encode_method_ref (MonoAotCompile *acfg, MonoMethod *method, guint8 *buf, guint8
        } else if (token == 0) {
                /* This might be a method of a constructed type like int[,].Set */
                /* Obtain the token from information recorded by the JIT */
-               ji = g_hash_table_lookup (acfg->token_info_hash, method);
+               ji = (MonoJumpInfoToken *)g_hash_table_lookup (acfg->token_info_hash, method);
                if (ji) {
                        image_index = get_image_index (acfg, ji->image);
                        g_assert (image_index < MAX_IMAGE_INDEX);
@@ -3058,7 +3059,6 @@ is_plt_patch (MonoJumpInfo *patch_info)
        case MONO_PATCH_INFO_JIT_ICALL_ADDR:
        case MONO_PATCH_INFO_ICALL_ADDR:
        case MONO_PATCH_INFO_RGCTX_FETCH:
-       case MONO_PATCH_INFO_LLVM_IMT_TRAMPOLINE:
                return TRUE;
        default:
                return FALSE;
@@ -3101,7 +3101,7 @@ get_plt_entry (MonoAotCompile *acfg, MonoJumpInfo *patch_info)
 
        if (!acfg->patch_to_plt_entry [patch_info->type])
                acfg->patch_to_plt_entry [patch_info->type] = g_hash_table_new (mono_patch_info_hash, mono_patch_info_equal);
-       res = g_hash_table_lookup (acfg->patch_to_plt_entry [patch_info->type], patch_info);
+       res = (MonoPltEntry *)g_hash_table_lookup (acfg->patch_to_plt_entry [patch_info->type], patch_info);
 
        if (!acfg->llvm && patch_info->type == MONO_PATCH_INFO_METHOD && (patch_info->data.method->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED)) {
                /* 
@@ -3118,7 +3118,7 @@ get_plt_entry (MonoAotCompile *acfg, MonoJumpInfo *patch_info)
 
                new_ji = mono_patch_info_dup_mp (acfg->mempool, patch_info);
 
-               res = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoPltEntry));
+               res = (MonoPltEntry *)mono_mempool_alloc0 (acfg->mempool, sizeof (MonoPltEntry));
                res->plt_offset = acfg->plt_offset;
                res->ji = new_ji;
                res->symbol = get_plt_symbol (acfg, res->plt_offset, patch_info);
@@ -3270,8 +3270,8 @@ add_extra_method (MonoAotCompile *acfg, MonoMethod *method)
 static void
 add_jit_icall_wrapper (gpointer key, gpointer value, gpointer user_data)
 {
-       MonoAotCompile *acfg = user_data;
-       MonoJitICallInfo *callinfo = value;
+       MonoAotCompile *acfg = (MonoAotCompile *)user_data;
+       MonoJitICallInfo *callinfo = (MonoJitICallInfo *)value;
        MonoMethod *wrapper;
        char *name;
 
@@ -3297,9 +3297,9 @@ get_runtime_invoke_sig (MonoMethodSignature *sig)
 }
 
 static MonoMethod*
-get_runtime_invoke (MonoAotCompile *acfg, MonoMethod *method, gboolean virtual)
+get_runtime_invoke (MonoAotCompile *acfg, MonoMethod *method, gboolean virtual_)
 {
-       return mono_marshal_get_runtime_invoke (method, virtual, acfg->aot_opts.llvm_only && mono_method_needs_static_rgctx_invoke (method, TRUE));
+       return mono_marshal_get_runtime_invoke (method, virtual_, acfg->aot_opts.llvm_only && mono_method_needs_static_rgctx_invoke (method, TRUE));
 }
 
 static gboolean
@@ -3863,7 +3863,7 @@ add_wrappers (MonoAotCompile *acfg)
 
                                /* From load_cattr_value () in reflection.c */
                                slen = mono_metadata_decode_value (p, &p);
-                               n = g_memdup (p, slen + 1);
+                               n = (char *)g_memdup (p, slen + 1);
                                n [slen] = 0;
                                t = mono_reflection_type_from_name (n, acfg->image);
                                g_assert (t);
@@ -3890,7 +3890,7 @@ add_wrappers (MonoAotCompile *acfg)
                                        named += 1;
 
                                        name_len = mono_metadata_decode_blob_size (named, &named);
-                                       name = g_malloc (name_len + 1);
+                                       name = (char *)g_malloc (name_len + 1);
                                        memcpy (name, named, name_len);
                                        name [name_len] = 0;
                                        named += name_len;
@@ -3901,7 +3901,7 @@ add_wrappers (MonoAotCompile *acfg)
                                        /* load_cattr_value (), string case */
                                        g_assert (*named != (char)0xff);
                                        slen = mono_metadata_decode_value (named, &named);
-                                       export_name = g_malloc (slen + 1);
+                                       export_name = (char *)g_malloc (slen + 1);
                                        memcpy (export_name, named, slen);
                                        export_name [slen] = 0;
                                        named += slen;
@@ -4453,7 +4453,7 @@ add_generic_instances (MonoAotCompile *acfg)
 
        /* Add types of args/locals */
        for (i = 0; i < acfg->methods->len; ++i) {
-               method = g_ptr_array_index (acfg->methods, i);
+               method = (MonoMethod *)g_ptr_array_index (acfg->methods, i);
                add_types_from_method_header (acfg, method);
        }
 
@@ -4483,24 +4483,39 @@ add_generic_instances (MonoAotCompile *acfg)
                if (klass)
                        add_instances_of (acfg, klass, insts, ninsts, TRUE);
 
-               /* Add an instance of LongEnumEqualityComparer<long/ulong> which is created by EqualityComparer<T> for enums */
+               /* Add instances of EnumEqualityComparer which are created by EqualityComparer<T> for enums */
                {
                        MonoClass *enum_comparer;
-                       MonoGenericContext ctx;
-                       MonoType *args [16];
+                       MonoType *insts [16];
+                       int ninsts;
+
+                       ninsts = 0;
+                       insts [ninsts ++] = &mono_defaults.int32_class->byval_arg;
+                       insts [ninsts ++] = &mono_defaults.uint32_class->byval_arg;
+                       insts [ninsts ++] = &mono_defaults.uint16_class->byval_arg;
+                       insts [ninsts ++] = &mono_defaults.byte_class->byval_arg;
+                       enum_comparer = mono_class_from_name (mono_defaults.corlib, "System.Collections.Generic", "EnumEqualityComparer`1");
+                       g_assert (enum_comparer);
+                       add_instances_of (acfg, enum_comparer, insts, ninsts, FALSE);
 
-                       enum_comparer = mono_class_from_name (mono_defaults.corlib, "System.Collections.Generic", "LongEnumEqualityComparer`1");
+                       ninsts = 0;
+                       insts [ninsts ++] = &mono_defaults.int16_class->byval_arg;
+                       enum_comparer = mono_class_from_name (mono_defaults.corlib, "System.Collections.Generic", "ShortEnumEqualityComparer`1");
                        g_assert (enum_comparer);
+                       add_instances_of (acfg, enum_comparer, insts, ninsts, FALSE);
 
-                       memset (&ctx, 0, sizeof (ctx));
-                       args [0] = &mono_defaults.int64_class->byval_arg;
-                       ctx.class_inst = mono_metadata_get_generic_inst (1, args);
-                       add_generic_class (acfg, mono_class_inflate_generic_class (enum_comparer, &ctx), FALSE, "EqualityComparer<T>");
+                       ninsts = 0;
+                       insts [ninsts ++] = &mono_defaults.sbyte_class->byval_arg;
+                       enum_comparer = mono_class_from_name (mono_defaults.corlib, "System.Collections.Generic", "SByteEnumEqualityComparer`1");
+                       g_assert (enum_comparer);
+                       add_instances_of (acfg, enum_comparer, insts, ninsts, FALSE);
 
-                       memset (&ctx, 0, sizeof (ctx));
-                       args [0] = &mono_defaults.uint64_class->byval_arg;
-                       ctx.class_inst = mono_metadata_get_generic_inst (1, args);
-                       add_generic_class (acfg, mono_class_inflate_generic_class (enum_comparer, &ctx), FALSE, "EqualityComparer<T>");
+                       enum_comparer = mono_class_from_name (mono_defaults.corlib, "System.Collections.Generic", "LongEnumEqualityComparer`1");
+                       g_assert (enum_comparer);
+                       ninsts = 0;
+                       insts [ninsts ++] = &mono_defaults.int64_class->byval_arg;
+                       insts [ninsts ++] = &mono_defaults.uint64_class->byval_arg;
+                       add_instances_of (acfg, enum_comparer, insts, ninsts, FALSE);
                }
 
                /* Add instances of the array generic interfaces for primitive types */
@@ -4615,7 +4630,7 @@ static gboolean
 is_direct_callable (MonoAotCompile *acfg, MonoMethod *method, MonoJumpInfo *patch_info)
 {
        if ((patch_info->type == MONO_PATCH_INFO_METHOD) && (patch_info->data.method->klass->image == acfg->image)) {
-               MonoCompile *callee_cfg = g_hash_table_lookup (acfg->method_to_cfg, patch_info->data.method);
+               MonoCompile *callee_cfg = (MonoCompile *)g_hash_table_lookup (acfg->method_to_cfg, patch_info->data.method);
                if (callee_cfg) {
                        gboolean direct_callable = TRUE;
 
@@ -4667,7 +4682,7 @@ get_pinvoke_import (MonoAotCompile *acfg, MonoMethod *method)
        guint32 im_cols [MONO_IMPLMAP_SIZE];
        char *import;
 
-       import = g_hash_table_lookup (acfg->method_to_pinvoke_import, method);
+       import = (char *)g_hash_table_lookup (acfg->method_to_pinvoke_import, method);
        if (import != NULL)
                return import;
 
@@ -4727,7 +4742,7 @@ compute_line_numbers (MonoMethod *method, int code_size, MonoDebugMethodJitInfo
        ln_array = g_new0 (MonoDebugLineNumberEntry, debug_info->num_line_numbers);
        memcpy (ln_array, debug_info->line_numbers, debug_info->num_line_numbers * sizeof (MonoDebugLineNumberEntry));
 
-       qsort (ln_array, debug_info->num_line_numbers, sizeof (MonoDebugLineNumberEntry), (gpointer)compare_lne);
+       qsort (ln_array, debug_info->num_line_numbers, sizeof (MonoDebugLineNumberEntry), (int (*)(const void *, const void *))compare_lne);
 
        native_to_il_offset = g_new0 (int, code_size + 1);
 
@@ -4848,7 +4863,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui
        for (i = 0; i < code_len; i += INST_LEN) {
                patch_info = NULL;
                for (pindex = start_index; pindex < patches->len; ++pindex) {
-                       patch_info = g_ptr_array_index (patches, pindex);
+                       patch_info = (MonoJumpInfo *)g_ptr_array_index (patches, pindex);
                        if (patch_info->ip.i >= i)
                                break;
                }
@@ -4882,7 +4897,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui
                        }
                        case MONO_PATCH_INFO_OBJC_SELECTOR_REF: {
                                int code_size, index;
-                               char *selector = (void*)patch_info->data.target;
+                               char *selector = (char *)patch_info->data.target;
 
                                if (!acfg->objc_selector_to_index)
                                        acfg->objc_selector_to_index = g_hash_table_new (g_str_hash, g_str_equal);
@@ -4914,7 +4929,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui
                                external_call = FALSE;
                                if ((patch_info->type == MONO_PATCH_INFO_METHOD) && (patch_info->data.method->klass->image == acfg->image)) {
                                        if (!got_only && is_direct_callable (acfg, method, patch_info)) {
-                                               MonoCompile *callee_cfg = g_hash_table_lookup (acfg->method_to_cfg, patch_info->data.method);
+                                               MonoCompile *callee_cfg = (MonoCompile *)g_hash_table_lookup (acfg->method_to_cfg, patch_info->data.method);
                                                //printf ("DIRECT: %s %s\n", method ? mono_method_full_name (method, TRUE) : "", mono_method_full_name (callee_cfg->method, TRUE));
                                                direct_call = TRUE;
                                                direct_call_target = callee_cfg->asm_symbol;
@@ -4997,7 +5012,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui
                        /* Find next patch */
                        patch_info = NULL;
                        for (pindex = start_index; pindex < patches->len; ++pindex) {
-                               patch_info = g_ptr_array_index (patches, pindex);
+                               patch_info = (MonoJumpInfo *)g_ptr_array_index (patches, pindex);
                                if (patch_info->ip.i >= i)
                                        break;
                        }
@@ -5088,7 +5103,7 @@ get_debug_sym (MonoMethod *method, const char *prefix, GHashTable *cache)
 #endif
 
        len = strlen (name1);
-       name2 = malloc (strlen (prefix) + len + 16);
+       name2 = (char *)malloc (strlen (prefix) + len + 16);
        memcpy (name2, prefix, strlen (prefix));
        j = strlen (prefix);
        for (i = 0; i < len; ++i) {
@@ -5111,7 +5126,7 @@ get_debug_sym (MonoMethod *method, const char *prefix, GHashTable *cache)
 
        count = 0;
        while (TRUE) {
-               cached_method = g_hash_table_lookup (cache, name2);
+               cached_method = (MonoMethod *)g_hash_table_lookup (cache, name2);
                if (!(cached_method && cached_method != method))
                        break;
                sprintf (name2 + j, "_%d", count);
@@ -5166,7 +5181,7 @@ emit_method_code (MonoAotCompile *acfg, MonoCompile *cfg)
                emit_label (acfg, debug_sym);
        }
 
-       export_name = g_hash_table_lookup (acfg->export_names, method);
+       export_name = (char *)g_hash_table_lookup (acfg->export_names, method);
        if (export_name) {
                /* Emit a global symbol for the method */
                emit_global_inner (acfg, export_name, TRUE);
@@ -5278,7 +5293,7 @@ encode_patch (MonoAotCompile *acfg, MonoJumpInfo *patch_info, guint8 *buf, guint
 
                ex_class =
                        mono_class_from_name (mono_defaults.exception_class->image,
-                                                                 "System", patch_info->data.target);
+                                                                 "System", (const char *)patch_info->data.target);
                g_assert (ex_class);
                encode_klass_ref (acfg, ex_class, p, &p);
                break;
@@ -5324,7 +5339,7 @@ encode_patch (MonoAotCompile *acfg, MonoJumpInfo *patch_info, guint8 *buf, guint
                 */
                offset = GPOINTER_TO_UINT (g_hash_table_lookup (acfg->method_blob_hash, entry->method));
                if (!offset) {
-                       buf2 = g_malloc (1024);
+                       buf2 = (guint8 *)g_malloc (1024);
                        p2 = buf2;
 
                        encode_method_ref (acfg, entry->method, p2, &p2);
@@ -5348,10 +5363,6 @@ encode_patch (MonoAotCompile *acfg, MonoJumpInfo *patch_info, guint8 *buf, guint
        case MONO_PATCH_INFO_SEQ_POINT_INFO:
        case MONO_PATCH_INFO_AOT_MODULE:
                break;
-       case MONO_PATCH_INFO_LLVM_IMT_TRAMPOLINE:
-               encode_method_ref (acfg, patch_info->data.imt_tramp->method, p, &p);
-               encode_value (patch_info->data.imt_tramp->vt_offset, p, &p);
-               break;
        case MONO_PATCH_INFO_SIGNATURE:
                encode_signature (acfg, (MonoMethodSignature*)patch_info->data.target, p, &p);
                break;
@@ -5369,15 +5380,15 @@ encode_patch (MonoAotCompile *acfg, MonoJumpInfo *patch_info, guint8 *buf, guint
                encode_method_ref (acfg, info->method, p, &p);
                encode_value (info->num_entries, p, &p);
                for (i = 0; i < info->num_entries; ++i) {
-                       MonoRuntimeGenericContextInfoTemplate *template = &info->entries [i];
+                       MonoRuntimeGenericContextInfoTemplate *template_ = &info->entries [i];
 
-                       encode_value (template->info_type, p, &p);
-                       switch (mini_rgctx_info_type_to_patch_info_type (template->info_type)) {
+                       encode_value (template_->info_type, p, &p);
+                       switch (mini_rgctx_info_type_to_patch_info_type (template_->info_type)) {
                        case MONO_PATCH_INFO_CLASS:
-                               encode_klass_ref (acfg, mono_class_from_mono_type (template->data), p, &p);
+                               encode_klass_ref (acfg, mono_class_from_mono_type ((MonoType *)template_->data), p, &p);
                                break;
                        case MONO_PATCH_INFO_FIELD:
-                               encode_field_info (acfg, template->data, p, &p);
+                               encode_field_info (acfg, (MonoClassField *)template_->data, p, &p);
                                break;
                        default:
                                g_assert_not_reached ();
@@ -5387,7 +5398,7 @@ encode_patch (MonoAotCompile *acfg, MonoJumpInfo *patch_info, guint8 *buf, guint
                break;
        }
        case MONO_PATCH_INFO_LDSTR_LIT: {
-               const char *s = patch_info->data.target;
+               const char *s = (const char *)patch_info->data.target;
                int len = strlen (s);
 
                encode_value (len, p, &p);
@@ -5419,7 +5430,7 @@ encode_patch_list (MonoAotCompile *acfg, GPtrArray *patches, int n_patches, gboo
        encode_value (n_patches, p, &p);
 
        for (pindex = 0; pindex < patches->len; ++pindex) {
-               patch_info = g_ptr_array_index (patches, pindex);
+               patch_info = (MonoJumpInfo *)g_ptr_array_index (patches, pindex);
 
                if (patch_info->type == MONO_PATCH_INFO_NONE || patch_info->type == MONO_PATCH_INFO_BB)
                        /* Nothing to do */
@@ -5460,7 +5471,7 @@ emit_method_info (MonoAotCompile *acfg, MonoCompile *cfg)
        /**********************/
 
        buf_size = (patches->len < 1000) ? 40960 : 40960 + (patches->len * 64);
-       p = buf = g_malloc (buf_size);
+       p = buf = (guint8 *)g_malloc (buf_size);
 
        if (mono_class_get_cctor (method->klass))
                encode_klass_ref (acfg, method->klass, p, &p);
@@ -5472,7 +5483,7 @@ emit_method_info (MonoAotCompile *acfg, MonoCompile *cfg)
 
        n_patches = 0;
        for (pindex = 0; pindex < patches->len; ++pindex) {
-               patch_info = g_ptr_array_index (patches, pindex);
+               patch_info = (MonoJumpInfo *)g_ptr_array_index (patches, pindex);
                
                if ((patch_info->type == MONO_PATCH_INFO_GOT_OFFSET) ||
                        (patch_info->type == MONO_PATCH_INFO_NONE)) {
@@ -5579,7 +5590,7 @@ emit_exception_debug_info (MonoAotCompile *acfg, MonoCompile *cfg, gboolean stor
 
        buf_size = header->num_clauses * 256 + debug_info_size + 2048 + seq_points_size + cfg->gc_map_size;
 
-       p = buf = g_malloc (buf_size);
+       p = buf = (guint8 *)g_malloc (buf_size);
 
        use_unwind_ops = cfg->unwind_ops != NULL;
 
@@ -5680,7 +5691,7 @@ emit_exception_debug_info (MonoAotCompile *acfg, MonoCompile *cfg, gboolean stor
                                        guint8 *buf2, *p2;
                                        int len;
 
-                                       buf2 = g_malloc (4096);
+                                       buf2 = (guint8 *)g_malloc (4096);
                                        p2 = buf2;
                                        encode_klass_ref (acfg, ei->data.catch_class, p2, &p2);
                                        len = p2 - buf2;
@@ -5751,7 +5762,7 @@ emit_exception_debug_info (MonoAotCompile *acfg, MonoCompile *cfg, gboolean stor
                 * Need to encode jinfo->method too, since it is not equal to 'method'
                 * when using generic sharing.
                 */
-               buf2 = g_malloc (4096);
+               buf2 = (guint8 *)g_malloc (4096);
                p2 = buf2;
                encode_method_ref (acfg, jinfo->d.method, p2, &p2);
                len = p2 - buf2;
@@ -5815,7 +5826,7 @@ emit_klass_info (MonoAotCompile *acfg, guint32 token)
 
                buf_size = 16;
 
-               p = buf = g_malloc (buf_size);
+               p = buf = (guint8 *)g_malloc (buf_size);
 
                /* Mark as unusable */
                encode_value (-1, p, &p);
@@ -5827,7 +5838,7 @@ emit_klass_info (MonoAotCompile *acfg, guint32 token)
        }
                
        buf_size = 10240 + (klass->vtable_size * 16);
-       p = buf = g_malloc (buf_size);
+       p = buf = (guint8 *)g_malloc (buf_size);
 
        g_assert (klass);
 
@@ -5965,7 +5976,7 @@ emit_plt (MonoAotCompile *acfg)
                         */
                        continue;
 
-               plt_entry = g_hash_table_lookup (acfg->plt_offset_to_entry, GUINT_TO_POINTER (i));
+               plt_entry = (MonoPltEntry *)g_hash_table_lookup (acfg->plt_offset_to_entry, GUINT_TO_POINTER (i));
 
                debug_sym = plt_entry->debug_sym;
 
@@ -6019,7 +6030,7 @@ emit_plt (MonoAotCompile *acfg)
                        if (i == 0)
                                continue;
 
-                       plt_entry = g_hash_table_lookup (acfg->plt_offset_to_entry, GUINT_TO_POINTER (i));
+                       plt_entry = (MonoPltEntry *)g_hash_table_lookup (acfg->plt_offset_to_entry, GUINT_TO_POINTER (i));
 
                        /* Skip plt entries not actually called by LLVM code */
                        if (!plt_entry->llvm_used)
@@ -6128,7 +6139,7 @@ emit_trampoline_full (MonoAotCompile *acfg, int got_offset, MonoTrampInfo *info,
        g_ptr_array_sort (patches, compare_patches);
 
        buf_size = patches->len * 128 + 128;
-       buf = g_malloc (buf_size);
+       buf = (guint8 *)g_malloc (buf_size);
        p = buf;
 
        encode_patch_list (acfg, patches, patches->len, FALSE, got_offset, p, &p);
@@ -6184,7 +6195,7 @@ emit_trampolines (MonoAotCompile *acfg)
        char symbol [256];
        char end_symbol [256];
        int i, tramp_got_offset;
-       MonoAotTrampoline ntype;
+       int ntype;
 #ifdef MONO_ARCH_HAVE_FULL_AOT_TRAMPOLINES
        int tramp_type;
 #endif
@@ -6216,7 +6227,7 @@ emit_trampolines (MonoAotCompile *acfg)
                        if (tramp_type == MONO_TRAMPOLINE_HANDLER_BLOCK_GUARD)
                                continue;
 #endif
-                       mono_arch_create_generic_trampoline (tramp_type, &info, acfg->aot_opts.use_trampolines_page? 2: TRUE);
+                       mono_arch_create_generic_trampoline ((MonoTrampolineType)tramp_type, &info, acfg->aot_opts.use_trampolines_page? 2: TRUE);
                        emit_trampoline (acfg, acfg->got_offset, info);
                }
 
@@ -6255,7 +6266,7 @@ emit_trampolines (MonoAotCompile *acfg)
                        GSList *l = mono_arch_get_trampolines (TRUE);
 
                        while (l) {
-                               MonoTrampInfo *info = l->data;
+                               MonoTrampInfo *info = (MonoTrampInfo *)l->data;
 
                                emit_trampoline (acfg, acfg->got_offset, info);
                                l = l->next;
@@ -6286,7 +6297,7 @@ emit_trampolines (MonoAotCompile *acfg)
                        /* delegate_invoke_impl trampolines */
                        l = mono_arch_get_delegate_invoke_impls ();
                        while (l) {
-                               MonoTrampInfo *info = l->data;
+                               MonoTrampInfo *info = (MonoTrampInfo *)l->data;
 
                                emit_trampoline (acfg, acfg->got_offset, info);
                                l = l->next;
@@ -6467,7 +6478,7 @@ add_readonly_value (MonoAotOptions *opts, const char *val)
                exit (1);
        }
        rdv = g_new0 (ReadOnlyValue, 1);
-       rdv->name = g_malloc0 (tval - val + 1);
+       rdv->name = (char *)g_malloc0 (tval - val + 1);
        memcpy (rdv->name, val, tval - val);
        tval++;
        fval++;
@@ -6583,7 +6594,7 @@ mono_aot_parse_options (const char *aot_options, MonoAotOptions *opts)
 
        args = mono_aot_split_options (aot_options ? aot_options : "");
        for (int i = 0; i < args->len; ++i) {
-               const char *arg = g_ptr_array_index (args, i);
+               const char *arg = (const char *)g_ptr_array_index (args, i);
 
                if (str_begins_with (arg, "outfile=")) {
                        opts->outfile = g_strdup (arg + strlen ("outfile="));
@@ -6735,10 +6746,10 @@ add_token_info_hash (gpointer key, gpointer value, gpointer user_data)
 {
        MonoMethod *method = (MonoMethod*)key;
        MonoJumpInfoToken *ji = (MonoJumpInfoToken*)value;
-       MonoAotCompile *acfg = user_data;
+       MonoAotCompile *acfg = (MonoAotCompile *)user_data;
        MonoJumpInfoToken *new_ji;
 
-       new_ji = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfoToken));
+       new_ji = (MonoJumpInfoToken *)mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfoToken));
        new_ji->image = ji->image;
        new_ji->token = ji->token;
        g_hash_table_insert (acfg->token_info_hash, method, new_ji);
@@ -6913,13 +6924,13 @@ compile_method (MonoAotCompile *acfg, MonoMethod *method)
         */
        flags = JIT_FLAG_AOT;
        if (mono_aot_mode_is_full (&acfg->aot_opts))
-               flags |= JIT_FLAG_FULL_AOT;
+               flags = (JitFlags)(flags | JIT_FLAG_FULL_AOT);
        if (acfg->llvm)
-               flags |= JIT_FLAG_LLVM;
+               flags = (JitFlags)(flags | JIT_FLAG_LLVM);
        if (acfg->aot_opts.llvm_only)
-               flags |= JIT_FLAG_LLVM_ONLY | JIT_FLAG_EXPLICIT_NULL_CHECKS;
+               flags = (JitFlags)(flags | JIT_FLAG_LLVM_ONLY | JIT_FLAG_EXPLICIT_NULL_CHECKS);
        if (acfg->aot_opts.no_direct_calls)
-               flags |= JIT_FLAG_NO_DIRECT_ICALLS;
+               flags = (JitFlags)(flags | JIT_FLAG_NO_DIRECT_ICALLS);
        cfg = mini_method_compile (method, acfg->opts, mono_get_root_domain (), flags, 0, index);
        mono_loader_clear_error ();
 
@@ -7135,7 +7146,7 @@ compile_method (MonoAotCompile *acfg, MonoMethod *method)
 
                unwind_ops = NULL;
                for (l = cfg->unwind_ops; l; l = l->next) {
-                       op = mono_mempool_alloc (acfg->mempool, sizeof (MonoUnwindOp));
+                       op = (MonoUnwindOp *)mono_mempool_alloc (acfg->mempool, sizeof (MonoUnwindOp));
                        memcpy (op, l->data, sizeof (MonoUnwindOp));
                        unwind_ops = g_slist_prepend_mempool (acfg->mempool, unwind_ops, op);
                }
@@ -7149,17 +7160,17 @@ compile_method (MonoAotCompile *acfg, MonoMethod *method)
                int i;
                
                sig = mono_method_signature (method);
-               args = mono_mempool_alloc (acfg->mempool, sizeof (MonoInst*) * (sig->param_count + sig->hasthis));
+               args = (MonoInst **)mono_mempool_alloc (acfg->mempool, sizeof (MonoInst*) * (sig->param_count + sig->hasthis));
                for (i = 0; i < sig->param_count + sig->hasthis; ++i) {
-                       args [i] = mono_mempool_alloc (acfg->mempool, sizeof (MonoInst));
+                       args [i] = (MonoInst *)mono_mempool_alloc (acfg->mempool, sizeof (MonoInst));
                        memcpy (args [i], cfg->args [i], sizeof (MonoInst));
                }
                cfg->args = args;
 
                header = mono_method_get_header (method);
-               locals = mono_mempool_alloc (acfg->mempool, sizeof (MonoInst*) * header->num_locals);
+               locals = (MonoInst **)mono_mempool_alloc (acfg->mempool, sizeof (MonoInst*) * header->num_locals);
                for (i = 0; i < header->num_locals; ++i) {
-                       locals [i] = mono_mempool_alloc (acfg->mempool, sizeof (MonoInst));
+                       locals [i] = (MonoInst *)mono_mempool_alloc (acfg->mempool, sizeof (MonoInst));
                        memcpy (locals [i], cfg->locals [i], sizeof (MonoInst));
                }
                cfg->locals = locals;
@@ -7207,15 +7218,15 @@ compile_method (MonoAotCompile *acfg, MonoMethod *method)
 static void
 compile_thread_main (gpointer *user_data)
 {
-       MonoDomain *domain = user_data [0];
-       MonoAotCompile *acfg = user_data [1];
-       GPtrArray *methods = user_data [2];
+       MonoDomain *domain = (MonoDomain *)user_data [0];
+       MonoAotCompile *acfg = (MonoAotCompile *)user_data [1];
+       GPtrArray *methods = (GPtrArray *)user_data [2];
        int i;
 
        mono_thread_attach (domain);
 
        for (i = 0; i < methods->len; ++i)
-               compile_method (acfg, g_ptr_array_index (methods, i));
+               compile_method (acfg, (MonoMethod *)g_ptr_array_index (methods, i));
 }
 
 static void
@@ -7359,9 +7370,9 @@ mono_aot_get_direct_call_symbol (MonoJumpInfoType type, gconstpointer data)
        if (llvm_acfg->aot_opts.direct_icalls) {
                if (type == MONO_PATCH_INFO_JIT_ICALL_ADDR) {
                        /* Call to a C function implementing a jit icall */
-                       sym = mono_lookup_jit_icall_symbol (data);
+                       sym = mono_lookup_jit_icall_symbol ((const char *)data);
                } else if (type == MONO_PATCH_INFO_ICALL_ADDR) {
-                       MonoMethod *method = (gpointer)data;
+                       MonoMethod *method = (MonoMethod *)data;
                        if (!(method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL))
                                sym = mono_lookup_icall_symbol (method);
                }
@@ -7374,7 +7385,7 @@ mono_aot_get_direct_call_symbol (MonoJumpInfoType type, gconstpointer data)
 char*
 mono_aot_get_plt_symbol (MonoJumpInfoType type, gconstpointer data)
 {
-       MonoJumpInfo *ji = mono_mempool_alloc (llvm_acfg->mempool, sizeof (MonoJumpInfo));
+       MonoJumpInfo *ji = (MonoJumpInfo *)mono_mempool_alloc (llvm_acfg->mempool, sizeof (MonoJumpInfo));
        MonoPltEntry *plt_entry;
        const char *sym = NULL;
 
@@ -7387,9 +7398,9 @@ mono_aot_get_plt_symbol (MonoJumpInfoType type, gconstpointer data)
        if (llvm_acfg->aot_opts.direct_icalls) {
                if (type == MONO_PATCH_INFO_JIT_ICALL_ADDR) {
                        /* Call to a C function implementing a jit icall */
-                       sym = mono_lookup_jit_icall_symbol (data);
+                       sym = mono_lookup_jit_icall_symbol ((const char *)data);
                } else if (type == MONO_PATCH_INFO_ICALL_ADDR) {
-                       MonoMethod *method = (gpointer)data;
+                       MonoMethod *method = (MonoMethod *)data;
                        if (!(method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL))
                                sym = mono_lookup_icall_symbol (method);
                }
@@ -7879,7 +7890,7 @@ mono_aot_method_hash (MonoMethod *method)
                ginst = ((MonoMethodInflated*)method)->context.method_inst;
 
        hashes_count = sig->param_count + 5 + (class_ginst ? class_ginst->type_argc : 0) + (ginst ? ginst->type_argc : 0);
-       hashes_start = g_malloc0 (hashes_count * sizeof (guint32));
+       hashes_start = (guint32 *)g_malloc0 (hashes_count * sizeof (guint32));
        hashes = hashes_start;
 
        /* Some wrappers are assigned to random classes */
@@ -8030,14 +8041,14 @@ emit_extra_methods (MonoAotCompile *acfg)
        /* Emit method info */
        nmethods = 0;
        for (i = 0; i < acfg->extra_methods->len; ++i) {
-               MonoMethod *method = g_ptr_array_index (acfg->extra_methods, i);
-               MonoCompile *cfg = g_hash_table_lookup (acfg->method_to_cfg, method);
+               MonoMethod *method = (MonoMethod *)g_ptr_array_index (acfg->extra_methods, i);
+               MonoCompile *cfg = (MonoCompile *)g_hash_table_lookup (acfg->method_to_cfg, method);
 
                if (!cfg)
                        continue;
 
                buf_size = 10240;
-               p = buf = g_malloc (buf_size);
+               p = buf = (guint8 *)g_malloc (buf_size);
 
                nmethods ++;
 
@@ -8062,8 +8073,8 @@ emit_extra_methods (MonoAotCompile *acfg)
        chain_lengths = g_new0 (int, table_size);
        max_chain_length = 0;
        for (i = 0; i < acfg->extra_methods->len; ++i) {
-               MonoMethod *method = g_ptr_array_index (acfg->extra_methods, i);
-               MonoCompile *cfg = g_hash_table_lookup (acfg->method_to_cfg, method);
+               MonoMethod *method = (MonoMethod *)g_ptr_array_index (acfg->extra_methods, i);
+               MonoCompile *cfg = (MonoCompile *)g_hash_table_lookup (acfg->method_to_cfg, method);
                guint32 key, value;
 
                if (!cfg)
@@ -8078,11 +8089,11 @@ emit_extra_methods (MonoAotCompile *acfg)
                chain_lengths [hash] ++;
                max_chain_length = MAX (max_chain_length, chain_lengths [hash]);
 
-               new_entry = mono_mempool_alloc0 (acfg->mempool, sizeof (HashEntry));
+               new_entry = (HashEntry *)mono_mempool_alloc0 (acfg->mempool, sizeof (HashEntry));
                new_entry->key = key;
                new_entry->value = value;
 
-               entry = g_ptr_array_index (table, hash);
+               entry = (HashEntry *)g_ptr_array_index (table, hash);
                if (entry == NULL) {
                        new_entry->index = hash;
                        g_ptr_array_index (table, hash) = new_entry;
@@ -8099,11 +8110,11 @@ emit_extra_methods (MonoAotCompile *acfg)
        //printf ("MAX: %d\n", max_chain_length);
 
        buf_size = table->len * 12 + 4;
-       p = buf = g_malloc (buf_size);
+       p = buf = (guint8 *)g_malloc (buf_size);
        encode_int (table_size, p, &p);
 
        for (i = 0; i < table->len; ++i) {
-               HashEntry *entry = g_ptr_array_index (table, i);
+               HashEntry *entry = (HashEntry *)g_ptr_array_index (table, i);
 
                if (entry == NULL) {
                        encode_int (0, p, &p);
@@ -8137,10 +8148,10 @@ emit_extra_methods (MonoAotCompile *acfg)
         * This is used by mono_aot_find_jit_info ().
         */
        buf_size = acfg->extra_methods->len * 8 + 4;
-       p = buf = g_malloc (buf_size);
+       p = buf = (guint8 *)g_malloc (buf_size);
        encode_int (acfg->extra_methods->len, p, &p);
        for (i = 0; i < acfg->extra_methods->len; ++i) {
-               MonoMethod *method = g_ptr_array_index (acfg->extra_methods, i);
+               MonoMethod *method = (MonoMethod *)g_ptr_array_index (acfg->extra_methods, i);
 
                encode_int (get_method_index (acfg, method), p, &p);
                encode_int (info_offsets [i], p, &p);
@@ -8296,7 +8307,7 @@ emit_class_name_table (MonoAotCompile *acfg)
                new_entry = g_new0 (ClassNameTableEntry, 1);
                new_entry->token = token;
 
-               entry = g_ptr_array_index (table, hash);
+               entry = (ClassNameTableEntry *)g_ptr_array_index (table, hash);
                if (entry == NULL) {
                        new_entry->index = hash;
                        g_ptr_array_index (table, hash) = new_entry;
@@ -8312,14 +8323,14 @@ emit_class_name_table (MonoAotCompile *acfg)
 
        /* Emit the table */
        buf_size = table->len * 4 + 4;
-       p = buf = g_malloc0 (buf_size);
+       p = buf = (guint8 *)g_malloc0 (buf_size);
 
        /* FIXME: Optimize memory usage */
        g_assert (table_size < 65000);
        encode_int16 (table_size, p, &p);
        g_assert (table->len < 65000);
        for (i = 0; i < table->len; ++i) {
-               ClassNameTableEntry *entry = g_ptr_array_index (table, i);
+               ClassNameTableEntry *entry = (ClassNameTableEntry *)g_ptr_array_index (table, i);
 
                if (entry == NULL) {
                        encode_int16 (0, p, &p);
@@ -8364,7 +8375,7 @@ emit_image_table (MonoAotCompile *acfg)
                buf_size += strlen (image->assembly_name) + strlen (image->guid) + (aname->culture ? strlen (aname->culture) : 1) + strlen ((char*)aname->public_key_token) + 4;
        }
 
-       buf = p = g_malloc0 (buf_size);
+       buf = p = (guint8 *)g_malloc0 (buf_size);
        encode_int (acfg->image_table->len, p, &p);
        for (i = 0; i < acfg->image_table->len; i++) {
                MonoImage *image = (MonoImage*)g_ptr_array_index (acfg->image_table, i);
@@ -8415,7 +8426,7 @@ emit_got_info (MonoAotCompile *acfg, gboolean llvm)
                acfg->plt_got_offset_base = acfg->got_offset;
                first_plt_got_patch = info->got_patches->len;
                for (i = 1; i < acfg->plt_offset; ++i) {
-                       MonoPltEntry *plt_entry = g_hash_table_lookup (acfg->plt_offset_to_entry, GUINT_TO_POINTER (i));
+                       MonoPltEntry *plt_entry = (MonoPltEntry *)g_hash_table_lookup (acfg->plt_offset_to_entry, GUINT_TO_POINTER (i));
 
                        g_ptr_array_add (info->got_patches, plt_entry->ji);
 
@@ -8438,16 +8449,16 @@ emit_got_info (MonoAotCompile *acfg, gboolean llvm)
 
        /* Encode info required to decode shared GOT entries */
        buf_size = info->got_patches->len * 128;
-       p = buf = mono_mempool_alloc (acfg->mempool, buf_size);
-       got_info_offsets = mono_mempool_alloc (acfg->mempool, info->got_patches->len * sizeof (guint32));
+       p = buf = (guint8 *)mono_mempool_alloc (acfg->mempool, buf_size);
+       got_info_offsets = (guint32 *)mono_mempool_alloc (acfg->mempool, info->got_patches->len * sizeof (guint32));
        if (!llvm) {
-               acfg->plt_got_info_offsets = mono_mempool_alloc (acfg->mempool, acfg->plt_offset * sizeof (guint32));
+               acfg->plt_got_info_offsets = (guint32 *)mono_mempool_alloc (acfg->mempool, acfg->plt_offset * sizeof (guint32));
                /* Unused */
                if (acfg->plt_offset)
                        acfg->plt_got_info_offsets [0] = 0;
        }
        for (i = 0; i < info->got_patches->len; ++i) {
-               MonoJumpInfo *ji = g_ptr_array_index (info->got_patches, i);
+               MonoJumpInfo *ji = (MonoJumpInfo *)g_ptr_array_index (info->got_patches, i);
                guint8 *p2;
 
                p = buf;
@@ -8533,7 +8544,7 @@ emit_globals (MonoAotCompile *acfg)
        for (i = 0; i < table_size; ++i)
                g_ptr_array_add (table, NULL);
        for (i = 0; i < acfg->globals->len; ++i) {
-               char *name = g_ptr_array_index (acfg->globals, i);
+               char *name = (char *)g_ptr_array_index (acfg->globals, i);
 
                hash = mono_metadata_str_hash (name) % table_size;
 
@@ -8541,7 +8552,7 @@ emit_globals (MonoAotCompile *acfg)
                new_entry = g_new0 (GlobalsTableEntry, 1);
                new_entry->value = i;
 
-               entry = g_ptr_array_index (table, hash);
+               entry = (GlobalsTableEntry *)g_ptr_array_index (table, hash);
                if (entry == NULL) {
                        new_entry->index = hash;
                        g_ptr_array_index (table, hash) = new_entry;
@@ -8565,7 +8576,7 @@ emit_globals (MonoAotCompile *acfg)
        g_assert (table_size < 65000);
        emit_int16 (acfg, table_size);
        for (i = 0; i < table->len; ++i) {
-               GlobalsTableEntry *entry = g_ptr_array_index (table, i);
+               GlobalsTableEntry *entry = (GlobalsTableEntry *)g_ptr_array_index (table, i);
 
                if (entry == NULL) {
                        emit_int16 (acfg, 0);
@@ -8581,7 +8592,7 @@ emit_globals (MonoAotCompile *acfg)
 
        /* Emit the names */
        for (i = 0; i < acfg->globals->len; ++i) {
-               char *name = g_ptr_array_index (acfg->globals, i);
+               char *name = (char *)g_ptr_array_index (acfg->globals, i);
 
                sprintf (symbol, "name_%d", i);
                emit_section_change (acfg, RODATA_SECT, 1);
@@ -8603,7 +8614,7 @@ emit_globals (MonoAotCompile *acfg)
        emit_pointer (acfg, symbol);
 
        for (i = 0; i < acfg->globals->len; ++i) {
-               char *name = g_ptr_array_index (acfg->globals, i);
+               char *name = (char *)g_ptr_array_index (acfg->globals, i);
 
                sprintf (symbol, "name_%d", i);
                emit_pointer (acfg, symbol);
@@ -8929,7 +8940,7 @@ emit_dwarf_info (MonoAotCompile *acfg)
 
                sprintf (symbol2, "%sme_%x", acfg->temp_prefix, i);
 
-               mono_dwarf_writer_emit_method (acfg->dwarf, cfg, cfg->method, cfg->asm_symbol, symbol2, cfg->asm_debug_symbol, cfg->jit_info->code_start, cfg->jit_info->code_size, cfg->args, cfg->locals, cfg->unwind_ops, mono_debug_find_method (cfg->jit_info->d.method, mono_domain_get ()));
+               mono_dwarf_writer_emit_method (acfg->dwarf, cfg, cfg->method, cfg->asm_symbol, symbol2, cfg->asm_debug_symbol, (guint8 *)cfg->jit_info->code_start, cfg->jit_info->code_size, cfg->args, cfg->locals, cfg->unwind_ops, mono_debug_find_method (cfg->jit_info->d.method, mono_domain_get ()));
        }
 #endif
 }
@@ -9042,7 +9053,7 @@ compile_methods (MonoAotCompile *acfg)
                methods = g_new0 (MonoMethod*, methods_len);
                //memcpy (methods, g_ptr_array_index (acfg->methods, 0), sizeof (MonoMethod*) * methods_len);
                for (i = 0; i < methods_len; ++i)
-                       methods [i] = g_ptr_array_index (acfg->methods, i);
+                       methods [i] = (MonoMethod *)g_ptr_array_index (acfg->methods, i);
                i = 0;
                while (i < methods_len) {
                        frag = g_ptr_array_new ();
@@ -9058,7 +9069,7 @@ compile_methods (MonoAotCompile *acfg)
                        user_data [1] = acfg;
                        user_data [2] = frag;
                        
-                       handle = mono_threads_create_thread ((gpointer)compile_thread_main, user_data, 0, 0, NULL);
+                       handle = mono_threads_create_thread ((LPTHREAD_START_ROUTINE)compile_thread_main, user_data, 0, 0, NULL);
                        g_ptr_array_add (threads, handle);
                }
                g_free (methods);
@@ -9073,7 +9084,7 @@ compile_methods (MonoAotCompile *acfg)
        /* Compile methods added by compile_method () or all methods if nthreads == 0 */
        for (i = methods_len; i < acfg->methods->len; ++i) {
                /* This can new methods to acfg->methods */
-               compile_method (acfg, g_ptr_array_index (acfg->methods, i));
+               compile_method (acfg, (MonoMethod *)g_ptr_array_index (acfg->methods, i));
        }
 }
 
@@ -9303,7 +9314,7 @@ acfg_create (MonoAssembly *ass, guint32 opts)
        acfg->klass_blob_hash = g_hash_table_new (NULL, NULL);
        acfg->method_blob_hash = g_hash_table_new (NULL, NULL);
        acfg->plt_entry_debug_sym_cache = g_hash_table_new (g_str_hash, g_str_equal);
-       mono_mutex_init_recursive (&acfg->mutex);
+       mono_os_mutex_init_recursive (&acfg->mutex);
 
        init_got_info (&acfg->got_info);
        init_got_info (&acfg->llvm_got_info);
@@ -9537,44 +9548,44 @@ add_preinit_got_slots (MonoAotCompile *acfg)
         * during method initialization etc.
         */
 
-       ji = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
+       ji = (MonoJumpInfo *)mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
        ji->type = MONO_PATCH_INFO_IMAGE;
        ji->data.image = acfg->image;
        get_got_offset (acfg, FALSE, ji);
        get_got_offset (acfg, TRUE, ji);
 
-       ji = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
+       ji = (MonoJumpInfo *)mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
        ji->type = MONO_PATCH_INFO_MSCORLIB_GOT_ADDR;
        get_got_offset (acfg, FALSE, ji);
        get_got_offset (acfg, TRUE, ji);
 
-       ji = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
+       ji = (MonoJumpInfo *)mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
        ji->type = MONO_PATCH_INFO_GC_CARD_TABLE_ADDR;
        get_got_offset (acfg, FALSE, ji);
        get_got_offset (acfg, TRUE, ji);
 
-       ji = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
+       ji = (MonoJumpInfo *)mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
        ji->type = MONO_PATCH_INFO_GC_NURSERY_START;
        get_got_offset (acfg, FALSE, ji);
        get_got_offset (acfg, TRUE, ji);
 
-       ji = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
+       ji = (MonoJumpInfo *)mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
        ji->type = MONO_PATCH_INFO_JIT_TLS_ID;
        get_got_offset (acfg, FALSE, ji);
        get_got_offset (acfg, TRUE, ji);
 
-       ji = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
+       ji = (MonoJumpInfo *)mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
        ji->type = MONO_PATCH_INFO_AOT_MODULE;
        get_got_offset (acfg, FALSE, ji);
        get_got_offset (acfg, TRUE, ji);
 
-       ji = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
+       ji = (MonoJumpInfo *)mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
        ji->type = MONO_PATCH_INFO_GC_NURSERY_BITS;
        get_got_offset (acfg, FALSE, ji);
        get_got_offset (acfg, TRUE, ji);
 
        for (i = 0; i < sizeof (preinited_jit_icalls) / sizeof (char*); ++i) {
-               ji = mono_mempool_alloc0 (acfg->mempool, sizeof (MonoAotCompile));
+               ji = (MonoJumpInfo *)mono_mempool_alloc0 (acfg->mempool, sizeof (MonoAotCompile));
                ji->type = MONO_PATCH_INFO_INTERNAL_METHOD;
                ji->data.name = preinited_jit_icalls [i];
                get_got_offset (acfg, FALSE, ji);
@@ -9653,13 +9664,13 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options)
                        aot_printerrf (acfg, "The soft-debug AOT option requires the --debug option.\n");
                        return 1;
                }
-               acfg->flags |= MONO_AOT_FILE_FLAG_DEBUG;
+               acfg->flags = (MonoAotFileFlags)(acfg->flags | MONO_AOT_FILE_FLAG_DEBUG);
        }
 
        if (mono_use_llvm || acfg->aot_opts.llvm) {
                acfg->llvm = TRUE;
                acfg->aot_opts.asm_writer = TRUE;
-               acfg->flags |= MONO_AOT_FILE_FLAG_WITH_LLVM;
+               acfg->flags = (MonoAotFileFlags)(acfg->flags | MONO_AOT_FILE_FLAG_WITH_LLVM);
 
                if (acfg->aot_opts.soft_debug) {
                        aot_printerrf (acfg, "The 'soft-debug' option is not supported when compiling with LLVM.\n");
@@ -9688,10 +9699,10 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options)
        }
 
        if (mono_aot_mode_is_full (&acfg->aot_opts))
-               acfg->flags |= MONO_AOT_FILE_FLAG_FULL_AOT;
+               acfg->flags = (MonoAotFileFlags)(acfg->flags | MONO_AOT_FILE_FLAG_FULL_AOT);
 
        if (mono_threads_is_coop_enabled ())
-               acfg->flags |= MONO_AOT_FILE_FLAG_SAFEPOINTS;
+               acfg->flags = (MonoAotFileFlags)(acfg->flags | MONO_AOT_FILE_FLAG_SAFEPOINTS);
 
        if (acfg->aot_opts.instances_logfile_path) {
                acfg->instances_logfile = fopen (acfg->aot_opts.instances_logfile_path, "w");
@@ -9718,9 +9729,9 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options)
        arch_init (acfg);
 
        if (acfg->llvm && acfg->thumb_mixed)
-               acfg->flags |= MONO_AOT_FILE_FLAG_LLVM_THUMB;
+               acfg->flags = (MonoAotFileFlags)(acfg->flags | MONO_AOT_FILE_FLAG_LLVM_THUMB);
        if (acfg->aot_opts.llvm_only)
-               acfg->flags |= MONO_AOT_FILE_FLAG_LLVM_ONLY;
+               acfg->flags = (MonoAotFileFlags)(acfg->flags | MONO_AOT_FILE_FLAG_LLVM_ONLY);
 
        acfg->assembly_name_sym = g_strdup (acfg->image->assembly->aname.name);
        /* Get rid of characters which cannot occur in symbols */

diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c
index bb6d72f607a188a06bc2b50c7c1340c6952a8272..57d53d55ea46660388b2a34240834d7ac73ba785 100644 (file)
--- a/mono/mini/aot-runtime.c
+++ b/mono/mini/aot-runtime.c
@@ -155,8 +155,8 @@ typedef struct {
 } TrampolinePage;
 
 static GHashTable *aot_modules;
-#define mono_aot_lock() mono_mutex_lock (&aot_mutex)
-#define mono_aot_unlock() mono_mutex_unlock (&aot_mutex)
+#define mono_aot_lock() mono_os_mutex_lock (&aot_mutex)
+#define mono_aot_unlock() mono_os_mutex_unlock (&aot_mutex)
 static mono_mutex_t aot_mutex;
 
 /* 
@@ -201,8 +201,8 @@ static GHashTable *aot_jit_icall_hash;
 #define USE_PAGE_TRAMPOLINES 0
 #endif
 
-#define mono_aot_page_lock() mono_mutex_lock (&aot_page_mutex)
-#define mono_aot_page_unlock() mono_mutex_unlock (&aot_page_mutex)
+#define mono_aot_page_lock() mono_os_mutex_lock (&aot_page_mutex)
+#define mono_aot_page_unlock() mono_os_mutex_unlock (&aot_page_mutex)
 static mono_mutex_t aot_page_mutex;
 
 static MonoAotModule *mscorlib_aot_module;
@@ -222,13 +222,13 @@ decode_patches (MonoAotModule *amodule, MonoMemPool *mp, int n_patches, gboolean
 static inline void
 amodule_lock (MonoAotModule *amodule)
 {
-       mono_mutex_lock (&amodule->mutex);
+       mono_os_mutex_lock (&amodule->mutex);
 }
 
 static inline void
 amodule_unlock (MonoAotModule *amodule)
 {
-       mono_mutex_unlock (&amodule->mutex);
+       mono_os_mutex_unlock (&amodule->mutex);
 }
 
 /*
@@ -471,69 +471,65 @@ decode_klass_ref (MonoAotModule *module, guint8 *buf, guint8 **endbuf)
                break;
        }
        case MONO_AOT_TYPEREF_VAR: {
-               MonoType *t;
+               MonoType *t = NULL;
                MonoGenericContainer *container = NULL;
-               int type = decode_value (p, &p);
-               int num = decode_value (p, &p);
-               gboolean has_container = decode_value (p, &p);
-               MonoType *gshared_constraint = NULL;
-               char *par_name = NULL;
-
-               t = NULL;
-               if (has_container) {
-                       gboolean is_method = decode_value (p, &p);
-                       
-                       if (is_method) {
-                               MonoMethod *method_def;
-                               g_assert (type == MONO_TYPE_MVAR);
-                               method_def = decode_resolve_method_ref (module, p, &p);
-                               if (!method_def)
-                                       return NULL;
+               gboolean has_constraint = decode_value (p, &p);
 
-                               container = mono_method_get_generic_container (method_def);
-                       } else {
-                               MonoClass *class_def;
-                               g_assert (type == MONO_TYPE_VAR);
-                               class_def = decode_klass_ref (module, p, &p);
-                               if (!class_def)
-                                       return NULL;
+               if (has_constraint) {
+                       MonoClass *par_klass;
+                       MonoType *gshared_constraint;
 
-                               container = class_def->generic_container;
-                       }
-               } else {
-                       gboolean has_gshared_constraint = decode_value (p, &p);
-                       if (has_gshared_constraint) {
-                               MonoClass *par_klass;
+                       gshared_constraint = decode_type (module, p, &p);
+                       if (!gshared_constraint)
+                               return NULL;
 
-                               gshared_constraint = decode_type (module, p, &p);
-                               if (!gshared_constraint)
-                                       return NULL;
+                       par_klass = decode_klass_ref (module, p, &p);
+                       if (!par_klass)
+                               return NULL;
 
-                               par_klass = decode_klass_ref (module, p, &p);
-                               if (!par_klass)
-                                       return NULL;
+                       t = mini_get_shared_gparam (&par_klass->byval_arg, gshared_constraint);
+                       klass = mono_class_from_mono_type (t);
+               } else {
+                       int type = decode_value (p, &p);
+                       int num = decode_value (p, &p);
+                       gboolean is_not_anonymous = decode_value (p, &p);
+
+                       if (is_not_anonymous) {
+                               gboolean is_method = decode_value (p, &p);
+                       
+                               if (is_method) {
+                                       MonoMethod *method_def;
+                                       g_assert (type == MONO_TYPE_MVAR);
+                                       method_def = decode_resolve_method_ref (module, p, &p);
+                                       if (!method_def)
+                                               return NULL;
+
+                                       container = mono_method_get_generic_container (method_def);
+                               } else {
+                                       MonoClass *class_def;
+                                       g_assert (type == MONO_TYPE_VAR);
+                                       class_def = decode_klass_ref (module, p, &p);
+                                       if (!class_def)
+                                               return NULL;
 
-                               t = mini_get_shared_gparam (&par_klass->byval_arg, gshared_constraint);
+                                       container = class_def->generic_container;
+                               }
+                       } else {
+                               // We didn't decode is_method, so we have to infer it from type enum.
+                               container = get_anonymous_container_for_image (module->assembly->image, type == MONO_TYPE_MVAR);
                        }
-               }
 
-               if (t) {
-                       klass = mono_class_from_mono_type (t);
-               } else {
                        t = g_new0 (MonoType, 1);
-                       t->type = type;
-                       if (container) {
+                       t->type = (MonoTypeEnum)type;
+                       if (is_not_anonymous) {
                                t->data.generic_param = mono_generic_container_get_param (container, num);
-                               g_assert (gshared_constraint == NULL);
                        } else {
                                /* Anonymous */
                                MonoGenericParam *par = (MonoGenericParam*)mono_image_alloc0 (module->assembly->image, sizeof (MonoGenericParamFull));
+                               par->owner = container;
                                par->num = num;
-                               par->gshared_constraint = gshared_constraint;
-                               par->image = module->assembly->image;
                                t->data.generic_param = par;
-                               if (par_name)
-                                       ((MonoGenericParamFull*)par)->info.name = par_name;
+                               ((MonoGenericParamFull*)par)->info.name = make_generic_name_string (module->assembly->image, num);
                        }
                        // FIXME: Maybe use types directly to avoid
                        // the overhead of creating MonoClass-es
@@ -603,7 +599,7 @@ decode_type (MonoAotModule *module, guint8 *buf, guint8 **endbuf)
        guint8 *p = buf;
        MonoType *t;
 
-       t = g_malloc0 (sizeof (MonoType));
+       t = (MonoType *)g_malloc0 (sizeof (MonoType));
 
        while (TRUE) {
                if (*p == MONO_TYPE_PINNED) {
@@ -617,7 +613,7 @@ decode_type (MonoAotModule *module, guint8 *buf, guint8 **endbuf)
                }
        }
 
-       t->type = *p;
+       t->type = (MonoTypeEnum)*p;
        ++p;
 
        switch (t->type) {
@@ -686,13 +682,13 @@ decode_type (MonoAotModule *module, guint8 *buf, guint8 **endbuf)
                array->numsizes = decode_value (p, &p);
 
                if (array->numsizes)
-                       array->sizes = g_malloc0 (sizeof (int) * array->numsizes);
+                       array->sizes = (int *)g_malloc0 (sizeof (int) * array->numsizes);
                for (i = 0; i < array->numsizes; ++i)
                        array->sizes [i] = decode_value (p, &p);
 
                array->numlobounds = decode_value (p, &p);
                if (array->numlobounds)
-                       array->lobounds = g_malloc0 (sizeof (int) * array->numlobounds);
+                       array->lobounds = (int *)g_malloc0 (sizeof (int) * array->numlobounds);
                for (i = 0; i < array->numlobounds; ++i)
                        array->lobounds [i] = decode_value (p, &p);
                t->data.array = array;
@@ -738,7 +734,7 @@ decode_signature_with_target (MonoAotModule *module, MonoMethodSignature *target
        param_count = decode_value (p, &p);
        if (target && param_count != target->param_count)
                return NULL;
-       sig = g_malloc0 (MONO_SIZEOF_METHOD_SIGNATURE + param_count * sizeof (MonoType *));
+       sig = (MonoMethodSignature *)g_malloc0 (MONO_SIZEOF_METHOD_SIGNATURE + param_count * sizeof (MonoType *));
        sig->param_count = param_count;
        sig->sentinelpos = -1;
        sig->hasthis = hasthis;
@@ -1122,9 +1118,17 @@ decode_method_ref_with_target (MonoAotModule *module, MethodRef *ref, MonoMethod
                                        g_assert_not_reached ();
                                        break;
                                }
-                               if (target && wrapper != target)
-                                       return FALSE;
-                               ref->method = wrapper;
+                               if (target) {
+                                       /*
+                                        * Due to the way mini_get_shared_method () works, we could end up with
+                                        * multiple copies of the same wrapper.
+                                        */
+                                       if (wrapper->klass != target->klass)
+                                               return FALSE;
+                                       ref->method = target;
+                               } else {
+                                       ref->method = wrapper;
+                               }
                        } else {
                                /*
                                 * These wrappers are associated with a signature, not with a method.
@@ -1134,7 +1138,7 @@ decode_method_ref_with_target (MonoAotModule *module, MethodRef *ref, MonoMethod
                                        return FALSE;
 
                                if (wrapper_type == MONO_WRAPPER_DELEGATE_INVOKE) {
-                                       subtype = decode_value (p, &p);
+                                       subtype = (WrapperSubtype)decode_value (p, &p);
                                        info = mono_marshal_get_wrapper_info (target);
                                        if (info) {
                                                if (info->subtype != subtype)
@@ -1598,7 +1602,7 @@ find_symbol (MonoDl *module, gpointer *globals, const char *name, gpointer *valu
 #endif
 
                /* The first entry points to the hash */
-               table = globals [0];
+               table = (guint16 *)globals [0];
                globals ++;
 
                table_size = table [0];
@@ -1659,7 +1663,7 @@ check_usable (MonoAssembly *assembly, MonoAotFileInfo *info, char **out_msg)
        }
 
        build_info = mono_get_runtime_build_info ();
-       if (strlen (info->runtime_version) > 0 && strcmp (info->runtime_version, build_info)) {
+       if (strlen ((const char *)info->runtime_version) > 0 && strcmp (info->runtime_version, build_info)) {
                msg = g_strdup_printf ("compiled against runtime version '%s' while this runtime has version '%s'", info->runtime_version, build_info);
                usable = FALSE;
        }
@@ -1706,7 +1710,7 @@ check_usable (MonoAssembly *assembly, MonoAotFileInfo *info, char **out_msg)
                usable = FALSE;
        }
 
-       blob = info->blob;
+       blob = (guint8 *)info->blob;
 
        if (info->gc_name_index != -1) {
                char *gc_name = (char*)&blob [info->gc_name_index];
@@ -1800,7 +1804,7 @@ init_amodule_got (MonoAotModule *amodule)
                        amodule->shared_got [i] = amodule->assembly->image;
                } else if (ji->type == MONO_PATCH_INFO_MSCORLIB_GOT_ADDR) {
                        if (mono_defaults.corlib) {
-                               MonoAotModule *mscorlib_amodule = mono_defaults.corlib->aot_module;
+                               MonoAotModule *mscorlib_amodule = (MonoAotModule *)mono_defaults.corlib->aot_module;
 
                                if (mscorlib_amodule)
                                        amodule->shared_got [i] = mscorlib_amodule->got;
@@ -1857,7 +1861,7 @@ load_aot_module (MonoAssembly *assembly, gpointer user_data)
 
        mono_aot_lock ();
        if (static_aot_modules)
-               info = g_hash_table_lookup (static_aot_modules, assembly->aname.name);
+               info = (MonoAotFileInfo *)g_hash_table_lookup (static_aot_modules, assembly->aname.name);
        else
                info = NULL;
        mono_aot_unlock ();
@@ -1868,7 +1872,7 @@ load_aot_module (MonoAssembly *assembly, gpointer user_data)
                /* Statically linked AOT module */
                aot_name = g_strdup_printf ("%s", assembly->aname.name);
                mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "Found statically linked AOT module '%s'.\n", aot_name);
-               globals = info->globals;
+               globals = (void **)info->globals;
        } else {
                if (enable_aot_cache)
                        sofile = aot_cache_load_module (assembly, &aot_name);
@@ -1882,7 +1886,7 @@ load_aot_module (MonoAssembly *assembly, gpointer user_data)
                                mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT module '%s' not found: %s\n", aot_name, err);
                                g_free (err);
 
-                               aot_name = g_strdup_printf ("%s/mono/aot-cache/%s/%s%s", mono_assembly_getrootdir(), ARCHITECTURE, g_path_get_basename (assembly->image->name), MONO_SOLIB_EXT);
+                               aot_name = g_strdup_printf ("%s/mono/aot-cache/%s/%s%s", mono_assembly_getrootdir(), MONO_ARCHITECTURE, g_path_get_basename (assembly->image->name), MONO_SOLIB_EXT);
                                sofile = mono_dl_open (aot_name, MONO_DL_LAZY, &err);
                                if (!sofile) {
                                        mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT module '%s' not found: %s\n", aot_name, err);
@@ -1941,7 +1945,7 @@ load_aot_module (MonoAssembly *assembly, gpointer user_data)
        g_assert (info->long_align == align_int64);
        g_assert (info->generic_tramp_num == MONO_TRAMPOLINE_NUM);
 
-       blob = info->blob;
+       blob = (guint8 *)info->blob;
 
        amodule = g_new0 (MonoAotModule, 1);
        amodule->aot_name = aot_name;
@@ -1949,8 +1953,8 @@ load_aot_module (MonoAssembly *assembly, gpointer user_data)
 
        memcpy (&amodule->info, info, sizeof (*info));
 
-       amodule->got = amodule->info.jit_got;
-       amodule->llvm_got = amodule->info.llvm_got;
+       amodule->got = (void **)amodule->info.jit_got;
+       amodule->llvm_got = (void **)amodule->info.llvm_got;
        amodule->globals = globals;
        amodule->sofile = sofile;
        amodule->method_to_code = g_hash_table_new (mono_aligned_addr_hash, NULL);
@@ -1958,14 +1962,14 @@ load_aot_module (MonoAssembly *assembly, gpointer user_data)
        amodule->blob = blob;
        amodule->shared_got = g_new0 (gpointer, info->nshared_got_entries);
 
-       mono_mutex_init_recursive (&amodule->mutex);
+       mono_os_mutex_init_recursive (&amodule->mutex);
 
        /* Read image table */
        {
                guint32 table_len, i;
                char *table = NULL;
 
-               table = info->image_table;
+               table = (char *)info->image_table;
                g_assert (table);
 
                table_len = *(guint32*)table;
@@ -1987,7 +1991,7 @@ load_aot_module (MonoAssembly *assembly, gpointer user_data)
                        memcpy (aname->public_key_token, table, strlen (table) + 1);
                        table += strlen (table) + 1;                    
 
-                       table = ALIGN_PTR_TO (table, 8);
+                       table = (char *)ALIGN_PTR_TO (table, 8);
                        aname->flags = *(guint32*)table;
                        table += 4;
                        aname->major = *(guint32*)table;
@@ -2001,38 +2005,38 @@ load_aot_module (MonoAssembly *assembly, gpointer user_data)
                }
        }
 
-       amodule->jit_code_start = info->jit_code_start;
-       amodule->jit_code_end = info->jit_code_end;
-       amodule->method_info_offsets = info->method_info_offsets;
-       amodule->ex_info_offsets = info->ex_info_offsets;
-       amodule->class_info_offsets = info->class_info_offsets;
-       amodule->class_name_table = info->class_name_table;
-       amodule->extra_method_table = info->extra_method_table;
-       amodule->extra_method_info_offsets = info->extra_method_info_offsets;
-       amodule->unbox_trampolines = info->unbox_trampolines;
-       amodule->unbox_trampolines_end = info->unbox_trampolines_end;
-       amodule->unbox_trampoline_addresses = info->unbox_trampoline_addresses;
-       amodule->unwind_info = info->unwind_info;
+       amodule->jit_code_start = (guint8 *)info->jit_code_start;
+       amodule->jit_code_end = (guint8 *)info->jit_code_end;
+       amodule->method_info_offsets = (guint32 *)info->method_info_offsets;
+       amodule->ex_info_offsets = (guint32 *)info->ex_info_offsets;
+       amodule->class_info_offsets = (guint32 *)info->class_info_offsets;
+       amodule->class_name_table = (guint16 *)info->class_name_table;
+       amodule->extra_method_table = (guint32 *)info->extra_method_table;
+       amodule->extra_method_info_offsets = (guint32 *)info->extra_method_info_offsets;
+       amodule->unbox_trampolines = (guint32 *)info->unbox_trampolines;
+       amodule->unbox_trampolines_end = (guint32 *)info->unbox_trampolines_end;
+       amodule->unbox_trampoline_addresses = (guint32 *)info->unbox_trampoline_addresses;
+       amodule->unwind_info = (guint8 *)info->unwind_info;
        amodule->mem_begin = amodule->jit_code_start;
-       amodule->mem_end = info->mem_end;
-       amodule->plt = info->plt;
-       amodule->plt_end = info->plt_end;
-       amodule->mono_eh_frame = info->mono_eh_frame;
-       amodule->trampolines [MONO_AOT_TRAMP_SPECIFIC] = info->specific_trampolines;
-       amodule->trampolines [MONO_AOT_TRAMP_STATIC_RGCTX] = info->static_rgctx_trampolines;
-       amodule->trampolines [MONO_AOT_TRAMP_IMT_THUNK] = info->imt_thunks;
-       amodule->trampolines [MONO_AOT_TRAMP_GSHAREDVT_ARG] = info->gsharedvt_arg_trampolines;
+       amodule->mem_end = (guint8 *)info->mem_end;
+       amodule->plt = (guint8 *)info->plt;
+       amodule->plt_end = (guint8 *)info->plt_end;
+       amodule->mono_eh_frame = (guint8 *)info->mono_eh_frame;
+       amodule->trampolines [MONO_AOT_TRAMP_SPECIFIC] = (guint8 *)info->specific_trampolines;
+       amodule->trampolines [MONO_AOT_TRAMP_STATIC_RGCTX] = (guint8 *)info->static_rgctx_trampolines;
+       amodule->trampolines [MONO_AOT_TRAMP_IMT_THUNK] = (guint8 *)info->imt_thunks;
+       amodule->trampolines [MONO_AOT_TRAMP_GSHAREDVT_ARG] = (guint8 *)info->gsharedvt_arg_trampolines;
 
        if (!strcmp (assembly->aname.name, "mscorlib"))
                mscorlib_aot_module = amodule;
 
        /* Compute method addresses */
-       amodule->methods = g_malloc0 (amodule->info.nmethods * sizeof (gpointer));
+       amodule->methods = (void **)g_malloc0 (amodule->info.nmethods * sizeof (gpointer));
        for (i = 0; i < amodule->info.nmethods; ++i) {
                void *addr = NULL;
 
                if (amodule->info.llvm_get_method) {
-                       gpointer (*get_method) (int) = amodule->info.llvm_get_method;
+                       gpointer (*get_method) (int) = (gpointer (*)(int))amodule->info.llvm_get_method;
 
                        addr = get_method (i);
                }
@@ -2159,14 +2163,14 @@ mono_aot_register_module (gpointer *aot_info)
 {
        gpointer *globals;
        char *aname;
-       MonoAotFileInfo *info = (gpointer)aot_info;
+       MonoAotFileInfo *info = (MonoAotFileInfo *)aot_info;
 
        g_assert (info->version == MONO_AOT_FILE_VERSION);
 
-       globals = info->globals;
+       globals = (void **)info->globals;
        g_assert (globals);
 
-       aname = info->assembly_name;
+       aname = (char *)info->assembly_name;
 
        /* This could be called before startup */
        if (aot_modules)
@@ -2184,8 +2188,8 @@ mono_aot_register_module (gpointer *aot_info)
 void
 mono_aot_init (void)
 {
-       mono_mutex_init_recursive (&aot_mutex);
-       mono_mutex_init_recursive (&aot_page_mutex);
+       mono_os_mutex_init_recursive (&aot_mutex);
+       mono_os_mutex_init_recursive (&aot_page_mutex);
        aot_modules = g_hash_table_new (NULL, NULL);
 
 #ifndef __native_client__
@@ -2258,7 +2262,7 @@ mono_aot_get_method_from_vt_slot (MonoDomain *domain, MonoVTable *vtable, int sl
 {
        int i;
        MonoClass *klass = vtable->klass;
-       MonoAotModule *amodule = klass->image->aot_module;
+       MonoAotModule *amodule = (MonoAotModule *)klass->image->aot_module;
        guint8 *info, *p;
        MonoCachedClassInfo class_info;
        gboolean err;
@@ -2293,7 +2297,7 @@ mono_aot_get_method_from_vt_slot (MonoDomain *domain, MonoVTable *vtable, int sl
 gboolean
 mono_aot_get_cached_class_info (MonoClass *klass, MonoCachedClassInfo *res)
 {
-       MonoAotModule *amodule = klass->image->aot_module;
+       MonoAotModule *amodule = (MonoAotModule *)klass->image->aot_module;
        guint8 *p;
        gboolean err;
 
@@ -2322,7 +2326,7 @@ mono_aot_get_cached_class_info (MonoClass *klass, MonoCachedClassInfo *res)
 gboolean
 mono_aot_get_class_from_name (MonoImage *image, const char *name_space, const char *name, MonoClass **klass)
 {
-       MonoAotModule *amodule = image->aot_module;
+       MonoAotModule *amodule = (MonoAotModule *)image->aot_module;
        guint16 *table, *entry;
        guint16 table_size;
        guint32 hash;
@@ -2343,9 +2347,9 @@ mono_aot_get_class_from_name (MonoImage *image, const char *name_space, const ch
        /* First look in the cache */
        if (!amodule->name_cache)
                amodule->name_cache = g_hash_table_new (g_str_hash, g_str_equal);
-       nspace_table = g_hash_table_lookup (amodule->name_cache, name_space);
+       nspace_table = (GHashTable *)g_hash_table_lookup (amodule->name_cache, name_space);
        if (nspace_table) {
-               *klass = g_hash_table_lookup (nspace_table, name);
+               *klass = (MonoClass *)g_hash_table_lookup (nspace_table, name);
                if (*klass) {
                        amodule_unlock (amodule);
                        return TRUE;
@@ -2396,7 +2400,7 @@ mono_aot_get_class_from_name (MonoImage *image, const char *name_space, const ch
                                /* Add to cache */
                                if (*klass) {
                                        amodule_lock (amodule);
-                                       nspace_table = g_hash_table_lookup (amodule->name_cache, name_space);
+                                       nspace_table = (GHashTable *)g_hash_table_lookup (amodule->name_cache, name_space);
                                        if (!nspace_table) {
                                                nspace_table = g_hash_table_new (g_str_hash, g_str_equal);
                                                g_hash_table_insert (amodule->name_cache, (char*)name_space2, nspace_table);
@@ -2429,10 +2433,10 @@ compute_llvm_code_range (MonoAotModule *amodule, guint8 **code_start, guint8 **c
        gint32 *table;
 
        if (amodule->info.llvm_get_method) {
-               gpointer (*get_method) (int) = amodule->info.llvm_get_method;
+               gpointer (*get_method) (int) = (gpointer (*)(int))amodule->info.llvm_get_method;
 
-               *code_start = get_method (-1);
-               *code_end = get_method (-2);
+               *code_start = (guint8 *)get_method (-1);
+               *code_end = (guint8 *)get_method (-2);
 
                g_assert (*code_end > *code_start);
                return;
@@ -2449,14 +2453,14 @@ compute_llvm_code_range (MonoAotModule *amodule, guint8 **code_start, guint8 **c
        g_assert (version == 3);
        p ++;
        p ++;
-       p = ALIGN_PTR_TO (p, 4);
+       p = (guint8 *)ALIGN_PTR_TO (p, 4);
 
        fde_count = *(guint32*)p;
        p += 4;
        table = (gint32*)p;
 
        if (fde_count > 0) {
-               *code_start = amodule->methods [table [0]];
+               *code_start = (guint8 *)amodule->methods [table [0]];
                *code_end = (guint8*)amodule->methods [table [(fde_count - 1) * 2]] + table [fde_count * 2];
        } else {
                *code_start = NULL;
@@ -2509,7 +2513,7 @@ decode_llvm_mono_eh_frame (MonoAotModule *amodule, MonoDomain *domain,
        MonoLLVMFDEInfo info;
 
        if (!amodule->mono_eh_frame) {
-               jinfo = mono_domain_alloc0_lock_free (domain, mono_jit_info_size (flags, num_clauses, 0));
+               jinfo = (MonoJitInfo *)mono_domain_alloc0_lock_free (domain, mono_jit_info_size (flags, num_clauses, 0));
                mono_jit_info_init (jinfo, method, code, code_len, flags, num_clauses, 0);
                memcpy (jinfo->clauses, clauses, num_clauses * sizeof (MonoJitExceptionInfo));
                return jinfo;
@@ -2527,7 +2531,7 @@ decode_llvm_mono_eh_frame (MonoAotModule *amodule, MonoDomain *domain,
        p ++;
        /* func_encoding = *p; */
        p ++;
-       p = ALIGN_PTR_TO (p, 4);
+       p = (guint8 *)ALIGN_PTR_TO (p, 4);
 
        fde_count = *(guint32*)p;
        p += 4;
@@ -2544,12 +2548,12 @@ decode_llvm_mono_eh_frame (MonoAotModule *amodule, MonoDomain *domain,
 
                /* The table contains method index/fde offset pairs */
                g_assert (table [(pos * 2)] != -1);
-               code1 = amodule->methods [table [(pos * 2)]];
+               code1 = (guint8 *)amodule->methods [table [(pos * 2)]];
                if (pos + 1 == fde_count) {
                        code2 = amodule->llvm_code_end;
                } else {
                        g_assert (table [(pos + 1) * 2] != -1);
-                       code2 = amodule->methods [table [(pos + 1) * 2]];
+                       code2 = (guint8 *)amodule->methods [table [(pos + 1) * 2]];
                }
 
                if (code < code1)
@@ -2560,13 +2564,13 @@ decode_llvm_mono_eh_frame (MonoAotModule *amodule, MonoDomain *domain,
                        break;
        }
 
-       code_start = amodule->methods [table [(pos * 2)]];
+       code_start = (guint8 *)amodule->methods [table [(pos * 2)]];
        if (pos + 1 == fde_count) {
                /* The +1 entry in the table contains the length of the last method */
                int len = table [(pos + 1) * 2];
                code_end = code_start + len;
        } else {
-               code_end = amodule->methods [table [(pos + 1) * 2]];
+               code_end = (guint8 *)amodule->methods [table [(pos + 1) * 2]];
        }
        if (!code_len)
                code_len = code_end - code_start;
@@ -2604,7 +2608,7 @@ decode_llvm_mono_eh_frame (MonoAotModule *amodule, MonoDomain *domain,
         * allocate a new JI.
         */
        jinfo = 
-               mono_domain_alloc0_lock_free (domain, mono_jit_info_size (flags, ei_len + nested_len, 0));
+               (MonoJitInfo *)mono_domain_alloc0_lock_free (domain, mono_jit_info_size (flags, ei_len + nested_len, 0));
        mono_jit_info_init (jinfo, method, code, code_len, flags, ei_len + nested_len, 0);
 
        jinfo->unwind_info = mono_cache_unwind_info (info.unw_info, info.unw_info_len);
@@ -2631,7 +2635,7 @@ decode_llvm_mono_eh_frame (MonoAotModule *amodule, MonoDomain *domain,
                jei->handler_start = ei [i].handler_start;
                jei->clause_index = clause_index;
 
-               if (is_thumb_code (amodule, jei->try_start)) {
+               if (is_thumb_code (amodule, (guint8 *)jei->try_start)) {
                        jei->try_start = (void*)((mgreg_t)jei->try_start & ~1);
                        jei->try_end = (void*)((mgreg_t)jei->try_end & ~1);
                        /* Make sure we transition to thumb when a handler starts */
@@ -2719,18 +2723,18 @@ decode_exception_debug_info (MonoAotModule *amodule, MonoDomain *domain,
                unwind_info = decode_value (p, &p);
        }
        if (has_generic_jit_info)
-               flags |= JIT_INFO_HAS_GENERIC_JIT_INFO;
+               flags = (MonoJitInfoFlags)(flags | JIT_INFO_HAS_GENERIC_JIT_INFO);
 
        if (has_try_block_holes) {
                num_holes = decode_value (p, &p);
-               flags |= JIT_INFO_HAS_TRY_BLOCK_HOLES;
+               flags = (MonoJitInfoFlags)(flags | JIT_INFO_HAS_TRY_BLOCK_HOLES);
                try_holes_info_size = sizeof (MonoTryBlockHoleTableJitInfo) + num_holes * sizeof (MonoTryBlockHoleJitInfo);
        } else {
                num_holes = try_holes_info_size = 0;
        }
 
        if (has_arch_eh_jit_info) {
-               flags |= JIT_INFO_HAS_ARCH_EH_INFO;
+               flags = (MonoJitInfoFlags)(flags | JIT_INFO_HAS_ARCH_EH_INFO);
                /* Overwrite the original code_len which includes alignment padding */
                code_len = decode_value (p, &p);
        }
@@ -2787,7 +2791,7 @@ decode_exception_debug_info (MonoAotModule *amodule, MonoDomain *domain,
                g_free (nesting);
        } else {
                len = mono_jit_info_size (flags, num_clauses, num_holes);
-               jinfo = alloc0_jit_info_data (domain, len, async);
+               jinfo = (MonoJitInfo *)alloc0_jit_info_data (domain, len, async);
                mono_jit_info_init (jinfo, method, code, code_len, flags, num_clauses, num_holes);
 
                for (i = 0; i < jinfo->num_clauses; ++i) {
@@ -2872,7 +2876,7 @@ decode_exception_debug_info (MonoAotModule *amodule, MonoDomain *domain,
 
                gi->nlocs = decode_value (p, &p);
                if (gi->nlocs) {
-                       gi->locations = alloc0_jit_info_data (domain, gi->nlocs * sizeof (MonoDwarfLocListEntry), async);
+                       gi->locations = (MonoDwarfLocListEntry *)alloc0_jit_info_data (domain, gi->nlocs * sizeof (MonoDwarfLocListEntry), async);
                        for (i = 0; i < gi->nlocs; ++i) {
                                MonoDwarfLocListEntry *entry = &gi->locations [i];
 
@@ -2965,12 +2969,12 @@ mono_aot_get_unwind_info (MonoJitInfo *ji, guint32 *unwind_info_len)
 {
        MonoAotModule *amodule;
        guint8 *p;
-       guint8 *code = ji->code_start;
+       guint8 *code = (guint8 *)ji->code_start;
 
        if (ji->async)
-               amodule = ji->d.aot_info;
+               amodule = (MonoAotModule *)ji->d.aot_info;
        else
-               amodule = jinfo_get_method (ji)->klass->image->aot_module;
+               amodule = (MonoAotModule *)jinfo_get_method (ji)->klass->image->aot_module;
        g_assert (amodule);
        g_assert (ji->from_aot);
 
@@ -2978,7 +2982,7 @@ mono_aot_get_unwind_info (MonoJitInfo *ji, guint32 *unwind_info_len)
                /* ji belongs to a different aot module than amodule */
                mono_aot_lock ();
                g_assert (ji_to_amodule);
-               amodule = g_hash_table_lookup (ji_to_amodule, ji);
+               amodule = (MonoAotModule *)g_hash_table_lookup (ji_to_amodule, ji);
                g_assert (amodule);
                g_assert (amodule_contains_code_addr (amodule, code));
                mono_aot_unlock ();
@@ -3059,7 +3063,7 @@ mono_aot_find_jit_info (MonoDomain *domain, MonoImage *image, gpointer addr)
        int pos, left, right, code_len;
        int method_index, table_len;
        guint32 token;
-       MonoAotModule *amodule = image->aot_module;
+       MonoAotModule *amodule = (MonoAotModule *)image->aot_module;
        MonoMethod *method = NULL;
        MonoJitInfo *jinfo;
        guint8 *code, *ex_info, *p;
@@ -3079,7 +3083,7 @@ mono_aot_find_jit_info (MonoDomain *domain, MonoImage *image, gpointer addr)
                /* FIXME: */
                return NULL;
 
-       if (!amodule_contains_code_addr (amodule, addr))
+       if (!amodule_contains_code_addr (amodule, (guint8 *)addr))
                return NULL;
 
        async = mono_thread_info_is_async_context ();
@@ -3115,20 +3119,20 @@ mono_aot_find_jit_info (MonoDomain *domain, MonoImage *image, gpointer addr)
        /* Binary search in the sorted_methods table */
        methods = amodule->sorted_methods;
        methods_len = amodule->sorted_methods_len;
-       code = addr;
+       code = (guint8 *)addr;
        left = 0;
        right = methods_len;
        while (TRUE) {
                pos = (left + right) / 2;
 
-               code1 = methods [pos];
+               code1 = (guint8 *)methods [pos];
                if (pos + 1 == methods_len) {
                        if (code1 >= amodule->jit_code_start && code1 < amodule->jit_code_end)
                                code2 = amodule->jit_code_end;
                        else
                                code2 = amodule->llvm_code_end;
                } else {
-                       code2 = methods [pos + 1];
+                       code2 = (guint8 *)methods [pos + 1];
                }
 
                if (code < code1)
@@ -3158,7 +3162,7 @@ mono_aot_find_jit_info (MonoDomain *domain, MonoImage *image, gpointer addr)
                }
        }
 
-       code = amodule->methods [method_index];
+       code = (guint8 *)amodule->methods [method_index];
        ex_info = &amodule->blob [mono_aot_get_offset (amodule->ex_info_offsets, method_index)];
 
        if (pos == methods_len - 1) {
@@ -3176,7 +3180,7 @@ mono_aot_find_jit_info (MonoDomain *domain, MonoImage *image, gpointer addr)
        if (!async) {
                if (amodule->extra_methods) {
                        amodule_lock (amodule);
-                       method = g_hash_table_lookup (amodule->extra_methods, GUINT_TO_POINTER (method_index));
+                       method = (MonoMethod *)g_hash_table_lookup (amodule->extra_methods, GUINT_TO_POINTER (method_index));
                        amodule_unlock (amodule);
                } else {
                        method = NULL;
@@ -3244,7 +3248,7 @@ mono_aot_find_jit_info (MonoDomain *domain, MonoImage *image, gpointer addr)
                                len = old_table[0].method_index;
                        else
                                len = 1;
-                       new_table = alloc0_jit_info_data (domain, (len + 1) * sizeof (JitInfoMap), async);
+                       new_table = (JitInfoMap *)alloc0_jit_info_data (domain, (len + 1) * sizeof (JitInfoMap), async);
                        if (old_table)
                                memcpy (new_table, old_table, len * sizeof (JitInfoMap));
                        new_table [0].method_index = len + 1;
@@ -3252,7 +3256,7 @@ mono_aot_find_jit_info (MonoDomain *domain, MonoImage *image, gpointer addr)
                        new_table [len].jinfo = jinfo;
                        /* Publish it */
                        mono_memory_barrier ();
-                       if (InterlockedCompareExchangePointer ((gpointer)&amodule->async_jit_info_table, new_table, old_table) == old_table)
+                       if (InterlockedCompareExchangePointer ((volatile gpointer *)&amodule->async_jit_info_table, new_table, old_table) == old_table)
                                break;
                }
        } else {
@@ -3325,7 +3329,7 @@ decode_patch (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guin
                        goto cleanup;
                break;
        case MONO_PATCH_INFO_DELEGATE_TRAMPOLINE:
-               ji->data.del_tramp = mono_mempool_alloc0 (mp, sizeof (MonoDelegateClassMethodPair));
+               ji->data.del_tramp = (MonoDelegateClassMethodPair *)mono_mempool_alloc0 (mp, sizeof (MonoDelegateClassMethodPair));
                ji->data.del_tramp->klass = decode_klass_ref (aot_module, p, &p);
                if (!ji->data.del_tramp->klass)
                        goto cleanup;
@@ -3349,9 +3353,9 @@ decode_patch (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guin
                        goto cleanup;
                break;
        case MONO_PATCH_INFO_SWITCH:
-               ji->data.table = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoBBTable));
+               ji->data.table = (MonoJumpInfoBBTable *)mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoBBTable));
                ji->data.table->table_size = decode_value (p, &p);
-               table = mono_domain_alloc (mono_domain_get (), sizeof (gpointer) * ji->data.table->table_size);
+               table = (void **)mono_domain_alloc (mono_domain_get (), sizeof (gpointer) * ji->data.table->table_size);
                ji->data.table->table = (MonoBasicBlock**)table;
                for (i = 0; i < ji->data.table->table_size; i++)
                        table [i] = (gpointer)(gssize)decode_value (p, &p);
@@ -3427,13 +3431,13 @@ decode_patch (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guin
                offset = decode_value (p, &p);
                val = decode_value (p, &p);
 
-               entry = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoRgctxEntry));
+               entry = (MonoJumpInfoRgctxEntry *)mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoRgctxEntry));
                p2 = aot_module->blob + offset;
                entry->method = decode_resolve_method_ref (aot_module, p2, &p2);
                entry->in_mrgctx = ((val & 1) > 0) ? TRUE : FALSE;
-               entry->info_type = (val >> 1) & 0xff;
-               entry->data = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfo));
-               entry->data->type = (val >> 9) & 0xff;
+               entry->info_type = (MonoRgctxInfoType)((val >> 1) & 0xff);
+               entry->data = (MonoJumpInfo *)mono_mempool_alloc0 (mp, sizeof (MonoJumpInfo));
+               entry->data->type = (MonoJumpInfoType)((val >> 9) & 0xff);
                
                res = decode_patch (aot_module, mp, entry->data, p, &p);
                if (!res)
@@ -3445,15 +3449,6 @@ decode_patch (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guin
        case MONO_PATCH_INFO_AOT_MODULE:
        case MONO_PATCH_INFO_MSCORLIB_GOT_ADDR:
                break;
-       case MONO_PATCH_INFO_LLVM_IMT_TRAMPOLINE: {
-               MonoJumpInfoImtTramp *imt_tramp = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoImtTramp));
-
-               imt_tramp->method = decode_resolve_method_ref (aot_module, p, &p);
-               imt_tramp->vt_offset = decode_value (p, &p);
-               
-               ji->data.imt_tramp = imt_tramp;
-               break;
-       }
        case MONO_PATCH_INFO_SIGNATURE:
                ji->data.target = decode_signature (aot_module, p, &p);
                break;
@@ -3461,7 +3456,7 @@ decode_patch (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guin
                ji->data.target = GINT_TO_POINTER (decode_value (p, &p));
                break;
        case MONO_PATCH_INFO_GSHAREDVT_CALL: {
-               MonoJumpInfoGSharedVtCall *info = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoGSharedVtCall));
+               MonoJumpInfoGSharedVtCall *info = (MonoJumpInfoGSharedVtCall *)mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoGSharedVtCall));
                info->sig = decode_signature (aot_module, p, &p);
                g_assert (info->sig);
                info->method = decode_resolve_method_ref (aot_module, p, &p);
@@ -3471,29 +3466,29 @@ decode_patch (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guin
                break;
        }
        case MONO_PATCH_INFO_GSHAREDVT_METHOD: {
-               MonoGSharedVtMethodInfo *info = mono_mempool_alloc0 (mp, sizeof (MonoGSharedVtMethodInfo));
+               MonoGSharedVtMethodInfo *info = (MonoGSharedVtMethodInfo *)mono_mempool_alloc0 (mp, sizeof (MonoGSharedVtMethodInfo));
                int i;
                
                info->method = decode_resolve_method_ref (aot_module, p, &p);
                g_assert (info->method);
                info->num_entries = decode_value (p, &p);
                info->count_entries = info->num_entries;
-               info->entries = mono_mempool_alloc0 (mp, sizeof (MonoRuntimeGenericContextInfoTemplate) * info->num_entries);
+               info->entries = (MonoRuntimeGenericContextInfoTemplate *)mono_mempool_alloc0 (mp, sizeof (MonoRuntimeGenericContextInfoTemplate) * info->num_entries);
                for (i = 0; i < info->num_entries; ++i) {
-                       MonoRuntimeGenericContextInfoTemplate *template = &info->entries [i];
+                       MonoRuntimeGenericContextInfoTemplate *template_ = &info->entries [i];
 
-                       template->info_type = decode_value (p, &p);
-                       switch (mini_rgctx_info_type_to_patch_info_type (template->info_type)) {
+                       template_->info_type = (MonoRgctxInfoType)decode_value (p, &p);
+                       switch (mini_rgctx_info_type_to_patch_info_type (template_->info_type)) {
                        case MONO_PATCH_INFO_CLASS: {
                                MonoClass *klass = decode_klass_ref (aot_module, p, &p);
                                if (!klass)
                                        goto cleanup;
-                               template->data = &klass->byval_arg;
+                               template_->data = &klass->byval_arg;
                                break;
                        }
                        case MONO_PATCH_INFO_FIELD:
-                               template->data = decode_field_info (aot_module, p, &p);
-                               if (!template->data)
+                               template_->data = decode_field_info (aot_module, p, &p);
+                               if (!template_->data)
                                        goto cleanup;
                                break;
                        default:
@@ -3508,7 +3503,7 @@ decode_patch (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guin
                int len = decode_value (p, &p);
                char *s;
 
-               s = mono_mempool_alloc0 (mp, len + 1);
+               s = (char *)mono_mempool_alloc0 (mp, len + 1);
                memcpy (s, p, len + 1);
                p += len + 1;
 
@@ -3516,7 +3511,7 @@ decode_patch (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guin
                break;
        }
        case MONO_PATCH_INFO_VIRT_METHOD: {
-               MonoJumpInfoVirtMethod *info = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoVirtMethod));
+               MonoJumpInfoVirtMethod *info = (MonoJumpInfoVirtMethod *)mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoVirtMethod));
 
                info->klass = decode_klass_ref (aot_module, p, &p);
                g_assert (info->klass);
@@ -3562,18 +3557,18 @@ decode_patches (MonoAotModule *amodule, MonoMemPool *mp, int n_patches, gboolean
 
        if (llvm) {
                got = amodule->llvm_got;
-               got_info_offsets = amodule->info.llvm_got_info_offsets;
+               got_info_offsets = (guint32 *)amodule->info.llvm_got_info_offsets;
        } else {
                got = amodule->got;
-               got_info_offsets = amodule->info.got_info_offsets;
+               got_info_offsets = (guint32 *)amodule->info.got_info_offsets;
        }
 
-       patches = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfo) * n_patches);
+       patches = (MonoJumpInfo *)mono_mempool_alloc0 (mp, sizeof (MonoJumpInfo) * n_patches);
        for (i = 0; i < n_patches; ++i) {
                guint8 *p = amodule->blob + mono_aot_get_offset (got_info_offsets, got_offsets [i]);
 
                ji = &patches [i];
-               ji->type = decode_value (p, &p);
+               ji->type = (MonoJumpInfoType)decode_value (p, &p);
 
                /* See load_method () for SFLDA */
                if (got && got [got_offsets [i]] && ji->type != MONO_PATCH_INFO_SFLDA) {
@@ -3599,7 +3594,7 @@ load_patch_info (MonoAotModule *amodule, MonoMemPool *mp, int n_patches,
 
        p = buf;
 
-       *got_slots = g_malloc (sizeof (guint32) * n_patches);
+       *got_slots = (guint32 *)g_malloc (sizeof (guint32) * n_patches);
        for (pindex = 0; pindex < n_patches; ++pindex) {
                (*got_slots)[pindex] = decode_value (p, &p);
        }
@@ -3630,7 +3625,7 @@ register_jump_target_got_slot (MonoDomain *domain, MonoMethod *method, gpointer
        mono_domain_lock (domain);
        if (!info->jump_target_got_slot_hash)
                info->jump_target_got_slot_hash = g_hash_table_new (NULL, NULL);
-       list = g_hash_table_lookup (info->jump_target_got_slot_hash, method);
+       list = (GSList *)g_hash_table_lookup (info->jump_target_got_slot_hash, method);
        list = g_slist_prepend (list, got_slot);
        g_hash_table_insert (info->jump_target_got_slot_hash, method, list);
        mono_domain_unlock (domain);
@@ -3670,8 +3665,8 @@ load_method (MonoDomain *domain, MonoAotModule *amodule, MonoImage *image, MonoM
                /*
                 * Obtain the method address by calling a generated function in the LLVM module.
                 */
-               gpointer (*get_method) (int) = amodule->info.llvm_get_method;
-               code = get_method (method_index);
+               gpointer (*get_method) (int) = (gpointer (*)(int))amodule->info.llvm_get_method;
+               code = (guint8 *)get_method (method_index);
        }
 
        if (!code) {
@@ -3688,7 +3683,7 @@ load_method (MonoDomain *domain, MonoAotModule *amodule, MonoImage *image, MonoM
                        }
                        return NULL;
                }
-               code = amodule->methods [method_index];
+               code = (guint8 *)amodule->methods [method_index];
        }
 
        info = &amodule->blob [mono_aot_get_offset (amodule->method_info_offsets, method_index)];
@@ -3815,7 +3810,7 @@ find_aot_method_in_amodule (MonoAotModule *amodule, MonoMethod *method, guint32
                amodule_lock (amodule);
                if (!amodule->method_ref_to_method)
                        amodule->method_ref_to_method = g_hash_table_new (NULL, NULL);
-               m = g_hash_table_lookup (amodule->method_ref_to_method, p);
+               m = (MonoMethod *)g_hash_table_lookup (amodule->method_ref_to_method, p);
                amodule_unlock (amodule);
                if (!m) {
                        m = decode_resolve_method_ref_with_target (amodule, method, p, &p);
@@ -3883,8 +3878,8 @@ find_aot_method (MonoMethod *method, MonoAotModule **out_amodule)
        guint32 hash = mono_aot_method_hash (method);
 
        /* Try the method's module first */
-       *out_amodule = method->klass->image->aot_module;
-       index = find_aot_method_in_amodule (method->klass->image->aot_module, method, hash);
+       *out_amodule = (MonoAotModule *)method->klass->image->aot_module;
+       index = find_aot_method_in_amodule ((MonoAotModule *)method->klass->image->aot_module, method, hash);
        if (index != 0xffffff)
                return index;
 
@@ -3903,7 +3898,7 @@ find_aot_method (MonoMethod *method, MonoAotModule **out_amodule)
 
        index = 0xffffff;
        for (i = 0; i < modules->len; ++i) {
-               MonoAotModule *amodule = g_ptr_array_index (modules, i);
+               MonoAotModule *amodule = (MonoAotModule *)g_ptr_array_index (modules, i);
 
                if (amodule != method->klass->image->aot_module)
                        index = find_aot_method_in_amodule (amodule, method, hash);
@@ -3937,7 +3932,7 @@ init_llvm_method (MonoAotModule *amodule, guint32 method_index, MonoMethod *meth
        MonoJitInfo *jinfo = NULL;
        guint8 *code, *info;
 
-       code = amodule->methods [method_index];
+       code = (guint8 *)amodule->methods [method_index];
        info = &amodule->blob [mono_aot_get_offset (amodule->method_info_offsets, method_index)];
 
        p = info;
@@ -4034,7 +4029,7 @@ init_llvm_method (MonoAotModule *amodule, guint32 method_index, MonoMethod *meth
 void
 mono_aot_init_llvm_method (gpointer aot_module, guint32 method_index)
 {
-       MonoAotModule *amodule = aot_module;
+       MonoAotModule *amodule = (MonoAotModule *)aot_module;
        gboolean res;
 
        // FIXME: Handle failure
@@ -4043,20 +4038,20 @@ mono_aot_init_llvm_method (gpointer aot_module, guint32 method_index)
 }
 
 void
-mono_aot_init_gshared_method_this (gpointer aot_module, guint32 method_index, MonoObject *this)
+mono_aot_init_gshared_method_this (gpointer aot_module, guint32 method_index, MonoObject *this_obj)
 {
-       MonoAotModule *amodule = aot_module;
+       MonoAotModule *amodule = (MonoAotModule *)aot_module;
        gboolean res;
        MonoClass *klass;
        MonoGenericContext *context;
        MonoMethod *method;
 
        // FIXME:
-       g_assert (this);
-       klass = this->vtable->klass;
+       g_assert (this_obj);
+       klass = this_obj->vtable->klass;
 
        amodule_lock (amodule);
-       method = g_hash_table_lookup (amodule->extra_methods, GUINT_TO_POINTER (method_index));
+       method = (MonoMethod *)g_hash_table_lookup (amodule->extra_methods, GUINT_TO_POINTER (method_index));
        amodule_unlock (amodule);
 
        g_assert (method);
@@ -4070,7 +4065,7 @@ mono_aot_init_gshared_method_this (gpointer aot_module, guint32 method_index, Mo
 void
 mono_aot_init_gshared_method_rgctx  (gpointer aot_module, guint32 method_index, MonoMethodRuntimeGenericContext *rgctx)
 {
-       MonoAotModule *amodule = aot_module;
+       MonoAotModule *amodule = (MonoAotModule *)aot_module;
        gboolean res;
        MonoGenericContext context = { NULL, NULL };
        MonoClass *klass = rgctx->class_vtable->klass;
@@ -4096,16 +4091,22 @@ gpointer
 mono_aot_get_method (MonoDomain *domain, MonoMethod *method)
 {
        MonoClass *klass = method->klass;
+       MonoMethod *orig_method = method;
        guint32 method_index;
-       MonoAotModule *amodule = klass->image->aot_module;
+       MonoAotModule *amodule = (MonoAotModule *)klass->image->aot_module;
        guint8 *code;
+       gboolean cache_result = FALSE;
+
+       if (domain != mono_get_root_domain ())
+               /* Non shared AOT code can't be used in other appdomains */
+               return NULL;
 
        if (enable_aot_cache && !amodule && domain->entry_assembly && klass->image == mono_defaults.corlib) {
                /* This cannot be AOTed during startup, so do it now */
                if (!mscorlib_aot_loaded) {
                        mscorlib_aot_loaded = TRUE;
                        load_aot_module (klass->image->assembly, NULL);
-                       amodule = klass->image->aot_module;
+                       amodule = (MonoAotModule *)klass->image->aot_module;
                }
        }
 
@@ -4152,11 +4153,12 @@ mono_aot_get_method (MonoDomain *domain, MonoMethod *method)
        } else if (method->is_inflated || !method->token) {
                /* This hash table is used to avoid the slower search in the extra_method_table in the AOT image */
                amodule_lock (amodule);
-               code = g_hash_table_lookup (amodule->method_to_code, method);
+               code = (guint8 *)g_hash_table_lookup (amodule->method_to_code, method);
                amodule_unlock (amodule);
                if (code)
                        return code;
 
+               cache_result = TRUE;
                method_index = find_aot_method (method, &amodule);
                /*
                 * Special case the ICollection<T> wrappers for arrays, as they cannot
@@ -4166,7 +4168,7 @@ mono_aot_get_method (MonoDomain *domain, MonoMethod *method)
                if (method_index == 0xffffff && method->wrapper_type == MONO_WRAPPER_MANAGED_TO_MANAGED && method->klass->rank && strstr (method->name, "System.Collections.Generic")) {
                        MonoMethod *m = mono_aot_get_array_helper_from_wrapper (method);
 
-                       code = mono_aot_get_method (domain, m);
+                       code = (guint8 *)mono_aot_get_method (domain, m);
                        if (code)
                                return code;
                }
@@ -4200,7 +4202,7 @@ mono_aot_get_method (MonoDomain *domain, MonoMethod *method)
                         * Get the code for the <object> instantiation which should be emitted into
                         * the mscorlib aot image by the AOT compiler.
                         */
-                       code = mono_aot_get_method (domain, m);
+                       code = (guint8 *)mono_aot_get_method (domain, m);
                        if (code)
                                return code;
                }
@@ -4238,7 +4240,7 @@ mono_aot_get_method (MonoDomain *domain, MonoMethod *method)
                         * Get the code for the <object> instantiation which should be emitted into
                         * the mscorlib aot image by the AOT compiler.
                         */
-                       code = mono_aot_get_method (domain, m);
+                       code = (guint8 *)mono_aot_get_method (domain, m);
                        if (code)
                                return code;
                }
@@ -4256,7 +4258,7 @@ mono_aot_get_method (MonoDomain *domain, MonoMethod *method)
 
                                        m = mono_marshal_get_array_accessor_wrapper (m);
                                        if (m != method) {
-                                               code = mono_aot_get_method (domain, m);
+                                               code = (guint8 *)mono_aot_get_method (domain, m);
                                                if (code)
                                                        return code;
                                        }
@@ -4305,7 +4307,13 @@ mono_aot_get_method (MonoDomain *domain, MonoMethod *method)
                method_index = mono_metadata_token_index (method->token) - 1;
        }
 
-       return load_method (domain, amodule, klass->image, method, method->token, method_index);
+       code = (guint8 *)load_method (domain, amodule, klass->image, method, method->token, method_index);
+       if (code && cache_result) {
+               amodule_lock (amodule);
+               g_hash_table_insert (amodule->method_to_code, orig_method, code);
+               amodule_unlock (amodule);
+       }
+       return code;
 }
 
 /**
@@ -4315,7 +4323,7 @@ mono_aot_get_method (MonoDomain *domain, MonoMethod *method)
 gpointer
 mono_aot_get_method_from_token (MonoDomain *domain, MonoImage *image, guint32 token)
 {
-       MonoAotModule *aot_module = image->aot_module;
+       MonoAotModule *aot_module = (MonoAotModule *)image->aot_module;
        int method_index;
 
        if (!aot_module)
@@ -4438,7 +4446,7 @@ mono_aot_plt_resolve (gpointer aot_module, guint32 plt_info_offset, guint8 *code
 
        p = &module->blob [plt_info_offset];
 
-       ji.type = decode_value (p, &p);
+       ji.type = (MonoJumpInfoType)decode_value (p, &p);
 
        mp = mono_mempool_new ();
        res = decode_patch (module, mp, &ji, p, &p);
@@ -4460,10 +4468,10 @@ mono_aot_plt_resolve (gpointer aot_module, guint32 plt_info_offset, guint8 *code
         */
        if (mono_aot_only && ji.type == MONO_PATCH_INFO_METHOD && !ji.data.method->is_generic && !mono_method_check_context_used (ji.data.method) && !(ji.data.method->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED) &&
                !mono_method_needs_static_rgctx_invoke (ji.data.method, FALSE) && !using_gsharedvt) {
-               target = mono_jit_compile_method (ji.data.method);
+               target = (guint8 *)mono_jit_compile_method (ji.data.method);
                no_ftnptr = TRUE;
        } else {
-               target = mono_resolve_patch_target (NULL, mono_domain_get (), NULL, &ji, TRUE);
+               target = (guint8 *)mono_resolve_patch_target (NULL, mono_domain_get (), NULL, &ji, TRUE);
        }
 
        /*
@@ -4484,7 +4492,7 @@ mono_aot_plt_resolve (gpointer aot_module, guint32 plt_info_offset, guint8 *code
 #ifdef PPC_USES_FUNCTION_DESCRIPTOR
                g_assert (((gpointer*)target) [2] != 0);
 #endif
-               target = mono_create_ftnptr (mono_domain_get (), target);
+               target = (guint8 *)mono_create_ftnptr (mono_domain_get (), target);
        }
 
        mono_mempool_destroy (mp);
@@ -4681,7 +4689,7 @@ load_function_full (MonoAotModule *amodule, const char *name, MonoTrampInfo **ou
                uw_info_len = decode_value (uw_info, &uw_info);
 
                tinfo = g_new0 (MonoTrampInfo, 1);
-               tinfo->code = code;
+               tinfo->code = (guint8 *)code;
                tinfo->code_size = code_size;
                tinfo->uw_info = uw_info;
                tinfo->uw_info_len = uw_info_len;
@@ -4725,7 +4733,7 @@ load_function_full (MonoAotModule *amodule, const char *name, MonoTrampInfo **ou
                                } else if (!strcmp (ji->data.name, "mono_throw_exception")) {
                                        target = mono_get_throw_exception ();
                                } else if (strstr (ji->data.name, "trampoline_func_") == ji->data.name) {
-                                       int tramp_type2 = atoi (ji->data.name + strlen ("trampoline_func_"));
+                                       MonoTrampolineType tramp_type2 = (MonoTrampolineType)atoi (ji->data.name + strlen ("trampoline_func_"));
                                        target = (gpointer)mono_get_trampoline_func (tramp_type2);
                                } else if (strstr (ji->data.name, "specific_trampoline_lazy_fetch_") == ji->data.name) {
                                        /* atoll is needed because the the offset is unsigned */
@@ -4735,7 +4743,7 @@ load_function_full (MonoAotModule *amodule, const char *name, MonoTrampInfo **ou
                                        res = sscanf (ji->data.name, "specific_trampoline_lazy_fetch_%u", &slot);
                                        g_assert (res == 1);
                                        target = mono_create_specific_trampoline (GUINT_TO_POINTER (slot), MONO_TRAMPOLINE_RGCTX_LAZY_FETCH, mono_get_root_domain (), NULL);
-                                       target = mono_create_ftnptr_malloc (target);
+                                       target = mono_create_ftnptr_malloc ((guint8 *)target);
                                } else if (!strcmp (ji->data.name, "mono_thread_get_and_clear_pending_exception")) {
                                        target = mono_thread_get_and_clear_pending_exception;
                                } else if (!strcmp (ji->data.name, "debugger_agent_single_step_from_context")) {
@@ -4756,7 +4764,7 @@ load_function_full (MonoAotModule *amodule, const char *name, MonoTrampInfo **ou
                                /* Hopefully the code doesn't have patches which need method or 
                                 * domain to be set.
                                 */
-                               target = mono_resolve_patch_target (NULL, NULL, code, ji, FALSE);
+                               target = mono_resolve_patch_target (NULL, NULL, (guint8 *)code, ji, FALSE);
                                g_assert (target);
                        }
 
@@ -4785,7 +4793,7 @@ get_mscorlib_aot_module (void)
 
        image = mono_defaults.corlib;
        if (image)
-               amodule = image->aot_module;
+               amodule = (MonoAotModule *)image->aot_module;
        else
                amodule = mscorlib_aot_module;
        g_assert (amodule);
@@ -4812,7 +4820,7 @@ mono_aot_get_trampoline_full (const char *name, MonoTrampInfo **out_tinfo)
                return no_trampolines;
        }
 
-       return mono_create_ftnptr_malloc (load_function_full (amodule, name, out_tinfo));
+       return mono_create_ftnptr_malloc ((guint8 *)load_function_full (amodule, name, out_tinfo));
 }
 
 gpointer
@@ -5146,14 +5154,14 @@ mono_aot_create_specific_trampoline (MonoImage *image, gpointer arg1, MonoTrampo
                g_free (symbol);
        }
 
-       tramp = generic_trampolines [tramp_type];
+       tramp = (guint8 *)generic_trampolines [tramp_type];
        g_assert (tramp);
 
        if (USE_PAGE_TRAMPOLINES) {
-               code = get_new_specific_trampoline_from_page (tramp, arg1);
+               code = (guint8 *)get_new_specific_trampoline_from_page (tramp, arg1);
                tramp_size = 8;
        } else {
-               code = get_numerous_trampoline (MONO_AOT_TRAMP_SPECIFIC, 2, &amodule, &got_offset, &tramp_size);
+               code = (guint8 *)get_numerous_trampoline (MONO_AOT_TRAMP_SPECIFIC, 2, &amodule, &got_offset, &tramp_size);
 
                amodule->got [got_offset] = tramp;
                amodule->got [got_offset + 1] = arg1;
@@ -5173,9 +5181,9 @@ mono_aot_get_static_rgctx_trampoline (gpointer ctx, gpointer addr)
        guint32 got_offset;
 
        if (USE_PAGE_TRAMPOLINES) {
-               code = get_new_rgctx_trampoline_from_page (addr, ctx);
+               code = (guint8 *)get_new_rgctx_trampoline_from_page (addr, ctx);
        } else {
-               code = get_numerous_trampoline (MONO_AOT_TRAMP_STATIC_RGCTX, 2, &amodule, &got_offset, NULL);
+               code = (guint8 *)get_numerous_trampoline (MONO_AOT_TRAMP_STATIC_RGCTX, 2, &amodule, &got_offset, NULL);
 
                amodule->got [got_offset] = ctx;
                amodule->got [got_offset + 1] = addr; 
@@ -5208,12 +5216,12 @@ mono_aot_get_unbox_trampoline (MonoMethod *method)
                }
                g_assert (method_index != 0xffffff);
        } else {
-               amodule = method->klass->image->aot_module;
+               amodule = (MonoAotModule *)method->klass->image->aot_module;
                g_assert (amodule);
        }
 
        if (amodule->info.llvm_get_unbox_tramp) {
-               gpointer (*get_tramp) (int) = amodule->info.llvm_get_unbox_tramp;
+               gpointer (*get_tramp) (int) = (gpointer (*)(int))amodule->info.llvm_get_unbox_tramp;
                code = get_tramp (method_index);
 
                if (code)
@@ -5242,7 +5250,7 @@ mono_aot_get_unbox_trampoline (MonoMethod *method)
        code = get_call_table_entry (amodule->unbox_trampoline_addresses, entry_index);
        g_assert (code);
 
-       tinfo = mono_tramp_info_create (NULL, code, 0, NULL, NULL);
+       tinfo = mono_tramp_info_create (NULL, (guint8 *)code, 0, NULL, NULL);
 
        symbol_addr = read_unwind_info (amodule, tinfo, "unbox_trampoline_p");
        if (!symbol_addr) {
@@ -5262,7 +5270,7 @@ mono_aot_get_lazy_fetch_trampoline (guint32 slot)
 {
        char *symbol;
        gpointer code;
-       MonoAotModule *amodule = mono_defaults.corlib->aot_module;
+       MonoAotModule *amodule = (MonoAotModule *)mono_defaults.corlib->aot_module;
        guint32 index = MONO_RGCTX_SLOT_INDEX (slot);
        static int count = 0;
 
@@ -5276,7 +5284,7 @@ mono_aot_get_lazy_fetch_trampoline (guint32 slot)
                 */
                if (!addr)
                        addr = load_function (amodule, "rgctx_fetch_trampoline_general");
-               info = mono_domain_alloc0 (mono_get_root_domain (), sizeof (gpointer) * 2);
+               info = (void **)mono_domain_alloc0 (mono_get_root_domain (), sizeof (gpointer) * 2);
                info [0] = GUINT_TO_POINTER (slot);
                info [1] = mono_create_specific_trampoline (GUINT_TO_POINTER (slot), MONO_TRAMPOLINE_RGCTX_LAZY_FETCH, mono_get_root_domain (), NULL);
                code = mono_aot_get_static_rgctx_trampoline (info, addr);
@@ -5284,7 +5292,7 @@ mono_aot_get_lazy_fetch_trampoline (guint32 slot)
        }
 
        symbol = mono_get_rgctx_fetch_trampoline_name (slot);
-       code = load_function (mono_defaults.corlib->aot_module, symbol);
+       code = load_function ((MonoAotModule *)mono_defaults.corlib->aot_module, symbol);
        g_free (symbol);
        /* The caller expects an ftnptr */
        return mono_create_ftnptr (mono_domain_get (), code);
@@ -5317,7 +5325,7 @@ mono_aot_get_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckItem
        }
 
        /* Save the entries into an array */
-       buf = mono_domain_alloc (domain, (real_count + 1) * 2 * sizeof (gpointer));
+       buf = (void **)mono_domain_alloc (domain, (real_count + 1) * 2 * sizeof (gpointer));
        index = 0;
        for (i = 0; i < count; ++i) {
                MonoIMTCheckItem *item = imt_entries [i];               
@@ -5329,7 +5337,7 @@ mono_aot_get_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckItem
 
                buf [(index * 2)] = item->key;
                if (item->has_target_code) {
-                       gpointer *p = mono_domain_alloc (domain, sizeof (gpointer));
+                       gpointer *p = (gpointer *)mono_domain_alloc (domain, sizeof (gpointer));
                        *p = item->value.target_code;
                        buf [(index * 2) + 1] = p;
                } else {
@@ -5359,9 +5367,9 @@ mono_aot_get_gsharedvt_arg_trampoline (gpointer arg, gpointer addr)
        guint32 got_offset;
 
        if (USE_PAGE_TRAMPOLINES) {
-               code = get_new_gsharedvt_arg_trampoline_from_page (addr, arg);
+               code = (guint8 *)get_new_gsharedvt_arg_trampoline_from_page (addr, arg);
        } else {
-               code = get_numerous_trampoline (MONO_AOT_TRAMP_GSHAREDVT_ARG, 2, &amodule, &got_offset, NULL);
+               code = (guint8 *)get_numerous_trampoline (MONO_AOT_TRAMP_GSHAREDVT_ARG, 2, &amodule, &got_offset, NULL);
 
                amodule->got [got_offset] = arg;
                amodule->got [got_offset + 1] = addr; 

diff --git a/mono/mini/aot-tests.cs b/mono/mini/aot-tests.cs
index 048ae081e4e8ef7d3d54de059a5526ddad5d5551..6092346ea4ccb21349b8d22bba00ef891fad4a79 100644 (file)
--- a/mono/mini/aot-tests.cs
+++ b/mono/mini/aot-tests.cs
@@ -303,6 +303,52 @@ class Tests
                return 0;
        }
 
+       enum UInt32Enum : uint {
+               A = 1
+                       }
+
+       enum Int32Enum : int {
+               A = 1
+                       }
+
+       enum Int16Enum : short {
+               A = 1
+                       }
+
+       enum UInt16Enum : ushort {
+               A = 1
+                       }
+
+       enum Int8Enum : sbyte {
+               A = 1
+                       }
+
+       enum UInt8Enum : byte {
+               A = 1
+                       }
+
+       public static int test_0_int_enum_eq_comparer () {
+               var t1 = new Dictionary<Int32Enum, object> ();
+               t1 [Int32Enum.A] = "foo";
+
+               var t2 = new Dictionary<UInt32Enum, object> ();
+               t2 [UInt32Enum.A] = "foo";
+
+               var t3 = new Dictionary<UInt16Enum, object> ();
+               t3 [UInt16Enum.A] = "foo";
+
+               var t4 = new Dictionary<Int16Enum, object> ();
+               t4 [Int16Enum.A] = "foo";
+
+               var t5 = new Dictionary<Int8Enum, object> ();
+               t5 [Int8Enum.A] = "foo";
+
+               var t6 = new Dictionary<UInt8Enum, object> ();
+               t6 [UInt8Enum.A] = "foo";
+
+               return 0;
+       }
+
        public static int test_0_array_accessor_runtime_invoke_ref () {
                var t = typeof (string[]);
                var arr = Array.CreateInstance (typeof (string), 1);
@@ -312,4 +358,47 @@ class Tests
                        return 1;
                return 0;
        }
+
+       public static void SetArrayValue_<T> (T[] values) {
+               values.Select (x => x).ToArray ();
+       }
+
+       [Category ("GSHAREDVT")]
+       public static int test_0_delegate_invoke_wrappers_gsharedvt () {
+               var enums = new LongEnum [] { LongEnum.A };
+               SetArrayValue_ (enums);
+               return 0;
+       }
+
+       struct LargeStruct {
+               public int a, b, c, d;
+       }
+
+       [MethodImplAttribute (MethodImplOptions.NoInlining)]
+       public static bool GetHasValue<T>(T? value) where T : struct
+       {
+               return value.HasValue;
+       }
+
+       [Category ("DYNCALL")]
+       public static int test_0_large_nullable_invoke () {
+               var s = new LargeStruct () { a = 1, b = 2, c = 3, d = 4 };
+
+               GetHasValue<LargeStruct> (s);
+
+#if __MOBILE__
+               var m = typeof(AotTests).GetMethod("GetHasValue", BindingFlags.Static | BindingFlags.Public);
+#else
+               var m = typeof(Tests).GetMethod("GetHasValue", BindingFlags.Static | BindingFlags.Public);
+#endif
+
+               Type type = typeof (LargeStruct?).GetGenericArguments () [0];
+               bool b1 = (bool)m.MakeGenericMethod (new Type[] {type}).Invoke (null, new object[] { s });
+               if (!b1)
+                       return 1;
+               bool b2 = (bool)m.MakeGenericMethod (new Type[] {type}).Invoke (null, new object[] { null });
+               if (b2)
+                       return 2;
+               return 0;
+       }
 }

diff --git a/mono/mini/branch-opts.c b/mono/mini/branch-opts.c
index a6d4915ee3697032916385ff1f2e81d0e5f6ba34..aeb11a0ff0e7ab327bac24441a82e0854a51cec2 100644 (file)
--- a/mono/mini/branch-opts.c
+++ b/mono/mini/branch-opts.c
@@ -85,7 +85,7 @@ mono_branch_optimize_exception_target (MonoCompile *cfg, MonoBasicBlock *bb, con
                                                MONO_INST_NEW (cfg, jump, OP_BR);
 
                                                /* Allocate memory for our branch target */
-                                               jump->inst_i1 = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst));
+                                               jump->inst_i1 = (MonoInst *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst));
                                                jump->inst_true_bb = targetbb;
 
                                                if (cfg->verbose_level > 2) 
@@ -851,7 +851,7 @@ replace_out_block_in_code (MonoBasicBlock *bb, MonoBasicBlock *orig, MonoBasicBl
                                        ins->inst_false_bb = repl;
                        } else if (MONO_IS_JUMP_TABLE (ins)) {
                                int i;
-                               MonoJumpInfoBBTable *table = MONO_JUMP_TABLE_FROM_INS (ins);
+                               MonoJumpInfoBBTable *table = (MonoJumpInfoBBTable *)MONO_JUMP_TABLE_FROM_INS (ins);
                                for (i = 0; i < table->table_size; i++ ) {
                                        if (table->table [i] == orig)
                                                table->table [i] = repl;
@@ -995,7 +995,7 @@ mono_merge_basic_blocks (MonoCompile *cfg, MonoBasicBlock *bb, MonoBasicBlock *b
                for (inst = bb->code; inst != NULL; inst = inst->next) {
                        if (MONO_IS_JUMP_TABLE (inst)) {
                                int i;
-                               MonoJumpInfoBBTable *table = MONO_JUMP_TABLE_FROM_INS (inst);
+                               MonoJumpInfoBBTable *table = (MonoJumpInfoBBTable *)MONO_JUMP_TABLE_FROM_INS (inst);
                                for (i = 0; i < table->table_size; i++ ) {
                                        /* Might be already NULL from a previous merge */
                                        if (table->table [i])
@@ -1137,7 +1137,7 @@ mono_remove_critical_edges (MonoCompile *cfg)
                                 * overwrite the sreg1 of the ins.
                                 */
                                if ((in_bb->out_count > 1) || (in_bb->out_count == 1 && in_bb->last_ins && in_bb->last_ins->opcode == OP_BR_REG)) {
-                                       MonoBasicBlock *new_bb = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoBasicBlock));
+                                       MonoBasicBlock *new_bb = (MonoBasicBlock *)mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoBasicBlock));
                                        new_bb->block_num = cfg->num_bblocks++;
 //                                     new_bb->real_offset = bb->real_offset;
                                        new_bb->region = bb->region;
@@ -1161,7 +1161,7 @@ mono_remove_critical_edges (MonoCompile *cfg)
                                                        /* We cannot add any inst to the entry BB, so we must */
                                                        /* put a new BB in the middle to hold the OP_BR */
                                                        MonoInst *jump;
-                                                       MonoBasicBlock *new_bb_after_entry = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoBasicBlock));
+                                                       MonoBasicBlock *new_bb_after_entry = (MonoBasicBlock *)mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoBasicBlock));
                                                        new_bb_after_entry->block_num = cfg->num_bblocks++;
 //                                                     new_bb_after_entry->real_offset = bb->real_offset;
                                                        new_bb_after_entry->region = bb->region;
@@ -1190,10 +1190,10 @@ mono_remove_critical_edges (MonoCompile *cfg)
                                        previous_bb = new_bb;
                                        
                                        /* Setup in_bb and out_bb */
-                                       new_bb->in_bb = mono_mempool_alloc ((cfg)->mempool, sizeof (MonoBasicBlock*));
+                                       new_bb->in_bb = (MonoBasicBlock **)mono_mempool_alloc ((cfg)->mempool, sizeof (MonoBasicBlock*));
                                        new_bb->in_bb [0] = in_bb;
                                        new_bb->in_count = 1;
-                                       new_bb->out_bb = mono_mempool_alloc ((cfg)->mempool, sizeof (MonoBasicBlock*));
+                                       new_bb->out_bb = (MonoBasicBlock **)mono_mempool_alloc ((cfg)->mempool, sizeof (MonoBasicBlock*));
                                        new_bb->out_bb [0] = bb;
                                        new_bb->out_count = 1;
                                        

diff --git a/mono/mini/debug-mini.c b/mono/mini/debug-mini.c
index 92ff7d8ce1f1fdeaa03cf1e759b33b5e0b1dcf2f..8ee0457a5647100e15bc48df186fd318859b5129 100644 (file)
--- a/mono/mini/debug-mini.c
+++ b/mono/mini/debug-mini.c
@@ -451,7 +451,7 @@ mono_debug_serialize_debug_info (MonoCompile *cfg, guint8 **out_buf, guint32 *bu
        }
 
        size = ((jit->num_params + jit->num_locals + 1) * 10) + (jit->num_line_numbers * 10) + 64;
-       p = buf = g_malloc (size);
+       p = buf = (guint8 *)g_malloc (size);
        encode_value (jit->epilogue_begin, p, &p);
        encode_value (jit->prologue_end, p, &p);
        encode_value (jit->code_size, p, &p);
@@ -650,7 +650,7 @@ void
 mono_debug_print_vars (gpointer ip, gboolean only_arguments)
 {
        MonoDomain *domain = mono_domain_get ();
-       MonoJitInfo *ji = mono_jit_info_table_find (domain, ip);
+       MonoJitInfo *ji = mono_jit_info_table_find (domain, (char *)ip);
        MonoDebugMethodJitInfo *jit;
        int i;
 
@@ -730,7 +730,7 @@ mono_debugger_method_has_breakpoint (MonoMethod *method)
                return 0;
 
        for (i = 0; i < breakpoints->len; i++) {
-               MiniDebugBreakpointInfo *info = g_ptr_array_index (breakpoints, i);
+               MiniDebugBreakpointInfo *info = (MiniDebugBreakpointInfo *)g_ptr_array_index (breakpoints, i);
 
                if (!mono_method_desc_full_match (info->desc, method))
                        continue;

diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
index eef2438346a647340bd3a238de55a2830ddc42d7..a8e6b3920eb370ed43e229f6f4ce9d1317dffe39 100644 (file)
--- a/mono/mini/debugger-agent.c
+++ b/mono/mini/debugger-agent.c
@@ -62,7 +62,8 @@
 #include <mono/metadata/assembly.h>
 #include <mono/metadata/runtime.h>
 #include <mono/metadata/verify-internals.h>
-#include <mono/utils/mono-semaphore.h>
+#include <mono/utils/mono-coop-mutex.h>
+#include <mono/utils/mono-coop-semaphore.h>
 #include <mono/utils/mono-error-internals.h>
 #include <mono/utils/mono-stack-unwinding.h>
 #include <mono/utils/mono-time.h>
@@ -91,7 +92,7 @@
 
 #ifndef DISABLE_DEBUGGER_AGENT
 
-#include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-os-mutex.h>
 
 #define THREAD_TO_INTERNAL(thread) (thread)->internal_thread
 
@@ -680,10 +681,10 @@ static GPtrArray *pending_assembly_loads;
 static gboolean debugger_thread_exited;
 
 /* Cond variable used to wait for debugger_thread_exited becoming true */
-static mono_cond_t debugger_thread_exited_cond;
+static MonoCoopCond debugger_thread_exited_cond;
 
 /* Mutex for the cond var above */
-static mono_mutex_t debugger_thread_exited_mutex;
+static MonoCoopMutex debugger_thread_exited_mutex;
 
 static DebuggerProfiler debugger_profiler;
 
@@ -715,14 +716,9 @@ static gboolean buffer_replies;
 static ReplyPacket reply_packets [128];
 int nreply_packets;
 
-#define dbg_lock() do {        \
-       MONO_TRY_BLOCKING;                      \
-       mono_mutex_lock (&debug_mutex); \
-       MONO_FINISH_TRY_BLOCKING;               \
-} while (0)
-
-#define dbg_unlock() mono_mutex_unlock (&debug_mutex)
-static mono_mutex_t debug_mutex;
+#define dbg_lock() mono_coop_mutex_lock (&debug_mutex)
+#define dbg_unlock() mono_coop_mutex_unlock (&debug_mutex)
+static MonoCoopMutex debug_mutex;
 
 static void transport_init (void);
 static void transport_connect (const char *address);
@@ -822,7 +818,7 @@ parse_address (char *address, char **host, int *port)
        if (pos == NULL || pos == address)
                return 1;
 
-       *host = g_malloc (pos - address + 1);
+       *host = (char *)g_malloc (pos - address + 1);
        strncpy (*host, address, pos - address);
        (*host) [pos - address] = '\0';
 
@@ -961,7 +957,7 @@ mono_debugger_agent_parse_options (char *options)
 void
 mono_debugger_agent_init (void)
 {
-       mono_mutex_init_recursive (&debug_mutex);
+       mono_coop_mutex_init_recursive (&debug_mutex);
 
        if (!agent_config.enabled)
                return;
@@ -973,11 +969,11 @@ mono_debugger_agent_init (void)
 
        event_requests = g_ptr_array_new ();
 
-       mono_mutex_init (&debugger_thread_exited_mutex);
-       mono_cond_init (&debugger_thread_exited_cond, 0);
+       mono_coop_mutex_init (&debugger_thread_exited_mutex);
+       mono_coop_cond_init (&debugger_thread_exited_cond);
 
        mono_profiler_install ((MonoProfiler*)&debugger_profiler, runtime_shutdown);
-       mono_profiler_set_events (MONO_PROFILE_APPDOMAIN_EVENTS | MONO_PROFILE_THREADS | MONO_PROFILE_ASSEMBLY_EVENTS | MONO_PROFILE_JIT_COMPILATION | MONO_PROFILE_METHOD_EVENTS);
+       mono_profiler_set_events ((MonoProfileFlags)(MONO_PROFILE_APPDOMAIN_EVENTS | MONO_PROFILE_THREADS | MONO_PROFILE_ASSEMBLY_EVENTS | MONO_PROFILE_JIT_COMPILATION | MONO_PROFILE_METHOD_EVENTS));
        mono_profiler_install_runtime_initialized (runtime_initialized);
        mono_profiler_install_appdomain (NULL, appdomain_load, appdomain_start_unload, appdomain_unload);
        mono_profiler_install_thread (thread_startup, thread_end);
@@ -1075,7 +1071,7 @@ finish_agent_init (gboolean on_startup)
                argv [2] = agent_config.address;
                argv [3] = NULL;
 
-               res = g_spawn_async_with_pipes (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+               res = g_spawn_async_with_pipes (NULL, argv, NULL, (GSpawnFlags)0, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
                if (!res) {
                        fprintf (stderr, "Failed to execute '%s'.\n", agent_config.launch);
                        exit (1);
@@ -1104,9 +1100,6 @@ mono_debugger_agent_cleanup (void)
        breakpoints_cleanup ();
        objrefs_cleanup ();
        ids_cleanup ();
-       
-       mono_mutex_destroy (&debugger_thread_exited_mutex);
-       mono_cond_destroy (&debugger_thread_exited_cond);
 }
 
 /*
@@ -1538,18 +1531,18 @@ transport_handshake (void)
        /* Write handshake message */
        sprintf (handshake_msg, "DWP-Handshake");
        /* Must use try blocking as this can nest into code that runs blocking */
-       MONO_TRY_BLOCKING;
+       MONO_PREPARE_BLOCKING;
        do {
                res = transport_send (handshake_msg, strlen (handshake_msg));
        } while (res == -1 && get_last_sock_error () == MONO_EINTR);
-       MONO_FINISH_TRY_BLOCKING;
+       MONO_FINISH_BLOCKING;
 
        g_assert (res != -1);
 
        /* Read answer */
-       MONO_TRY_BLOCKING;
+       MONO_PREPARE_BLOCKING;
        res = transport_recv (buf, strlen (handshake_msg));
-       MONO_FINISH_TRY_BLOCKING;
+       MONO_FINISH_BLOCKING;
        if ((res != strlen (handshake_msg)) || (memcmp (buf, handshake_msg, strlen (handshake_msg)) != 0)) {
                fprintf (stderr, "debugger-agent: DWP handshake failed.\n");
                return FALSE;
@@ -1604,12 +1597,10 @@ stop_debugger_thread (void)
         */
        if (!is_debugger_thread ()) {
                do {
-                       MONO_TRY_BLOCKING;
-                       mono_mutex_lock (&debugger_thread_exited_mutex);
+                       mono_coop_mutex_lock (&debugger_thread_exited_mutex);
                        if (!debugger_thread_exited)
-                               mono_cond_wait (&debugger_thread_exited_cond, &debugger_thread_exited_mutex);
-                       mono_mutex_unlock (&debugger_thread_exited_mutex);
-                       MONO_FINISH_TRY_BLOCKING;
+                               mono_coop_cond_wait (&debugger_thread_exited_cond, &debugger_thread_exited_mutex);
+                       mono_coop_mutex_unlock (&debugger_thread_exited_mutex);
                } while (!debugger_thread_exited);
        }
 
@@ -1674,7 +1665,7 @@ decode_string (guint8 *buf, guint8 **endbuf, guint8 *limit)
                return NULL;
        }
 
-       s = g_malloc (len + 1);
+       s = (char *)g_malloc (len + 1);
        g_assert (s);
 
        memcpy (s, buf, len);
@@ -1692,7 +1683,7 @@ decode_string (guint8 *buf, guint8 **endbuf, guint8 *limit)
 static inline void
 buffer_init (Buffer *buf, int size)
 {
-       buf->buf = g_malloc (size);
+       buf->buf = (guint8 *)g_malloc (size);
        buf->p = buf->buf;
        buf->end = buf->buf + size;
 }
@@ -1708,7 +1699,7 @@ buffer_make_room (Buffer *buf, int size)
 {
        if (buf->end - buf->p < size) {
                int new_size = buf->end - buf->buf + size + 32;
-               guint8 *p = g_realloc (buf->buf, new_size);
+               guint8 *p = (guint8 *)g_realloc (buf->buf, new_size);
                size = buf->p - buf->buf;
                buf->buf = p;
                buf->p = p + size;
@@ -1917,7 +1908,7 @@ static MonoGHashTable *suspended_objs;
 static void
 free_objref (gpointer value)
 {
-       ObjRef *o = value;
+       ObjRef *o = (ObjRef *)value;
 
        mono_gchandle_free (o->handle);
 
@@ -1973,9 +1964,9 @@ get_objref (MonoObject *obj)
                 */
                hash = mono_object_hash (obj);
 
-               reflist = g_hash_table_lookup (obj_to_objref, GINT_TO_POINTER (hash));
+               reflist = (GSList *)g_hash_table_lookup (obj_to_objref, GINT_TO_POINTER (hash));
                for (l = reflist; l; l = l->next) {
-                       ref = l->data;
+                       ref = (ObjRef *)l->data;
                        if (ref && mono_gchandle_get_target (ref->handle) == obj) {
                                mono_loader_unlock ();
                                return ref;
@@ -1983,7 +1974,7 @@ get_objref (MonoObject *obj)
                }
        } else {
                /* Use a hash table with masked pointers to internalize object references */
-               ref = g_hash_table_lookup (obj_to_objref, GINT_TO_POINTER (~((gsize)obj)));
+               ref = (ObjRef *)g_hash_table_lookup (obj_to_objref, GINT_TO_POINTER (~((gsize)obj)));
                /* ref might refer to a different object with the same addr which was GCd */
                if (ref && mono_gchandle_get_target (ref->handle) == obj) {
                        mono_loader_unlock ();
@@ -2041,7 +2032,7 @@ get_object_allow_null (int objid, MonoObject **obj)
 
        if (objid == 0) {
                *obj = NULL;
-               return 0;
+               return ERR_NONE;
        }
 
        if (!objrefs)
@@ -2049,14 +2040,14 @@ get_object_allow_null (int objid, MonoObject **obj)
 
        mono_loader_lock ();
 
-       ref = g_hash_table_lookup (objrefs, GINT_TO_POINTER (objid));
+       ref = (ObjRef *)g_hash_table_lookup (objrefs, GINT_TO_POINTER (objid));
 
        if (ref) {
                *obj = mono_gchandle_get_target (ref->handle);
                mono_loader_unlock ();
                if (!(*obj))
                        return ERR_INVALID_OBJECT;
-               return 0;
+               return ERR_NONE;
        } else {
                mono_loader_unlock ();
                return ERR_INVALID_OBJECT;
@@ -2066,13 +2057,13 @@ get_object_allow_null (int objid, MonoObject **obj)
 static ErrorCode
 get_object (int objid, MonoObject **obj)
 {
-       int err = get_object_allow_null (objid, obj);
+       ErrorCode err = get_object_allow_null (objid, obj);
 
-       if (err)
+       if (err != ERR_NONE)
                return err;
        if (!(*obj))
                return ERR_INVALID_OBJECT;
-       return 0;
+       return ERR_NONE;
 }
 
 static inline int
@@ -2168,7 +2159,7 @@ ids_cleanup (void)
 void
 mono_debugger_agent_free_domain_info (MonoDomain *domain)
 {
-       AgentDomainInfo *info = domain_jit_info (domain)->agent_info;
+       AgentDomainInfo *info = (AgentDomainInfo *)domain_jit_info (domain)->agent_info;
        int i, j;
        GHashTableIter iter;
        GPtrArray *file_names;
@@ -2210,7 +2201,7 @@ mono_debugger_agent_free_domain_info (MonoDomain *domain)
        for (i = 0; i < ID_NUM; ++i) {
                if (ids [i]) {
                        for (j = 0; j < ids [i]->len; ++j) {
-                               Id *id = g_ptr_array_index (ids [i], j);
+                               Id *id = (Id *)g_ptr_array_index (ids [i], j);
                                if (id->domain == domain)
                                        id->domain = NULL;
                        }
@@ -2230,9 +2221,10 @@ get_agent_domain_info (MonoDomain *domain)
 
        mono_domain_lock (domain);
 
-       info = domain_jit_info (domain)->agent_info;
+       info = (AgentDomainInfo *)domain_jit_info (domain)->agent_info;
        if (!info) {
-               info = domain_jit_info (domain)->agent_info = g_new0 (AgentDomainInfo, 1);
+               info = g_new0 (AgentDomainInfo, 1);
+               domain_jit_info (domain)->agent_info = info;
                info->loaded_classes = g_hash_table_new (mono_aligned_addr_hash, NULL);
                info->source_files = g_hash_table_new (mono_aligned_addr_hash, NULL);
                info->source_file_to_class = g_hash_table_new (g_str_hash, g_str_equal);
@@ -2260,7 +2252,7 @@ get_id (MonoDomain *domain, IdType type, gpointer val)
        if (info->val_to_id [type] == NULL)
                info->val_to_id [type] = g_hash_table_new (mono_aligned_addr_hash, NULL);
 
-       id = g_hash_table_lookup (info->val_to_id [type], val);
+       id = (Id *)g_hash_table_lookup (info->val_to_id [type], val);
        if (id) {
                dbg_unlock ();
                return id->id;
@@ -2281,13 +2273,13 @@ get_id (MonoDomain *domain, IdType type, gpointer val)
 }
 
 static inline gpointer
-decode_ptr_id (guint8 *buf, guint8 **endbuf, guint8 *limit, IdType type, MonoDomain **domain, int *err)
+decode_ptr_id (guint8 *buf, guint8 **endbuf, guint8 *limit, IdType type, MonoDomain **domain, ErrorCode *err)
 {
        Id *res;
 
        int id = decode_id (buf, endbuf, limit);
 
-       *err = 0;
+       *err = ERR_NONE;
        if (domain)
                *domain = NULL;
 
@@ -2298,7 +2290,7 @@ decode_ptr_id (guint8 *buf, guint8 **endbuf, guint8 *limit, IdType type, MonoDom
        dbg_lock ();
        g_assert (id > 0 && id <= ids [type]->len);
 
-       res = g_ptr_array_index (ids [type], GPOINTER_TO_INT (id - 1));
+       res = (Id *)g_ptr_array_index (ids [type], GPOINTER_TO_INT (id - 1));
        dbg_unlock ();
 
        if (res->domain == NULL) {
@@ -2323,11 +2315,11 @@ buffer_add_ptr_id (Buffer *buf, MonoDomain *domain, IdType type, gpointer val)
 }
 
 static inline MonoClass*
-decode_typeid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain, int *err)
+decode_typeid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain, ErrorCode *err)
 {
        MonoClass *klass;
 
-       klass = decode_ptr_id (buf, endbuf, limit, ID_TYPE, domain, err);
+       klass = (MonoClass *)decode_ptr_id (buf, endbuf, limit, ID_TYPE, domain, err);
        if (G_UNLIKELY (log_level >= 2) && klass) {
                char *s;
 
@@ -2339,23 +2331,23 @@ decode_typeid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain,
 }
 
 static inline MonoAssembly*
-decode_assemblyid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain, int *err)
+decode_assemblyid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain, ErrorCode *err)
 {
-       return decode_ptr_id (buf, endbuf, limit, ID_ASSEMBLY, domain, err);
+       return (MonoAssembly *)decode_ptr_id (buf, endbuf, limit, ID_ASSEMBLY, domain, err);
 }
 
 static inline MonoImage*
-decode_moduleid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain, int *err)
+decode_moduleid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain, ErrorCode *err)
 {
-       return decode_ptr_id (buf, endbuf, limit, ID_MODULE, domain, err);
+       return (MonoImage *)decode_ptr_id (buf, endbuf, limit, ID_MODULE, domain, err);
 }
 
 static inline MonoMethod*
-decode_methodid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain, int *err)
+decode_methodid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain, ErrorCode *err)
 {
        MonoMethod *m;
 
-       m = decode_ptr_id (buf, endbuf, limit, ID_METHOD, domain, err);
+       m = (MonoMethod *)decode_ptr_id (buf, endbuf, limit, ID_METHOD, domain, err);
        if (G_UNLIKELY (log_level >= 2) && m) {
                char *s;
 
@@ -2367,21 +2359,21 @@ decode_methodid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domai
 }
 
 static inline MonoClassField*
-decode_fieldid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain, int *err)
+decode_fieldid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain, ErrorCode *err)
 {
-       return decode_ptr_id (buf, endbuf, limit, ID_FIELD, domain, err);
+       return (MonoClassField *)decode_ptr_id (buf, endbuf, limit, ID_FIELD, domain, err);
 }
 
 static inline MonoDomain*
-decode_domainid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain, int *err)
+decode_domainid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain, ErrorCode *err)
 {
-       return decode_ptr_id (buf, endbuf, limit, ID_DOMAIN, domain, err);
+       return (MonoDomain *)decode_ptr_id (buf, endbuf, limit, ID_DOMAIN, domain, err);
 }
 
 static inline MonoProperty*
-decode_propertyid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain, int *err)
+decode_propertyid (guint8 *buf, guint8 **endbuf, guint8 *limit, MonoDomain **domain, ErrorCode *err)
 {
-       return decode_ptr_id (buf, endbuf, limit, ID_PROPERTY, domain, err);
+       return (MonoProperty *)decode_ptr_id (buf, endbuf, limit, ID_PROPERTY, domain, err);
 }
 
 static inline void
@@ -2464,7 +2456,7 @@ save_thread_context (MonoContext *ctx)
 {
        DebuggerTlsData *tls;
 
-       tls = mono_native_tls_get_value (debugger_tls_id);
+       tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
        g_assert (tls);
 
        if (ctx)
@@ -2480,20 +2472,20 @@ save_thread_context (MonoContext *ctx)
  */
 static gint32 threads_suspend_count;
 
-static mono_mutex_t suspend_mutex;
+static MonoCoopMutex suspend_mutex;
 
 /* Cond variable used to wait for suspend_count becoming 0 */
-static mono_cond_t suspend_cond;
+static MonoCoopCond suspend_cond;
 
 /* Semaphore used to wait for a thread becoming suspended */
-static MonoSemType suspend_sem;
+static MonoCoopSem suspend_sem;
 
 static void
 suspend_init (void)
 {
-       mono_mutex_init (&suspend_mutex);
-       mono_cond_init (&suspend_cond, 0);      
-       MONO_SEM_INIT (&suspend_sem, 0);
+       mono_coop_mutex_init (&suspend_mutex);
+       mono_coop_cond_init (&suspend_cond);    
+       mono_coop_sem_init (&suspend_sem, 0);
 }
 
 typedef struct
@@ -2508,7 +2500,7 @@ typedef struct
 static gboolean
 get_last_frame (StackFrameInfo *info, MonoContext *ctx, gpointer user_data)
 {
-       GetLastFrameUserData *data = user_data;
+       GetLastFrameUserData *data = (GetLastFrameUserData *)user_data;
 
        if (info->type == FRAME_TYPE_MANAGED_TO_NATIVE || info->type == FRAME_TYPE_TRAMPOLINE)
                return FALSE;
@@ -2608,7 +2600,7 @@ thread_interrupt (DebuggerTlsData *tls, MonoThreadInfo *info, MonoJitInfo *ji)
                        mono_memory_barrier ();
 
                        tls->suspended = TRUE;
-                       MONO_SEM_POST (&suspend_sem);
+                       mono_coop_sem_post (&suspend_sem);
                }
        }
 }
@@ -2621,7 +2613,7 @@ thread_interrupt (DebuggerTlsData *tls, MonoThreadInfo *info, MonoJitInfo *ji)
 static void
 reset_native_thread_suspend_state (gpointer key, gpointer value, gpointer user_data)
 {
-       DebuggerTlsData *tls = value;
+       DebuggerTlsData *tls = (DebuggerTlsData *)value;
 
        if (!tls->really_suspended && tls->suspended) {
                tls->suspended = FALSE;
@@ -2643,13 +2635,13 @@ typedef struct {
 static SuspendThreadResult
 debugger_interrupt_critical (MonoThreadInfo *info, gpointer user_data)
 {
-       InterruptData *data = user_data;
+       InterruptData *data = (InterruptData *)user_data;
        MonoJitInfo *ji;
 
        data->valid_info = TRUE;
        ji = mono_jit_info_table_find_internal (
-                       mono_thread_info_get_suspend_state (info)->unwind_data [MONO_UNWIND_DATA_DOMAIN],
-                       MONO_CONTEXT_GET_IP (&mono_thread_info_get_suspend_state (info)->ctx),
+                       (MonoDomain *)mono_thread_info_get_suspend_state (info)->unwind_data [MONO_UNWIND_DATA_DOMAIN],
+                       (char *)MONO_CONTEXT_GET_IP (&mono_thread_info_get_suspend_state (info)->ctx),
                        TRUE,
                        TRUE);
 
@@ -2666,8 +2658,8 @@ debugger_interrupt_critical (MonoThreadInfo *info, gpointer user_data)
 static void
 notify_thread (gpointer key, gpointer value, gpointer user_data)
 {
-       MonoInternalThread *thread = key;
-       DebuggerTlsData *tls = value;
+       MonoInternalThread *thread = (MonoInternalThread *)key;
+       DebuggerTlsData *tls = (DebuggerTlsData *)value;
        MonoNativeThreadId tid = MONO_UINT_TO_NATIVE_THREAD_ID (thread->tid);
 
        if (mono_native_thread_id_equals (mono_native_thread_id_get (), tid) || tls->terminated)
@@ -2692,7 +2684,7 @@ notify_thread (gpointer key, gpointer value, gpointer user_data)
 static void
 process_suspend (DebuggerTlsData *tls, MonoContext *ctx)
 {
-       guint8 *ip = MONO_CONTEXT_GET_IP (ctx);
+       guint8 *ip = (guint8 *)MONO_CONTEXT_GET_IP (ctx);
        MonoJitInfo *ji;
        MonoMethod *method;
 
@@ -2747,9 +2739,7 @@ suspend_vm (void)
 {
        mono_loader_lock ();
 
-       MONO_TRY_BLOCKING;
-       mono_mutex_lock (&suspend_mutex);
-       MONO_FINISH_TRY_BLOCKING;
+       mono_coop_mutex_lock (&suspend_mutex);
 
        suspend_count ++;
 
@@ -2761,7 +2751,7 @@ suspend_vm (void)
                mono_g_hash_table_foreach (thread_to_tls, notify_thread, NULL);
        }
 
-       mono_mutex_unlock (&suspend_mutex);
+       mono_coop_mutex_unlock (&suspend_mutex);
 
        if (suspend_count == 1)
                /*
@@ -2787,9 +2777,7 @@ resume_vm (void)
 
        mono_loader_lock ();
 
-       MONO_TRY_BLOCKING;
-       mono_mutex_lock (&suspend_mutex);
-       MONO_FINISH_TRY_BLOCKING;
+       mono_coop_mutex_lock (&suspend_mutex);
 
        g_assert (suspend_count > 0);
        suspend_count --;
@@ -2803,10 +2791,10 @@ resume_vm (void)
        }
 
        /* Signal this even when suspend_count > 0, since some threads might have resume_count > 0 */
-       err = mono_cond_broadcast (&suspend_cond);
+       err = mono_coop_cond_broadcast (&suspend_cond);
        g_assert (err == 0);
 
-       mono_mutex_unlock (&suspend_mutex);
+       mono_coop_mutex_unlock (&suspend_mutex);
        //g_assert (err == 0);
 
        if (suspend_count == 0)
@@ -2830,12 +2818,10 @@ resume_thread (MonoInternalThread *thread)
 
        mono_loader_lock ();
 
-       tls = mono_g_hash_table_lookup (thread_to_tls, thread);
+       tls = (DebuggerTlsData *)mono_g_hash_table_lookup (thread_to_tls, thread);
        g_assert (tls);
-       
-       MONO_TRY_BLOCKING;
-       mono_mutex_lock (&suspend_mutex);
-       MONO_FINISH_TRY_BLOCKING;
+
+       mono_coop_mutex_lock (&suspend_mutex);
 
        g_assert (suspend_count > 0);
 
@@ -2847,10 +2833,10 @@ resume_thread (MonoInternalThread *thread)
         * Signal suspend_count without decreasing suspend_count, the threads will wake up
         * but only the one whose resume_count field is > 0 will be resumed.
         */
-       err = mono_cond_broadcast (&suspend_cond);
+       err = mono_coop_cond_broadcast (&suspend_cond);
        g_assert (err == 0);
 
-       mono_mutex_unlock (&suspend_mutex);
+       mono_coop_mutex_unlock (&suspend_mutex);
        //g_assert (err == 0);
 
        mono_loader_unlock ();
@@ -2873,7 +2859,7 @@ static void
 invalidate_frames (DebuggerTlsData *tls)
 {
        if (!tls)
-               tls = mono_native_tls_get_value (debugger_tls_id);
+               tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
        g_assert (tls);
 
        free_frames (tls->frames, tls->frame_count);
@@ -2907,36 +2893,32 @@ suspend_current (void)
                return;
        }
 
-       tls = mono_native_tls_get_value (debugger_tls_id);
+       tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
        g_assert (tls);
 
-       MONO_TRY_BLOCKING;
-       mono_mutex_lock (&suspend_mutex);
-       MONO_FINISH_TRY_BLOCKING;
+       mono_coop_mutex_lock (&suspend_mutex);
 
        tls->suspending = FALSE;
        tls->really_suspended = TRUE;
 
        if (!tls->suspended) {
                tls->suspended = TRUE;
-               MONO_SEM_POST (&suspend_sem);
+               mono_coop_sem_post (&suspend_sem);
        }
 
        DEBUG_PRINTF (1, "[%p] Suspended.\n", (gpointer)mono_native_thread_id_get ());
 
-       MONO_TRY_BLOCKING;
        while (suspend_count - tls->resume_count > 0) {
-               err = mono_cond_wait (&suspend_cond, &suspend_mutex);
+               err = mono_coop_cond_wait (&suspend_cond, &suspend_mutex);
                g_assert (err == 0);
        }
-       MONO_FINISH_TRY_BLOCKING;
 
        tls->suspended = FALSE;
        tls->really_suspended = FALSE;
 
        threads_suspend_count --;
 
-       mono_mutex_unlock (&suspend_mutex);
+       mono_coop_mutex_unlock (&suspend_mutex);
 
        DEBUG_PRINTF (1, "[%p] Resumed.\n", (gpointer)mono_native_thread_id_get ());
 
@@ -2957,7 +2939,7 @@ suspend_current (void)
 static void
 count_thread (gpointer key, gpointer value, gpointer user_data)
 {
-       DebuggerTlsData *tls = value;
+       DebuggerTlsData *tls = (DebuggerTlsData *)value;
 
        if (!tls->suspended && !tls->terminated)
                *(int*)user_data = *(int*)user_data + 1;
@@ -2995,7 +2977,7 @@ wait_for_suspend (void)
                nwait = count_threads_to_wait_for ();
                if (nwait) {
                        DEBUG_PRINTF (1, "Waiting for %d(%d) threads to suspend...\n", nwait, nthreads);
-                       err = MONO_SEM_WAIT (&suspend_sem);
+                       err = mono_coop_sem_wait (&suspend_sem, MONO_SEM_FLAGS_NONE);
                        g_assert (err == 0);
                        waited = TRUE;
                } else {
@@ -3035,7 +3017,7 @@ typedef struct {
 static gboolean
 process_frame (StackFrameInfo *info, MonoContext *ctx, gpointer user_data)
 {
-       ComputeFramesUserData *ud = user_data;
+       ComputeFramesUserData *ud = (ComputeFramesUserData *)user_data;
        StackFrame *frame;
        MonoMethod *method, *actual_method, *api_method;
        SeqPoint sp;
@@ -3110,7 +3092,7 @@ process_frame (StackFrameInfo *info, MonoContext *ctx, gpointer user_data)
 static gboolean
 process_filter_frame (StackFrameInfo *info, MonoContext *ctx, gpointer user_data)
 {
-       ComputeFramesUserData *ud = user_data;
+       ComputeFramesUserData *ud = (ComputeFramesUserData *)user_data;
 
        /*
         * 'tls->filter_ctx' is the location of the throw site.
@@ -3133,7 +3115,7 @@ static StackFrame**
 compute_frame_info_from (MonoInternalThread *thread, DebuggerTlsData *tls, MonoThreadUnwindState *state, int *out_nframes)
 {
        ComputeFramesUserData user_data;
-       MonoUnwindOptions opts = MONO_UNWIND_DEFAULT|MONO_UNWIND_REG_LOCATIONS;
+       MonoUnwindOptions opts = (MonoUnwindOptions)(MONO_UNWIND_DEFAULT | MONO_UNWIND_REG_LOCATIONS);
        StackFrame **res;
        int i, nframes;
        GSList *l;
@@ -3147,7 +3129,7 @@ compute_frame_info_from (MonoInternalThread *thread, DebuggerTlsData *tls, MonoT
        res = g_new0 (StackFrame*, nframes);
        l = user_data.frames;
        for (i = 0; i < nframes; ++i) {
-               res [i] = l->data;
+               res [i] = (StackFrame *)l->data;
                l = l->next;
        }
        *out_nframes = nframes;
@@ -3162,7 +3144,7 @@ compute_frame_info (MonoInternalThread *thread, DebuggerTlsData *tls)
        GSList *tmp;
        int i, findex, new_frame_count;
        StackFrame **new_frames, *f;
-       MonoUnwindOptions opts = MONO_UNWIND_DEFAULT|MONO_UNWIND_REG_LOCATIONS;
+       MonoUnwindOptions opts = (MonoUnwindOptions)(MONO_UNWIND_DEFAULT | MONO_UNWIND_REG_LOCATIONS);
 
        // FIXME: Locking on tls
        if (tls->frames && tls->frames_up_to_date)
@@ -3203,7 +3185,7 @@ compute_frame_info (MonoInternalThread *thread, DebuggerTlsData *tls)
        new_frames = g_new0 (StackFrame*, new_frame_count);
        findex = 0;
        for (tmp = user_data.frames; tmp; tmp = tmp->next) {
-               f = tmp->data;
+               f = (StackFrame *)tmp->data;
 
                /* 
                 * Reuse the id for already existing stack frames, so invokes don't invalidate
@@ -3241,7 +3223,7 @@ static void
 emit_appdomain_load (gpointer key, gpointer value, gpointer user_data)
 {
        process_profiler_event (EVENT_KIND_APPDOMAIN_CREATE, value);
-       g_hash_table_foreach (get_agent_domain_info (value)->loaded_classes, emit_type_load, NULL);
+       g_hash_table_foreach (get_agent_domain_info ((MonoDomain *)value)->loaded_classes, emit_type_load, NULL);
 }
 
 /*
@@ -3402,7 +3384,7 @@ create_event_list (EventKind event, GPtrArray *reqs, MonoJitInfo *ji, EventInfo
                return NULL;
 
        for (i = 0; i < reqs->len; ++i) {
-               EventRequest *req = g_ptr_array_index (reqs, i);
+               EventRequest *req = (EventRequest *)g_ptr_array_index (reqs, i);
                if (req->event_kind == event) {
                        gboolean filtered = FALSE;
 
@@ -3458,7 +3440,7 @@ create_event_list (EventKind event, GPtrArray *reqs, MonoJitInfo *ji, EventInfo
                                                if (minfo) {
                                                        mono_debug_get_seq_points (minfo, &source_file, &source_file_list, NULL, NULL, NULL);
                                                        for (i = 0; i < source_file_list->len; ++i) {
-                                                               sinfo = g_ptr_array_index (source_file_list, i);
+                                                               sinfo = (MonoDebugSourceInfo *)g_ptr_array_index (source_file_list, i);
                                                                /*
                                                                 * Do a case-insesitive match by converting the file name to
                                                                 * lowercase.
@@ -3638,7 +3620,7 @@ process_event (EventKind event, gpointer arg, gint32 il_offset, MonoContext *ctx
                        thread = mono_thread_current ();
 
                if (event == EVENT_KIND_VM_START && arg != NULL)
-                       thread = arg;
+                       thread = (MonoThread *)arg;
 
                buffer_add_objid (&buf, (MonoObject*)thread); // thread
 
@@ -3648,32 +3630,32 @@ process_event (EventKind event, gpointer arg, gint32 il_offset, MonoContext *ctx
                        break;
                case EVENT_KIND_APPDOMAIN_CREATE:
                case EVENT_KIND_APPDOMAIN_UNLOAD:
-                       buffer_add_domainid (&buf, arg);
+                       buffer_add_domainid (&buf, (MonoDomain *)arg);
                        break;
                case EVENT_KIND_METHOD_ENTRY:
                case EVENT_KIND_METHOD_EXIT:
-                       buffer_add_methodid (&buf, domain, arg);
+                       buffer_add_methodid (&buf, domain, (MonoMethod *)arg);
                        break;
                case EVENT_KIND_ASSEMBLY_LOAD:
-                       buffer_add_assemblyid (&buf, domain, arg);
+                       buffer_add_assemblyid (&buf, domain, (MonoAssembly *)arg);
                        break;
                case EVENT_KIND_ASSEMBLY_UNLOAD: {
                        DebuggerTlsData *tls;
 
                        /* The domain the assembly belonged to is not equal to the current domain */
-                       tls = mono_native_tls_get_value (debugger_tls_id);
+                       tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
                        g_assert (tls);
                        g_assert (tls->domain_unloading);
 
-                       buffer_add_assemblyid (&buf, tls->domain_unloading, arg);
+                       buffer_add_assemblyid (&buf, tls->domain_unloading, (MonoAssembly *)arg);
                        break;
                }
                case EVENT_KIND_TYPE_LOAD:
-                       buffer_add_typeid (&buf, domain, arg);
+                       buffer_add_typeid (&buf, domain, (MonoClass *)arg);
                        break;
                case EVENT_KIND_BREAKPOINT:
                case EVENT_KIND_STEP:
-                       buffer_add_methodid (&buf, domain, arg);
+                       buffer_add_methodid (&buf, domain, (MonoMethod *)arg);
                        buffer_add_long (&buf, il_offset);
                        break;
                case EVENT_KIND_VM_START:
@@ -3684,7 +3666,7 @@ process_event (EventKind event, gpointer arg, gint32 il_offset, MonoContext *ctx
                                buffer_add_int (&buf, mono_environment_exitcode_get ());
                        break;
                case EVENT_KIND_EXCEPTION: {
-                       EventInfo *ei = arg;
+                       EventInfo *ei = (EventInfo *)arg;
                        buffer_add_objid (&buf, ei->exc);
                        /*
                         * We are not yet suspending, so get_objref () will not keep this object alive. So we need to do it
@@ -3696,7 +3678,7 @@ process_event (EventKind event, gpointer arg, gint32 il_offset, MonoContext *ctx
                case EVENT_KIND_USER_BREAK:
                        break;
                case EVENT_KIND_USER_LOG: {
-                       EventInfo *ei = arg;
+                       EventInfo *ei = (EventInfo *)arg;
                        buffer_add_int (&buf, ei->level);
                        buffer_add_string (&buf, ei->category ? ei->category : "");
                        buffer_add_string (&buf, ei->message ? ei->message : "");
@@ -3778,7 +3760,7 @@ process_profiler_event (EventKind event, gpointer arg)
        EventInfo ei, *ei_arg = NULL;
 
        if (event == EVENT_KIND_TYPE_LOAD) {
-               ei.klass = arg;
+               ei.klass = (MonoClass *)arg;
                ei_arg = &ei;
        }
 
@@ -3818,7 +3800,7 @@ thread_startup (MonoProfiler *prof, uintptr_t tid)
        g_assert (mono_native_thread_id_equals (MONO_UINT_TO_NATIVE_THREAD_ID (tid), MONO_UINT_TO_NATIVE_THREAD_ID (thread->tid)));
 
        mono_loader_lock ();
-       old_thread = mono_g_hash_table_lookup (tid_to_thread, GUINT_TO_POINTER (tid));
+       old_thread = (MonoInternalThread *)mono_g_hash_table_lookup (tid_to_thread, GUINT_TO_POINTER (tid));
        mono_loader_unlock ();
        if (old_thread) {
                if (thread == old_thread) {
@@ -3842,7 +3824,7 @@ thread_startup (MonoProfiler *prof, uintptr_t tid)
                }
        }
 
-       tls = mono_native_tls_get_value (debugger_tls_id);
+       tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
        g_assert (!tls);
        // FIXME: Free this somewhere
        tls = g_new0 (DebuggerTlsData, 1);
@@ -3873,10 +3855,10 @@ thread_end (MonoProfiler *prof, uintptr_t tid)
        DebuggerTlsData *tls = NULL;
 
        mono_loader_lock ();
-       thread = mono_g_hash_table_lookup (tid_to_thread, GUINT_TO_POINTER (tid));
+       thread = (MonoInternalThread *)mono_g_hash_table_lookup (tid_to_thread, GUINT_TO_POINTER (tid));
        if (thread) {
                mono_g_hash_table_remove (tid_to_thread_obj, GUINT_TO_POINTER (tid));
-               tls = mono_g_hash_table_lookup (thread_to_tls, thread);
+               tls = (DebuggerTlsData *)mono_g_hash_table_lookup (thread_to_tls, thread);
                if (tls) {
                        /* FIXME: Maybe we need to free this instead, but some code can't handle that */
                        tls->terminated = TRUE;
@@ -3928,7 +3910,7 @@ appdomain_start_unload (MonoProfiler *prof, MonoDomain *domain)
         * Remember the currently unloading appdomain as it is needed to generate
         * proper ids for unloading assemblies.
         */
-       tls = mono_native_tls_get_value (debugger_tls_id);
+       tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
        g_assert (tls);
        tls->domain_unloading = domain;
 }
@@ -3941,7 +3923,7 @@ appdomain_unload (MonoProfiler *prof, MonoDomain *domain)
        if (is_debugger_thread ())
                return;
 
-       tls = mono_native_tls_get_value (debugger_tls_id);
+       tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
        g_assert (tls);
        tls->domain_unloading = NULL;
 
@@ -3964,7 +3946,7 @@ appdomain_unload (MonoProfiler *prof, MonoDomain *domain)
 static void
 invalidate_each_thread (gpointer key, gpointer value, gpointer user_data)
 {
-       invalidate_frames (value);
+       invalidate_frames ((DebuggerTlsData *)value);
 }
 
 static void
@@ -4043,7 +4025,7 @@ jit_end (MonoProfiler *prof, MonoMethod *method, MonoJitInfo *jinfo, int result)
                // FIXME: Maybe store this in TLS so the thread of the event is correct ?
                dbg_lock ();
                if (pending_assembly_loads->len > 0) {
-                       assembly = g_ptr_array_index (pending_assembly_loads, 0);
+                       assembly = (MonoAssembly *)g_ptr_array_index (pending_assembly_loads, 0);
                        g_ptr_array_remove_index (pending_assembly_loads, 0);
                }
                dbg_unlock ();
@@ -4280,14 +4262,14 @@ add_pending_breakpoints (MonoMethod *method, MonoJitInfo *ji)
        mono_loader_lock ();
 
        for (i = 0; i < breakpoints->len; ++i) {
-               MonoBreakpoint *bp = g_ptr_array_index (breakpoints, i);
+               MonoBreakpoint *bp = (MonoBreakpoint *)g_ptr_array_index (breakpoints, i);
                gboolean found = FALSE;
 
                if (!bp_matches_method (bp, method))
                        continue;
 
                for (j = 0; j < bp->children->len; ++j) {
-                       BreakpointInstance *inst = g_ptr_array_index (bp->children, j);
+                       BreakpointInstance *inst = (BreakpointInstance *)g_ptr_array_index (bp->children, j);
 
                        if (inst->ji == ji)
                                found = TRUE;
@@ -4301,9 +4283,9 @@ add_pending_breakpoints (MonoMethod *method, MonoJitInfo *ji)
                                declaring = mono_method_get_declaring_generic_method (jmethod);
 
                        mono_domain_lock (domain);
-                       seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, jmethod);
+                       seq_points = (MonoSeqPointInfo *)g_hash_table_lookup (domain_jit_info (domain)->seq_points, jmethod);
                        if (!seq_points && declaring)
-                               seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, declaring);
+                               seq_points = (MonoSeqPointInfo *)g_hash_table_lookup (domain_jit_info (domain)->seq_points, declaring);
                        mono_domain_unlock (domain);
                        if (!seq_points)
                                /* Could be AOT code */
@@ -4331,7 +4313,7 @@ set_bp_in_method (MonoDomain *domain, MonoMethod *method, MonoSeqPointInfo *seq_
                /* Might be AOTed code */
                code = mono_aot_get_method (domain, method);
                g_assert (code);
-               ji = mono_jit_info_table_find (domain, code);
+               ji = mono_jit_info_table_find (domain, (char *)code);
                g_assert (ji);
        }
        g_assert (code);
@@ -4403,9 +4385,9 @@ set_breakpoint (MonoMethod *method, long il_offset, EventRequest *req, MonoError
        }
 
        for (i = 0; i < methods->len; ++i) {
-               m = g_ptr_array_index (methods, i);
-               domain = g_ptr_array_index (method_domains, i);
-               seq_points = g_ptr_array_index (method_seq_points, i);
+               m = (MonoMethod *)g_ptr_array_index (methods, i);
+               domain = (MonoDomain *)g_ptr_array_index (method_domains, i);
+               seq_points = (MonoSeqPointInfo *)g_ptr_array_index (method_seq_points, i);
                set_bp_in_method (domain, m, seq_points, bp, error);
        }
 
@@ -4431,7 +4413,7 @@ clear_breakpoint (MonoBreakpoint *bp)
 
        // FIXME: locking, races
        for (i = 0; i < bp->children->len; ++i) {
-               BreakpointInstance *inst = g_ptr_array_index (bp->children, i);
+               BreakpointInstance *inst = (BreakpointInstance *)g_ptr_array_index (bp->children, i);
 
                remove_breakpoint (inst);
 
@@ -4454,10 +4436,10 @@ breakpoints_cleanup (void)
        mono_loader_lock ();
        i = 0;
        while (i < event_requests->len) {
-               EventRequest *req = g_ptr_array_index (event_requests, i);
+               EventRequest *req = (EventRequest *)g_ptr_array_index (event_requests, i);
 
                if (req->event_kind == EVENT_KIND_BREAKPOINT) {
-                       clear_breakpoint (req->info);
+                       clear_breakpoint ((MonoBreakpoint *)req->info);
                        g_ptr_array_remove_index_fast (event_requests, i);
                        g_free (req);
                } else {
@@ -4493,11 +4475,11 @@ clear_breakpoints_for_domain (MonoDomain *domain)
 
        mono_loader_lock ();
        for (i = 0; i < breakpoints->len; ++i) {
-               MonoBreakpoint *bp = g_ptr_array_index (breakpoints, i);
+               MonoBreakpoint *bp = (MonoBreakpoint *)g_ptr_array_index (breakpoints, i);
 
                j = 0;
                while (j < bp->children->len) {
-                       BreakpointInstance *inst = g_ptr_array_index (bp->children, j);
+                       BreakpointInstance *inst = (BreakpointInstance *)g_ptr_array_index (bp->children, j);
 
                        if (inst->domain == domain) {
                                remove_breakpoint (inst);
@@ -4564,7 +4546,7 @@ ss_update (SingleStepReq *req, MonoJitInfo *ji, SeqPoint *sp, DebuggerTlsData *t
        minfo = mono_debug_lookup_method (method);
 
        if (minfo)
-               loc = mono_debug_symfile_lookup_location (minfo, sp->il_offset);
+               loc = mono_debug_method_lookup_location (minfo, sp->il_offset);
 
        if (!loc) {
                DEBUG_PRINTF (1, "[%p] No line number info for il offset %x, continuing single stepping.\n", (gpointer)mono_native_thread_id_get (), sp->il_offset);
@@ -4610,7 +4592,7 @@ process_breakpoint_inner (DebuggerTlsData *tls, gboolean from_signal)
 
        // FIXME: Speed this up
 
-       ip = MONO_CONTEXT_GET_IP (ctx);
+       ip = (guint8 *)MONO_CONTEXT_GET_IP (ctx);
        ji = mini_jit_info_table_find (mono_domain_get (), (char*)ip, NULL);
        g_assert (ji && !ji->is_trampoline);
        method = jinfo_get_method (ji);
@@ -4648,13 +4630,13 @@ process_breakpoint_inner (DebuggerTlsData *tls, gboolean from_signal)
 
        bp = NULL;
        for (i = 0; i < breakpoints->len; ++i) {
-               bp = g_ptr_array_index (breakpoints, i);
+               bp = (MonoBreakpoint *)g_ptr_array_index (breakpoints, i);
 
                if (!bp->method)
                        continue;
 
                for (j = 0; j < bp->children->len; ++j) {
-                       inst = g_ptr_array_index (bp->children, j);
+                       inst = (BreakpointInstance *)g_ptr_array_index (bp->children, j);
                        if (inst->ji == ji && inst->il_offset == sp.il_offset && inst->native_offset == sp.native_offset) {
                                if (bp->req->event_kind == EVENT_KIND_STEP) {
                                        g_ptr_array_add (ss_reqs_orig, bp->req);
@@ -4674,8 +4656,8 @@ process_breakpoint_inner (DebuggerTlsData *tls, gboolean from_signal)
 
        /* Process single step requests */
        for (i = 0; i < ss_reqs_orig->len; ++i) {
-               EventRequest *req = g_ptr_array_index (ss_reqs_orig, i);
-               SingleStepReq *ss_req = req->info;
+               EventRequest *req = (EventRequest *)g_ptr_array_index (ss_reqs_orig, i);
+               SingleStepReq *ss_req = (SingleStepReq *)req->info;
                gboolean hit;
 
                if (mono_thread_internal_current () != ss_req->thread)
@@ -4721,7 +4703,7 @@ process_signal_event (void (*func) (DebuggerTlsData*, gboolean))
        MonoThreadUnwindState orig_restore_state;
        MonoContext ctx;
 
-       tls = mono_native_tls_get_value (debugger_tls_id);
+       tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
        /* Have to save/restore the restore_ctx as we can be called recursively during invokes etc. */
        memcpy (&orig_restore_state, &tls->restore_state, sizeof (MonoThreadUnwindState));
        mono_thread_state_init_from_monoctx (&tls->restore_state, &tls->handler_ctx);
@@ -4749,7 +4731,7 @@ resume_from_signal_handler (void *sigctx, void *func)
 
        /* Save the original context in TLS */
        // FIXME: This might not work on an altstack ?
-       tls = mono_native_tls_get_value (debugger_tls_id);
+       tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
        if (!tls)
                fprintf (stderr, "Thread %p is not attached to the JIT.\n", (gpointer)mono_native_thread_id_get ());
        g_assert (tls);
@@ -4808,7 +4790,7 @@ mono_debugger_agent_user_break (void)
 
                /* Obtain a context */
                MONO_CONTEXT_SET_IP (&ctx, NULL);
-               mono_walk_stack_with_ctx (user_break_cb, NULL, 0, &ctx);
+               mono_walk_stack_with_ctx (user_break_cb, NULL, (MonoUnwindOptions)0, &ctx);
                g_assert (MONO_CONTEXT_GET_IP (&ctx) != NULL);
 
                mono_loader_lock ();
@@ -4851,7 +4833,7 @@ process_single_step_inner (DebuggerTlsData *tls, gboolean from_signal)
        SeqPoint sp;
        MonoSeqPointInfo *info;
 
-       ip = MONO_CONTEXT_GET_IP (ctx);
+       ip = (guint8 *)MONO_CONTEXT_GET_IP (ctx);
 
        /* Skip the instruction causing the single step */
        if (from_signal)
@@ -4974,7 +4956,7 @@ debugger_agent_single_step_from_context (MonoContext *ctx)
        DebuggerTlsData *tls;
        MonoThreadUnwindState orig_restore_state;
 
-       tls = mono_native_tls_get_value (debugger_tls_id);
+       tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
        /* Fastpath during invokes, see in process_suspend () */
        if (tls && suspend_count && suspend_count - tls->resume_count == 0)
                return;
@@ -5005,10 +4987,10 @@ debugger_agent_breakpoint_from_context (MonoContext *ctx)
        if (is_debugger_thread ())
                return;
 
-       orig_ip = MONO_CONTEXT_GET_IP (ctx);
+       orig_ip = (guint8 *)MONO_CONTEXT_GET_IP (ctx);
        MONO_CONTEXT_SET_IP (ctx, orig_ip - 1);
 
-       tls = mono_native_tls_get_value (debugger_tls_id);
+       tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
        g_assert (tls);
        memcpy (&orig_restore_state, &tls->restore_state, sizeof (MonoThreadUnwindState));
        mono_thread_state_init_from_monoctx (&tls->restore_state, ctx);
@@ -5066,7 +5048,7 @@ ss_stop (SingleStepReq *ss_req)
                GSList *l;
 
                for (l = ss_req->bps; l; l = l->next) {
-                       clear_breakpoint (l->data);
+                       clear_breakpoint ((MonoBreakpoint *)l->data);
                }
                g_slist_free (ss_req->bps);
                ss_req->bps = NULL;
@@ -5295,7 +5277,7 @@ ss_create (MonoInternalThread *thread, StepSize size, StepDepth depth, StepFilte
        req->info = ss_req;
 
        mono_loader_lock ();
-       tls = mono_g_hash_table_lookup (thread_to_tls, thread);
+       tls = (DebuggerTlsData *)mono_g_hash_table_lookup (thread_to_tls, thread);
        mono_loader_unlock ();
        g_assert (tls);
        g_assert (tls->context.valid);
@@ -5321,7 +5303,10 @@ ss_create (MonoInternalThread *thread, StepSize size, StepDepth depth, StepFilte
                 */
 
                /* Find the the jit info for the catch context */
-               res = mono_find_jit_info_ext (tls->catch_state.unwind_data [MONO_UNWIND_DATA_DOMAIN], ((MonoThreadInfo*)thread->thread_info)->jit_data, NULL, &tls->catch_state.ctx, &new_ctx, NULL, &lmf, NULL, &frame);
+               res = mono_find_jit_info_ext (
+                       (MonoDomain *)tls->catch_state.unwind_data [MONO_UNWIND_DATA_DOMAIN],
+                       (MonoJitTlsData *)((MonoThreadInfo*)thread->thread_info)->jit_data,
+                       NULL, &tls->catch_state.ctx, &new_ctx, NULL, &lmf, NULL, &frame);
                g_assert (res);
                g_assert (frame.type == FRAME_TYPE_MANAGED);
 
@@ -5362,7 +5347,7 @@ ss_create (MonoInternalThread *thread, StepSize size, StepDepth depth, StepFilte
 
                                minfo = mono_debug_lookup_method (frame->method);
                                if (minfo && frame->il_offset != -1) {
-                                       MonoDebugSourceLocation *loc = mono_debug_symfile_lookup_location (minfo, frame->il_offset);
+                                       MonoDebugSourceLocation *loc = mono_debug_method_lookup_location (minfo, frame->il_offset);
 
                                        if (loc) {
                                                ss_req->last_line = loc->row;
@@ -5392,7 +5377,7 @@ ss_create (MonoInternalThread *thread, StepSize size, StepDepth depth, StepFilte
        if (frames)
                free_frames (frames, nframes);
 
-       return 0;
+       return ERR_NONE;
 }
 
 static void
@@ -5416,8 +5401,8 @@ ss_clear_for_assembly (SingleStepReq *req, MonoAssembly *assembly)
        while (found) {
                found = FALSE;
                for (l = ss_req->bps; l; l = l->next) {
-                       if (breakpoint_matches_assembly (l->data, assembly)) {
-                               clear_breakpoint (l->data);
+                       if (breakpoint_matches_assembly ((MonoBreakpoint *)l->data, assembly)) {
+                               clear_breakpoint ((MonoBreakpoint *)l->data);
                                ss_req->bps = g_slist_delete_link (ss_req->bps, l);
                                found = TRUE;
                                break;
@@ -5496,7 +5481,7 @@ mono_debugger_agent_handle_exception (MonoException *exc, MonoContext *throw_ctx
                MonoInternalThread *thread = mono_thread_internal_current ();
 
                mono_loader_lock ();
-               tls = mono_g_hash_table_lookup (thread_to_tls, thread);
+               tls = (DebuggerTlsData *)mono_g_hash_table_lookup (thread_to_tls, thread);
                mono_loader_unlock ();
 
                if (tls && tls->abort_requested)
@@ -5525,7 +5510,7 @@ mono_debugger_agent_handle_exception (MonoException *exc, MonoContext *throw_ctx
                gboolean found = FALSE;
 
                for (l = agent_config.onthrow; l; l = l->next) {
-                       char *ex_type = l->data;
+                       char *ex_type = (char *)l->data;
                        char *f = mono_type_full_name (&exc->object.vtable->klass->byval_arg);
 
                        if (!strcmp (ex_type, "") || !strcmp (ex_type, f))
@@ -5550,9 +5535,9 @@ mono_debugger_agent_handle_exception (MonoException *exc, MonoContext *throw_ctx
        if (!inited)
                return;
 
-       ji = mini_jit_info_table_find (mono_domain_get (), MONO_CONTEXT_GET_IP (throw_ctx), NULL);
+       ji = mini_jit_info_table_find (mono_domain_get (), (char *)MONO_CONTEXT_GET_IP (throw_ctx), NULL);
        if (catch_ctx)
-               catch_ji = mini_jit_info_table_find (mono_domain_get (), MONO_CONTEXT_GET_IP (catch_ctx), NULL);
+               catch_ji = mini_jit_info_table_find (mono_domain_get (), (char *)MONO_CONTEXT_GET_IP (catch_ctx), NULL);
        else
                catch_ji = NULL;
 
@@ -5563,7 +5548,7 @@ mono_debugger_agent_handle_exception (MonoException *exc, MonoContext *throw_ctx
 
        /* Treat exceptions which are caught in non-user code as unhandled */
        for (i = 0; i < event_requests->len; ++i) {
-               EventRequest *req = g_ptr_array_index (event_requests, i);
+               EventRequest *req = (EventRequest *)g_ptr_array_index (event_requests, i);
                if (req->event_kind != EVENT_KIND_EXCEPTION)
                        continue;
 
@@ -5610,7 +5595,7 @@ mono_debugger_agent_begin_exception_filter (MonoException *exc, MonoContext *ctx
        if (!inited)
                return;
 
-       tls = mono_native_tls_get_value (debugger_tls_id);
+       tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
        if (!tls)
                return;
 
@@ -5649,7 +5634,7 @@ mono_debugger_agent_end_exception_filter (MonoException *exc, MonoContext *ctx,
        if (!inited)
                return;
 
-       tls = mono_native_tls_get_value (debugger_tls_id);
+       tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
        if (!tls)
                return;
 
@@ -5879,14 +5864,14 @@ decode_vtype (MonoType *t, MonoDomain *domain, guint8 *addr, guint8 *buf, guint8
        int nfields;
        gpointer iter = NULL;
        MonoDomain *d;
-       int err;
+       ErrorCode err;
 
        is_enum = decode_byte (buf, &buf, limit);
        /* Enums are sent as a normal vtype */
        if (is_enum)
                return ERR_NOT_IMPLEMENTED;
        klass = decode_typeid (buf, &buf, limit, &d, &err);
-       if (err)
+       if (err != ERR_NONE)
                return err;
 
        if (t && klass != mono_class_from_mono_type (t)) {
@@ -5905,7 +5890,7 @@ decode_vtype (MonoType *t, MonoDomain *domain, guint8 *addr, guint8 *buf, guint8
                if (mono_field_is_deleted (f))
                        continue;
                err = decode_value (f->type, domain, (guint8*)addr + f->offset - sizeof (MonoObject), buf, &buf, limit);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
                nfields --;
        }
@@ -5913,13 +5898,13 @@ decode_vtype (MonoType *t, MonoDomain *domain, guint8 *addr, guint8 *buf, guint8
 
        *endbuf = buf;
 
-       return 0;
+       return ERR_NONE;
 }
 
 static ErrorCode
 decode_value_internal (MonoType *t, int type, MonoDomain *domain, guint8 *addr, guint8 *buf, guint8 **endbuf, guint8 *limit)
 {
-       int err;
+       ErrorCode err;
 
        if (type != t->type && !MONO_TYPE_IS_REFERENCE (t) &&
                !(t->type == MONO_TYPE_I && type == MONO_TYPE_VALUETYPE) &&
@@ -5993,11 +5978,11 @@ decode_value_internal (MonoType *t, int type, MonoDomain *domain, guint8 *addr,
                if (type == MONO_TYPE_OBJECT) {
                        /* Boxed vtype */
                        int objid = decode_objid (buf, &buf, limit);
-                       int err;
+                       ErrorCode err;
                        MonoObject *obj;
 
                        err = get_object (objid, (MonoObject**)&obj);
-                       if (err)
+                       if (err != ERR_NONE)
                                return err;
                        if (!obj)
                                return ERR_INVALID_ARGUMENT;
@@ -6008,7 +5993,7 @@ decode_value_internal (MonoType *t, int type, MonoDomain *domain, guint8 *addr,
                        memcpy (addr, mono_object_unbox (obj), mono_class_value_size (obj->vtable->klass, NULL));
                } else {
                        err = decode_vtype (t, domain, addr, buf, &buf, limit);
-                       if (err)
+                       if (err != ERR_NONE)
                                return err;
                }
                break;
@@ -6017,11 +6002,11 @@ decode_value_internal (MonoType *t, int type, MonoDomain *domain, guint8 *addr,
                if (MONO_TYPE_IS_REFERENCE (t)) {
                        if (type == MONO_TYPE_OBJECT) {
                                int objid = decode_objid (buf, &buf, limit);
-                               int err;
+                               ErrorCode err;
                                MonoObject *obj;
 
                                err = get_object (objid, (MonoObject**)&obj);
-                               if (err)
+                               if (err != ERR_NONE)
                                        return err;
 
                                if (obj) {
@@ -6054,17 +6039,17 @@ decode_value_internal (MonoType *t, int type, MonoDomain *domain, guint8 *addr,
                                if (is_enum)
                                        return ERR_NOT_IMPLEMENTED;
                                klass = decode_typeid (buf, &buf, limit, &d, &err);
-                               if (err)
+                               if (err != ERR_NONE)
                                        return err;
 
                                /* Decode the vtype into a temporary buffer, then box it. */
                                vtype_buf_size = mono_class_value_size (klass, NULL);
-                               vtype_buf = g_malloc0 (vtype_buf_size);
+                               vtype_buf = (guint8 *)g_malloc0 (vtype_buf_size);
                                g_assert (vtype_buf);
 
                                buf = buf2;
                                err = decode_vtype (NULL, domain, vtype_buf, buf, &buf, limit);
-                               if (err) {
+                               if (err != ERR_NONE) {
                                        g_free (vtype_buf);
                                        return err;
                                }
@@ -6084,13 +6069,13 @@ decode_value_internal (MonoType *t, int type, MonoDomain *domain, guint8 *addr,
 
        *endbuf = buf;
 
-       return 0;
+       return ERR_NONE;
 }
 
 static ErrorCode
 decode_value (MonoType *t, MonoDomain *domain, guint8 *addr, guint8 *buf, guint8 **endbuf, guint8 *limit)
 {
-       int err;
+       ErrorCode err;
        int type = decode_byte (buf, &buf, limit);
 
        if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type (t))) {
@@ -6101,16 +6086,16 @@ decode_value (MonoType *t, MonoDomain *domain, guint8 *addr, guint8 *buf, guint8
                 * First try decoding it as a Nullable`1
                 */
                err = decode_value_internal (t, type, domain, addr, buf, endbuf, limit);
-               if (!err)
+               if (err == ERR_NONE)
                        return err;
 
                /*
                 * Then try decoding as a primitive value or null.
                 */
                if (targ->type == type) {
-                       nullable_buf = g_malloc (mono_class_instance_size (mono_class_from_mono_type (targ)));
+                       nullable_buf = (guint8 *)g_malloc (mono_class_instance_size (mono_class_from_mono_type (targ)));
                        err = decode_value_internal (targ, type, domain, nullable_buf, buf, endbuf, limit);
-                       if (err) {
+                       if (err != ERR_NONE) {
                                g_free (nullable_buf);
                                return err;
                        }
@@ -6146,7 +6131,7 @@ add_var (Buffer *buf, MonoDebugMethodJitInfo *jit, MonoType *t, MonoDebugVarInfo
                buffer_add_value_full (buf, t, &reg_val, domain, as_vtype, NULL);
                break;
        case MONO_DEBUG_VAR_ADDRESS_MODE_REGOFFSET:
-               addr = (gpointer)mono_arch_context_get_int_reg (ctx, reg);
+               addr = (guint8 *)mono_arch_context_get_int_reg (ctx, reg);
                addr += (gint32)var->offset;
 
                //printf ("[R%d+%d] = %p\n", reg, var->offset, addr);
@@ -6159,10 +6144,10 @@ add_var (Buffer *buf, MonoDebugMethodJitInfo *jit, MonoType *t, MonoDebugVarInfo
        case MONO_DEBUG_VAR_ADDRESS_MODE_REGOFFSET_INDIR:
        case MONO_DEBUG_VAR_ADDRESS_MODE_VTADDR:
                /* Same as regoffset, but with an indirection */
-               addr = (gpointer)mono_arch_context_get_int_reg (ctx, reg);
+               addr = (guint8 *)mono_arch_context_get_int_reg (ctx, reg);
                addr += (gint32)var->offset;
 
-               gaddr = *(gpointer*)addr;
+               gaddr = (guint8 *)*(gpointer*)addr;
                g_assert (gaddr);
                buffer_add_value_full (buf, t, gaddr, domain, as_vtype, NULL);
                break;
@@ -6181,11 +6166,11 @@ add_var (Buffer *buf, MonoDebugMethodJitInfo *jit, MonoType *t, MonoDebugVarInfo
                flags = info_var->index & MONO_DEBUG_VAR_ADDRESS_MODE_FLAGS;
                reg = info_var->index & ~MONO_DEBUG_VAR_ADDRESS_MODE_FLAGS;
                if (flags == MONO_DEBUG_VAR_ADDRESS_MODE_REGOFFSET) {
-                       addr = (gpointer)mono_arch_context_get_int_reg (ctx, reg);
+                       addr = (guint8 *)mono_arch_context_get_int_reg (ctx, reg);
                        addr += (gint32)info_var->offset;
-                       info = *(gpointer*)addr;
+                       info = (MonoGSharedVtMethodRuntimeInfo *)*(gpointer*)addr;
                } else if (flags == MONO_DEBUG_VAR_ADDRESS_MODE_REGISTER) {
-                       info = (gpointer)mono_arch_context_get_int_reg (ctx, reg);
+                       info = (MonoGSharedVtMethodRuntimeInfo *)mono_arch_context_get_int_reg (ctx, reg);
                } else {
                        g_assert_not_reached ();
                }
@@ -6194,11 +6179,11 @@ add_var (Buffer *buf, MonoDebugMethodJitInfo *jit, MonoType *t, MonoDebugVarInfo
                flags = locals_var->index & MONO_DEBUG_VAR_ADDRESS_MODE_FLAGS;
                reg = locals_var->index & ~MONO_DEBUG_VAR_ADDRESS_MODE_FLAGS;
                if (flags == MONO_DEBUG_VAR_ADDRESS_MODE_REGOFFSET) {
-                       addr = (gpointer)mono_arch_context_get_int_reg (ctx, reg);
+                       addr = (guint8 *)mono_arch_context_get_int_reg (ctx, reg);
                        addr += (gint32)locals_var->offset;
-                       locals = *(gpointer*)addr;
+                       locals = (guint8 *)*(gpointer*)addr;
                } else if (flags == MONO_DEBUG_VAR_ADDRESS_MODE_REGISTER) {
-                       locals = (gpointer)mono_arch_context_get_int_reg (ctx, reg);
+                       locals = (guint8 *)mono_arch_context_get_int_reg (ctx, reg);
                } else {
                        g_assert_not_reached ();
                }
@@ -6237,7 +6222,7 @@ set_var (MonoType *t, MonoDebugVarInfo *var, MonoContext *ctx, MonoDomain *domai
                gboolean is_signed = FALSE;
 
                if (t->byref) {
-                       addr = (gpointer)mono_arch_context_get_int_reg (ctx, reg);
+                       addr = (guint8 *)mono_arch_context_get_int_reg (ctx, reg);
 
                        if (addr) {
                                // FIXME: Write barriers
@@ -6286,7 +6271,7 @@ set_var (MonoType *t, MonoDebugVarInfo *var, MonoContext *ctx, MonoDomain *domai
                break;
        }
        case MONO_DEBUG_VAR_ADDRESS_MODE_REGOFFSET:
-               addr = (gpointer)mono_arch_context_get_int_reg (ctx, reg);
+               addr = (guint8 *)mono_arch_context_get_int_reg (ctx, reg);
                addr += (gint32)var->offset;
 
                //printf ("[R%d+%d] = %p\n", reg, var->offset, addr);
@@ -6303,10 +6288,10 @@ set_var (MonoType *t, MonoDebugVarInfo *var, MonoContext *ctx, MonoDomain *domai
                break;
        case MONO_DEBUG_VAR_ADDRESS_MODE_REGOFFSET_INDIR:
                /* Same as regoffset, but with an indirection */
-               addr = (gpointer)mono_arch_context_get_int_reg (ctx, reg);
+               addr = (guint8 *)mono_arch_context_get_int_reg (ctx, reg);
                addr += (gint32)var->offset;
 
-               gaddr = *(gpointer*)addr;
+               gaddr = (guint8 *)*(gpointer*)addr;
                g_assert (gaddr);
                // FIXME: Write barriers
                mono_gc_memmove_atomic (gaddr, val, size);
@@ -6326,17 +6311,17 @@ clear_event_request (int req_id, int etype)
 
        mono_loader_lock ();
        for (i = 0; i < event_requests->len; ++i) {
-               EventRequest *req = g_ptr_array_index (event_requests, i);
+               EventRequest *req = (EventRequest *)g_ptr_array_index (event_requests, i);
 
                if (req->id == req_id && req->event_kind == etype) {
                        if (req->event_kind == EVENT_KIND_BREAKPOINT)
-                               clear_breakpoint (req->info);
+                               clear_breakpoint ((MonoBreakpoint *)req->info);
                        if (req->event_kind == EVENT_KIND_STEP)
-                               ss_destroy (req->info);
+                               ss_destroy ((SingleStepReq *)req->info);
                        if (req->event_kind == EVENT_KIND_METHOD_ENTRY)
-                               clear_breakpoint (req->info);
+                               clear_breakpoint ((MonoBreakpoint *)req->info);
                        if (req->event_kind == EVENT_KIND_METHOD_EXIT)
-                               clear_breakpoint (req->info);
+                               clear_breakpoint ((MonoBreakpoint *)req->info);
                        g_ptr_array_remove_index_fast (event_requests, i);
                        g_free (req);
                        break;
@@ -6404,18 +6389,18 @@ clear_event_requests_for_assembly (MonoAssembly *assembly)
        while (found) {
                found = FALSE;
                for (i = 0; i < event_requests->len; ++i) {
-                       EventRequest *req = g_ptr_array_index (event_requests, i);
+                       EventRequest *req = (EventRequest *)g_ptr_array_index (event_requests, i);
 
                        clear_assembly_from_modifiers (req, assembly);
 
-                       if (req->event_kind == EVENT_KIND_BREAKPOINT && breakpoint_matches_assembly (req->info, assembly)) {
+                       if (req->event_kind == EVENT_KIND_BREAKPOINT && breakpoint_matches_assembly ((MonoBreakpoint *)req->info, assembly)) {
                                clear_event_request (req->id, req->event_kind);
                                found = TRUE;
                                break;
                        }
 
                        if (req->event_kind == EVENT_KIND_STEP)
-                               ss_clear_for_assembly (req->info, assembly);
+                               ss_clear_for_assembly ((SingleStepReq *)req->info, assembly);
                }
        }
        mono_loader_unlock ();
@@ -6457,8 +6442,8 @@ clear_types_for_assembly (MonoAssembly *assembly)
 static void
 add_thread (gpointer key, gpointer value, gpointer user_data)
 {
-       MonoInternalThread *thread = value;
-       Buffer *buf = user_data;
+       MonoInternalThread *thread = (MonoInternalThread *)value;
+       Buffer *buf = (Buffer *)user_data;
 
        buffer_add_objid (buf, (MonoObject*)thread);
 }
@@ -6468,7 +6453,8 @@ do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, guint8
 {
        guint8 *end = invoke->endp;
        MonoMethod *m;
-       int i, err, nargs;
+       int i, nargs;
+       ErrorCode err;
        MonoMethodSignature *sig;
        guint8 **arg_buf;
        void **args;
@@ -6491,14 +6477,14 @@ do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, guint8
        }
 
        m = decode_methodid (p, &p, end, &domain, &err);
-       if (err)
+       if (err != ERR_NONE)
                return err;
        sig = mono_method_signature (m);
 
        if (m->klass->valuetype)
-               this_buf = g_alloca (mono_class_instance_size (m->klass));
+               this_buf = (guint8 *)g_alloca (mono_class_instance_size (m->klass));
        else
-               this_buf = g_alloca (sizeof (MonoObject*));
+               this_buf = (guint8 *)g_alloca (sizeof (MonoObject*));
        if (m->klass->valuetype && (m->flags & METHOD_ATTRIBUTE_STATIC)) {
                /* Should be null */
                int type = decode_byte (p, &p, end);
@@ -6517,12 +6503,12 @@ do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, guint8
                                p = tmp_p;
                        } else {
                                err = decode_value (&m->klass->byval_arg, domain, this_buf, p, &p, end);
-                               if (err)
+                               if (err != ERR_NONE)
                                        return err;
                        }
        } else {
                err = decode_value (&m->klass->byval_arg, domain, this_buf, p, &p, end);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
        }
 
@@ -6539,7 +6525,7 @@ do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, guint8
                m = mono_object_get_virtual_method (this_arg, m);
                /* Transform this to the format the rest of the code expects it to be */
                if (m->klass->valuetype) {
-                       this_buf = g_alloca (mono_class_instance_size (m->klass));
+                       this_buf = (guint8 *)g_alloca (mono_class_instance_size (m->klass));
                        memcpy (this_buf, mono_object_unbox (this_arg), mono_class_instance_size (m->klass));
                }
        } else if ((m->flags & METHOD_ATTRIBUTE_VIRTUAL) && !m->klass->valuetype && invoke->flags & INVOKE_FLAG_VIRTUAL) {
@@ -6549,7 +6535,7 @@ do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, guint8
                }
                m = mono_object_get_virtual_method (this_arg, m);
                if (m->klass->valuetype) {
-                       this_buf = g_alloca (mono_class_instance_size (m->klass));
+                       this_buf = (guint8 *)g_alloca (mono_class_instance_size (m->klass));
                        memcpy (this_buf, mono_object_unbox (this_arg), mono_class_instance_size (m->klass));
                }
        }
@@ -6577,26 +6563,26 @@ do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, guint8
        if (nargs != sig->param_count)
                return ERR_INVALID_ARGUMENT;
        /* Use alloca to get gc tracking */
-       arg_buf = g_alloca (nargs * sizeof (gpointer));
+       arg_buf = (guint8 **)g_alloca (nargs * sizeof (gpointer));
        memset (arg_buf, 0, nargs * sizeof (gpointer));
-       args = g_alloca (nargs * sizeof (gpointer));
+       args = (gpointer *)g_alloca (nargs * sizeof (gpointer));
        for (i = 0; i < nargs; ++i) {
                if (MONO_TYPE_IS_REFERENCE (sig->params [i])) {
                        err = decode_value (sig->params [i], domain, (guint8*)&args [i], p, &p, end);
-                       if (err)
+                       if (err != ERR_NONE)
                                break;
                        if (args [i] && ((MonoObject*)args [i])->vtable->domain != domain)
                                NOT_IMPLEMENTED;
 
                        if (sig->params [i]->byref) {
-                               arg_buf [i] = g_alloca (sizeof (mgreg_t));
+                               arg_buf [i] = (guint8 *)g_alloca (sizeof (mgreg_t));
                                *(gpointer*)arg_buf [i] = args [i];
                                args [i] = arg_buf [i];
                        }
                } else {
-                       arg_buf [i] = g_alloca (mono_class_instance_size (mono_class_from_mono_type (sig->params [i])));
+                       arg_buf [i] = (guint8 *)g_alloca (mono_class_instance_size (mono_class_from_mono_type (sig->params [i])));
                        err = decode_value (sig->params [i], domain, arg_buf [i], p, &p, end);
-                       if (err)
+                       if (err != ERR_NONE)
                                break;
                        args [i] = arg_buf [i];
                }
@@ -6663,7 +6649,7 @@ do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, guint8
                } else if (mono_class_from_mono_type (sig->ret)->valuetype || sig->ret->type == MONO_TYPE_PTR || sig->ret->type == MONO_TYPE_FNPTR) {
                        if (mono_class_is_nullable (mono_class_from_mono_type (sig->ret))) {
                                MonoClass *k = mono_class_from_mono_type (sig->ret);
-                               guint8 *nullable_buf = g_alloca (mono_class_value_size (k, NULL));
+                               guint8 *nullable_buf = (guint8 *)g_alloca (mono_class_value_size (k, NULL));
 
                                g_assert (nullable_buf);
                                mono_nullable_init (nullable_buf, res, k);
@@ -6696,7 +6682,7 @@ do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, guint8
 
 #ifdef MONO_ARCH_SOFT_DEBUG_SUPPORTED
        if (invoke->has_ctx)
-               mono_set_lmf ((gpointer)(((gssize)ext.lmf.previous_lmf) & ~3));
+               mono_set_lmf ((MonoLMF *)(((gssize)ext.lmf.previous_lmf) & ~3));
 #endif
 
        *endp = p;
@@ -6716,12 +6702,13 @@ invoke_method (void)
        DebuggerTlsData *tls;
        InvokeData *invoke;
        int id;
-       int i, err, mindex;
+       int i, mindex;
+       ErrorCode err;
        Buffer buf;
        MonoContext restore_ctx;
        guint8 *p;
 
-       tls = mono_native_tls_get_value (debugger_tls_id);
+       tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
        g_assert (tls);
 
        /*
@@ -6745,7 +6732,7 @@ invoke_method (void)
        id = invoke->id;
 
        p = invoke->p;
-       err = 0;
+       err = ERR_NONE;
        for (mindex = 0; mindex < invoke->nmethods; ++mindex) {
                buffer_init (&buf, 128);
 
@@ -6812,12 +6799,12 @@ invoke_method (void)
 static gboolean
 is_really_suspended (gpointer key, gpointer value, gpointer user_data)
 {
-       MonoThread *thread = value;
+       MonoThread *thread = (MonoThread *)value;
        DebuggerTlsData *tls;
        gboolean res;
 
        mono_loader_lock ();
-       tls = mono_g_hash_table_lookup (thread_to_tls, thread);
+       tls = (DebuggerTlsData *)mono_g_hash_table_lookup (thread_to_tls, thread);
        g_assert (tls);
        res = tls->really_suspended;
        mono_loader_unlock ();
@@ -6843,7 +6830,7 @@ get_source_files_for_type (MonoClass *klass)
                if (minfo) {
                        mono_debug_get_seq_points (minfo, NULL, &source_file_list, NULL, NULL, NULL);
                        for (j = 0; j < source_file_list->len; ++j) {
-                               sinfo = g_ptr_array_index (source_file_list, j);
+                               sinfo = (MonoDebugSourceInfo *)g_ptr_array_index (source_file_list, j);
                                for (i = 0; i < files->len; ++i)
                                        if (!strcmp (g_ptr_array_index (files, i), sinfo->source_file))
                                                break;
@@ -6903,7 +6890,7 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
                /* Clear all event requests */
                mono_loader_lock ();
                while (event_requests->len > 0) {
-                       EventRequest *req = g_ptr_array_index (event_requests, 0);
+                       EventRequest *req = (EventRequest *)g_ptr_array_index (event_requests, 0);
 
                        clear_event_request (req->id, req->event_kind);
                }
@@ -6934,7 +6921,7 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
                /* Clear all event requests */
                mono_loader_lock ();
                while (event_requests->len > 0) {
-                       EventRequest *req = g_ptr_array_index (event_requests, 0);
+                       EventRequest *req = (EventRequest *)g_ptr_array_index (event_requests, 0);
 
                        clear_event_request (req->id, req->event_kind);
                }
@@ -6957,12 +6944,12 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
 #endif
 
                mono_loader_lock ();
-               thread = mono_g_hash_table_find (tid_to_thread, is_really_suspended, NULL);
+               thread = (MonoInternalThread *)mono_g_hash_table_find (tid_to_thread, is_really_suspended, NULL);
                mono_loader_unlock ();
 
                if (thread && exit_method) {
                        mono_loader_lock ();
-                       tls = mono_g_hash_table_lookup (thread_to_tls, thread);
+                       tls = (DebuggerTlsData *)mono_g_hash_table_lookup (thread_to_tls, thread);
                        mono_loader_unlock ();
 
                        args = g_new0 (gpointer, 1);
@@ -7006,10 +6993,11 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
                int objid = decode_objid (p, &p, end);
                MonoThread *thread;
                DebuggerTlsData *tls;
-               int i, count, err, flags, nmethods;
+               int i, count, flags, nmethods;
+               ErrorCode err;
 
                err = get_object (objid, (MonoObject**)&thread);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
 
                flags = decode_int (p, &p, end);
@@ -7026,7 +7014,7 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
                        return ERR_NOT_SUSPENDED;
 
                mono_loader_lock ();
-               tls = mono_g_hash_table_lookup (thread_to_tls, THREAD_TO_INTERNAL (thread));
+               tls = (DebuggerTlsData *)mono_g_hash_table_lookup (thread_to_tls, THREAD_TO_INTERNAL (thread));
                mono_loader_unlock ();
                g_assert (tls);
 
@@ -7043,7 +7031,7 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
                tls->pending_invoke = g_new0 (InvokeData, 1);
                tls->pending_invoke->id = id;
                tls->pending_invoke->flags = flags;
-               tls->pending_invoke->p = g_malloc (end - p);
+               tls->pending_invoke->p = (guint8 *)g_malloc (end - p);
                memcpy (tls->pending_invoke->p, p, end - p);
                tls->pending_invoke->endp = tls->pending_invoke->p + (end - p);
                tls->pending_invoke->suspend_count = suspend_count;
@@ -7063,16 +7051,17 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
                int objid = decode_objid (p, &p, end);
                MonoThread *thread;
                DebuggerTlsData *tls;
-               int invoke_id, err;
+               int invoke_id;
+               ErrorCode err;
 
                err = get_object (objid, (MonoObject**)&thread);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
 
                invoke_id = decode_int (p, &p, end);
 
                mono_loader_lock ();
-               tls = mono_g_hash_table_lookup (thread_to_tls, THREAD_TO_INTERNAL (thread));
+               tls = (DebuggerTlsData *)mono_g_hash_table_lookup (thread_to_tls, THREAD_TO_INTERNAL (thread));
                g_assert (tls);
 
                if (tls->abort_requested) {
@@ -7136,7 +7125,7 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
                mono_loader_lock ();
                g_hash_table_iter_init (&iter, domains);
                while (g_hash_table_iter_next (&iter, NULL, (void**)&domain)) {
-                       AgentDomainInfo *info = domain_jit_info (domain)->agent_info;
+                       AgentDomainInfo *info = (AgentDomainInfo *)domain_jit_info (domain)->agent_info;
 
                        /* Update 'source_file_to_class' cache */
                        g_hash_table_iter_init (&kiter, info->loaded_classes);
@@ -7146,11 +7135,11 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
                                        g_hash_table_insert (info->source_files, klass, files);
 
                                        for (i = 0; i < files->len; ++i) {
-                                               char *s = g_ptr_array_index (files, i);
+                                               char *s = (char *)g_ptr_array_index (files, i);
                                                char *s2 = dbg_path_get_basename (s);
                                                char *s3;
 
-                                               class_list = g_hash_table_lookup (info->source_file_to_class, s2);
+                                               class_list = (GSList *)g_hash_table_lookup (info->source_file_to_class, s2);
                                                if (!class_list) {
                                                        class_list = g_slist_prepend (class_list, klass);
                                                        g_hash_table_insert (info->source_file_to_class, g_strdup (s2), class_list);
@@ -7161,7 +7150,7 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
 
                                                /* The _ignorecase hash contains the lowercase path */
                                                s3 = strdup_tolower (s2);
-                                               class_list = g_hash_table_lookup (info->source_file_to_class_ignorecase, s3);
+                                               class_list = (GSList *)g_hash_table_lookup (info->source_file_to_class_ignorecase, s3);
                                                if (!class_list) {
                                                        class_list = g_slist_prepend (class_list, klass);
                                                        g_hash_table_insert (info->source_file_to_class_ignorecase, g_strdup (s3), class_list);
@@ -7180,14 +7169,14 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
                                char *s;
 
                                s = strdup_tolower (basename);
-                               class_list = g_hash_table_lookup (info->source_file_to_class_ignorecase, s);
+                               class_list = (GSList *)g_hash_table_lookup (info->source_file_to_class_ignorecase, s);
                                g_free (s);
                        } else {
-                               class_list = g_hash_table_lookup (info->source_file_to_class, basename);
+                               class_list = (GSList *)g_hash_table_lookup (info->source_file_to_class, basename);
                        }
 
                        for (l = class_list; l; l = l->next) {
-                               klass = l->data;
+                               klass = (MonoClass *)l->data;
 
                                g_ptr_array_add (res_classes, klass);
                                g_ptr_array_add (res_domains, domain);
@@ -7200,7 +7189,7 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
 
                buffer_add_int (buf, res_classes->len);
                for (i = 0; i < res_classes->len; ++i)
-                       buffer_add_typeid (buf, g_ptr_array_index (res_domains, i), g_ptr_array_index (res_classes, i));
+                       buffer_add_typeid (buf, (MonoDomain *)g_ptr_array_index (res_domains, i), (MonoClass *)g_ptr_array_index (res_classes, i));
                g_ptr_array_free (res_classes, TRUE);
                g_ptr_array_free (res_domains, TRUE);
                break;
@@ -7236,7 +7225,7 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
 
                        mono_domain_assemblies_lock (domain);
                        for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
-                               ass = tmp->data;
+                               ass = (MonoAssembly *)tmp->data;
 
                                if (ass->image) {
                                        type_resolve = TRUE;
@@ -7256,7 +7245,7 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
 
                buffer_add_int (buf, res_classes->len);
                for (i = 0; i < res_classes->len; ++i)
-                       buffer_add_typeid (buf, g_ptr_array_index (res_domains, i), g_ptr_array_index (res_classes, i));
+                       buffer_add_typeid (buf, (MonoDomain *)g_ptr_array_index (res_domains, i), (MonoClass *)g_ptr_array_index (res_classes, i));
                g_ptr_array_free (res_classes, TRUE);
                g_ptr_array_free (res_domains, TRUE);
                break;
@@ -7275,17 +7264,21 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
 static ErrorCode
 event_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 {
-       int err;
+       ErrorCode err;
        MonoError error;
 
        switch (command) {
        case CMD_EVENT_REQUEST_SET: {
                EventRequest *req;
-               int i, event_kind, suspend_policy, nmodifiers, mod;
+               int i, event_kind, suspend_policy, nmodifiers;
+               ModifierKind mod;
                MonoMethod *method;
                long location = 0;
                MonoThread *step_thread;
-               int size = 0, depth = 0, filter = 0, step_thread_id = 0;
+               int step_thread_id = 0;
+               StepDepth depth = STEP_DEPTH_INTO;
+               StepSize size = STEP_SIZE_MIN;
+               StepFilter filter = STEP_FILTER_NONE;
                MonoDomain *domain;
                Modifier *modifier;
 
@@ -7293,7 +7286,7 @@ event_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                suspend_policy = decode_byte (p, &p, end);
                nmodifiers = decode_byte (p, &p, end);
 
-               req = g_malloc0 (sizeof (EventRequest) + (nmodifiers * sizeof (Modifier)));
+               req = (EventRequest *)g_malloc0 (sizeof (EventRequest) + (nmodifiers * sizeof (Modifier)));
                req->id = InterlockedIncrement (&event_request_id);
                req->event_kind = event_kind;
                req->suspend_policy = suspend_policy;
@@ -7301,38 +7294,38 @@ event_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 
                method = NULL;
                for (i = 0; i < nmodifiers; ++i) {
-                       mod = decode_byte (p, &p, end);
+                       mod = (ModifierKind)decode_byte (p, &p, end);
 
                        req->modifiers [i].kind = mod;
                        if (mod == MOD_KIND_COUNT) {
                                req->modifiers [i].data.count = decode_int (p, &p, end);
                        } else if (mod == MOD_KIND_LOCATION_ONLY) {
                                method = decode_methodid (p, &p, end, &domain, &err);
-                               if (err)
+                               if (err != ERR_NONE)
                                        return err;
                                location = decode_long (p, &p, end);
                        } else if (mod == MOD_KIND_STEP) {
                                step_thread_id = decode_id (p, &p, end);
-                               size = decode_int (p, &p, end);
-                               depth = decode_int (p, &p, end);
+                               size = (StepSize)decode_int (p, &p, end);
+                               depth = (StepDepth)decode_int (p, &p, end);
                                if (CHECK_PROTOCOL_VERSION (2, 16))
-                                       filter = decode_int (p, &p, end);
+                                       filter = (StepFilter)decode_int (p, &p, end);
                                req->modifiers [i].data.filter = filter;
                                if (!CHECK_PROTOCOL_VERSION (2, 26) && (req->modifiers [i].data.filter & STEP_FILTER_DEBUGGER_HIDDEN))
                                        /* Treat STEP_THOUGH the same as HIDDEN */
-                                       req->modifiers [i].data.filter |= STEP_FILTER_DEBUGGER_STEP_THROUGH;
+                                       req->modifiers [i].data.filter = (StepFilter)(req->modifiers [i].data.filter | STEP_FILTER_DEBUGGER_STEP_THROUGH);
                        } else if (mod == MOD_KIND_THREAD_ONLY) {
                                int id = decode_id (p, &p, end);
 
                                err = get_object (id, (MonoObject**)&req->modifiers [i].data.thread);
-                               if (err) {
+                               if (err != ERR_NONE) {
                                        g_free (req);
                                        return err;
                                }
                        } else if (mod == MOD_KIND_EXCEPTION_ONLY) {
                                MonoClass *exc_class = decode_typeid (p, &p, end, &domain, &err);
 
-                               if (err)
+                               if (err != ERR_NONE)
                                        return err;
                                req->modifiers [i].caught = decode_byte (p, &p, end);
                                req->modifiers [i].uncaught = decode_byte (p, &p, end);
@@ -7356,7 +7349,7 @@ event_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                                req->modifiers [i].data.assemblies = g_new0 (MonoAssembly*, n);
                                for (j = 0; j < n; ++j) {
                                        req->modifiers [i].data.assemblies [j] = decode_assemblyid (p, &p, end, &domain, &err);
-                                       if (err) {
+                                       if (err != ERR_NONE) {
                                                g_free (req->modifiers [i].data.assemblies);
                                                return err;
                                        }
@@ -7409,13 +7402,13 @@ event_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                        g_assert (step_thread_id);
 
                        err = get_object (step_thread_id, (MonoObject**)&step_thread);
-                       if (err) {
+                       if (err != ERR_NONE) {
                                g_free (req);
                                return err;
                        }
 
                        err = ss_create (THREAD_TO_INTERNAL (step_thread), size, depth, filter, req);
-                       if (err) {
+                       if (err != ERR_NONE) {
                                g_free (req);
                                return err;
                        }
@@ -7479,10 +7472,10 @@ event_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                mono_loader_lock ();
                i = 0;
                while (i < event_requests->len) {
-                       EventRequest *req = g_ptr_array_index (event_requests, i);
+                       EventRequest *req = (EventRequest *)g_ptr_array_index (event_requests, i);
 
                        if (req->event_kind == EVENT_KIND_BREAKPOINT) {
-                               clear_breakpoint (req->info);
+                               clear_breakpoint ((MonoBreakpoint *)req->info);
 
                                g_ptr_array_remove_index_fast (event_requests, i);
                                g_free (req);
@@ -7503,7 +7496,7 @@ event_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 static ErrorCode
 domain_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 {
-       int err;
+       ErrorCode err;
        MonoDomain *domain;
 
        switch (command) {
@@ -7513,7 +7506,7 @@ domain_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
        }
        case CMD_APPDOMAIN_GET_FRIENDLY_NAME: {
                domain = decode_domainid (p, &p, end, NULL, &err);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
                buffer_add_string (buf, domain->friendly_name);
                break;
@@ -7524,7 +7517,7 @@ domain_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                int count;
 
                domain = decode_domainid (p, &p, end, NULL, &err);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
                mono_loader_lock ();
                count = 0;
@@ -7533,7 +7526,7 @@ domain_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                }
                buffer_add_int (buf, count);
                for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
-                       ass = tmp->data;
+                       ass = (MonoAssembly *)tmp->data;
                        buffer_add_assemblyid (buf, domain, ass);
                }
                mono_loader_unlock ();
@@ -7541,7 +7534,7 @@ domain_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
        }
        case CMD_APPDOMAIN_GET_ENTRY_ASSEMBLY: {
                domain = decode_domainid (p, &p, end, NULL, &err);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
 
                buffer_add_assemblyid (buf, domain, domain->entry_assembly);
@@ -7549,7 +7542,7 @@ domain_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
        }
        case CMD_APPDOMAIN_GET_CORLIB: {
                domain = decode_domainid (p, &p, end, NULL, &err);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
 
                buffer_add_assemblyid (buf, domain, domain->domain->mbr.obj.vtable->klass->image->assembly);
@@ -7560,7 +7553,7 @@ domain_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                MonoString *o;
 
                domain = decode_domainid (p, &p, end, NULL, &err);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
                s = decode_string (p, &p, end);
 
@@ -7574,10 +7567,10 @@ domain_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                MonoObject *o;
 
                domain = decode_domainid (p, &p, end, NULL, &err);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
                klass = decode_typeid (p, &p, end, &domain2, &err);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
 
                // FIXME:
@@ -7585,8 +7578,8 @@ domain_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 
                o = mono_object_new (domain, klass);
 
-               err = decode_value (&klass->byval_arg, domain, mono_object_unbox (o), p, &p, end);
-               if (err)
+               err = decode_value (&klass->byval_arg, domain, (guint8 *)mono_object_unbox (o), p, &p, end);
+               if (err != ERR_NONE)
                        return err;
 
                buffer_add_objid (buf, o);
@@ -7602,12 +7595,12 @@ domain_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 static ErrorCode
 assembly_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 {
-       int err;
+       ErrorCode err;
        MonoAssembly *ass;
        MonoDomain *domain;
 
        ass = decode_assemblyid (p, &p, end, &domain, &err);
-       if (err)
+       if (err != ERR_NONE)
                return err;
 
        switch (command) {
@@ -7694,7 +7687,7 @@ assembly_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 static ErrorCode
 module_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 {
-       int err;
+       ErrorCode err;
        MonoDomain *domain;
 
        switch (command) {
@@ -7721,7 +7714,7 @@ module_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 static ErrorCode
 field_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 {
-       int err;
+       ErrorCode err;
        MonoDomain *domain;
 
        switch (command) {
@@ -7755,7 +7748,7 @@ buffer_add_cattr_arg (Buffer *buf, MonoType *t, MonoDomain *domain, MonoObject *
                buffer_add_value (buf, t, mono_object_unbox (val), domain);
 }
 
-static int
+static ErrorCode
 buffer_add_cattrs (Buffer *buf, MonoDomain *domain, MonoImage *image, MonoClass *attr_klass, MonoCustomAttrInfo *cinfo)
 {
        int i, j;
@@ -7860,7 +7853,8 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
        MonoType *type;
        gpointer iter;
        guint8 b;
-       int err, nnested;
+       int nnested;
+       ErrorCode err;
        char *name;
 
        switch (command) {
@@ -7932,7 +7926,7 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
                                count = container->type_argc;
                                buffer_add_int (buf, count);
                                for (i = 0; i < count; i++) {
-                                       pklass = mono_class_from_generic_parameter (mono_generic_container_get_param (container, i), klass->image, FALSE);
+                                       pklass = mono_class_from_generic_parameter_internal (mono_generic_container_get_param (container, i));
                                        buffer_add_typeid (buf, domain, pklass);
                                }
                        } else {
@@ -8007,13 +8001,13 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
 
                attr_klass = decode_typeid (p, &p, end, NULL, &err);
                /* attr_klass can be NULL */
-               if (err)
+               if (err != ERR_NONE)
                        return err;
 
                cinfo = mono_custom_attrs_from_class (klass);
 
                err = buffer_add_cattrs (buf, domain, klass->image, attr_klass, cinfo);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
                break;
        }
@@ -8023,16 +8017,16 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
                MonoClassField *field;
 
                field = decode_fieldid (p, &p, end, NULL, &err);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
                attr_klass = decode_typeid (p, &p, end, NULL, &err);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
 
                cinfo = mono_custom_attrs_from_field (klass, field);
 
                err = buffer_add_cattrs (buf, domain, klass->image, attr_klass, cinfo);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
                break;
        }
@@ -8042,16 +8036,16 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
                MonoProperty *prop;
 
                prop = decode_propertyid (p, &p, end, NULL, &err);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
                attr_klass = decode_typeid (p, &p, end, NULL, &err);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
 
                cinfo = mono_custom_attrs_from_property (klass, prop);
 
                err = buffer_add_cattrs (buf, domain, klass->image, attr_klass, cinfo);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
                break;
        }
@@ -8069,10 +8063,10 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
 
                if (command == CMD_TYPE_GET_VALUES_2) {
                        int objid = decode_objid (p, &p, end);
-                       int err;
+                       ErrorCode err;
 
                        err = get_object (objid, (MonoObject**)&thread_obj);
-                       if (err)
+                       if (err != ERR_NONE)
                                return err;
 
                        thread = THREAD_TO_INTERNAL (thread_obj);
@@ -8081,7 +8075,7 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
                len = decode_int (p, &p, end);
                for (i = 0; i < len; ++i) {
                        f = decode_fieldid (p, &p, end, NULL, &err);
-                       if (err)
+                       if (err != ERR_NONE)
                                return err;
 
                        if (!(f->type->attrs & FIELD_ATTRIBUTE_STATIC))
@@ -8104,7 +8098,7 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
                                return ERR_INVALID_FIELDID;
 
                        vtable = mono_class_vtable (domain, f->parent);
-                       val = g_malloc (mono_class_instance_size (mono_class_from_mono_type (f->type)));
+                       val = (guint8 *)g_malloc (mono_class_instance_size (mono_class_from_mono_type (f->type)));
                        mono_field_static_get_value_for_thread (thread ? thread : mono_thread_internal_current (), vtable, f, val);
                        buffer_add_value (buf, f->type, val, domain);
                        g_free (val);
@@ -8122,7 +8116,7 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
                len = decode_int (p, &p, end);
                for (i = 0; i < len; ++i) {
                        f = decode_fieldid (p, &p, end, NULL, &err);
-                       if (err)
+                       if (err != ERR_NONE)
                                return err;
 
                        if (!(f->type->attrs & FIELD_ATTRIBUTE_STATIC))
@@ -8144,9 +8138,9 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
                        // FIXME: Check for literal/const
 
                        vtable = mono_class_vtable (domain, f->parent);
-                       val = g_malloc (mono_class_instance_size (mono_class_from_mono_type (f->type)));
+                       val = (guint8 *)g_malloc (mono_class_instance_size (mono_class_from_mono_type (f->type)));
                        err = decode_value (f->type, domain, val, p, &p, end);
-                       if (err) {
+                       if (err != ERR_NONE) {
                                g_free (val);
                                return err;
                        }
@@ -8173,7 +8167,7 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
 
                buffer_add_int (buf, files->len);
                for (i = 0; i < files->len; ++i) {
-                       source_file = g_ptr_array_index (files, i);
+                       source_file = (char *)g_ptr_array_index (files, i);
                        if (command == CMD_TYPE_GET_SOURCE_FILES_2) {
                                buffer_add_string (buf, source_file);
                        } else {
@@ -8189,7 +8183,7 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
        case CMD_TYPE_IS_ASSIGNABLE_FROM: {
                MonoClass *oklass = decode_typeid (p, &p, end, NULL, &err);
 
-               if (err)
+               if (err != ERR_NONE)
                        return err;
                if (mono_class_is_assignable_from (klass, oklass))
                        buffer_add_byte (buf, 1);
@@ -8207,7 +8201,7 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
                        return ERR_LOADER_ERROR;
                buffer_add_int (buf, array->len);
                for (i = 0; i < array->len; ++i) {
-                       MonoMethod *method = g_ptr_array_index (array, i);
+                       MonoMethod *method = (MonoMethod *)g_ptr_array_index (array, i);
                        buffer_add_methodid (buf, domain, method);
                }
 
@@ -8254,7 +8248,7 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
 
                for (tindex = 0; tindex < len; ++tindex) {
                        iclass = decode_typeid (p, &p, end, NULL, &err);
-                       if (err)
+                       if (err != ERR_NONE)
                                return err;
 
                        ioffset = mono_class_interface_offset_with_variance (klass, iclass, &variance_used);
@@ -8302,10 +8296,10 @@ type_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
        MonoClass *klass;
        MonoDomain *old_domain;
        MonoDomain *domain;
-       int err;
+       ErrorCode err;
 
        klass = decode_typeid (p, &p, end, &domain, &err);
-       if (err)
+       if (err != ERR_NONE)
                return err;
 
        old_domain = mono_domain_get ();
@@ -8323,7 +8317,7 @@ static ErrorCode
 method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, guint8 *p, guint8 *end, Buffer *buf)
 {
        MonoMethodHeader *header;
-       int err;
+       ErrorCode err;
 
        switch (command) {
        case CMD_METHOD_GET_NAME: {
@@ -8364,7 +8358,7 @@ method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, g
                if (CHECK_PROTOCOL_VERSION (2, 13)) {
                        buffer_add_int (buf, source_file_list->len);
                        for (i = 0; i < source_file_list->len; ++i) {
-                               MonoDebugSourceInfo *sinfo = g_ptr_array_index (source_file_list, i);
+                               MonoDebugSourceInfo *sinfo = (MonoDebugSourceInfo *)g_ptr_array_index (source_file_list, i);
                                buffer_add_string (buf, sinfo->source_file);
                                if (CHECK_PROTOCOL_VERSION (2, 14)) {
                                        for (j = 0; j < 16; ++j)
@@ -8381,7 +8375,7 @@ method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, g
                        const char *srcfile = "";
 
                        if (source_files [i] != -1) {
-                               MonoDebugSourceInfo *sinfo = g_ptr_array_index (source_file_list, source_files [i]);
+                               MonoDebugSourceInfo *sinfo = (MonoDebugSourceInfo *)g_ptr_array_index (source_file_list, source_files [i]);
                                srcfile = sinfo->source_file;
                        }
                        DEBUG_PRINTF (10, "IL%x -> %s:%d %d %d %d\n", sp->il_offset, srcfile, sp->line, sp->column, sp->end_line, sp->end_column);
@@ -8544,7 +8538,7 @@ method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, g
                                                buffer_add_int (buf, count);
                                                for (i = 0; i < count; i++) {
                                                        MonoGenericParam *param = mono_generic_container_get_param (container, i);
-                                                       MonoClass *pklass = mono_class_from_generic_parameter (param, method->klass->image, TRUE);
+                                                       MonoClass *pklass = mono_class_from_generic_parameter_internal (param);
                                                        buffer_add_typeid (buf, domain, pklass);
                                                }
                                        } else {
@@ -8617,7 +8611,7 @@ method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, g
 
                        if (method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD) {
                                val = mono_method_get_wrapper_data (method, token);
-                               handle_class = mono_method_get_wrapper_data (method, token + 1);
+                               handle_class = (MonoClass *)mono_method_get_wrapper_data (method, token + 1);
 
                                if (handle_class == NULL) {
                                        // Can't figure out the token type
@@ -8639,14 +8633,14 @@ method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, g
                                        buffer_add_typeid (buf, domain, mono_class_from_mono_type ((MonoType*)val));
                        } else if (handle_class == mono_defaults.fieldhandle_class) {
                                buffer_add_byte (buf, TOKEN_TYPE_FIELD);
-                               buffer_add_fieldid (buf, domain, val);
+                               buffer_add_fieldid (buf, domain, (MonoClassField *)val);
                        } else if (handle_class == mono_defaults.methodhandle_class) {
                                buffer_add_byte (buf, TOKEN_TYPE_METHOD);
-                               buffer_add_methodid (buf, domain, val);
+                               buffer_add_methodid (buf, domain, (MonoMethod *)val);
                        } else if (handle_class == mono_defaults.string_class) {
                                char *s;
 
-                               s = mono_string_to_utf8 (val);
+                               s = mono_string_to_utf8 ((MonoString *)val);
                                buffer_add_byte (buf, TOKEN_TYPE_STRING);
                                buffer_add_string (buf, s);
                                g_free (s);
@@ -8664,13 +8658,13 @@ method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, g
 
                attr_klass = decode_typeid (p, &p, end, NULL, &err);
                /* attr_klass can be NULL */
-               if (err)
+               if (err != ERR_NONE)
                        return err;
 
                cinfo = mono_custom_attrs_from_method (method);
 
                err = buffer_add_cattrs (buf, domain, method->klass->image, attr_klass, cinfo);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
                break;
        }
@@ -8688,7 +8682,7 @@ method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, g
                type_argv = g_new0 (MonoType*, type_argc);
                for (i = 0; i < type_argc; ++i) {
                        klass = decode_typeid (p, &p, end, &d, &err);
-                       if (err) {
+                       if (err != ERR_NONE) {
                                g_free (type_argv);
                                return err;
                        }
@@ -8720,13 +8714,13 @@ method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, g
 static ErrorCode
 method_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 {
-       int err;
+       ErrorCode err;
        MonoDomain *old_domain;
        MonoDomain *domain;
        MonoMethod *method;
 
        method = decode_methodid (p, &p, end, &domain, &err);
-       if (err)
+       if (err != ERR_NONE)
                return err;
 
        old_domain = mono_domain_get ();
@@ -8744,12 +8738,12 @@ static ErrorCode
 thread_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 {
        int objid = decode_objid (p, &p, end);
-       int err;
+       ErrorCode err;
        MonoThread *thread_obj;
        MonoInternalThread *thread;
 
        err = get_object (objid, (MonoObject**)&thread_obj);
-       if (err)
+       if (err != ERR_NONE)
                return err;
 
        thread = THREAD_TO_INTERNAL (thread_obj);
@@ -8797,7 +8791,7 @@ thread_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                        return ERR_NOT_IMPLEMENTED;
 
                mono_loader_lock ();
-               tls = mono_g_hash_table_lookup (thread_to_tls, thread);
+               tls = (DebuggerTlsData *)mono_g_hash_table_lookup (thread_to_tls, thread);
                mono_loader_unlock ();
                g_assert (tls);
 
@@ -8841,7 +8835,7 @@ thread_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                gint64 il_offset;
 
                method = decode_methodid (p, &p, end, &domain, &err);
-               if (err)
+               if (err != ERR_NONE)
                        return err;
                il_offset = decode_long (p, &p, end);
 
@@ -8851,7 +8845,7 @@ thread_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                }
 
                mono_loader_lock ();
-               tls = mono_g_hash_table_lookup (thread_to_tls, thread);
+               tls = (DebuggerTlsData *)mono_g_hash_table_lookup (thread_to_tls, thread);
                mono_loader_unlock ();
                g_assert (tls);
 
@@ -8883,7 +8877,7 @@ static ErrorCode
 frame_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 {
        int objid;
-       int err;
+       ErrorCode err;
        MonoThread *thread_obj;
        MonoInternalThread *thread;
        int pos, i, len, frame_idx;
@@ -8896,7 +8890,7 @@ frame_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 
        objid = decode_objid (p, &p, end);
        err = get_object (objid, (MonoObject**)&thread_obj);
-       if (err)
+       if (err != ERR_NONE)
                return err;
 
        thread = THREAD_TO_INTERNAL (thread_obj);
@@ -8904,7 +8898,7 @@ frame_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
        id = decode_id (p, &p, end);
 
        mono_loader_lock ();
-       tls = mono_g_hash_table_lookup (thread_to_tls, thread);
+       tls = (DebuggerTlsData *)mono_g_hash_table_lookup (thread_to_tls, thread);
        mono_loader_unlock ();
        g_assert (tls);
 
@@ -9039,11 +9033,11 @@ frame_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                        }
 
                        if (MONO_TYPE_IS_REFERENCE (t))
-                               val_buf = g_alloca (sizeof (MonoObject*));
+                               val_buf = (guint8 *)g_alloca (sizeof (MonoObject*));
                        else
-                               val_buf = g_alloca (mono_class_instance_size (mono_class_from_mono_type (t)));
+                               val_buf = (guint8 *)g_alloca (mono_class_instance_size (mono_class_from_mono_type (t)));
                        err = decode_value (t, frame->domain, val_buf, p, &p, end);
-                       if (err)
+                       if (err != ERR_NONE)
                                return err;
 
                        set_var (t, var, &frame->ctx, frame->domain, val_buf, frame->reg_locations, &tls->restore_state.ctx);
@@ -9067,12 +9061,13 @@ static ErrorCode
 array_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 {
        MonoArray *arr;
-       int objid, err, index, len, i, esize;
+       int objid, index, len, i, esize;
+       ErrorCode err;
        gpointer elem;
 
        objid = decode_objid (p, &p, end);
        err = get_object (objid, (MonoObject**)&arr);
-       if (err)
+       if (err != ERR_NONE)
                return err;
 
        switch (command) {
@@ -9114,7 +9109,7 @@ array_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                for (i = index; i < index + len; ++i) {
                        elem = (gpointer*)((char*)arr->vector + (i * esize));
 
-                       decode_value (&arr->obj.vtable->klass->element_class->byval_arg, arr->obj.vtable->domain, elem, p, &p, end);
+                       decode_value (&arr->obj.vtable->klass->element_class->byval_arg, arr->obj.vtable->domain, (guint8 *)elem, p, &p, end);
                }
                break;
        default:
@@ -9127,7 +9122,8 @@ array_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 static ErrorCode
 string_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 {
-       int objid, err;
+       int objid;
+       ErrorCode err;
        MonoString *str;
        char *s;
        int i, index, length;
@@ -9136,7 +9132,7 @@ string_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 
        objid = decode_objid (p, &p, end);
        err = get_object (objid, (MonoObject**)&str);
-       if (err)
+       if (err != ERR_NONE)
                return err;
 
        switch (command) {
@@ -9178,7 +9174,8 @@ string_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 static ErrorCode
 object_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 {
-       int objid, err;
+       int objid;
+       ErrorCode err;
        MonoObject *obj;
        int len, i;
        MonoClassField *f;
@@ -9188,16 +9185,16 @@ object_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
        if (command == CMD_OBJECT_REF_IS_COLLECTED) {
                objid = decode_objid (p, &p, end);
                err = get_object (objid, &obj);
-               if (err)
+               if (err != ERR_NONE)
                        buffer_add_int (buf, 1);
                else
                        buffer_add_int (buf, 0);
-               return 0;
+               return ERR_NONE;
        }
 
        objid = decode_objid (p, &p, end);
        err = get_object (objid, &obj);
-       if (err)
+       if (err != ERR_NONE)
                return err;
 
        MonoClass *obj_type;
@@ -9218,7 +9215,7 @@ object_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 
                for (i = 0; i < len; ++i) {
                        MonoClassField *f = decode_fieldid (p, &p, end, NULL, &err);
-                       if (err)
+                       if (err != ERR_NONE)
                                return err;
 
                        /* Check that the field belongs to the object */
@@ -9241,7 +9238,7 @@ object_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 
                                g_assert (f->type->attrs & FIELD_ATTRIBUTE_STATIC);
                                vtable = mono_class_vtable (obj->vtable->domain, f->parent);
-                               val = g_malloc (mono_class_instance_size (mono_class_from_mono_type (f->type)));
+                               val = (guint8 *)g_malloc (mono_class_instance_size (mono_class_from_mono_type (f->type)));
                                mono_field_static_get_value (vtable, f, val);
                                buffer_add_value (buf, f->type, val, obj->vtable->domain);
                                g_free (val);
@@ -9255,7 +9252,7 @@ object_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 
                for (i = 0; i < len; ++i) {
                        f = decode_fieldid (p, &p, end, NULL, &err);
-                       if (err)
+                       if (err != ERR_NONE)
                                return err;
 
                        /* Check that the field belongs to the object */
@@ -9279,9 +9276,9 @@ object_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                                g_assert (f->type->attrs & FIELD_ATTRIBUTE_STATIC);
                                vtable = mono_class_vtable (obj->vtable->domain, f->parent);
 
-                               val = g_malloc (mono_class_instance_size (mono_class_from_mono_type (f->type)));
+                               val = (guint8 *)g_malloc (mono_class_instance_size (mono_class_from_mono_type (f->type)));
                                err = decode_value (f->type, obj->vtable->domain, val, p, &p, end);
-                               if (err) {
+                               if (err != ERR_NONE) {
                                        g_free (val);
                                        return err;
                                }
@@ -9289,7 +9286,7 @@ object_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
                                g_free (val);
                        } else {
                                err = decode_value (f->type, obj->vtable->domain, (guint8*)obj + f->offset, p, &p, end);
-                               if (err)
+                               if (err != ERR_NONE)
                                        return err;
                        }
                }
@@ -9584,7 +9581,8 @@ wait_for_attach (void)
 static guint32 WINAPI
 debugger_thread (void *arg)
 {
-       int res, len, id, flags, command_set = 0, command = 0;
+       int res, len, id, flags, command = 0;
+       CommandSet command_set = (CommandSet)0;
        guint8 header [HEADER_LENGTH];
        guint8 *data, *p, *end;
        Buffer buf;
@@ -9629,7 +9627,7 @@ debugger_thread (void *arg)
                len = decode_int (p, &p, end);
                id = decode_int (p, &p, end);
                flags = decode_byte (p, &p, end);
-               command_set = decode_byte (p, &p, end);
+               command_set = (CommandSet)decode_byte (p, &p, end);
                command = decode_byte (p, &p, end);
 
                g_assert (flags == 0);
@@ -9647,7 +9645,7 @@ debugger_thread (void *arg)
                        DEBUG_PRINTF (1, "[dbg] Command %s(%s) [%d][at=%lx].\n", command_set_to_string (command_set), cmd_str, id, (long)mono_100ns_ticks () / 10000);
                }
 
-               data = g_malloc (len - HEADER_LENGTH);
+               data = (guint8 *)g_malloc (len - HEADER_LENGTH);
                if (len - HEADER_LENGTH > 0)
                {
                        MONO_PREPARE_BLOCKING;
@@ -9671,7 +9669,7 @@ debugger_thread (void *arg)
                switch (command_set) {
                case CMD_SET_VM:
                        err = vm_commands (command, id, p, end, &buf);
-                       if (!err && command == CMD_VM_INVOKE_METHOD)
+                       if (err == ERR_NONE && command == CMD_VM_INVOKE_METHOD)
                                /* Sent after the invoke is complete */
                                no_reply = TRUE;
                        break;
@@ -9728,7 +9726,7 @@ debugger_thread (void *arg)
                        }
                }
 
-               if (!err && command_set == CMD_SET_VM && command == CMD_VM_STOP_BUFFERING) {
+               if (err == ERR_NONE && command_set == CMD_SET_VM && command == CMD_VM_STOP_BUFFERING) {
                        send_buffered_reply_packets ();
                        buffer_replies = FALSE;
                }
@@ -9741,13 +9739,11 @@ debugger_thread (void *arg)
        }
 
        mono_set_is_debugger_attached (FALSE);
-       
-       MONO_TRY_BLOCKING;
-       mono_mutex_lock (&debugger_thread_exited_mutex);
+
+       mono_coop_mutex_lock (&debugger_thread_exited_mutex);
        debugger_thread_exited = TRUE;
-       mono_cond_signal (&debugger_thread_exited_cond);
-       mono_mutex_unlock (&debugger_thread_exited_mutex);
-       MONO_FINISH_TRY_BLOCKING;
+       mono_coop_cond_signal (&debugger_thread_exited_cond);
+       mono_coop_mutex_unlock (&debugger_thread_exited_mutex);
 
        DEBUG_PRINTF (1, "[dbg] Debugger thread exited.\n");
        

diff --git a/mono/mini/decompose.c b/mono/mini/decompose.c
index d3fc7f2e92305f7f6cabeb442b61774466a2fe58..2dfff74b4fb6fbdf28dd94741eaef82865c8c795 100644 (file)
--- a/mono/mini/decompose.c
+++ b/mono/mini/decompose.c
@@ -539,7 +539,7 @@ mono_decompose_opcode (MonoCompile *cfg, MonoInst *ins)
                        g_assert (!info->sig->hasthis);
                        g_assert (info->sig->param_count <= MONO_MAX_SRC_REGS);
 
-                       args = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst*) * info->sig->param_count);
+                       args = (MonoInst **)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst*) * info->sig->param_count);
                        if (info->sig->param_count > 0) {
                                int sregs [MONO_MAX_SRC_REGS];
                                int num_sregs, i;
@@ -1197,9 +1197,11 @@ mono_decompose_vtype_opts (MonoCompile *cfg)
         * Create a dummy bblock and emit code into it so we can use the normal 
         * code generation macros.
         */
-       cfg->cbb = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoBasicBlock));
+       cfg->cbb = (MonoBasicBlock *)mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoBasicBlock));
        first_bb = cfg->cbb;
 
+       /* For LLVM, decompose only the OP_STOREV_MEMBASE opcodes, which need write barriers and the gsharedvt opcodes */
+
        for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
                MonoInst *ins;
                MonoInst *prev = NULL;
@@ -1218,11 +1220,12 @@ mono_decompose_vtype_opts (MonoCompile *cfg)
                        for (ins = bb->code; ins; ins = ins->next) {
                                switch (ins->opcode) {
                                case OP_VMOVE: {
+                                       g_assert (ins->klass);
+                                       if (COMPILE_LLVM (cfg) && !mini_is_gsharedvt_klass (ins->klass))
+                                               break;
                                        src_var = get_vreg_to_inst (cfg, ins->sreg1);
                                        dest_var = get_vreg_to_inst (cfg, ins->dreg);
 
-                                       g_assert (ins->klass);
-
                                        if (!src_var)
                                                src_var = mono_compile_create_var_for_vreg (cfg, &ins->klass->byval_arg, OP_LOCAL, ins->dreg);
 
@@ -1240,6 +1243,9 @@ mono_decompose_vtype_opts (MonoCompile *cfg)
                                        break;
                                }
                                case OP_VZERO:
+                                       if (COMPILE_LLVM (cfg))
+                                               break;
+
                                        g_assert (ins->klass);
 
                                        EMIT_NEW_VARLOADA_VREG (cfg, dest, ins->dreg, &ins->klass->byval_arg);
@@ -1258,6 +1264,9 @@ mono_decompose_vtype_opts (MonoCompile *cfg)
                                        }
                                        break;
                                case OP_DUMMY_VZERO:
+                                       if (COMPILE_LLVM (cfg))
+                                               break;
+
                                        NULLIFY_INS (ins);
                                        break;
                                case OP_STOREV_MEMBASE: {
@@ -1277,6 +1286,8 @@ mono_decompose_vtype_opts (MonoCompile *cfg)
                                }
                                case OP_LOADV_MEMBASE: {
                                        g_assert (ins->klass);
+                                       if (COMPILE_LLVM (cfg) && !mini_is_gsharedvt_klass (ins->klass))
+                                               break;
 
                                        dest_var = get_vreg_to_inst (cfg, ins->dreg);
                                        // FIXME-VT:
@@ -1291,6 +1302,9 @@ mono_decompose_vtype_opts (MonoCompile *cfg)
                                        break;
                                }
                                case OP_OUTARG_VT: {
+                                       if (COMPILE_LLVM (cfg))
+                                               break;
+
                                        g_assert (ins->klass);
 
                                        src_var = get_vreg_to_inst (cfg, ins->sreg1);
@@ -1307,6 +1321,9 @@ mono_decompose_vtype_opts (MonoCompile *cfg)
                                case OP_OUTARG_VTRETADDR: {
                                        MonoCallInst *call = (MonoCallInst*)ins->inst_p1;
 
+                                       if (COMPILE_LLVM (cfg))
+                                               break;
+
                                        src_var = get_vreg_to_inst (cfg, call->inst.dreg);
                                        if (!src_var)
                                                src_var = mono_compile_create_var_for_vreg (cfg, call->signature->ret, OP_LOCAL, call->inst.dreg);
@@ -1322,6 +1339,9 @@ mono_decompose_vtype_opts (MonoCompile *cfg)
                                        MonoCallInst *call = (MonoCallInst*)ins;
                                        int size;
 
+                                       if (COMPILE_LLVM (cfg))
+                                               break;
+
                                        if (call->vret_in_reg) {
                                                MonoCallInst *call2;
 
@@ -1442,71 +1462,6 @@ mono_decompose_vtype_opts (MonoCompile *cfg)
        }
 }
 
-void
-mono_decompose_vtype_opts_llvm (MonoCompile *cfg)
-{
-       MonoBasicBlock *bb, *first_bb;
-
-       /* Decompose only the OP_STOREV_MEMBASE opcodes, which need write barriers */
-
-       cfg->cbb = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoBasicBlock));
-       first_bb = cfg->cbb;
-
-       for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
-               MonoInst *ins;
-               MonoInst *prev = NULL;
-               MonoInst *src_var, *src, *dest;
-               gboolean restart;
-               int dreg;
-
-               if (cfg->verbose_level > 2) mono_print_bb (bb, "BEFORE LOWER-VTYPE-OPTS(LLVM) ");
-
-               cfg->cbb->code = cfg->cbb->last_ins = NULL;
-               restart = TRUE;
-
-               while (restart) {
-                       restart = FALSE;
-
-                       for (ins = bb->code; ins; ins = ins->next) {
-                               switch (ins->opcode) {
-                               case OP_STOREV_MEMBASE: {
-                                       src_var = get_vreg_to_inst (cfg, ins->sreg1);
-
-                                       if (!src_var) {
-                                               g_assert (ins->klass);
-                                               src_var = mono_compile_create_var_for_vreg (cfg, &ins->klass->byval_arg, OP_LOCAL, ins->sreg1);
-                                       }
-
-                                       EMIT_NEW_VARLOADA_VREG ((cfg), (src), ins->sreg1, &ins->klass->byval_arg);
-
-                                       dreg = alloc_preg (cfg);
-                                       EMIT_NEW_BIALU_IMM (cfg, dest, OP_ADD_IMM, dreg, ins->inst_destbasereg, ins->inst_offset);
-                                       mini_emit_stobj (cfg, dest, src, src_var->klass, src_var->backend.is_pinvoke);
-                                       break;
-                               }
-                               default:
-                                       break;
-                               }
-
-                               g_assert (cfg->cbb == first_bb);
-
-                               if (cfg->cbb->code || (cfg->cbb != first_bb)) {
-                                       /* Replace the original instruction with the new code sequence */
-
-                                       mono_replace_ins (cfg, bb, ins, &prev, first_bb, cfg->cbb);
-                                       first_bb->code = first_bb->last_ins = NULL;
-                                       first_bb->in_count = first_bb->out_count = 0;
-                                       cfg->cbb = first_bb;
-                               }
-                               else
-                                       prev = ins;
-                       }
-               }
-
-               if (cfg->verbose_level > 2) mono_print_bb (bb, "AFTER LOWER-VTYPE-OPTS(LLVM) ");
-       }
-}
-
 inline static MonoInst *
 mono_get_domainvar (MonoCompile *cfg)
 {
@@ -1534,7 +1489,7 @@ mono_decompose_array_access_opts (MonoCompile *cfg)
         * Create a dummy bblock and emit code into it so we can use the normal 
         * code generation macros.
         */
-       cfg->cbb = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoBasicBlock));
+       cfg->cbb = (MonoBasicBlock *)mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoBasicBlock));
        first_bb = cfg->cbb;
 
        for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {

diff --git a/mono/mini/dominators.c b/mono/mini/dominators.c
index b9437db9be4aea35c456101921a911d5c6529e29..ab3ba6333cce8f5c11d47acd8c0b7759ce421275 100644 (file)
--- a/mono/mini/dominators.c
+++ b/mono/mini/dominators.c
@@ -117,7 +117,7 @@ compute_dominators (MonoCompile *cfg)
                MonoBitSet *dominators;
                char *mem;
 
-               mem = mono_mempool_alloc0 (cfg->mempool, bitsize);
+               mem = (char *)mono_mempool_alloc0 (cfg->mempool, bitsize);
 
                bb->dominators = dominators = mono_bitset_mem_new (mem, cfg->num_bblocks, 0);
                mem += bitsize;
@@ -199,7 +199,7 @@ compute_dominance_frontier (MonoCompile *cfg)
                cfg->bblocks [i]->flags &= ~BB_VISITED;
 
        bitsize = mono_bitset_alloc_size (cfg->num_bblocks, 0);
-       mem = mono_mempool_alloc0 (cfg->mempool, bitsize * cfg->num_bblocks);
+       mem = (char *)mono_mempool_alloc0 (cfg->mempool, bitsize * cfg->num_bblocks);
  
        for (i = 0; i < cfg->num_bblocks; ++i) {
                MonoBasicBlock *bb = cfg->bblocks [i];
@@ -332,7 +332,7 @@ mono_compute_natural_loops (MonoCompile *cfg)
                                        GList *l;
 
                                        for (l = h->loop_blocks; l; l = l->next) {
-                                               MonoBasicBlock *b = l->data;
+                                               MonoBasicBlock *b = (MonoBasicBlock *)l->data;
                                                if (b->dfn)
                                                        mono_bitset_set_fast (in_loop_blocks, b->dfn);
                                        }

diff --git a/mono/mini/driver.c b/mono/mini/driver.c
index ff482db7b5182da706ee7d2dd81e009bc22e5a44..7f35d2549db598803bb160b60caec732173b4e6b 100644 (file)
--- a/mono/mini/driver.c
+++ b/mono/mini/driver.c
@@ -60,6 +60,9 @@
 #include <locale.h>
 #include "version.h"
 #include "debugger-agent.h"
+#if TARGET_OSX
+#   include <sys/resource.h>
+#endif
 
 static FILE *mini_stats_fd;
 
@@ -392,7 +395,7 @@ mini_regression_step (MonoImage *image, int verbose, int *total_run, int *total,
                                if (verbose >= 2)
                                        g_print ("Running '%s' ...\n", method->name);
 #ifdef MONO_USE_AOT_COMPILER
-                               if ((func = mono_aot_get_method (mono_get_root_domain (), method)))
+                               if ((func = (TestMethod)mono_aot_get_method (mono_get_root_domain (), method)))
                                        ;
                                else
 #endif
@@ -497,7 +500,7 @@ mini_regression (MonoImage *image, int verbose, int *total_run)
                for (iter = mono_single_method_list; iter; iter = g_slist_next (iter)) {
                        char *method_name;
 
-                       mono_current_single_method = iter->data;
+                       mono_current_single_method = (MonoMethod *)iter->data;
 
                        method_name = mono_method_full_name (mono_current_single_method, TRUE);
                        g_print ("Current single method: %s\n", method_name);
@@ -934,7 +937,7 @@ compile_all_methods_thread_main_inner (CompileAllThreadArgs *args)
                        g_print ("Compiling %d %s\n", count, desc);
                        g_free (desc);
                }
-               cfg = mini_method_compile (method, mono_get_optimizations_for_method (method, args->opts), mono_get_root_domain (), 0, 0, -1);
+               cfg = mini_method_compile (method, mono_get_optimizations_for_method (method, args->opts), mono_get_root_domain (), (JitFlags)0, 0, -1);
                if (cfg->exception_type != MONO_EXCEPTION_NONE) {
                        printf ("Compilation of %s failed with exception '%s':\n", mono_method_full_name (cfg->method, TRUE), cfg->exception_message);
                        fail_count ++;
@@ -1017,7 +1020,7 @@ typedef struct
 
 static void main_thread_handler (gpointer user_data)
 {
-       MainThreadArgs *main_args = user_data;
+       MainThreadArgs *main_args = (MainThreadArgs *)user_data;
        MonoAssembly *assembly;
 
        if (mono_compile_aot) {
@@ -1079,7 +1082,7 @@ load_agent (MonoDomain *domain, char *desc)
        MonoImageOpenStatus open_status;
 
        if (col) {
-               agent = g_memdup (desc, col - desc + 1);
+               agent = (char *)g_memdup (desc, col - desc + 1);
                agent [col - desc] = '\0';
                args = col + 1;
        } else {
@@ -1257,9 +1260,9 @@ mini_debug_usage (void)
 }
 
 #if defined(MONO_ARCH_ARCHITECTURE)
-/* Redefine ARCHITECTURE to include more information */
-#undef ARCHITECTURE
-#define ARCHITECTURE MONO_ARCH_ARCHITECTURE
+/* Redefine MONO_ARCHITECTURE to include more information */
+#undef MONO_ARCHITECTURE
+#define MONO_ARCHITECTURE MONO_ARCH_ARCHITECTURE
 #endif
 
 static const char info[] =
@@ -1280,7 +1283,7 @@ static const char info[] =
 #else
     "\tNotification:  Thread + polling\n"
 #endif
-        "\tArchitecture:  " ARCHITECTURE "\n"
+        "\tArchitecture:  " MONO_ARCHITECTURE "\n"
        "\tDisabled:      " DISABLED_FEATURES "\n"
        "\tMisc:          "
 #ifdef MONO_SMALL_CONFIG
@@ -1435,7 +1438,7 @@ mono_set_use_smp (int use_smp)
 #ifdef GLIBC_BEFORE_2_3_4_SCHED_SETAFFINITY
                sched_setaffinity (getpid(), (gpointer)&proc_mask);
 #else
-               sched_setaffinity (getpid(), sizeof (unsigned long), (gpointer)&proc_mask);
+               sched_setaffinity (getpid(), sizeof (unsigned long), (const cpu_set_t *)&proc_mask);
 #endif
        }
 #endif
@@ -1470,14 +1473,30 @@ switch_gc (char* argv[], const char* target_gc)
 
 #ifdef TARGET_OSX
 
+/*
+ * tries to increase the minimum number of files, if the number is below 1024
+ */
+static void
+darwin_change_default_file_handles ()
+{
+       struct rlimit limit;
+       
+       if (getrlimit (RLIMIT_NOFILE, &limit) == 0){
+               if (limit.rlim_cur < 1024){
+                       limit.rlim_cur = MAX(1024,limit.rlim_cur);
+                       setrlimit (RLIMIT_NOFILE, &limit);
+               }
+       }
+}
+
 static void
 switch_arch (char* argv[], const char* target_arch)
 {
        GString *path;
        gsize arch_offset;
 
-       if ((strcmp (target_arch, "32") == 0 && strcmp (ARCHITECTURE, "x86") == 0) ||
-               (strcmp (target_arch, "64") == 0 && strcmp (ARCHITECTURE, "amd64") == 0)) {
+       if ((strcmp (target_arch, "32") == 0 && strcmp (MONO_ARCHITECTURE, "x86") == 0) ||
+               (strcmp (target_arch, "64") == 0 && strcmp (MONO_ARCHITECTURE, "amd64") == 0)) {
                return; /* matching arch loaded */
        }
 
@@ -1520,7 +1539,7 @@ mono_main (int argc, char* argv[])
        char *config_file = NULL;
        int i, count = 1;
        guint32 opt, action = DO_EXEC, recompilation_times = 1;
-       MonoGraphOptions mono_graph_options = 0;
+       MonoGraphOptions mono_graph_options = (MonoGraphOptions)0;
        int mini_verbose = 0;
        gboolean enable_profile = FALSE;
        char *trace_options = NULL;
@@ -1550,6 +1569,10 @@ mono_main (int argc, char* argv[])
 
        setlocale (LC_ALL, "");
 
+#if TARGET_OSX
+       darwin_change_default_file_handles ();
+#endif
+       
        if (g_getenv ("MONO_NO_SMP"))
                mono_set_use_smp (FALSE);
        
@@ -2113,10 +2136,10 @@ mono_main (int argc, char* argv[])
                        (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL)) {
                        MonoMethod *nm;
                        nm = mono_marshal_get_native_wrapper (method, TRUE, FALSE);
-                       cfg = mini_method_compile (nm, opt, mono_get_root_domain (), 0, part, -1);
+                       cfg = mini_method_compile (nm, opt, mono_get_root_domain (), (JitFlags)0, part, -1);
                }
                else
-                       cfg = mini_method_compile (method, opt, mono_get_root_domain (), 0, part, -1);
+                       cfg = mini_method_compile (method, opt, mono_get_root_domain (), (JitFlags)0, part, -1);
                if ((mono_graph_options & MONO_GRAPH_CFG_SSA) && !(cfg->comp_done & MONO_COMP_SSA)) {
                        g_warning ("no SSA info available (use -O=deadce)");
                        return 1;
@@ -2148,7 +2171,7 @@ mono_main (int argc, char* argv[])
                                opt = opt_sets [i];
                                g_timer_start (timer);
                                for (j = 0; j < count; ++j) {
-                                       cfg = mini_method_compile (method, opt, mono_get_root_domain (), 0, 0, -1);
+                                       cfg = mini_method_compile (method, opt, mono_get_root_domain (), (JitFlags)0, 0, -1);
                                        mono_destroy_compile (cfg);
                                }
                                g_timer_stop (timer);
@@ -2171,12 +2194,12 @@ mono_main (int argc, char* argv[])
                                        (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL))
                                        method = mono_marshal_get_native_wrapper (method, TRUE, FALSE);
 
-                               cfg = mini_method_compile (method, opt, mono_get_root_domain (), 0, 0, -1);
+                               cfg = mini_method_compile (method, opt, mono_get_root_domain (), (JitFlags)0, 0, -1);
                                mono_destroy_compile (cfg);
                        }
                }
        } else {
-               cfg = mini_method_compile (method, opt, mono_get_root_domain (), 0, 0, -1);
+               cfg = mini_method_compile (method, opt, mono_get_root_domain (), (JitFlags)0, 0, -1);
                mono_destroy_compile (cfg);
        }
 #endif
@@ -2290,8 +2313,11 @@ mono_set_crash_chaining (gboolean chain_crashes)
 }
 
 void
-mono_parse_env_options (int argc, char *argv [])
+mono_parse_env_options (int *ref_argc, char **ref_argv [])
 {
+       int argc = *ref_argc;
+       char **argv = *ref_argv;
+
        const char *env_options = g_getenv ("MONO_ENV_OPTIONS");
        if (env_options != NULL){
                GPtrArray *array = g_ptr_array_new ();
@@ -2354,14 +2380,14 @@ mono_parse_env_options (int argc, char *argv [])
                        
                        /* First the environment variable settings, to allow the command line options to override */
                        for (i = 0; i < array->len; i++)
-                               new_argv [i+1] = g_ptr_array_index (array, i);
+                               new_argv [i+1] = (char *)g_ptr_array_index (array, i);
                        i++;
                        for (j = 1; j < argc; j++)
                                new_argv [i++] = argv [j];
                        new_argv [i] = NULL;
 
-                       argc = new_argc;
-                       argv = new_argv;
+                       *ref_argc = new_argc;
+                       *ref_argv = new_argv;
                }
                g_ptr_array_free (array, TRUE);
        }

diff --git a/mono/mini/dwarfwriter.c b/mono/mini/dwarfwriter.c
index 090f29fb12e5641b4ef9c7068b3bafbfb8a9b8e0..771c1be1e7f993d2aeed58b0c645fe4b696a4746 100644 (file)
--- a/mono/mini/dwarfwriter.c
+++ b/mono/mini/dwarfwriter.c
@@ -223,6 +223,39 @@ emit_byte (MonoDwarfWriter *w, guint8 val)
        mono_img_writer_emit_byte (w->w, val); 
 }
 
+static void
+emit_escaped_string (MonoDwarfWriter *w, char *value)
+{
+       int i, len;
+
+       len = strlen (value);
+       for (i = 0; i < len; ++i) {
+               char c = value [i];
+               if (!(isalnum (c))) {
+                       switch (c) {
+                       case '_':
+                       case '-':
+                       case ':':
+                       case '.':
+                       case ',':
+                       case '/':
+                       case '<':
+                       case '>':
+                       case '`':
+                       case '(':
+                       case ')':
+                       case '[':
+                       case ']':
+                               break;
+                       default:
+                               value [i] = '_';
+                               break;
+                       }
+               }
+       }
+       mono_img_writer_emit_string (w->w, value);
+}
+
 static G_GNUC_UNUSED void
 emit_uleb128 (MonoDwarfWriter *w, guint32 value)
 {
@@ -678,7 +711,7 @@ mono_dwarf_escape_path (const char *name)
                int len, i, j;
 
                len = strlen (name);
-               s = g_malloc0 ((len + 1) * 2);
+               s = (char *)g_malloc0 ((len + 1) * 2);
                j = 0;
                for (i = 0; i < len; ++i) {
                        if (name [i] == '\\') {
@@ -708,7 +741,7 @@ emit_all_line_number_info (MonoDwarfWriter *w)
        /* Collect files */
        info_list = g_slist_reverse (w->line_info);
        for (l = info_list; l; l = l->next) {
-               MethodLineNumberInfo *info = l->data;
+               MethodLineNumberInfo *info = (MethodLineNumberInfo *)l->data;
                MonoDebugMethodInfo *minfo;
                GPtrArray *source_file_list;
 
@@ -719,7 +752,7 @@ emit_all_line_number_info (MonoDwarfWriter *w)
 
                mono_debug_get_seq_points (minfo, NULL, &source_file_list, NULL, NULL, NULL);
                for (i = 0; i < source_file_list->len; ++i) {
-                       MonoDebugSourceInfo *sinfo = g_ptr_array_index (source_file_list, i);
+                       MonoDebugSourceInfo *sinfo = (MonoDebugSourceInfo *)g_ptr_array_index (source_file_list, i);
                        add_line_number_file_name (w, sinfo->source_file, 0, 0);
                }
        }               
@@ -728,7 +761,7 @@ emit_all_line_number_info (MonoDwarfWriter *w)
        dir_to_index = g_hash_table_new (g_str_hash, g_str_equal);
        index_to_dir = g_hash_table_new (NULL, NULL);
        for (i = 0; i < w->line_number_file_index; ++i) {
-               char *name = g_hash_table_lookup (w->index_to_file, GUINT_TO_POINTER (i + 1));
+               char *name = (char *)g_hash_table_lookup (w->index_to_file, GUINT_TO_POINTER (i + 1));
                char *copy;
                int dir_index = 0;
 
@@ -778,7 +811,7 @@ emit_all_line_number_info (MonoDwarfWriter *w)
        /* Includes */
        emit_section_change (w, ".debug_line", 0);
        for (i = 0; i < w->line_number_dir_index; ++i) {
-               char *dir = g_hash_table_lookup (index_to_dir, GUINT_TO_POINTER (i + 1));
+               char *dir = (char *)g_hash_table_lookup (index_to_dir, GUINT_TO_POINTER (i + 1));
 
                emit_string (w, mono_dwarf_escape_path (dir));
        }
@@ -787,7 +820,7 @@ emit_all_line_number_info (MonoDwarfWriter *w)
 
        /* Files */
        for (i = 0; i < w->line_number_file_index; ++i) {
-               char *name = g_hash_table_lookup (w->index_to_file, GUINT_TO_POINTER (i + 1));
+               char *name = (char *)g_hash_table_lookup (w->index_to_file, GUINT_TO_POINTER (i + 1));
                char *basename = NULL, *dir;
                int dir_index = 0;
 
@@ -814,7 +847,7 @@ emit_all_line_number_info (MonoDwarfWriter *w)
 
        /* Emit line number table */
        for (l = info_list; l; l = l->next) {
-               MethodLineNumberInfo *info = l->data;
+               MethodLineNumberInfo *info = (MethodLineNumberInfo *)l->data;
                MonoDebugMethodJitInfo *dmji;
 
                dmji = mono_debug_find_method (info->method, mono_domain_get ());
@@ -978,7 +1011,7 @@ get_class_die (MonoDwarfWriter *w, MonoClass *klass, gboolean vtype)
        else
                cache = w->class_to_die;
 
-       return g_hash_table_lookup (cache, klass);
+       return (const char *)g_hash_table_lookup (cache, klass);
 }
 
 /* Returns the local symbol pointing to the emitted debug info */
@@ -999,7 +1032,7 @@ emit_class_dwarf_info (MonoDwarfWriter *w, MonoClass *klass, gboolean vtype)
        else
                cache = w->class_to_die;
 
-       die = g_hash_table_lookup (cache, klass);
+       die = (char *)g_hash_table_lookup (cache, klass);
        if (die)
                return die;
 
@@ -1206,7 +1239,7 @@ get_type_die (MonoDwarfWriter *w, MonoType *t)
 
        if (t->byref) {
                if (t->type == MONO_TYPE_VALUETYPE) {
-                       tdie = g_hash_table_lookup (w->class_to_pointer_die, klass);
+                       tdie = (const char *)g_hash_table_lookup (w->class_to_pointer_die, klass);
                }
                else {
                        tdie = get_class_die (w, klass, FALSE);
@@ -1223,7 +1256,7 @@ get_type_die (MonoDwarfWriter *w, MonoType *t)
        } else {
                switch (t->type) {
                case MONO_TYPE_CLASS:
-                       tdie = g_hash_table_lookup (w->class_to_reference_die, klass);
+                       tdie = (const char *)g_hash_table_lookup (w->class_to_reference_die, klass);
                        //tdie = ".LDIE_OBJECT";
                        break;
                case MONO_TYPE_ARRAY:
@@ -1237,7 +1270,7 @@ get_type_die (MonoDwarfWriter *w, MonoType *t)
                        break;
                case MONO_TYPE_GENERICINST:
                        if (!MONO_TYPE_ISSTRUCT (t)) {
-                               tdie = g_hash_table_lookup (w->class_to_reference_die, klass);
+                               tdie = (const char *)g_hash_table_lookup (w->class_to_reference_die, klass);
                        } else {
                                tdie = ".LDIE_I4";
                        }
@@ -1386,7 +1419,7 @@ token_handler (MonoDisHelper *dh, MonoMethod *method, guint32 token)
        case CEE_CASTCLASS:
        case CEE_LDELEMA:
                if (method->wrapper_type) {
-                       klass = data;
+                       klass = (MonoClass *)data;
                } else {
                        klass = mono_class_get_checked (method->klass->image, token, &error);
                        g_assert (mono_error_ok (&error)); /* FIXME error handling */
@@ -1397,7 +1430,7 @@ token_handler (MonoDisHelper *dh, MonoMethod *method, guint32 token)
        case CEE_CALL:
        case CEE_CALLVIRT:
                if (method->wrapper_type)
-                       cmethod = data;
+                       cmethod = (MonoMethod *)data;
                else
                        cmethod = mono_get_method_full (method->klass->image, token, NULL, NULL);
                desc = mono_method_full_name (cmethod, TRUE);
@@ -1406,7 +1439,7 @@ token_handler (MonoDisHelper *dh, MonoMethod *method, guint32 token)
                break;
        case CEE_CALLI:
                if (method->wrapper_type) {
-                       desc = mono_signature_get_desc (data, FALSE);
+                       desc = mono_signature_get_desc ((MonoMethodSignature *)data, FALSE);
                        res = g_strdup_printf ("<%s>", desc);
                        g_free (desc);
                } else {
@@ -1418,7 +1451,7 @@ token_handler (MonoDisHelper *dh, MonoMethod *method, guint32 token)
        case CEE_STFLD:
        case CEE_STSFLD:
                if (method->wrapper_type) {
-                       field = data;
+                       field = (MonoClassField *)data;
                } else {
                        field = mono_field_from_token_checked (method->klass->image, token, &klass, NULL,  &error);
                        g_assert (mono_error_ok (&error)); /* FIXME error handling */
@@ -1587,7 +1620,7 @@ emit_line_number_info (MonoDwarfWriter *w, MonoMethod *method,
        ln_array = g_new0 (MonoDebugLineNumberEntry, debug_info->num_line_numbers);
        memcpy (ln_array, debug_info->line_numbers, debug_info->num_line_numbers * sizeof (MonoDebugLineNumberEntry));
 
-       qsort (ln_array, debug_info->num_line_numbers, sizeof (MonoDebugLineNumberEntry), (gpointer)compare_lne);
+       qsort (ln_array, debug_info->num_line_numbers, sizeof (MonoDebugLineNumberEntry), (int (*)(const void *, const void *))compare_lne);
 
        native_to_il_offset = g_new0 (int, code_size + 1);
 
@@ -1870,7 +1903,7 @@ mono_dwarf_writer_emit_method (MonoDwarfWriter *w, MonoCompile *cfg, MonoMethod
        emit_uleb128 (w, ABBREV_SUBPROGRAM);
        /* DW_AT_name */
        name = mono_method_full_name (method, FALSE);
-       emit_string (w, name);
+       emit_escaped_string (w, name);
        /* DW_AT_MIPS_linkage_name */
        if (linkage_name)
                emit_string (w, linkage_name);

diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c
index ca3b19bfb0a2495050561f1bb5c8c073be3f943e..3f039f74b3e71ad570f7b0cbe5df185b6329566f 100644 (file)
--- a/mono/mini/exceptions-amd64.c
+++ b/mono/mini/exceptions-amd64.c
@@ -167,7 +167,7 @@ mono_arch_get_restore_context (MonoTrampInfo **info, gboolean aot)
 
        /* restore_contect (MonoContext *ctx) */
 
-       start = code = mono_global_codeman_reserve (256);
+       start = code = (guint8 *)mono_global_codeman_reserve (256);
 
        amd64_mov_reg_reg (code, AMD64_R11, AMD64_ARG_REG1, 8);
 
@@ -226,7 +226,7 @@ mono_arch_get_call_filter (MonoTrampInfo **info, gboolean aot)
        GSList *unwind_ops = NULL;
        const guint kMaxCodeSize = NACL_SIZE (128, 256);
 
-       start = code = mono_global_codeman_reserve (kMaxCodeSize);
+       start = code = (guint8 *)mono_global_codeman_reserve (kMaxCodeSize);
 
        /* call_filter (MonoContext *ctx, unsigned long eip) */
        code = start;
@@ -381,7 +381,7 @@ get_throw_trampoline (MonoTrampInfo **info, gboolean rethrow, gboolean corlib, g
        dummy_stack_space = 0;
 #endif
 
-       start = code = mono_global_codeman_reserve (kMaxCodeSize);
+       start = code = (guint8 *)mono_global_codeman_reserve (kMaxCodeSize);
 
        /* The stack is unaligned on entry */
        stack_size = ALIGN_TO (sizeof (MonoContext) + 64 + dummy_stack_space, MONO_ARCH_FRAME_ALIGNMENT) + 8;
@@ -561,9 +561,9 @@ mono_arch_unwind_frame (MonoDomain *domain, MonoJitTlsData *jit_tls,
                for (i = 0; i < AMD64_NREG; ++i)
                        regs [i] = new_ctx->gregs [i];
 
-               mono_unwind_frame (unwind_info, unwind_info_len, ji->code_start, 
+               mono_unwind_frame (unwind_info, unwind_info_len, (guint8 *)ji->code_start,
                                                   (guint8*)ji->code_start + ji->code_size,
-                                                  ip, epilog ? &epilog : NULL, regs, MONO_MAX_IREGS + 1,
+                                                  (guint8 *)ip, epilog ? &epilog : NULL, regs, MONO_MAX_IREGS + 1,
                                                   save_locations, MONO_MAX_IREGS, &cfa);
 
                for (i = 0; i < AMD64_NREG; ++i)
@@ -590,7 +590,7 @@ mono_arch_unwind_frame (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
                        memcpy (new_ctx, &ext->ctx, sizeof (MonoContext));
 
-                       *lmf = (gpointer)(((guint64)(*lmf)->previous_lmf) & ~7);
+                       *lmf = (MonoLMF *)(((guint64)(*lmf)->previous_lmf) & ~7);
 
                        frame->type = FRAME_TYPE_DEBUGGER_INVOKE;
 
@@ -615,7 +615,7 @@ mono_arch_unwind_frame (MonoDomain *domain, MonoJitTlsData *jit_tls,
                        rip = *(guint64*)((*lmf)->rsp - sizeof(mgreg_t));
                }
 
-               ji = mini_jit_info_table_find (domain, (gpointer)rip, NULL);
+               ji = mini_jit_info_table_find (domain, (char *)rip, NULL);
                /*
                 * FIXME: ji == NULL can happen when a managed-to-native wrapper is interrupted
                 * in the soft debugger suspend code, since (*lmf)->rsp no longer points to the
@@ -652,7 +652,7 @@ mono_arch_unwind_frame (MonoDomain *domain, MonoJitTlsData *jit_tls,
                        }
                }
 
-               *lmf = (gpointer)(((guint64)(*lmf)->previous_lmf) & ~7);
+               *lmf = (MonoLMF *)(((guint64)(*lmf)->previous_lmf) & ~7);
 
                return TRUE;
        }
@@ -668,12 +668,12 @@ mono_arch_unwind_frame (MonoDomain *domain, MonoJitTlsData *jit_tls,
 static void
 handle_signal_exception (gpointer obj)
 {
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        MonoContext ctx;
 
        memcpy (&ctx, &jit_tls->ex_ctx, sizeof (MonoContext));
 
-       mono_handle_exception (&ctx, obj);
+       mono_handle_exception (&ctx, (MonoObject *)obj);
 
        mono_restore_context (&ctx);
 }
@@ -715,7 +715,7 @@ mono_arch_handle_exception (void *sigctx, gpointer obj)
         * signal is disabled, and we could run arbitrary code though the debugger. So
         * resume into the normal stack and do most work there if possible.
         */
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
 
        /* Pass the ctx parameter in TLS */
        mono_sigctx_to_monoctx (sigctx, &jit_tls->ex_ctx);
@@ -756,7 +756,7 @@ mono_arch_ip_from_context (void *sigctx)
 static void
 restore_soft_guard_pages (void)
 {
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        if (jit_tls->stack_ovf_guard_base)
                mono_mprotect (jit_tls->stack_ovf_guard_base, jit_tls->stack_ovf_guard_size, MONO_MMAP_NONE);
 }
@@ -771,7 +771,7 @@ static void
 prepare_for_guard_pages (MonoContext *mctx)
 {
        gpointer *sp;
-       sp = (gpointer)(mctx->gregs [AMD64_RSP]);
+       sp = (gpointer *)(mctx->gregs [AMD64_RSP]);
        sp -= 1;
        /* the return addr */
        sp [0] = (gpointer)(mctx->gregs [AMD64_RIP]);
@@ -780,7 +780,7 @@ prepare_for_guard_pages (MonoContext *mctx)
 }
 
 static void
-altstack_handle_and_restore (MonoContext *ctx, gpointer obj, gboolean stack_ovf)
+altstack_handle_and_restore (MonoContext *ctx, MonoObject *obj, gboolean stack_ovf)
 {
        MonoContext mctx;
 
@@ -797,7 +797,7 @@ mono_arch_handle_altstack_exception (void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *s
 {
 #if defined(MONO_ARCH_USE_SIGACTION)
        MonoException *exc = NULL;
-       MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), (gpointer)UCONTEXT_REG_RIP (sigctx), NULL);
+       MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), (char *)UCONTEXT_REG_RIP (sigctx), NULL);
        gpointer *sp;
        int frame_size;
        MonoContext *copied_ctx;
@@ -818,8 +818,8 @@ mono_arch_handle_altstack_exception (void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *s
        frame_size = sizeof (MonoContext) + sizeof (gpointer) * 4 + 128;
        frame_size += 15;
        frame_size &= ~15;
-       sp = (gpointer)(UCONTEXT_REG_RSP (sigctx) & ~15);
-       sp = (gpointer)((char*)sp - frame_size);
+       sp = (gpointer *)(UCONTEXT_REG_RSP (sigctx) & ~15);
+       sp = (gpointer *)((char*)sp - frame_size);
        copied_ctx = (MonoContext*)(sp + 4);
        /* the arguments must be aligned */
        sp [-1] = (gpointer)UCONTEXT_REG_RIP (sigctx);
@@ -882,7 +882,7 @@ mono_arch_exceptions_init (void)
                /* Call this to avoid initialization races */
                tramps = mono_amd64_get_exception_trampolines (FALSE);
                for (l = tramps; l; l = l->next) {
-                       MonoTrampInfo *info = l->data;
+                       MonoTrampInfo *info = (MonoTrampInfo *)l->data;
 
                        mono_register_jit_icall (info->code, g_strdup (info->name), NULL, TRUE);
                        mono_tramp_info_register (info, NULL);
@@ -1145,7 +1145,7 @@ mono_tasklets_arch_restore (void)
 
        if (saved)
                return (MonoContinuationRestore)saved;
-       code = start = mono_global_codeman_reserve (kMaxCodeSize);
+       code = start = (guint8 *)mono_global_codeman_reserve (kMaxCodeSize);
        /* the signature is: restore (MonoContinuation *cont, int state, MonoLMF **lmf_addr) */
        /* cont is in AMD64_ARG_REG1 ($rcx or $rdi)
         * state is in AMD64_ARG_REG2 ($rdx or $rsi)

diff --git a/mono/mini/exceptions.cs b/mono/mini/exceptions.cs
index 0148488dee3a3ab0ca92865eaf656c14f4a0fb93..e84abc68b019d0994e72115d53373ee2097a8f99 100644 (file)
--- a/mono/mini/exceptions.cs
+++ b/mono/mini/exceptions.cs
@@ -2816,6 +2816,34 @@ class Tests
                }
                return finally_called ? 0 : 1;
        }
+
+       static int array_len_1 = 1;
+
+       public static int test_0_bounds_check_negative_constant () {
+               try {
+                       byte[] arr = new byte [array_len_1];
+                       byte b = arr [-1];
+                       return 1;
+               } catch {
+               }
+               try {
+                       byte[] arr = new byte [array_len_1];
+                       arr [-1] = 1;
+                       return 2;
+               } catch {
+               }
+               return 0;
+       }
+
+       public static int test_0_string_bounds_check_negative_constant () {
+               try {
+                       string s = "A";
+                       char c = s [-1];
+                       return 1;
+               } catch {
+               }
+               return 0;
+       }
 }
 
 #if !__MOBILE__

diff --git a/mono/mini/genmdesc.c b/mono/mini/genmdesc.c
index 0cd3f3b5c815699c87ccd4a2beb6e9e55f633102..b996f8f83b55a07a401a31409d4f5c437228d43c 100644 (file)
--- a/mono/mini/genmdesc.c
+++ b/mono/mini/genmdesc.c
@@ -99,7 +99,7 @@ load_file (const char *name) {
                        is_template = TRUE;
                        desc = g_new0 (OpDesc, 1);
                } else {
-                       desc = g_hash_table_lookup (table, str);
+                       desc = (OpDesc *)g_hash_table_lookup (table, str);
                        if (!desc)
                                g_error ("Invalid opcode '%s' at line %d in %s\n", str, line, name);
                        if (desc->desc)
@@ -165,7 +165,7 @@ load_file (const char *name) {
                                tname = p;
                                while (*p && isalnum (*p)) ++p;
                                *p++ = 0;
-                               tdesc = g_hash_table_lookup (template_table, tname);
+                               tdesc = (OpDesc *)g_hash_table_lookup (template_table, tname);
                                if (!tdesc)
                                        g_error ("Invalid template name %s at '%s' at line %d in %s\n", tname, p, line, name);
                                for (i = 0; i < MONO_INST_MAX; ++i) {

diff --git a/mono/mini/graph.c b/mono/mini/graph.c
index fed9002320487da1e5088867e4905881ca99a3f9..08d2891f87c239c138f3d1e48284f3f8c8399aef 100644 (file)
--- a/mono/mini/graph.c
+++ b/mono/mini/graph.c
@@ -20,7 +20,7 @@ static char *
 convert_name (const char *str)
 {
        int i, j, len = strlen (str);
-       char *res = g_malloc (len * 2);
+       char *res = (char *)g_malloc (len * 2);
 
        j = 0;
        for (i = 0; i < len; i++) {

diff --git a/mono/mini/gshared.cs b/mono/mini/gshared.cs
index c4c6a1ff19654120bb1f9d2c669758082f64eb56..48a3e4416315c97845cd8008ec433f47f67f3979 100644 (file)
--- a/mono/mini/gshared.cs
+++ b/mono/mini/gshared.cs
@@ -1718,6 +1718,33 @@ public class Tests
                        return 2;
                return 0;
        }
+
+       public interface IFaceTest {
+               int iface_method ();
+       }
+
+       public interface IFaceConstrainedIFace {
+               int foo<T, T2> (ref T val) where T: IFaceTest;
+       }
+
+       class ConstrainedIFace : IFaceConstrainedIFace {
+               public int foo<T, T2> (ref T val) where T: IFaceTest {
+                       return val.iface_method ();
+               }
+       }
+
+       class ClassTest : IFaceTest {
+               public int iface_method () {
+                       return 42;
+               }
+       }
+
+       // Test constrained calls on an interface made from gsharedvt methods
+       public static int test_42_gsharedvt_constrained_iface () {
+               IFaceConstrainedIFace obj = new ConstrainedIFace ();
+               IFaceTest t = new ClassTest ();
+               return obj.foo<IFaceTest, int> (ref t);
+       }
 }
 
 // #13191

diff --git a/mono/mini/image-writer.c b/mono/mini/image-writer.c
index 0a74bfb4ff875eca13a397a825b55ff506582437..c216f3b25755f4231091b096a4f506990e4a8d2f 100644 (file)
--- a/mono/mini/image-writer.c
+++ b/mono/mini/image-writer.c
@@ -324,7 +324,7 @@ bin_writer_emit_ensure_buffer (BinSection *section, int size)
                guint8 *data;
                while (new_size <= new_offset)
                        new_size *= 2;
-               data = g_malloc0 (new_size);
+               data = (guint8 *)g_malloc0 (new_size);
 #ifdef __native_client_codegen__
                /* for Native Client, fill empty space with HLT instruction */
                /* instead of 00.                                           */
@@ -448,7 +448,7 @@ static BinReloc*
 create_reloc (MonoImageWriter *acfg, const char *end, const char* start, int offset)
 {
        BinReloc *reloc;
-       reloc = mono_mempool_alloc0 (acfg->mempool, sizeof (BinReloc));
+       reloc = (BinReloc *)mono_mempool_alloc0 (acfg->mempool, sizeof (BinReloc));
        reloc->val1 = mono_mempool_strdup (acfg->mempool, end);
        if (strcmp (start, ".") == 0) {
                reloc->val2_section = acfg->cur_section;
@@ -899,7 +899,7 @@ get_label_addr (MonoImageWriter *acfg, const char *name)
        BinSection *section;
        gsize value;
 
-       lab = g_hash_table_lookup (acfg->labels, name);
+       lab = (BinLabel *)g_hash_table_lookup (acfg->labels, name);
        if (!lab)
                g_error ("Undefined label: '%s'.\n", name);
        section = lab->section;
@@ -982,7 +982,7 @@ collect_syms (MonoImageWriter *acfg, int *hash, ElfStrTable *strtab, ElfSectHead
                /*g_print ("sym name %s tabled to %d\n", symbol->name, symbols [i].st_name);*/
                section = symbol->section;
                symbols [i].st_shndx = section->parent? section->parent->shidx: section->shidx;
-               lab = g_hash_table_lookup (acfg->labels, symbol->name);
+               lab = (BinLabel *)g_hash_table_lookup (acfg->labels, symbol->name);
                offset = lab->offset;
                if (section->parent) {
                        symbols [i].st_value = section->parent->virt_offset + section->cur_offset + offset;
@@ -991,7 +991,7 @@ collect_syms (MonoImageWriter *acfg, int *hash, ElfStrTable *strtab, ElfSectHead
                }
 
                if (symbol->end_label) {
-                       BinLabel *elab = g_hash_table_lookup (acfg->labels, symbol->end_label);
+                       BinLabel *elab = (BinLabel *)g_hash_table_lookup (acfg->labels, symbol->end_label);
                        g_assert (elab);
                        symbols [i].st_size = elab->offset - lab->offset;
                }
@@ -1063,7 +1063,7 @@ reloc_symbols (MonoImageWriter *acfg, ElfSymbol *symbols, ElfSectHeader *sheader
                if (dynamic && !symbol->is_global)
                        continue;
                section = symbol->section;
-               lab = g_hash_table_lookup (acfg->labels, symbol->name);
+               lab = (BinLabel *)g_hash_table_lookup (acfg->labels, symbol->name);
                offset = lab->offset;
                if (section->parent) {
                        symbols [i].st_value = sheaders [section->parent->shidx].sh_addr + section->cur_offset + offset;
@@ -1615,7 +1615,7 @@ bin_writer_emit_writeout (MonoImageWriter *acfg)
 
        if (!acfg->fp) {
                acfg->out_buf_size = file_offset + sizeof (secth);
-               acfg->out_buf = g_malloc (acfg->out_buf_size);
+               acfg->out_buf = (guint8 *)g_malloc (acfg->out_buf_size);
        }
 
        bin_writer_fwrite (acfg, &header, sizeof (header), 1);

diff --git a/mono/mini/ir-emit.h b/mono/mini/ir-emit.h
index 59654ee902875458b9aa814f6dc22c194f449b49..b9ed1784a5643c47f95c11fb39edaf9e0699cfe6 100644 (file)
--- a/mono/mini/ir-emit.h
+++ b/mono/mini/ir-emit.h
@@ -106,7 +106,7 @@ alloc_dreg (MonoCompile *cfg, MonoStackType stack_type)
  * JIT code still uses the left and right fields, so it has to stay.
  */
 #define MONO_INST_NEW(cfg,dest,op) do {        \
-               (dest) = mono_mempool_alloc ((cfg)->mempool, sizeof (MonoInst));        \
+               (dest) = (MonoInst *)mono_mempool_alloc ((cfg)->mempool, sizeof (MonoInst));    \
                (dest)->inst_c0 = (dest)->inst_c1 = 0; \
                (dest)->next = (dest)->prev = NULL;    \
                (dest)->opcode = (op);  \
@@ -230,7 +230,7 @@ alloc_dreg (MonoCompile *cfg, MonoStackType stack_type)
 #define NEW_AOTCONST(cfg,dest,patch_type,cons) do {    \
         MONO_INST_NEW ((cfg), (dest), cfg->compile_aot ? OP_AOTCONST : OP_PCONST); \
                (dest)->inst_p0 = (cons);       \
-               (dest)->inst_i1 = (gpointer)(patch_type); \
+               (dest)->inst_i1 = (MonoInst *)(patch_type); \
                (dest)->type = STACK_PTR;       \
                (dest)->dreg = alloc_dreg ((cfg), STACK_PTR);   \
     } while (0)
@@ -311,7 +311,7 @@ alloc_dreg (MonoCompile *cfg, MonoStackType stack_type)
                type_to_eval_stack_type ((cfg), (vartype), (dest));     \
                (dest)->klass = var->klass;     \
                (dest)->sreg1 = var->dreg;   \
-        (dest)->dreg = alloc_dreg ((cfg), (dest)->type); \
+        (dest)->dreg = alloc_dreg ((cfg), (MonoStackType)(dest)->type); \
         if ((dest)->opcode == OP_VMOVE) (dest)->klass = mono_class_from_mono_type ((vartype)); \
        } while (0)
 
@@ -373,7 +373,7 @@ handle_gsharedvt_ldaddr (MonoCompile *cfg)
         (dest)->type = STACK_MP; \
            (dest)->klass = cfg->ret->klass;    \
            (dest)->sreg1 = cfg->vret_addr->dreg;   \
-        (dest)->dreg = alloc_dreg ((cfg), (dest)->type); \
+        (dest)->dreg = alloc_dreg ((cfg), (MonoStackType)(dest)->type); \
        } while (0)
 
 #define NEW_ARGLOADA(cfg,dest,num) NEW_VARLOADA ((cfg), (dest), arg_array [(num)], param_types [(num)])
@@ -395,7 +395,7 @@ handle_gsharedvt_ldaddr (MonoCompile *cfg)
 #define NEW_LOAD_MEMBASE_TYPE(cfg,dest,ltype,base,offset) do { \
            NEW_LOAD_MEMBASE ((cfg), (dest), mono_type_to_load_membase ((cfg), (ltype)), 0, (base), (offset)); \
            type_to_eval_stack_type ((cfg), (ltype), (dest)); \
-           (dest)->dreg = alloc_dreg ((cfg), (dest)->type); \
+           (dest)->dreg = alloc_dreg ((cfg), (MonoStackType)(dest)->type); \
     } while (0)
 
 #define NEW_STORE_MEMBASE_TYPE(cfg,dest,ltype,base,offset,sr) do { \
@@ -743,7 +743,7 @@ handle_gsharedvt_ldaddr (MonoCompile *cfg)
  * block_num: unique ID assigned at bblock creation
  */
 #define NEW_BBLOCK(cfg,bblock) do { \
-       (bblock) = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoBasicBlock)); \
+       (bblock) = (MonoBasicBlock *)mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoBasicBlock)); \
        (bblock)->block_num = cfg->num_bblocks++; \
     } while (0)
 
@@ -796,7 +796,7 @@ static int ccount = 0;
             MONO_ADD_INS ((cfg)->cbb, ins); \
             MONO_START_BB ((cfg), falsebb); \
         } else { \
-                   ins->inst_many_bb = mono_mempool_alloc (cfg->mempool, sizeof(gpointer)*2);  \
+                   ins->inst_many_bb = (MonoBasicBlock **)mono_mempool_alloc (cfg->mempool, sizeof(gpointer)*2);       \
             ins->inst_true_bb = (truebb); \
             ins->inst_false_bb = NULL; \
             mono_link_bblock ((cfg), (cfg)->cbb, (truebb)); \
@@ -817,7 +817,7 @@ static int ccount = 0;
 #define        MONO_EMIT_NEW_BRANCH_BLOCK2(cfg,op,truebb,falsebb) do { \
         MonoInst *ins; \
         MONO_INST_NEW ((cfg), (ins), (op)); \
-               ins->inst_many_bb = mono_mempool_alloc (cfg->mempool, sizeof(gpointer)*2);      \
+               ins->inst_many_bb = (MonoBasicBlock **)mono_mempool_alloc (cfg->mempool, sizeof(gpointer)*2);   \
         ins->inst_true_bb = (truebb); \
         ins->inst_false_bb = (falsebb); \
         mono_link_bblock ((cfg), (cfg)->cbb, (truebb)); \

diff --git a/mono/mini/jit-icalls.c b/mono/mini/jit-icalls.c
index a5875f98883e3c60efd8990ff335712cdf425bbf..f5b4e4204fd0efc1ad3e00fbb6d133a9e1f1fec7 100644 (file)
--- a/mono/mini/jit-icalls.c
+++ b/mono/mini/jit-icalls.c
@@ -671,14 +671,14 @@ mono_array_new_va (MonoMethod *cm, ...)
 
        va_start (ap, cm);
        
-       lengths = alloca (sizeof (uintptr_t) * pcount);
+       lengths = (uintptr_t *)alloca (sizeof (uintptr_t) * pcount);
        for (i = 0; i < pcount; ++i)
                lengths [i] = d = va_arg(ap, int);
 
        if (rank == pcount) {
                /* Only lengths provided. */
                if (cm->klass->byval_arg.type == MONO_TYPE_ARRAY) {
-                       lower_bounds = alloca (sizeof (intptr_t) * rank);
+                       lower_bounds = (intptr_t *)alloca (sizeof (intptr_t) * rank);
                        memset (lower_bounds, 0, sizeof (intptr_t) * rank);
                } else {
                        lower_bounds = NULL;
@@ -712,7 +712,7 @@ mono_array_new_1 (MonoMethod *cm, guint32 length)
        g_assert (rank == pcount);
 
        if (cm->klass->byval_arg.type == MONO_TYPE_ARRAY) {
-               lower_bounds = alloca (sizeof (intptr_t) * rank);
+               lower_bounds = (intptr_t *)alloca (sizeof (intptr_t) * rank);
                memset (lower_bounds, 0, sizeof (intptr_t) * rank);
        } else {
                lower_bounds = NULL;
@@ -739,7 +739,7 @@ mono_array_new_2 (MonoMethod *cm, guint32 length1, guint32 length2)
        g_assert (rank == pcount);
 
        if (cm->klass->byval_arg.type == MONO_TYPE_ARRAY) {
-               lower_bounds = alloca (sizeof (intptr_t) * rank);
+               lower_bounds = (intptr_t *)alloca (sizeof (intptr_t) * rank);
                memset (lower_bounds, 0, sizeof (intptr_t) * rank);
        } else {
                lower_bounds = NULL;
@@ -767,7 +767,7 @@ mono_array_new_3 (MonoMethod *cm, guint32 length1, guint32 length2, guint32 leng
        g_assert (rank == pcount);
 
        if (cm->klass->byval_arg.type == MONO_TYPE_ARRAY) {
-               lower_bounds = alloca (sizeof (intptr_t) * rank);
+               lower_bounds = (intptr_t *)alloca (sizeof (intptr_t) * rank);
                memset (lower_bounds, 0, sizeof (intptr_t) * rank);
        } else {
                lower_bounds = NULL;
@@ -796,7 +796,7 @@ mono_array_new_4 (MonoMethod *cm, guint32 length1, guint32 length2, guint32 leng
        g_assert (rank == pcount);
 
        if (cm->klass->byval_arg.type == MONO_TYPE_ARRAY) {
-               lower_bounds = alloca (sizeof (intptr_t) * rank);
+               lower_bounds = (intptr_t *)alloca (sizeof (intptr_t) * rank);
                memset (lower_bounds, 0, sizeof (intptr_t) * rank);
        } else {
                lower_bounds = NULL;
@@ -1119,7 +1119,7 @@ mono_object_castclass_unbox (MonoObject *obj, MonoClass *klass)
        MonoClass *oklass;
 
        if (mini_get_debug_options ()->better_cast_details) {
-               jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+               jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
                jit_tls->class_cast_from = NULL;
        }
 
@@ -1150,7 +1150,7 @@ mono_object_castclass_with_cache (MonoObject *obj, MonoClass *klass, gpointer *c
        gpointer cached_vtable, obj_vtable;
 
        if (mini_get_debug_options ()->better_cast_details) {
-               jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+               jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
                jit_tls->class_cast_from = NULL;
        }
 
@@ -1223,11 +1223,16 @@ static MonoMethod*
 constrained_gsharedvt_call_setup (gpointer mp, MonoMethod *cmethod, MonoClass *klass, gpointer *this_arg)
 {
        MonoMethod *m;
-       int vt_slot;
+       int vt_slot, iface_offset;
 
        if (klass->flags & TYPE_ATTRIBUTE_INTERFACE) {
-               mono_set_pending_exception (mono_get_exception_execution_engine ("Not yet supported."));
-               return NULL;
+               MonoObject *this_obj;
+
+               /* Have to use the receiver's type instead of klass, the receiver is a ref type */
+               this_obj = *(MonoObject**)mp;
+               g_assert (this_obj);
+
+               klass = this_obj->vtable->klass;
        }
 
        if (mono_method_signature (cmethod)->pinvoke) {
@@ -1239,8 +1244,6 @@ constrained_gsharedvt_call_setup (gpointer mp, MonoMethod *cmethod, MonoClass *k
                g_assert (klass->vtable);
                vt_slot = mono_method_get_vtable_slot (cmethod);
                if (cmethod->klass->flags & TYPE_ATTRIBUTE_INTERFACE) {
-                       int iface_offset;
-
                        iface_offset = mono_class_interface_offset (klass, cmethod->klass);
                        g_assert (iface_offset != -1);
                        vt_slot += iface_offset;
@@ -1249,6 +1252,7 @@ constrained_gsharedvt_call_setup (gpointer mp, MonoMethod *cmethod, MonoClass *k
                if (cmethod->is_inflated)
                        m = mono_class_inflate_generic_method (m, mono_method_get_context (cmethod));
        }
+
        if (klass->valuetype && (m->klass == mono_defaults.object_class || m->klass == mono_defaults.enum_class->parent || m->klass == mono_defaults.enum_class))
                /*
                 * Calling a non-vtype method with a vtype receiver, has to box.
@@ -1384,7 +1388,7 @@ mono_resolve_iface_call (MonoObject *this_obj, int imt_slot, MonoMethod *imt_met
                /*
                 * The exact compiled method might not be shared so it doesn't have an rgctx arg.
                 */
-               ji = mini_jit_info_table_find (mono_domain_get (), compiled_method, NULL);
+               ji = mini_jit_info_table_find (mono_domain_get (), (char *)compiled_method, NULL);
                if (!ji || (ji && ji->has_generic_jit_info)) {
                        if (m->wrapper_type == MONO_WRAPPER_MANAGED_TO_MANAGED && m->klass->rank && strstr (m->name, "System.Collections.Generic"))
                                m = mono_aot_get_array_helper_from_wrapper (m);

diff --git a/mono/mini/jit-icalls.h b/mono/mini/jit-icalls.h
index 6368b8d5e3761b8856618862cce97a34e8ea8ae9..7c224995c2b5100b06f2291314ff8d239b424d37 100644 (file)
--- a/mono/mini/jit-icalls.h
+++ b/mono/mini/jit-icalls.h
@@ -195,9 +195,9 @@ gpointer mono_fill_class_rgctx (MonoVTable *vtable, int index);
 
 gpointer mono_fill_method_rgctx (MonoMethodRuntimeGenericContext *mrgctx, int index);
 
-gpointer mono_resolve_iface_call (MonoObject *this, int imt_slot, MonoMethod *imt_method, gpointer *out_rgctx_arg);
+gpointer mono_resolve_iface_call (MonoObject *this_obj, int imt_slot, MonoMethod *imt_method, gpointer *out_rgctx_arg);
 
-gpointer mono_resolve_vcall (MonoObject *this, int slot, MonoMethod *imt_method);
+gpointer mono_resolve_vcall (MonoObject *this_obj, int slot, MonoMethod *imt_method);
 
 void mono_init_delegate (MonoDelegate *del, MonoObject *target, MonoMethod *method);
 

diff --git a/mono/mini/linear-scan.c b/mono/mini/linear-scan.c
index d778ab5fc73f700a880ab4f65618a59172e62a66..6ee1e0ff7929ef8118525e4280d15b911eb029c9 100644 (file)
--- a/mono/mini/linear-scan.c
+++ b/mono/mini/linear-scan.c
@@ -23,7 +23,7 @@ mono_varlist_insert_sorted (MonoCompile *cfg, GList *list, MonoMethodVar *mv, in
                return g_list_prepend (NULL, mv);
 
        for (l = list; l; l = l->next) {
-               MonoMethodVar *v1 = l->data;
+               MonoMethodVar *v1 = (MonoMethodVar *)l->data;
                
                if (sort_type == 2) {
                        if (mv->spill_costs >= v1->spill_costs) {
@@ -108,7 +108,7 @@ mono_linear_scan (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_ma
 
        /* linear scan */
        for (l = vars; l; l = l->next) {
-               vmv = l->data;
+               vmv = (MonoMethodVar *)l->data;
 
 #ifdef DEBUG_LSCAN
                printf ("START  %2d %08x %08x\n",  vmv->idx, vmv->range.first_use.abs_pos, 
@@ -199,7 +199,7 @@ mono_linear_scan (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_ma
 
        n_regvars = 0;
        for (l = vars; l; l = l->next) {
-               vmv = l->data;
+               vmv = (MonoMethodVar *)l->data;
                
                if (vmv->reg >= 0)  {
                        if ((gains [vmv->reg] > mono_arch_regalloc_cost (cfg, vmv)) && (cfg->varinfo [vmv->idx]->opcode != OP_REGVAR)) {
@@ -227,7 +227,7 @@ mono_linear_scan (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_ma
        /* Compute used regs */
        used_regs = 0;
        for (l = vars; l; l = l->next) {
-               vmv = l->data;
+               vmv = (MonoMethodVar *)l->data;
                
                if (vmv->reg >= 0)
                        used_regs |= 1LL << vmv->reg;
@@ -288,7 +288,7 @@ mono_linear_scan2 (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_m
        int n_regs, n_regvars, i;
 
        for (l = vars; l; l = l->next) {
-               vmv = l->data;
+               vmv = (MonoMethodVar *)l->data;
                LSCAN_DEBUG (printf ("VAR R%d %08x %08x C%d\n", cfg->varinfo [vmv->idx]->dreg, vmv->range.first_use.abs_pos, 
                                                         vmv->range.last_use.abs_pos, vmv->spill_costs));
        }
@@ -302,7 +302,7 @@ mono_linear_scan2 (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_m
        inactive = NULL;
 
        while (unhandled) {
-               MonoMethodVar *current = unhandled->data;
+               MonoMethodVar *current = (MonoMethodVar *)unhandled->data;
                int pos, reg, max_free_pos;
                gboolean changed;
 
@@ -470,7 +470,7 @@ mono_linear_scan2 (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_m
        /* Do the actual register assignment */
        n_regvars = 0;
        for (l = vars; l; l = l->next) {
-               vmv = l->data;
+               vmv = (MonoMethodVar *)l->data;
 
                if (vmv->reg >= 0) {
                        int reg_index = vmv->reg;
@@ -498,7 +498,7 @@ mono_linear_scan2 (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_m
        /* Compute used regs */
        used_regs = 0;
        for (l = vars; l; l = l->next) {
-               vmv = l->data;
+               vmv = (MonoMethodVar *)l->data;
                
                if (vmv->reg >= 0)
                        used_regs |= 1LL << vmv->reg;

diff --git a/mono/mini/liveness.c b/mono/mini/liveness.c
index 355846bea67270805a5262f2d9518839fc2f33df..ee87dfa082ad509892177d58242c5dc7bf962971 100644 (file)
--- a/mono/mini/liveness.c
+++ b/mono/mini/liveness.c
@@ -44,14 +44,14 @@ optimize_initlocals (MonoCompile *cfg);
 static inline MonoBitSet* 
 mono_bitset_mp_new (MonoMemPool *mp, guint32 size, guint32 max_size)
 {
-       guint8 *mem = mono_mempool_alloc0 (mp, size);
+       guint8 *mem = (guint8 *)mono_mempool_alloc0 (mp, size);
        return mono_bitset_mem_new (mem, max_size, MONO_BITSET_DONT_FREE);
 }
 
 static inline MonoBitSet* 
 mono_bitset_mp_new_noinit (MonoMemPool *mp, guint32 size, guint32 max_size)
 {
-       guint8 *mem = mono_mempool_alloc (mp, size);
+       guint8 *mem = (guint8 *)mono_mempool_alloc (mp, size);
        return mono_bitset_mem_new (mem, max_size, MONO_BITSET_DONT_FREE);
 }
 
@@ -154,7 +154,7 @@ mono_liveness_handle_exception_clauses (MonoCompile *cfg)
         * Determine which clauses are outer try clauses, i.e. they are not contained in any
         * other non-try clause.
         */
-       outer_try = mono_mempool_alloc0 (cfg->mempool, sizeof (gboolean) * header->num_clauses);
+       outer_try = (gboolean *)mono_mempool_alloc0 (cfg->mempool, sizeof (gboolean) * header->num_clauses);
        for (i = 0; i < header->num_clauses; ++i)
                outer_try [i] = TRUE;
        /* Iterate over the clauses backward, so outer clauses come first */
@@ -238,7 +238,7 @@ analyze_liveness_bb (MonoCompile *cfg, MonoBasicBlock *bb)
                        continue;
 
                if (ins->opcode == OP_LDADDR) {
-                       MonoInst *var = ins->inst_p0;
+                       MonoInst *var = (MonoInst *)ins->inst_p0;
                        int idx = var->inst_c0;
                        MonoMethodVar *vi = MONO_VARINFO (cfg, idx);
 
@@ -660,7 +660,7 @@ mono_linterval_add_range (MonoCompile *cfg, MonoLiveInterval *interval, int from
                next_range->from = from;
        } else {
                /* Insert it */
-               new_range = mono_mempool_alloc (cfg->mempool, sizeof (MonoLiveRange2));
+               new_range = (MonoLiveRange2 *)mono_mempool_alloc (cfg->mempool, sizeof (MonoLiveRange2));
                new_range->from = from;
                new_range->to = to;
                new_range->next = NULL;
@@ -753,8 +753,8 @@ mono_linterval_split (MonoCompile *cfg, MonoLiveInterval *interval, MonoLiveInte
 
        g_assert (pos > interval->range->from && pos <= interval->last_range->to);
 
-       *i1 = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoLiveInterval));
-       *i2 = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoLiveInterval));
+       *i1 = (MonoLiveInterval *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoLiveInterval));
+       *i2 = (MonoLiveInterval *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoLiveInterval));
 
        for (r = interval->range; r; r = r->next) {
                if (pos > r->to) {
@@ -889,12 +889,12 @@ mono_analyze_liveness2 (MonoCompile *cfg)
        last_use = g_new0 (gint32, max_vars);
 
        reverse_len = 1024;
-       reverse = mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * reverse_len);
+       reverse = (MonoInst **)mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * reverse_len);
 
        for (idx = 0; idx < max_vars; ++idx) {
                MonoMethodVar *vi = MONO_VARINFO (cfg, idx);
 
-               vi->interval = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoLiveInterval));
+               vi->interval = (MonoLiveInterval *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoLiveInterval));
        }
 
        /*
@@ -941,7 +941,7 @@ mono_analyze_liveness2 (MonoCompile *cfg)
                for (nins = 0, pos = block_from, ins = bb->code; ins; ins = ins->next, ++nins, ++pos) {
                        if (nins >= reverse_len) {
                                int new_reverse_len = reverse_len * 2;
-                               MonoInst **new_reverse = mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * new_reverse_len);
+                               MonoInst **new_reverse = (MonoInst **)mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * new_reverse_len);
                                memcpy (new_reverse, reverse, sizeof (MonoInst*) * reverse_len);
                                reverse = new_reverse;
                                reverse_len = new_reverse_len;
@@ -1025,17 +1025,17 @@ update_liveness_gc (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins, gint32
 
                /* Add it to the last callsite */
                g_assert (*callsites);
-               last = (*callsites)->data;
+               last = (GCCallSite *)(*callsites)->data;
                last->param_slots = g_slist_prepend_mempool (cfg->mempool, last->param_slots, ins);
        } else if (ins->flags & MONO_INST_GC_CALLSITE) {
-               GCCallSite *callsite = mono_mempool_alloc0 (cfg->mempool, sizeof (GCCallSite));
+               GCCallSite *callsite = (GCCallSite *)mono_mempool_alloc0 (cfg->mempool, sizeof (GCCallSite));
                int i;
 
                LIVENESS_DEBUG (printf ("\t%x: ", ins->backend.pc_offset); mono_print_ins (ins));
                LIVENESS_DEBUG (printf ("\t\tlive: "));
 
                callsite->bb = bb;
-               callsite->liveness = mono_mempool_alloc0 (cfg->mempool, ALIGN_TO (cfg->num_varinfo, 8) / 8);
+               callsite->liveness = (guint8 *)mono_mempool_alloc0 (cfg->mempool, ALIGN_TO (cfg->num_varinfo, 8) / 8);
                callsite->pc_offset = ins->backend.pc_offset;
                for (i = 0; i < cfg->num_varinfo; ++i) {
                        if (last_use [i] != 0) {
@@ -1091,7 +1091,7 @@ mono_analyze_liveness_gc (MonoCompile *cfg)
        }
 
        reverse_len = 1024;
-       reverse = mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * reverse_len);
+       reverse = (MonoInst **)mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * reverse_len);
 
        for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
                MonoInst *ins;
@@ -1133,7 +1133,7 @@ mono_analyze_liveness_gc (MonoCompile *cfg)
                for (nins = 0, pos = block_from, ins = bb->code; ins; ins = ins->next, ++nins, ++pos) {
                        if (nins >= reverse_len) {
                                int new_reverse_len = reverse_len * 2;
-                               MonoInst **new_reverse = mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * new_reverse_len);
+                               MonoInst **new_reverse = (MonoInst **)mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * new_reverse_len);
                                memcpy (new_reverse, reverse, sizeof (MonoInst*) * reverse_len);
                                reverse = new_reverse;
                                reverse_len = new_reverse_len;

diff --git a/mono/mini/llvm-jit.cpp b/mono/mini/llvm-jit.cpp
new file mode 100644 (file)
index 0000000..dc39414
--- /dev/null
+++ b/mono/mini/llvm-jit.cpp
@@ -0,0 +1,581 @@
+//
+// jit-llvm.cpp: Support code for using LLVM as a JIT backend
+//
+// (C) 2009-2011 Novell, Inc.
+// Copyright 2011-2015 Xamarin, Inc (http://www.xamarin.com)
+//
+
+//
+// Mono's internal header files are not C++ clean, so avoid including them if 
+// possible
+//
+
+#include "config.h"
+
+#include <stdint.h>
+
+#include <llvm/Support/raw_ostream.h>
+#include <llvm/Support/Host.h>
+#include <llvm/PassManager.h>
+#include <llvm/ExecutionEngine/ExecutionEngine.h>
+#include <llvm/ExecutionEngine/JITMemoryManager.h>
+#include <llvm/ExecutionEngine/JITEventListener.h>
+#include <llvm/Target/TargetOptions.h>
+#include <llvm/Target/TargetRegisterInfo.h>
+#include <llvm/IR/Verifier.h>
+#include <llvm/Analysis/Passes.h>
+#include <llvm/Transforms/Scalar.h>
+#include <llvm/Support/CommandLine.h>
+#include <llvm/IR/LegacyPassNameParser.h>
+#include <llvm/Support/PrettyStackTrace.h>
+#include <llvm/CodeGen/Passes.h>
+#include <llvm/CodeGen/MachineFunctionPass.h>
+#include <llvm/CodeGen/MachineFunction.h>
+#include <llvm/CodeGen/MachineFrameInfo.h>
+#include <llvm/IR/Function.h>
+#include <llvm/IR/IRBuilder.h>
+#include <llvm/IR/Module.h>
+
+#include <llvm-c/Core.h>
+#include <llvm-c/ExecutionEngine.h>
+
+#include "mini-llvm-cpp.h"
+
+#ifndef MONO_CROSS_COMPILE
+
+using namespace llvm;
+
+static void (*unhandled_exception)() = default_mono_llvm_unhandled_exception;
+
+void
+mono_llvm_set_unhandled_exception_handler (void)
+{
+       std::set_terminate (unhandled_exception);
+}
+
+class MonoJITMemoryManager : public JITMemoryManager
+{
+private:
+       JITMemoryManager *mm;
+
+public:
+       /* Callbacks installed by mono */
+       AllocCodeMemoryCb *alloc_cb;
+       DlSymCb *dlsym_cb;
+       ExceptionTableCb *exception_cb;
+
+       MonoJITMemoryManager ();
+       ~MonoJITMemoryManager ();
+
+       void setMemoryWritable (void);
+
+       void setMemoryExecutable (void);
+
+       void AllocateGOT();
+
+    unsigned char *getGOTBase() const {
+               return mm->getGOTBase ();
+    }
+
+       void setPoisonMemory(bool) {
+       }
+
+       unsigned char *startFunctionBody(const Function *F, 
+                                                                        uintptr_t &ActualSize);
+  
+       unsigned char *allocateStub(const GlobalValue* F, unsigned StubSize,
+                                                                unsigned Alignment);
+  
+       void endFunctionBody(const Function *F, unsigned char *FunctionStart,
+                                                unsigned char *FunctionEnd);
+
+       unsigned char *allocateSpace(intptr_t Size, unsigned Alignment);
+
+       uint8_t *allocateGlobal(uintptr_t Size, unsigned Alignment);
+  
+       void deallocateMemForFunction(const Function *F);
+  
+       unsigned char*startExceptionTable(const Function* F,
+                                                                         uintptr_t &ActualSize);
+  
+       void endExceptionTable(const Function *F, unsigned char *TableStart,
+                                                  unsigned char *TableEnd, 
+                                                  unsigned char* FrameRegister);
+
+       virtual void deallocateFunctionBody(void*) {
+       }
+
+       virtual void deallocateExceptionTable(void*) {
+       }
+
+       virtual uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment, unsigned SectionID,
+                                                                                StringRef SectionName) {
+               // FIXME:
+               assert(0);
+               return NULL;
+       }
+
+       virtual uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, unsigned SectionID,
+                                                                                StringRef SectionName, bool IsReadOnly) {
+               // FIXME:
+               assert(0);
+               return NULL;
+       }
+
+       virtual bool applyPermissions(std::string*) {
+               // FIXME:
+               assert(0);
+               return false;
+       }
+
+       virtual bool finalizeMemory(std::string *ErrMsg = 0) {
+               // FIXME:
+               assert(0);
+               return false;
+       }
+
+       virtual void* getPointerToNamedFunction(const std::string &Name, bool AbortOnFailure) {
+               void *res;
+               char *err;
+
+               err = dlsym_cb (Name.c_str (), &res);
+               if (err) {
+                       outs () << "Unable to resolve: " << Name << ": " << err << "\n";
+                       assert(0);
+                       return NULL;
+               }
+               return res;
+       }
+};
+
+MonoJITMemoryManager::MonoJITMemoryManager ()
+{
+       mm = JITMemoryManager::CreateDefaultMemManager ();
+}
+
+MonoJITMemoryManager::~MonoJITMemoryManager ()
+{
+       delete mm;
+}
+
+void
+MonoJITMemoryManager::setMemoryWritable (void)
+{
+}
+
+void
+MonoJITMemoryManager::setMemoryExecutable (void)
+{
+}
+
+void
+MonoJITMemoryManager::AllocateGOT()
+{
+       mm->AllocateGOT ();
+}
+
+unsigned char *
+MonoJITMemoryManager::startFunctionBody(const Function *F, 
+                                       uintptr_t &ActualSize)
+{
+       // FIXME: This leaks memory
+       if (ActualSize == 0)
+               ActualSize = 128;
+       return alloc_cb (wrap (F), ActualSize);
+}
+  
+unsigned char *
+MonoJITMemoryManager::allocateStub(const GlobalValue* F, unsigned StubSize,
+                          unsigned Alignment)
+{
+       return alloc_cb (wrap (F), StubSize);
+}
+  
+void
+MonoJITMemoryManager::endFunctionBody(const Function *F, unsigned char *FunctionStart,
+                                 unsigned char *FunctionEnd)
+{
+}
+
+unsigned char *
+MonoJITMemoryManager::allocateSpace(intptr_t Size, unsigned Alignment)
+{
+       return new unsigned char [Size];
+}
+
+uint8_t *
+MonoJITMemoryManager::allocateGlobal(uintptr_t Size, unsigned Alignment)
+{
+       return new unsigned char [Size];
+}
+
+void
+MonoJITMemoryManager::deallocateMemForFunction(const Function *F)
+{
+}
+  
+unsigned char*
+MonoJITMemoryManager::startExceptionTable(const Function* F,
+                                         uintptr_t &ActualSize)
+{
+       return startFunctionBody(F, ActualSize);
+}
+  
+void
+MonoJITMemoryManager::endExceptionTable(const Function *F, unsigned char *TableStart,
+                                       unsigned char *TableEnd, 
+                                       unsigned char* FrameRegister)
+{
+       exception_cb (FrameRegister);
+}
+
+class MonoJITEventListener : public JITEventListener {
+
+public:
+       FunctionEmittedCb *emitted_cb;
+
+       MonoJITEventListener (FunctionEmittedCb *cb) {
+               emitted_cb = cb;
+       }
+
+       virtual void NotifyFunctionEmitted(const Function &F,
+                                                                          void *Code, size_t Size,
+                                                                          const EmittedFunctionDetails &Details) {
+               emitted_cb (wrap (&F), Code, (char*)Code + Size);
+       }
+};
+
+class MonoEE {
+public:
+       ExecutionEngine *EE;
+       MonoJITMemoryManager *mm;
+       MonoJITEventListener *listener;
+       FunctionPassManager *fpm;
+};
+
+void
+mono_llvm_optimize_method (MonoEERef eeref, LLVMValueRef method)
+{
+       MonoEE *mono_ee = (MonoEE*)eeref;
+
+       /*
+        * The verifier does some checks on the whole module, leading to quadratic behavior.
+        */
+       //verifyFunction (*(unwrap<Function> (method)));
+       mono_ee->fpm->run (*unwrap<Function> (method));
+}
+
+static cl::list<const PassInfo*, bool, PassNameParser>
+PassList(cl::desc("Optimizations available:"));
+
+static void
+force_pass_linking (void)
+{
+       // Make sure the rest is linked in, but never executed
+       if (g_getenv ("FOO") != (char*)-1)
+               return;
+
+       // This is a subset of the passes in LinkAllPasses.h
+       // The utility passes and the interprocedural passes are commented out
+
+      (void) llvm::createAAEvalPass();
+      (void) llvm::createAggressiveDCEPass();
+      (void) llvm::createAliasAnalysisCounterPass();
+      (void) llvm::createAliasDebugger();
+         /*
+      (void) llvm::createArgumentPromotionPass();
+      (void) llvm::createStructRetPromotionPass();
+         */
+      (void) llvm::createBasicAliasAnalysisPass();
+      (void) llvm::createLibCallAliasAnalysisPass(0);
+      (void) llvm::createScalarEvolutionAliasAnalysisPass();
+      //(void) llvm::createBlockPlacementPass();
+      (void) llvm::createBreakCriticalEdgesPass();
+      (void) llvm::createCFGSimplificationPass();
+         /*
+      (void) llvm::createConstantMergePass();
+      (void) llvm::createConstantPropagationPass();
+         */
+         /*
+      (void) llvm::createDeadArgEliminationPass();
+         */
+      (void) llvm::createDeadCodeEliminationPass();
+      (void) llvm::createDeadInstEliminationPass();
+      (void) llvm::createDeadStoreEliminationPass();
+         /*
+      (void) llvm::createDeadTypeEliminationPass();
+      (void) llvm::createDomOnlyPrinterPass();
+      (void) llvm::createDomPrinterPass();
+      (void) llvm::createDomOnlyViewerPass();
+      (void) llvm::createDomViewerPass();
+      (void) llvm::createEdgeProfilerPass();
+      (void) llvm::createOptimalEdgeProfilerPass();
+      (void) llvm::createFunctionInliningPass();
+      (void) llvm::createAlwaysInlinerPass();
+      (void) llvm::createGlobalDCEPass();
+      (void) llvm::createGlobalOptimizerPass();
+      (void) llvm::createGlobalsModRefPass();
+      (void) llvm::createIPConstantPropagationPass();
+      (void) llvm::createIPSCCPPass();
+         */
+      (void) llvm::createIndVarSimplifyPass();
+      (void) llvm::createInstructionCombiningPass();
+         /*
+      (void) llvm::createInternalizePass(false);
+         */
+      (void) llvm::createLCSSAPass();
+      (void) llvm::createLICMPass();
+      (void) llvm::createLazyValueInfoPass();
+      //(void) llvm::createLoopDependenceAnalysisPass();
+         /*
+      (void) llvm::createLoopExtractorPass();
+         */
+      (void) llvm::createLoopSimplifyPass();
+      (void) llvm::createLoopStrengthReducePass();
+      (void) llvm::createLoopUnrollPass();
+      (void) llvm::createLoopUnswitchPass();
+      (void) llvm::createLoopRotatePass();
+      (void) llvm::createLowerInvokePass();
+         /*
+      (void) llvm::createLowerSetJmpPass();
+         */
+      (void) llvm::createLowerSwitchPass();
+      (void) llvm::createNoAAPass();
+         /*
+      (void) llvm::createNoProfileInfoPass();
+      (void) llvm::createProfileEstimatorPass();
+      (void) llvm::createProfileVerifierPass();
+      (void) llvm::createProfileLoaderPass();
+         */
+      (void) llvm::createPromoteMemoryToRegisterPass();
+      (void) llvm::createDemoteRegisterToMemoryPass();
+         /*
+      (void) llvm::createPruneEHPass();
+      (void) llvm::createPostDomOnlyPrinterPass();
+      (void) llvm::createPostDomPrinterPass();
+      (void) llvm::createPostDomOnlyViewerPass();
+      (void) llvm::createPostDomViewerPass();
+         */
+      (void) llvm::createReassociatePass();
+      (void) llvm::createSCCPPass();
+      (void) llvm::createScalarReplAggregatesPass();
+      //(void) llvm::createSimplifyLibCallsPass();
+         /*
+      (void) llvm::createSingleLoopExtractorPass();
+      (void) llvm::createStripSymbolsPass();
+      (void) llvm::createStripNonDebugSymbolsPass();
+      (void) llvm::createStripDeadDebugInfoPass();
+      (void) llvm::createStripDeadPrototypesPass();
+      (void) llvm::createTailCallEliminationPass();
+      (void) llvm::createTailDuplicationPass();
+      (void) llvm::createJumpThreadingPass();
+         */
+         /*
+      (void) llvm::createUnifyFunctionExitNodesPass();
+         */
+      (void) llvm::createInstCountPass();
+      (void) llvm::createCodeGenPreparePass();
+      (void) llvm::createGVNPass();
+      (void) llvm::createMemCpyOptPass();
+      (void) llvm::createLoopDeletionPass();
+         /*
+      (void) llvm::createPostDomTree();
+      (void) llvm::createPostDomFrontier();
+      (void) llvm::createInstructionNamerPass();
+      (void) llvm::createPartialSpecializationPass();
+      (void) llvm::createFunctionAttrsPass();
+      (void) llvm::createMergeFunctionsPass();
+      (void) llvm::createPrintModulePass(0);
+      (void) llvm::createPrintFunctionPass("", 0);
+      (void) llvm::createDbgInfoPrinterPass();
+      (void) llvm::createModuleDebugInfoPrinterPass();
+      (void) llvm::createPartialInliningPass();
+      (void) llvm::createGEPSplitterPass();
+      (void) llvm::createLintPass();
+         */
+      (void) llvm::createSinkingPass();
+}
+
+static gboolean inited;
+
+static void
+init_llvm (void)
+{
+       if (inited)
+               return;
+
+  force_pass_linking ();
+
+#ifdef TARGET_ARM
+  LLVMInitializeARMTarget ();
+  LLVMInitializeARMTargetInfo ();
+  LLVMInitializeARMTargetMC ();
+#elif defined(TARGET_X86) || defined(TARGET_AMD64)
+  LLVMInitializeX86Target ();
+  LLVMInitializeX86TargetInfo ();
+  LLVMInitializeX86TargetMC ();
+#elif defined(TARGET_POWERPC)
+  LLVMInitializePowerPCTarget ();
+  LLVMInitializePowerPCTargetInfo ();
+  LLVMInitializePowerPCTargetMC ();
+#else
+  #error Unsupported mono-llvm target
+#endif
+
+  PassRegistry &Registry = *PassRegistry::getPassRegistry();
+  initializeCore(Registry);
+  initializeScalarOpts(Registry);
+  initializeAnalysis(Registry);
+  initializeIPA(Registry);
+  initializeTransformUtils(Registry);
+  initializeInstCombine(Registry);
+  initializeTarget(Registry);
+
+  llvm::cl::ParseEnvironmentOptions("mono", "MONO_LLVM", "");
+
+  inited = true;
+}
+
+MonoEERef
+mono_llvm_create_ee (LLVMModuleProviderRef MP, AllocCodeMemoryCb *alloc_cb, FunctionEmittedCb *emitted_cb, ExceptionTableCb *exception_cb, DlSymCb *dlsym_cb, LLVMExecutionEngineRef *ee)
+{
+  std::string Error;
+  MonoEE *mono_ee;
+
+  init_llvm ();
+
+  mono_ee = new MonoEE ();
+
+  MonoJITMemoryManager *mono_mm = new MonoJITMemoryManager ();
+  mono_mm->alloc_cb = alloc_cb;
+  mono_mm->dlsym_cb = dlsym_cb;
+  mono_mm->exception_cb = exception_cb;
+  mono_ee->mm = mono_mm;
+
+  /*
+   * The Default code model doesn't seem to work on amd64,
+   * test_0_fields_with_big_offsets (among others) crashes, because LLVM tries to call
+   * memset using a normal pcrel code which is in 32bit memory, while memset isn't.
+   */
+
+  TargetOptions opts;
+  opts.JITExceptionHandling = 1;
+
+  StringRef cpu_name = sys::getHostCPUName ();
+
+  // EngineBuilder no longer has a copy assignment operator (?)
+  std::unique_ptr<Module> Owner(unwrap(MP));
+  EngineBuilder b (std::move(Owner));
+  ExecutionEngine *EE = b.setJITMemoryManager (mono_mm).setTargetOptions (opts).setAllocateGVsWithCode (true).setMCPU (cpu_name).create ();
+
+  g_assert (EE);
+  mono_ee->EE = EE;
+
+  MonoJITEventListener *listener = new MonoJITEventListener (emitted_cb);
+  EE->RegisterJITEventListener (listener);
+  mono_ee->listener = listener;
+
+  FunctionPassManager *fpm = new FunctionPassManager (unwrap (MP));
+  mono_ee->fpm = fpm;
+
+  fpm->add(new DataLayoutPass(*EE->getDataLayout()));
+
+  if (PassList.size() > 0) {
+         /* Use the passes specified by the env variable */
+         /* Only the passes in force_pass_linking () can be used */
+         for (unsigned i = 0; i < PassList.size(); ++i) {
+                 const PassInfo *PassInf = PassList[i];
+                 Pass *P = 0;
+
+                 if (PassInf->getNormalCtor())
+                         P = PassInf->getNormalCtor()();
+                 fpm->add (P);
+         }
+  } else {
+         /* Use the same passes used by 'opt' by default, without the ipo passes */
+         const char *opts = "-simplifycfg -domtree -domfrontier -scalarrepl -instcombine -simplifycfg -domtree -domfrontier -scalarrepl -instcombine -simplifycfg -instcombine -simplifycfg -reassociate -domtree -loops -loop-simplify -domfrontier -loop-simplify -lcssa -loop-rotate -licm -lcssa -loop-unswitch -instcombine -scalar-evolution -loop-simplify -lcssa -iv-users -indvars -loop-deletion -loop-simplify -lcssa -loop-unroll -instcombine -memdep -gvn -memdep -memcpyopt -sccp -instcombine -domtree -memdep -dse -adce -gvn -simplifycfg";
+         char **args;
+         int i;
+
+         args = g_strsplit (opts, " ", 1000);
+         for (i = 0; args [i]; i++)
+                 ;
+         llvm::cl::ParseCommandLineOptions (i, args, "");
+         g_strfreev (args);
+
+         for (unsigned i = 0; i < PassList.size(); ++i) {
+                 const PassInfo *PassInf = PassList[i];
+                 Pass *P = 0;
+
+                 if (PassInf->getNormalCtor())
+                         P = PassInf->getNormalCtor()();
+                 g_assert (P->getPassKind () == llvm::PT_Function || P->getPassKind () == llvm::PT_Loop);
+                 fpm->add (P);
+         }
+
+         /*
+         fpm->add(createInstructionCombiningPass());
+         fpm->add(createReassociatePass());
+         fpm->add(createGVNPass());
+         fpm->add(createCFGSimplificationPass());
+         */
+  }
+
+  *ee = wrap (EE);
+
+  return mono_ee;
+}
+
+void
+mono_llvm_dispose_ee (MonoEERef *eeref)
+{
+       MonoEE *mono_ee = (MonoEE*)eeref;
+
+       delete mono_ee->EE;
+       delete mono_ee->fpm;
+       //delete mono_ee->mm;
+       delete mono_ee->listener;
+       delete mono_ee;
+}
+
+#else /* MONO_CROSS_COMPILE */
+
+void
+mono_llvm_set_unhandled_exception_handler (void)
+{
+}
+
+MonoEERef
+mono_llvm_create_ee (LLVMModuleProviderRef MP, AllocCodeMemoryCb *alloc_cb, FunctionEmittedCb *emitted_cb, ExceptionTableCb *exception_cb, DlSymCb *dlsym_cb, LLVMExecutionEngineRef *ee)
+{
+       g_assert_not_reached ();
+       return NULL;
+}
+
+void
+mono_llvm_optimize_method (MonoEERef eeref, LLVMValueRef method)
+{
+}
+
+void
+mono_llvm_dispose_ee (MonoEERef *eeref)
+{
+       g_assert_not_reached ();
+}
+
+/* Not linked in */
+void
+LLVMAddGlobalMapping(LLVMExecutionEngineRef EE, LLVMValueRef Global,
+                                        void* Addr)
+{
+       g_assert_not_reached ();
+}
+
+void*
+LLVMGetPointerToGlobal(LLVMExecutionEngineRef EE, LLVMValueRef Global)
+{
+       g_assert_not_reached ();
+       return NULL;
+}
+
+#endif /* !MONO_CROSS_COMPILE */

diff --git a/mono/mini/local-propagation.c b/mono/mini/local-propagation.c
index 3d4e8029aab6b69e8e9a352adecdffc0e40445ff..fc7b74692f736ca83805bae61f0d7c0baf16e83d 100644 (file)
--- a/mono/mini/local-propagation.c
+++ b/mono/mini/local-propagation.c
@@ -58,8 +58,8 @@ mono_local_cprop (MonoCompile *cfg)
 restart:
 
        max = cfg->next_vreg;
-       defs = mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * (cfg->next_vreg + 1));
-       def_index = mono_mempool_alloc (cfg->mempool, sizeof (guint32) * (cfg->next_vreg + 1));
+       defs = (MonoInst **)mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * (cfg->next_vreg + 1));
+       def_index = (gint32 *)mono_mempool_alloc (cfg->mempool, sizeof (guint32) * (cfg->next_vreg + 1));
 
        for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
                MonoInst *ins;
@@ -107,7 +107,7 @@ restart:
 
                        /* FIXME: Optimize this */
                        if (ins->opcode == OP_LDADDR) {
-                               MonoInst *var = ins->inst_p0;
+                               MonoInst *var = (MonoInst *)ins->inst_p0;
 
                                defs [var->dreg] = NULL;
                                /*

diff --git a/mono/mini/main.c b/mono/mini/main.c
index 82849806e0aa3c715fb88da9d49efb2477461c73..4ef344ecdd9b0f1b5e005e5e9a1f6b258744dadb 100644 (file)
--- a/mono/mini/main.c
+++ b/mono/mini/main.c
@@ -15,7 +15,7 @@
 static int
 mono_main_with_options (int argc, char *argv [])
 {
-       mono_parse_env_options (argc, argv);
+       mono_parse_env_options (&argc, &argv);
 
        return mono_main (argc, argv);
 }

diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c
index 70bfd7934f6549cf96af06bbf01418b37222d8b7..a337597dae3a7ef306f7dcdc50e9b3c8bafd0758 100644 (file)
--- a/mono/mini/method-to-ir.c
+++ b/mono/mini/method-to-ir.c
@@ -499,7 +499,7 @@ add_widen_op (MonoCompile *cfg, MonoInst *ins, MonoInst **arg1_ref, MonoInst **a
                CHECK_TYPE (ins);       \
                /* Have to insert a widening op */               \
         add_widen_op (cfg, ins, &sp [0], &sp [1]);              \
-        ins->dreg = alloc_dreg ((cfg), (ins)->type); \
+        ins->dreg = alloc_dreg ((cfg), (MonoStackType)(ins)->type); \
         MONO_ADD_INS ((cfg)->cbb, (ins)); \
         *sp++ = mono_decompose_opcode ((cfg), (ins));  \
        } while (0)
@@ -510,7 +510,7 @@ add_widen_op (MonoCompile *cfg, MonoInst *ins, MonoInst **arg1_ref, MonoInst **a
                ins->sreg1 = sp [0]->dreg;      \
                type_from_op (cfg, ins, sp [0], NULL);  \
                CHECK_TYPE (ins);       \
-        (ins)->dreg = alloc_dreg ((cfg), (ins)->type); \
+        (ins)->dreg = alloc_dreg ((cfg), (MonoStackType)(ins)->type); \
         MONO_ADD_INS ((cfg)->cbb, (ins)); \
                *sp++ = mono_decompose_opcode (cfg, ins);       \
        } while (0)
@@ -525,7 +525,7 @@ add_widen_op (MonoCompile *cfg, MonoInst *ins, MonoInst **arg1_ref, MonoInst **a
                CHECK_TYPE (cmp);       \
                add_widen_op (cfg, cmp, &sp [0], &sp [1]);                                              \
                type_from_op (cfg, ins, sp [0], sp [1]);                                                        \
-               ins->inst_many_bb = mono_mempool_alloc (cfg->mempool, sizeof(gpointer)*2);      \
+               ins->inst_many_bb = (MonoBasicBlock **)mono_mempool_alloc (cfg->mempool, sizeof(gpointer)*2);   \
                GET_BBLOCK (cfg, tblock, target);               \
                link_bblock (cfg, cfg->cbb, tblock);    \
                ins->inst_true_bb = tblock;     \
@@ -582,7 +582,7 @@ link_bblock (MonoCompile *cfg, MonoBasicBlock *from, MonoBasicBlock* to)
                }
        }
        if (!found) {
-               newa = mono_mempool_alloc (cfg->mempool, sizeof (gpointer) * (from->out_count + 1));
+               newa = (MonoBasicBlock **)mono_mempool_alloc (cfg->mempool, sizeof (gpointer) * (from->out_count + 1));
                for (i = 0; i < from->out_count; ++i) {
                        newa [i] = from->out_bb [i];
                }
@@ -599,7 +599,7 @@ link_bblock (MonoCompile *cfg, MonoBasicBlock *from, MonoBasicBlock* to)
                }
        }
        if (!found) {
-               newa = mono_mempool_alloc (cfg->mempool, sizeof (gpointer) * (to->in_count + 1));
+               newa = (MonoBasicBlock **)mono_mempool_alloc (cfg->mempool, sizeof (gpointer) * (to->in_count + 1));
                for (i = 0; i < to->in_count; ++i) {
                        newa [i] = to->in_bb [i];
                }
@@ -685,7 +685,7 @@ mono_create_spvar_for_region (MonoCompile *cfg, int region)
 {
        MonoInst *var;
 
-       var = g_hash_table_lookup (cfg->spvars, GINT_TO_POINTER (region));
+       var = (MonoInst *)g_hash_table_lookup (cfg->spvars, GINT_TO_POINTER (region));
        if (var)
                return;
 
@@ -699,7 +699,7 @@ mono_create_spvar_for_region (MonoCompile *cfg, int region)
 MonoInst *
 mono_find_exvar_for_offset (MonoCompile *cfg, int offset)
 {
-       return g_hash_table_lookup (cfg->exvars, GINT_TO_POINTER (offset));
+       return (MonoInst *)g_hash_table_lookup (cfg->exvars, GINT_TO_POINTER (offset));
 }
 
 static MonoInst*
@@ -707,7 +707,7 @@ mono_create_exvar_for_offset (MonoCompile *cfg, int offset)
 {
        MonoInst *var;
 
-       var = g_hash_table_lookup (cfg->exvars, GINT_TO_POINTER (offset));
+       var = (MonoInst *)g_hash_table_lookup (cfg->exvars, GINT_TO_POINTER (offset));
        if (var)
                return var;
 
@@ -1397,7 +1397,7 @@ mono_save_token_info (MonoCompile *cfg, MonoImage *image, guint32 token, gpointe
         * table == 0 means this is a reference made from a wrapper.
         */
        if (cfg->compile_aot && !cfg->generic_context && (mono_metadata_token_table (token) > 0)) {
-               MonoJumpInfoToken *jump_info_token = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoJumpInfoToken));
+               MonoJumpInfoToken *jump_info_token = (MonoJumpInfoToken *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoJumpInfoToken));
                jump_info_token->image = image;
                jump_info_token->token = token;
                g_hash_table_insert (cfg->token_info_hash, key, jump_info_token);
@@ -1447,7 +1447,7 @@ handle_stack_args (MonoCompile *cfg, MonoInst **sp, int count)
                }
                //printf ("\n");
                if (!found) {
-                       bb->out_stack = mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * count);
+                       bb->out_stack = (MonoInst **)mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * count);
                        for (i = 0; i < count; ++i) {
                                /* 
                                 * try to reuse temps already allocated for this purpouse, if they occupy the same
@@ -1950,7 +1950,7 @@ mini_emit_memcpy (MonoCompile *cfg, int destreg, int doffset, int srcreg, int so
 }
 
 static void
-emit_tls_set (MonoCompile *cfg, int sreg1, int tls_key)
+emit_tls_set (MonoCompile *cfg, int sreg1, MonoTlsKey tls_key)
 {
        MonoInst *ins, *c;
 
@@ -2191,8 +2191,12 @@ target_type_is_incompatible (MonoCompile *cfg, MonoType *target, MonoInst *arg)
 
        if (target->byref) {
                /* FIXME: check that the pointed to types match */
-               if (arg->type == STACK_MP)
-                       return target->type != MONO_TYPE_I && arg->klass != mono_class_from_mono_type (target);
+               if (arg->type == STACK_MP) {
+                       MonoClass *base_class = mono_class_from_mono_type (target);
+                       /* This is needed to handle gshared types + ldaddr */
+                       simple_type = mini_get_underlying_type (&base_class->byval_arg);
+                       return target->type != MONO_TYPE_I && arg->klass != base_class && arg->klass != mono_class_from_mono_type (simple_type);
+               }
                if (arg->type == STACK_PTR)
                        return 0;
                return 1;
@@ -2264,11 +2268,13 @@ target_type_is_incompatible (MonoCompile *cfg, MonoType *target, MonoInst *arg)
                return 0;
        case MONO_TYPE_GENERICINST:
                if (mono_type_generic_inst_is_valuetype (simple_type)) {
+                       MonoClass *target_class;
                        if (arg->type != STACK_VTYPE)
                                return 1;
                        klass = mono_class_from_mono_type (simple_type);
+                       target_class = mono_class_from_mono_type (target);
                        /* The second cases is needed when doing partial sharing */
-                       if (klass != arg->klass && mono_class_from_mono_type (target) != arg->klass)
+                       if (klass != arg->klass && target_class != arg->klass && target_class != mono_class_from_mono_type (mini_get_underlying_type (&arg->klass->byval_arg)))
                                return 1;
                        return 0;
                } else {
@@ -2474,7 +2480,7 @@ emit_imt_argument (MonoCompile *cfg, MonoCallInst *call, MonoMethod *method, Mon
 static MonoJumpInfo *
 mono_patch_info_new (MonoMemPool *mp, int ip, MonoJumpInfoType type, gconstpointer target)
 {
-       MonoJumpInfo *ji = mono_mempool_alloc (mp, sizeof (MonoJumpInfo));
+       MonoJumpInfo *ji = (MonoJumpInfo *)mono_mempool_alloc (mp, sizeof (MonoJumpInfo));
 
        ji->ip.i = ip;
        ji->type = type;
@@ -2550,7 +2556,7 @@ check_method_sharing (MonoCompile *cfg, MonoMethod *cmethod, gboolean *out_pass_
 
 inline static MonoCallInst *
 mono_emit_call_args (MonoCompile *cfg, MonoMethodSignature *sig, 
-                                        MonoInst **args, int calli, int virtual, int tail, int rgctx, int unbox_trampoline)
+                                        MonoInst **args, int calli, int virtual_, int tail, int rgctx, int unbox_trampoline)
 {
        MonoType *sig_ret;
        MonoCallInst *call;
@@ -2566,7 +2572,7 @@ mono_emit_call_args (MonoCompile *cfg, MonoMethodSignature *sig,
 
                MONO_INST_NEW_CALL (cfg, call, OP_TAILCALL);
        } else
-               MONO_INST_NEW_CALL (cfg, call, ret_type_to_call_opcode (cfg, sig->ret, calli, virtual));
+               MONO_INST_NEW_CALL (cfg, call, ret_type_to_call_opcode (cfg, sig->ret, calli, virtual_));
 
        call->args = args;
        call->signature = sig;
@@ -2605,7 +2611,7 @@ mono_emit_call_args (MonoCompile *cfg, MonoMethodSignature *sig,
 
                call->vret_var = loada;
        } else if (!MONO_TYPE_IS_VOID (sig_ret))
-               call->inst.dreg = alloc_dreg (cfg, call->inst.type);
+               call->inst.dreg = alloc_dreg (cfg, (MonoStackType)call->inst.type);
 
 #ifdef MONO_ARCH_SOFT_FLOAT_FALLBACK
        if (COMPILE_SOFT_FLOAT (cfg)) {
@@ -2743,7 +2749,7 @@ mono_emit_method_call_full (MonoCompile *cfg, MonoMethod *method, MonoMethodSign
 #ifndef DISABLE_REMOTING
        gboolean might_be_remote = FALSE;
 #endif
-       gboolean virtual = this_ins != NULL;
+       gboolean virtual_ = this_ins != NULL;
        gboolean enable_for_aot = TRUE;
        int context_used;
        MonoCallInst *call;
@@ -2807,7 +2813,7 @@ mono_emit_method_call_full (MonoCompile *cfg, MonoMethod *method, MonoMethodSign
        }
 #endif
 
-       if (cfg->llvm_only && !call_target && virtual && (method->flags & METHOD_ATTRIBUTE_VIRTUAL)) {
+       if (cfg->llvm_only && !call_target && virtual_ && (method->flags & METHOD_ATTRIBUTE_VIRTUAL)) {
                // FIXME: Vcall optimizations below
                MonoInst *icall_args [16];
                MonoInst *ins;
@@ -2837,7 +2843,7 @@ mono_emit_method_call_full (MonoCompile *cfg, MonoMethod *method, MonoMethodSign
 
        need_unbox_trampoline = method->klass == mono_defaults.object_class || (method->klass->flags & TYPE_ATTRIBUTE_INTERFACE);
 
-       call = mono_emit_call_args (cfg, sig, args, FALSE, virtual, tail, rgctx_arg ? TRUE : FALSE, need_unbox_trampoline);
+       call = mono_emit_call_args (cfg, sig, args, FALSE, virtual_, tail, rgctx_arg ? TRUE : FALSE, need_unbox_trampoline);
 
 #ifndef DISABLE_REMOTING
        if (might_be_remote)
@@ -2849,7 +2855,7 @@ mono_emit_method_call_full (MonoCompile *cfg, MonoMethod *method, MonoMethodSign
        call->inst.inst_left = this_ins;
        call->tail_call = tail;
 
-       if (virtual) {
+       if (virtual_) {
                int vtable_reg, slot_reg, this_reg;
                int offset;
 
@@ -3470,10 +3476,10 @@ emit_get_rgctx (MonoCompile *cfg, MonoMethod *method, int context_used)
 static MonoJumpInfoRgctxEntry *
 mono_patch_info_rgctx_entry_new (MonoMemPool *mp, MonoMethod *method, gboolean in_mrgctx, MonoJumpInfoType patch_type, gconstpointer patch_data, MonoRgctxInfoType info_type)
 {
-       MonoJumpInfoRgctxEntry *res = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoRgctxEntry));
+       MonoJumpInfoRgctxEntry *res = (MonoJumpInfoRgctxEntry *)mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoRgctxEntry));
        res->method = method;
        res->in_mrgctx = in_mrgctx;
-       res->data = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfo));
+       res->data = (MonoJumpInfo *)mono_mempool_alloc0 (mp, sizeof (MonoJumpInfo));
        res->data->type = patch_type;
        res->data->data.target = patch_data;
        res->info_type = info_type;
@@ -3632,7 +3638,7 @@ emit_get_rgctx_gsharedvt_call (MonoCompile *cfg, int context_used,
        MonoJumpInfoRgctxEntry *entry;
        MonoInst *rgctx;
 
-       call_info = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoJumpInfoGSharedVtCall));
+       call_info = (MonoJumpInfoGSharedVtCall *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoJumpInfoGSharedVtCall));
        call_info->sig = sig;
        call_info->method = cmethod;
 
@@ -3655,7 +3661,7 @@ emit_get_rgctx_virt_method (MonoCompile *cfg, int context_used,
        MonoJumpInfoRgctxEntry *entry;
        MonoInst *rgctx;
 
-       info = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoJumpInfoVirtMethod));
+       info = (MonoJumpInfoVirtMethod *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoJumpInfoVirtMethod));
        info->klass = klass;
        info->method = virt_method;
 
@@ -3723,7 +3729,7 @@ static int
 get_gsharedvt_info_slot (MonoCompile *cfg, gpointer data, MonoRgctxInfoType rgctx_type)
 {
        MonoGSharedVtMethodInfo *info = cfg->gsharedvt_info;
-       MonoRuntimeGenericContextInfoTemplate *template;
+       MonoRuntimeGenericContextInfoTemplate *template_;
        int i, idx;
 
        g_assert (info);
@@ -3739,7 +3745,7 @@ get_gsharedvt_info_slot (MonoCompile *cfg, gpointer data, MonoRgctxInfoType rgct
                MonoRuntimeGenericContextInfoTemplate *new_entries;
                int new_count_entries = info->count_entries ? info->count_entries * 2 : 16;
 
-               new_entries = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoRuntimeGenericContextInfoTemplate) * new_count_entries);
+               new_entries = (MonoRuntimeGenericContextInfoTemplate *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoRuntimeGenericContextInfoTemplate) * new_count_entries);
 
                memcpy (new_entries, info->entries, sizeof (MonoRuntimeGenericContextInfoTemplate) * info->count_entries);
                info->entries = new_entries;
@@ -3747,9 +3753,9 @@ get_gsharedvt_info_slot (MonoCompile *cfg, gpointer data, MonoRgctxInfoType rgct
        }
 
        idx = info->num_entries;
-       template = &info->entries [idx];
-       template->info_type = rgctx_type;
-       template->data = data;
+       template_ = &info->entries [idx];
+       template_->info_type = rgctx_type;
+       template_->data = data;
 
        info->num_entries ++;
 
@@ -4108,7 +4114,7 @@ handle_unbox_gsharedvt (MonoCompile *cfg, MonoClass *klass, MonoInst *obj)
                MonoInst *unbox_call;
                MonoMethodSignature *unbox_sig;
 
-               unbox_sig = mono_mempool_alloc0 (cfg->mempool, MONO_SIZEOF_METHOD_SIGNATURE + (1 * sizeof (MonoType *)));
+               unbox_sig = (MonoMethodSignature *)mono_mempool_alloc0 (cfg->mempool, MONO_SIZEOF_METHOD_SIGNATURE + (1 * sizeof (MonoType *)));
                unbox_sig->ret = &klass->byval_arg;
                unbox_sig->param_count = 1;
                unbox_sig->params [0] = &mono_defaults.object_class->byval_arg;
@@ -4140,7 +4146,7 @@ handle_alloc (MonoCompile *cfg, MonoClass *klass, gboolean for_box, int context_
 
        if (context_used) {
                MonoInst *data;
-               int rgctx_info;
+               MonoRgctxInfoType rgctx_info;
                MonoInst *iargs [2];
                gboolean known_instance_size = !mini_is_gsharedvt_klass (klass);
 
@@ -4312,7 +4318,7 @@ handle_box (MonoCompile *cfg, MonoInst *val, MonoClass *klass, int context_used)
                         * klass is Nullable<T>, need to call Nullable<T>.Box () using a gsharedvt signature, but we cannot
                         * construct that method at JIT time, so have to do things by hand.
                         */
-                       box_sig = mono_mempool_alloc0 (cfg->mempool, MONO_SIZEOF_METHOD_SIGNATURE + (1 * sizeof (MonoType *)));
+                       box_sig = (MonoMethodSignature *)mono_mempool_alloc0 (cfg->mempool, MONO_SIZEOF_METHOD_SIGNATURE + (1 * sizeof (MonoType *)));
                        box_sig->ret = &mono_defaults.object_class->byval_arg;
                        box_sig->param_count = 1;
                        box_sig->params [0] = &klass->byval_arg;
@@ -4920,13 +4926,13 @@ handle_enum_has_flag (MonoCompile *cfg, MonoClass *klass, MonoInst *enum_this, M
        }
 
        {
-               MonoInst *load, *and, *cmp, *ceq;
+               MonoInst *load, *and_, *cmp, *ceq;
                int enum_reg = is_i4 ? alloc_ireg (cfg) : alloc_lreg (cfg);
                int and_reg = is_i4 ? alloc_ireg (cfg) : alloc_lreg (cfg);
                int dest_reg = alloc_ireg (cfg);
 
                EMIT_NEW_LOAD_MEMBASE (cfg, load, load_opc, enum_reg, enum_this->dreg, 0);
-               EMIT_NEW_BIALU (cfg, and, is_i4 ? OP_IAND : OP_LAND, and_reg, enum_reg, enum_flag->dreg);
+               EMIT_NEW_BIALU (cfg, and_, is_i4 ? OP_IAND : OP_LAND, and_reg, enum_reg, enum_flag->dreg);
                EMIT_NEW_BIALU (cfg, cmp, is_i4 ? OP_ICOMPARE : OP_LCOMPARE, -1, and_reg, enum_flag->dreg);
                EMIT_NEW_UNALU (cfg, ceq, is_i4 ? OP_ICEQ : OP_LCEQ, dest_reg, -1);
 
@@ -4934,7 +4940,7 @@ handle_enum_has_flag (MonoCompile *cfg, MonoClass *klass, MonoInst *enum_this, M
 
                if (!is_i4) {
                        load = mono_decompose_opcode (cfg, load);
-                       and = mono_decompose_opcode (cfg, and);
+                       and_ = mono_decompose_opcode (cfg, and_);
                        cmp = mono_decompose_opcode (cfg, cmp);
                        ceq = mono_decompose_opcode (cfg, ceq);
                }
@@ -4947,7 +4953,7 @@ handle_enum_has_flag (MonoCompile *cfg, MonoClass *klass, MonoInst *enum_this, M
  * Returns NULL and set the cfg exception on error.
  */
 static G_GNUC_UNUSED MonoInst*
-handle_delegate_ctor (MonoCompile *cfg, MonoClass *klass, MonoInst *target, MonoMethod *method, int context_used, gboolean virtual)
+handle_delegate_ctor (MonoCompile *cfg, MonoClass *klass, MonoInst *target, MonoMethod *method, int context_used, gboolean virtual_)
 {
        MonoInst *ptr;
        int dreg;
@@ -4956,7 +4962,7 @@ handle_delegate_ctor (MonoCompile *cfg, MonoClass *klass, MonoInst *target, Mono
        MonoDomain *domain;
        guint8 **code_slot;
 
-       if (virtual && !cfg->llvm_only) {
+       if (virtual_ && !cfg->llvm_only) {
                MonoMethod *invoke = mono_get_delegate_invoke (klass);
                g_assert (invoke);
 
@@ -4979,7 +4985,7 @@ handle_delegate_ctor (MonoCompile *cfg, MonoClass *klass, MonoInst *target, Mono
                args [0] = obj;
                args [1] = target;
                args [2] = emit_get_rgctx_method (cfg, context_used, method, MONO_RGCTX_INFO_METHOD);
-               mono_emit_jit_icall (cfg, virtual ? mono_init_delegate_virtual : mono_init_delegate, args);
+               mono_emit_jit_icall (cfg, virtual_ ? mono_init_delegate_virtual : mono_init_delegate, args);
 
                return obj;
        }
@@ -5016,9 +5022,9 @@ handle_delegate_ctor (MonoCompile *cfg, MonoClass *klass, MonoInst *target, Mono
                        mono_domain_lock (domain);
                        if (!domain_jit_info (domain)->method_code_hash)
                                domain_jit_info (domain)->method_code_hash = g_hash_table_new (NULL, NULL);
-                       code_slot = g_hash_table_lookup (domain_jit_info (domain)->method_code_hash, method);
+                       code_slot = (guint8 **)g_hash_table_lookup (domain_jit_info (domain)->method_code_hash, method);
                        if (!code_slot) {
-                               code_slot = mono_domain_alloc0 (domain, sizeof (gpointer));
+                               code_slot = (guint8 **)mono_domain_alloc0 (domain, sizeof (gpointer));
                                g_hash_table_insert (domain_jit_info (domain)->method_code_hash, method, code_slot);
                        }
                        mono_domain_unlock (domain);
@@ -5031,13 +5037,13 @@ handle_delegate_ctor (MonoCompile *cfg, MonoClass *klass, MonoInst *target, Mono
        if (cfg->compile_aot) {
                MonoDelegateClassMethodPair *del_tramp;
 
-               del_tramp = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoDelegateClassMethodPair));
+               del_tramp = (MonoDelegateClassMethodPair *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoDelegateClassMethodPair));
                del_tramp->klass = klass;
                del_tramp->method = context_used ? NULL : method;
-               del_tramp->is_virtual = virtual;
+               del_tramp->is_virtual = virtual_;
                EMIT_NEW_AOTCONST (cfg, tramp_ins, MONO_PATCH_INFO_DELEGATE_TRAMPOLINE, del_tramp);
        } else {
-               if (virtual)
+               if (virtual_)
                        trampoline = mono_create_delegate_virtual_trampoline (cfg->domain, klass, context_used ? NULL : method);
                else
                        trampoline = mono_create_delegate_trampoline_info (cfg->domain, klass, context_used ? NULL : method);
@@ -5045,7 +5051,7 @@ handle_delegate_ctor (MonoCompile *cfg, MonoClass *klass, MonoInst *target, Mono
        }
 
        /* Set invoke_impl field */
-       if (virtual) {
+       if (virtual_) {
                MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STORE_MEMBASE_REG, obj->dreg, MONO_STRUCT_OFFSET (MonoDelegate, invoke_impl), tramp_ins->dreg);
        } else {
                dreg = alloc_preg (cfg);
@@ -5058,7 +5064,7 @@ handle_delegate_ctor (MonoCompile *cfg, MonoClass *klass, MonoInst *target, Mono
        }
 
        dreg = alloc_preg (cfg);
-       MONO_EMIT_NEW_ICONST (cfg, dreg, virtual ? 1 : 0);
+       MONO_EMIT_NEW_ICONST (cfg, dreg, virtual_ ? 1 : 0);
        MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STOREI1_MEMBASE_REG, obj->dreg, MONO_STRUCT_OFFSET (MonoDelegate, method_is_virtual), dreg);
 
        /* All the checks which are in mono_delegate_ctor () are done by the delegate trampoline */
@@ -5638,6 +5644,9 @@ emit_array_store (MonoCompile *cfg, MonoClass *klass, MonoInst **sp, gboolean sa
                        int index_reg = sp [1]->dreg;
                        int offset = (mono_class_array_element_size (klass) * sp [1]->inst_c0) + MONO_STRUCT_OFFSET (MonoArray, vector);
 
+                       if (SIZEOF_REGISTER == 8 && COMPILE_LLVM (cfg))
+                               MONO_EMIT_NEW_UNALU (cfg, OP_ZEXT_I4, index_reg, index_reg);
+
                        if (safety_checks)
                                MONO_EMIT_BOUNDS_CHECK (cfg, array_reg, MonoArray, max_length, index_reg);
                        EMIT_NEW_STORE_MEMBASE_TYPE (cfg, ins, &klass->byval_arg, array_reg, offset, sp [2]->dreg);
@@ -5754,6 +5763,9 @@ emit_array_unsafe_mov (MonoCompile *cfg, MonoMethodSignature *fsig, MonoInst **a
        MonoClass *param_klass = mono_class_from_mono_type (fsig->params [0]);
        MonoClass *return_klass = mono_class_from_mono_type (fsig->ret);
 
+       if (mini_is_gsharedvt_variable_type (fsig->ret))
+               return NULL;
+
        //Valuetypes that are semantically equivalent or numbers than can be widened to
        if (is_unsafe_mov_compatible (cfg, param_klass, return_klass))
                return args [0];
@@ -5886,8 +5898,12 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign
                        int add_reg = alloc_preg (cfg);
 
 #if SIZEOF_REGISTER == 8
-                       /* The array reg is 64 bits but the index reg is only 32 */
-                       MONO_EMIT_NEW_UNALU (cfg, OP_SEXT_I4, index_reg, args [1]->dreg);
+                       if (COMPILE_LLVM (cfg)) {
+                               MONO_EMIT_NEW_UNALU (cfg, OP_ZEXT_I4, index_reg, args [1]->dreg);
+                       } else {
+                               /* The array reg is 64 bits but the index reg is only 32 */
+                               MONO_EMIT_NEW_UNALU (cfg, OP_SEXT_I4, index_reg, args [1]->dreg);
+                       }
 #else
                        index_reg = args [1]->dreg;
 #endif 
@@ -6676,13 +6692,13 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign
                        cfg->disable_llvm = TRUE;
 
                        if (args [0]->opcode == OP_GOT_ENTRY) {
-                               pi = args [0]->inst_p1;
+                               pi = (MonoInst *)args [0]->inst_p1;
                                g_assert (pi->opcode == OP_PATCH_INFO);
                                g_assert (GPOINTER_TO_INT (pi->inst_p1) == MONO_PATCH_INFO_LDSTR);
-                               ji = pi->inst_p0;
+                               ji = (MonoJumpInfoToken *)pi->inst_p0;
                        } else {
                                g_assert (GPOINTER_TO_INT (args [0]->inst_p1) == MONO_PATCH_INFO_LDSTR);
-                               ji = args [0]->inst_p0;
+                               ji = (MonoJumpInfoToken *)args [0]->inst_p0;
                        }
 
                        NULLIFY_INS (args [0]);
@@ -6911,7 +6927,7 @@ emit_init_local (MonoCompile *cfg, int local, MonoType *type, gboolean init)
        MonoInst *var = cfg->locals [local];
        if (COMPILE_SOFT_FLOAT (cfg)) {
                MonoInst *store;
-               int reg = alloc_dreg (cfg, var->type);
+               int reg = alloc_dreg (cfg, (MonoStackType)var->type);
                emit_init_rvar (cfg, reg, type);
                EMIT_NEW_LOCSTORE (cfg, store, local, cfg->cbb->last_ins);
        } else {
@@ -6946,7 +6962,7 @@ inline_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig,
        guint32 prev_cil_offset_to_bb_len;
        MonoMethod *prev_current_method;
        MonoGenericContext *prev_generic_context;
-       gboolean ret_var_set, prev_ret_var_set, prev_disable_inline, virtual = FALSE;
+       gboolean ret_var_set, prev_ret_var_set, prev_disable_inline, virtual_ = FALSE;
 
        g_assert (cfg->exception_type == MONO_EXCEPTION_NONE);
 
@@ -6997,7 +7013,7 @@ inline_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig,
        }
 
        prev_locals = cfg->locals;
-       cfg->locals = mono_mempool_alloc0 (cfg->mempool, cheader->num_locals * sizeof (MonoInst*));     
+       cfg->locals = (MonoInst **)mono_mempool_alloc0 (cfg->mempool, cheader->num_locals * sizeof (MonoInst*));
        for (i = 0; i < cheader->num_locals; ++i)
                cfg->locals [i] = mono_compile_create_var (cfg, cheader->locals [i], OP_LOCAL);
 
@@ -7028,9 +7044,9 @@ inline_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig,
        prev_disable_inline = cfg->disable_inline;
 
        if (ip && *ip == CEE_CALLVIRT && !(cmethod->flags & METHOD_ATTRIBUTE_STATIC))
-               virtual = TRUE;
+               virtual_ = TRUE;
 
-       costs = mono_method_to_ir (cfg, cmethod, sbblock, ebblock, rvar, sp, real_offset, virtual);
+       costs = mono_method_to_ir (cfg, cmethod, sbblock, ebblock, rvar, sp, real_offset, virtual_);
 
        ret_var_set = cfg->ret_var_set;
 
@@ -7270,7 +7286,7 @@ mini_get_method_allow_open (MonoMethod *m, guint32 token, MonoClass *klass, Mono
        MonoMethod *method;
 
        if (m->wrapper_type != MONO_WRAPPER_NONE) {
-               method = mono_method_get_wrapper_data (m, token);
+               method = (MonoMethod *)mono_method_get_wrapper_data (m, token);
                if (context) {
                        MonoError error;
                        method = mono_class_inflate_generic_method_checked (method, context, &error);
@@ -7301,7 +7317,7 @@ mini_get_class (MonoMethod *method, guint32 token, MonoGenericContext *context)
        MonoClass *klass;
 
        if (method->wrapper_type != MONO_WRAPPER_NONE) {
-               klass = mono_method_get_wrapper_data (method, token);
+               klass = (MonoClass *)mono_method_get_wrapper_data (method, token);
                if (context)
                        klass = mono_class_inflate_generic_class (klass, context);
        } else {
@@ -7464,7 +7480,7 @@ initialize_array_data (MonoMethod *method, gboolean aot, unsigned char *ip, Mono
                        /*g_print ("field: 0x%08x, rva: %d, rva_ptr: %p\n", read32 (ip + 2), rva, data_ptr);*/
                        /* for aot code we do the lookup on load */
                        if (aot && data_ptr)
-                               return GUINT_TO_POINTER (rva);
+                               return (const char *)GUINT_TO_POINTER (rva);
                } else {
                        /*FIXME is it possible to AOT a SRE assembly not meant to be saved? */ 
                        g_assert (!aot);
@@ -7781,7 +7797,7 @@ sig_to_rgctx_sig (MonoMethodSignature *sig)
        MonoMethodSignature *res;
        int i;
 
-       res = g_malloc (MONO_SIZEOF_METHOD_SIGNATURE + (sig->param_count + 1) * sizeof (MonoType*));
+       res = (MonoMethodSignature *)g_malloc (MONO_SIZEOF_METHOD_SIGNATURE + (sig->param_count + 1) * sizeof (MonoType*));
        memcpy (res, sig, MONO_SIZEOF_METHOD_SIGNATURE);
        res->param_count = sig->param_count + 1;
        for (i = 0; i < sig->param_count; ++i)
@@ -7941,7 +7957,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                cfg->real_offset = inline_offset;
        }
 
-       cfg->cil_offset_to_bb = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoBasicBlock*) * header->code_size);
+       cfg->cil_offset_to_bb = (MonoBasicBlock **)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoBasicBlock*) * header->code_size);
        cfg->cil_offset_to_bb_len = header->code_size;
 
        cfg->current_method = method;
@@ -7949,7 +7965,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
        if (cfg->verbose_level > 2)
                printf ("method to IR %s\n", mono_method_full_name (method, TRUE));
 
-       param_types = mono_mempool_alloc (cfg->mempool, sizeof (MonoType*) * num_args);
+       param_types = (MonoType **)mono_mempool_alloc (cfg->mempool, sizeof (MonoType*) * num_args);
        if (sig->hasthis)
                param_types [0] = method->klass->valuetype?&method->klass->this_arg:&method->klass->byval_arg;
        for (n = 0; n < sig->param_count; ++n)
@@ -8034,7 +8050,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                /* mostly like handle_stack_args (), but just sets the input args */
                                /* printf ("handling clause at IL_%04x\n", clause->handler_offset); */
                                tblock->in_scount = 1;
-                               tblock->in_stack = mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*));
+                               tblock->in_stack = (MonoInst **)mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*));
                                tblock->in_stack [0] = mono_create_exvar_for_offset (cfg, clause->handler_offset);
 
                                cfg->cbb = tblock;
@@ -8066,7 +8082,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                        tblock->flags |= BB_EXCEPTION_HANDLER;
                                        tblock->real_offset = clause->data.filter_offset;
                                        tblock->in_scount = 1;
-                                       tblock->in_stack = mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*));
+                                       tblock->in_stack = (MonoInst **)mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*));
                                        /* The filter block shares the exvar with the handler block */
                                        tblock->in_stack [0] = mono_create_exvar_for_offset (cfg, clause->handler_offset);
                                        MONO_INST_NEW (cfg, ins, OP_START_HANDLER);
@@ -8139,10 +8155,10 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                MonoInst *var, *locals_var;
                int dreg;
 
-               info = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoGSharedVtMethodInfo));
+               info = (MonoGSharedVtMethodInfo *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoGSharedVtMethodInfo));
                info->method = cfg->method;
                info->count_entries = 16;
-               info->entries = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoRuntimeGenericContextInfoTemplate) * info->count_entries);
+               info->entries = (MonoRuntimeGenericContextInfoTemplate *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoRuntimeGenericContextInfoTemplate) * info->count_entries);
                cfg->gsharedvt_info = info;
 
                var = mono_compile_create_var (cfg, &mono_defaults.int_class->byval_arg, OP_LOCAL);
@@ -8247,7 +8263,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
        }
 
        /* we use a spare stack slot in SWITCH and NEWOBJ and others */
-       stack_start = sp = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst*) * (header->max_stack + 1));
+       stack_start = sp = (MonoInst **)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst*) * (header->max_stack + 1));
 
        ins_flag = 0;
        start_new_bblock = 0;
@@ -8567,7 +8583,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 #endif
 
                        /* FIXME: we should really allocate this only late in the compilation process */
-                       f = mono_domain_alloc (cfg->domain, sizeof (float));
+                       f = (float *)mono_domain_alloc (cfg->domain, sizeof (float));
                        CHECK_OPSIZE (5);
                        CHECK_STACK_OVF (1);
 
@@ -8604,7 +8620,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 #endif
 
                        /* FIXME: we should really allocate this only late in the compilation process */
-                       d = mono_domain_alloc (cfg->domain, sizeof (double));
+                       d = (double *)mono_domain_alloc (cfg->domain, sizeof (double));
                        CHECK_OPSIZE (9);
                        CHECK_STACK_OVF (1);
 
@@ -8689,7 +8705,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        if (cfg->llvm_only) {
                                MonoInst **args;
 
-                               args = mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * n);
+                               args = (MonoInst **)mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * n);
                                for (i = 0; i < n; ++i)
                                        EMIT_NEW_ARGLOAD (cfg, args [i], i);
                                ins = mono_emit_method_call_full (cfg, cmethod, fsig, TRUE, args, NULL, NULL, NULL);
@@ -8713,7 +8729,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                call->method = cmethod;
                                call->tail_call = TRUE;
                                call->signature = mono_method_signature (cmethod);
-                               call->args = mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * n);
+                               call->args = (MonoInst **)mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * n);
                                call->inst.inst_p0 = cmethod;
                                for (i = 0; i < n; ++i)
                                        EMIT_NEW_ARGLOAD (cfg, call->args [i], i);
@@ -8771,7 +8787,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 
                        CHECK_STACK (n);
 
-                       //g_assert (!virtual || fsig->hasthis);
+                       //g_assert (!virtual_ || fsig->hasthis);
 
                        sp -= n;
 
@@ -8802,7 +8818,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        INLINE_FAILURE ("indirect call");
 
                        if (addr->opcode == OP_PCONST || addr->opcode == OP_AOTCONST || addr->opcode == OP_GOT_ENTRY) {
-                               int info_type;
+                               MonoJumpInfoType info_type;
                                gpointer info_data;
 
                                /*
@@ -8810,10 +8826,10 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                 * with the contents of the aotconst as the patch info.
                                 */
                                if (addr->opcode == OP_PCONST || addr->opcode == OP_AOTCONST) {
-                                       info_type = addr->inst_c1;
+                                       info_type = (MonoJumpInfoType)addr->inst_c1;
                                        info_data = addr->inst_p0;
                                } else {
-                                       info_type = addr->inst_right->inst_c1;
+                                       info_type = (MonoJumpInfoType)addr->inst_right->inst_c1;
                                        info_data = addr->inst_right->inst_left;
                                }
 
@@ -8846,7 +8862,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        MonoInst *addr = NULL;
                        MonoMethodSignature *fsig = NULL;
                        int array_rank = 0;
-                       int virtual = *ip == CEE_CALLVIRT;
+                       int virtual_ = *ip == CEE_CALLVIRT;
                        gboolean pass_imt_from_rgctx = FALSE;
                        MonoInst *imt_arg = NULL;
                        MonoInst *keep_this_alive = NULL;
@@ -8927,9 +8943,9 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        if (mono_security_core_clr_enabled ())
                                ensure_method_is_allowed_to_call_method (cfg, method, cil_method);
 
-                       if (!virtual && (cmethod->flags & METHOD_ATTRIBUTE_ABSTRACT))
+                       if (!virtual_ && (cmethod->flags & METHOD_ATTRIBUTE_ABSTRACT))
                                /* MS.NET seems to silently convert this to a callvirt */
-                               virtual = 1;
+                               virtual_ = 1;
 
                        {
                                /*
@@ -8940,8 +8956,8 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                 */
                                const int test_flags = METHOD_ATTRIBUTE_VIRTUAL | METHOD_ATTRIBUTE_FINAL | METHOD_ATTRIBUTE_STATIC;
                                const int expected_flags = METHOD_ATTRIBUTE_VIRTUAL | METHOD_ATTRIBUTE_FINAL;
-                               if (!virtual && mono_class_is_marshalbyref (cmethod->klass) && (cmethod->flags & test_flags) == expected_flags && cfg->method->wrapper_type == MONO_WRAPPER_NONE)
-                                       virtual = 1;
+                               if (!virtual_ && mono_class_is_marshalbyref (cmethod->klass) && (cmethod->flags & test_flags) == expected_flags && cfg->method->wrapper_type == MONO_WRAPPER_NONE)
+                                       virtual_ = 1;
                        }
 
                        if (!cmethod->klass->inited)
@@ -9005,10 +9021,13 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 
                        CHECK_STACK (n);
 
-                       //g_assert (!virtual || fsig->hasthis);
+                       //g_assert (!virtual_ || fsig->hasthis);
 
                        sp -= n;
 
+                       /*
+                        * We have the `constrained.' prefix opcode.
+                        */
                        if (constrained_class) {
                                if (mini_is_gsharedvt_klass (constrained_class)) {
                                        if ((cmethod->klass != mono_defaults.object_class) && constrained_class->valuetype && cmethod->klass->valuetype) {
@@ -9023,9 +9042,6 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                        }
                                }
 
-                               /*
-                                * We have the `constrained.' prefix opcode.
-                                */
                                if (constrained_partial_call) {
                                        gboolean need_box = TRUE;
 
@@ -9141,7 +9157,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                                        CHECK_CFG_EXCEPTION;
                                                }
                                        }
-                                       virtual = 0;
+                                       virtual_ = 0;
                                }
                                constrained_class = NULL;
                        }
@@ -9231,9 +9247,9 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                if ((!(cmethod->flags & METHOD_ATTRIBUTE_VIRTUAL) ||
                                         MONO_METHOD_IS_FINAL (cmethod)) &&
                                        !mono_class_is_marshalbyref (cmethod->klass)) {
-                                       if (virtual)
+                                       if (virtual_)
                                                check_this = TRUE;
-                                       virtual = 0;
+                                       virtual_ = 0;
                                }
                        }
 
@@ -9248,7 +9264,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                MONO_EMIT_NEW_CHECK_THIS (cfg, sp [0]->dreg);
 
                        /* Calling virtual generic methods */
-                       if (virtual && (cmethod->flags & METHOD_ATTRIBUTE_VIRTUAL) && 
+                       if (virtual_ && (cmethod->flags & METHOD_ATTRIBUTE_VIRTUAL) &&
                            !(MONO_METHOD_IS_FINAL (cmethod) && 
                              cmethod->wrapper_type != MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK) &&
                            fsig->generic_param_count && 
@@ -9333,7 +9349,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 
                        /* Inlining */
                        if ((cfg->opt & MONO_OPT_INLINE) &&
-                               (!virtual || !(cmethod->flags & METHOD_ATTRIBUTE_VIRTUAL) || MONO_METHOD_IS_FINAL (cmethod)) &&
+                               (!virtual_ || !(cmethod->flags & METHOD_ATTRIBUTE_VIRTUAL) || MONO_METHOD_IS_FINAL (cmethod)) &&
                            mono_method_check_inlining (cfg, cmethod)) {
                                int costs;
                                gboolean always = FALSE;
@@ -9405,7 +9421,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                !(cmethod->klass->rank && cmethod->klass->byval_arg.type != MONO_TYPE_SZARRAY)) {
                                MonoRgctxInfoType info_type;
 
-                               if (virtual) {
+                               if (virtual_) {
                                        //if (cmethod->klass->flags & TYPE_ATTRIBUTE_INTERFACE)
                                                //GSHAREDVT_FAILURE (*ip);
                                        // disable for possible remoting calls
@@ -9430,7 +9446,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                if ((cmethod->klass->parent == mono_defaults.multicastdelegate_class) && (!strcmp (cmethod->name, "Invoke")))
                                        keep_this_alive = sp [0];
 
-                               if (virtual && (cmethod->flags & METHOD_ATTRIBUTE_VIRTUAL))
+                               if (virtual_ && (cmethod->flags & METHOD_ATTRIBUTE_VIRTUAL))
                                        info_type = MONO_RGCTX_INFO_METHOD_GSHAREDVT_OUT_TRAMPOLINE_VIRT;
                                else
                                        info_type = MONO_RGCTX_INFO_METHOD_GSHAREDVT_OUT_TRAMPOLINE;
@@ -9450,7 +9466,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        if (context_used && !imt_arg && !array_rank && !delegate_invoke &&
                                (!mono_method_is_generic_sharable_full (cmethod, TRUE, FALSE, FALSE) ||
                                 !mono_class_generic_sharing_enabled (cmethod->klass)) &&
-                               (!virtual || MONO_METHOD_IS_FINAL (cmethod) ||
+                               (!virtual_ || MONO_METHOD_IS_FINAL (cmethod) ||
                                 !(cmethod->flags & METHOD_ATTRIBUTE_VIRTUAL))) {
                                INLINE_FAILURE ("gshared");
 
@@ -9537,7 +9553,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                goto call_end;
                        }
 
-                       ins = mini_redirect_call (cfg, cmethod, fsig, sp, virtual ? sp [0] : NULL);
+                       ins = mini_redirect_call (cfg, cmethod, fsig, sp, virtual_ ? sp [0] : NULL);
                        if (ins)
                                goto call_end;
 
@@ -9620,7 +9636,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                         * So we make resolve_iface_call return the rgctx, and do two calls with different signatures
                         * based on whenever there is an rgctx or not.
                         */
-                       if (cfg->llvm_only && virtual && cmethod && (cmethod->klass->flags & TYPE_ATTRIBUTE_INTERFACE)) {
+                       if (cfg->llvm_only && virtual_ && cmethod && (cmethod->klass->flags & TYPE_ATTRIBUTE_INTERFACE)) {
                                MonoInst *args_buf [16], *icall_args [16];
                                MonoInst **args;
                                MonoBasicBlock *rgctx_bb, *end_bb;
@@ -9667,7 +9683,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                if (fsig->param_count + 2 < 16)
                                        args = args_buf;
                                else
-                                       args = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst*) * (fsig->param_count + 2));
+                                       args = (MonoInst **)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst*) * (fsig->param_count + 2));
                                args [0] = sp [0];
                                for (i = 0; i < fsig->param_count; ++i)
                                        args [i + 1] = sp [i + 1];
@@ -9685,7 +9701,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 
                        /* Common call */
                        INLINE_FAILURE ("call");
-                       ins = mono_emit_method_call_full (cfg, cmethod, fsig, tail_call, sp, virtual ? sp [0] : NULL,
+                       ins = mono_emit_method_call_full (cfg, cmethod, fsig, tail_call, sp, virtual_ ? sp [0] : NULL,
                                                                                          imt_arg, vtable_arg);
 
                        if (tail_call && !cfg->llvm_only) {
@@ -9911,7 +9927,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        MONO_INST_NEW (cfg, ins, is_true ? CEE_BNE_UN : CEE_BEQ);
                        type_from_op (cfg, ins, sp [0], NULL);
                        MONO_ADD_INS (cfg->cbb, ins);
-                       ins->inst_many_bb = mono_mempool_alloc (cfg->mempool, sizeof(gpointer)*2);
+                       ins->inst_many_bb = (MonoBasicBlock **)mono_mempool_alloc (cfg->mempool, sizeof(gpointer)*2);
                        GET_BBLOCK (cfg, tblock, target);
                        ins->inst_true_bb = tblock;
                        GET_BBLOCK (cfg, tblock, ip);
@@ -9970,7 +9986,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        GET_BBLOCK (cfg, default_bblock, target);
                        default_bblock->flags |= BB_INDIRECT_JUMP_TARGET;
 
-                       targets = mono_mempool_alloc (cfg->mempool, sizeof (MonoBasicBlock*) * n);
+                       targets = (MonoBasicBlock **)mono_mempool_alloc (cfg->mempool, sizeof (MonoBasicBlock*) * n);
                        for (i = 0; i < n; ++i) {
                                GET_BBLOCK (cfg, tblock, target + (gint32)read32(ip));
                                targets [i] = tblock;
@@ -10003,7 +10019,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        for (i = 0; i < n; ++i)
                                link_bblock (cfg, cfg->cbb, targets [i]);
 
-                       table = mono_mempool_alloc (cfg->mempool, sizeof (MonoJumpInfoBBTable));
+                       table = (MonoJumpInfoBBTable *)mono_mempool_alloc (cfg->mempool, sizeof (MonoJumpInfoBBTable));
                        table->table = targets;
                        table->table_size = n;
 
@@ -10025,7 +10041,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                ins->sreg1 = src1->dreg;
                                ins->inst_p0 = table;
                                ins->inst_many_bb = targets;
-                               ins->klass = GUINT_TO_POINTER (n);
+                               ins->klass = (MonoClass *)GUINT_TO_POINTER (n);
                                MONO_ADD_INS (cfg->cbb, ins);
                        } else {
                                if (sizeof (gpointer) == 8)
@@ -10138,7 +10154,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        ins->sreg2 = sp [1]->dreg;
                        type_from_op (cfg, ins, sp [0], sp [1]);
                        CHECK_TYPE (ins);
-                       ins->dreg = alloc_dreg ((cfg), (ins)->type);
+                       ins->dreg = alloc_dreg ((cfg), (MonoStackType)(ins)->type);
 
                        /* Use the immediate opcodes if possible */
                        if ((sp [1]->opcode == OP_ICONST) && mono_arch_is_inst_imm (sp [1]->inst_c0)) {
@@ -10178,7 +10194,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        type_from_op (cfg, ins, sp [0], sp [1]);
                        CHECK_TYPE (ins);
                        add_widen_op (cfg, ins, &sp [0], &sp [1]);
-                       ins->dreg = alloc_dreg ((cfg), (ins)->type);
+                       ins->dreg = alloc_dreg ((cfg), (MonoStackType)(ins)->type);
 
                        /* FIXME: Pass opcode to is_inst_imm */
 
@@ -10426,7 +10442,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        }
                        else if (method->wrapper_type != MONO_WRAPPER_NONE) {
                                MonoInst *iargs [1];
-                               char *str = mono_method_get_wrapper_data (method, n);
+                               char *str = (char *)mono_method_get_wrapper_data (method, n);
 
                                if (cfg->compile_aot)
                                        EMIT_NEW_LDSTRLITCONST (cfg, iargs [0], str);
@@ -10991,7 +11007,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        CHECK_OPSIZE (5);
                        token = read32 (ip + 1);
                        if (method->wrapper_type != MONO_WRAPPER_NONE) {
-                               field = mono_method_get_wrapper_data (method, token);
+                               field = (MonoClassField *)mono_method_get_wrapper_data (method, token);
                                klass = field->parent;
                        }
                        else {
@@ -11713,6 +11729,9 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                int index_reg = sp [1]->dreg;
                                int offset = (mono_class_array_element_size (klass) * sp [1]->inst_c0) + MONO_STRUCT_OFFSET (MonoArray, vector);
 
+                               if (SIZEOF_REGISTER == 8 && COMPILE_LLVM (cfg))
+                                       MONO_EMIT_NEW_UNALU (cfg, OP_ZEXT_I4, index_reg, index_reg);
+
                                MONO_EMIT_BOUNDS_CHECK (cfg, array_reg, MonoArray, max_length, index_reg);
                                EMIT_NEW_LOAD_MEMBASE_TYPE (cfg, ins, &klass->byval_arg, array_reg, offset);
                        } else {
@@ -11885,7 +11904,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        if (method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD ||
                                        method->wrapper_type == MONO_WRAPPER_SYNCHRONIZED) {
                                handle = mono_method_get_wrapper_data (method, n);
-                               handle_class = mono_method_get_wrapper_data (method, n + 1);
+                               handle_class = (MonoClass *)mono_method_get_wrapper_data (method, n + 1);
                                if (handle_class == mono_defaults.typehandle_class)
                                        handle = &((MonoClass*)handle)->byval_arg;
                        }
@@ -11904,11 +11923,11 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                           typeof(Gen<>). */
                                        context_used = 0;
                                } else if (handle_class == mono_defaults.typehandle_class) {
-                                       context_used = mini_class_check_context_used (cfg, mono_class_from_mono_type (handle));
+                                       context_used = mini_class_check_context_used (cfg, mono_class_from_mono_type ((MonoType *)handle));
                                } else if (handle_class == mono_defaults.fieldhandle_class)
                                        context_used = mini_class_check_context_used (cfg, ((MonoClassField*)handle)->parent);
                                else if (handle_class == mono_defaults.methodhandle_class)
-                                       context_used = mini_method_check_context_used (cfg, handle);
+                                       context_used = mini_method_check_context_used (cfg, (MonoMethod *)handle);
                                else
                                        g_assert_not_reached ();
                        }
@@ -11944,7 +11963,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                        (cmethod = mini_get_method (cfg, method, read32 (ip + 6), NULL, generic_context)) &&
                                        (cmethod->klass == mono_defaults.systemtype_class) &&
                                        (strcmp (cmethod->name, "GetTypeFromHandle") == 0)) {
-                                       MonoClass *tclass = mono_class_from_mono_type (handle);
+                                       MonoClass *tclass = mono_class_from_mono_type ((MonoType *)handle);
 
                                        mono_class_init (tclass);
                                        if (context_used) {
@@ -11966,7 +11985,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                                        EMIT_NEW_TYPE_FROM_HANDLE_CONST (cfg, ins, image, n, generic_context);
                                                }
                                        } else {
-                                               EMIT_NEW_PCONST (cfg, ins, mono_type_get_object (cfg->domain, handle));
+                                               EMIT_NEW_PCONST (cfg, ins, mono_type_get_object (cfg->domain, (MonoType *)handle));
                                        }
                                        ins->type = STACK_OBJ;
                                        ins->klass = cmethod->klass;
@@ -11979,14 +11998,14 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                        if (context_used) {
                                                if (handle_class == mono_defaults.typehandle_class) {
                                                        ins = emit_get_rgctx_klass (cfg, context_used,
-                                                                       mono_class_from_mono_type (handle),
+                                                                       mono_class_from_mono_type ((MonoType *)handle),
                                                                        MONO_RGCTX_INFO_TYPE);
                                                } else if (handle_class == mono_defaults.methodhandle_class) {
                                                        ins = emit_get_rgctx_method (cfg, context_used,
-                                                                       handle, MONO_RGCTX_INFO_METHOD);
+                                                                       (MonoMethod *)handle, MONO_RGCTX_INFO_METHOD);
                                                } else if (handle_class == mono_defaults.fieldhandle_class) {
                                                        ins = emit_get_rgctx_field (cfg, context_used,
-                                                                       handle, MONO_RGCTX_INFO_CLASS_FIELD);
+                                                                       (MonoClassField *)handle, MONO_RGCTX_INFO_CLASS_FIELD);
                                                } else {
                                                        g_assert_not_reached ();
                                                }
@@ -12109,7 +12128,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                MonoExceptionClause *clause;
 
                                for (tmp = handlers; tmp; tmp = tmp->next) {
-                                       clause = tmp->data;
+                                       clause = (MonoExceptionClause *)tmp->data;
                                        tblock = cfg->cil_offset_to_bb [clause->handler_offset];
                                        g_assert (tblock);
                                        link_bblock (cfg, cfg->cbb, tblock);
@@ -12248,7 +12267,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                CHECK_OPSIZE (6);
                                token = read32 (ip + 2);
 
-                               cmethod = mono_method_get_wrapper_data (method, token);
+                               cmethod = (MonoMethod *)mono_method_get_wrapper_data (method, token);
 
                                if (cfg->compile_aot) {
                                        EMIT_NEW_AOTCONST (cfg, ins, MONO_PATCH_INFO_ICALL_ADDR, cmethod);
@@ -12311,7 +12330,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                CHECK_OPSIZE (6);
                                --sp;
                                token = read32 (ip + 2);
-                               klass = mono_method_get_wrapper_data (method, token);
+                               klass = (MonoClass *)mono_method_get_wrapper_data (method, token);
                                g_assert (klass->valuetype);
                                mono_class_init (klass);
 
@@ -12400,11 +12419,11 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                ip += 2;
                                break;
                        case CEE_MONO_TLS: {
-                               int key;
+                               MonoTlsKey key;
 
                                CHECK_STACK_OVF (1);
                                CHECK_OPSIZE (6);
-                               key = (gint32)read32 (ip + 2);
+                               key = (MonoTlsKey)read32 (ip + 2);
                                g_assert (key < TLS_KEY_NUM);
 
                                ins = mono_create_tls_get (cfg, key);
@@ -12582,7 +12601,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                        cmp->opcode = OP_ICOMPARE;
                                MONO_ADD_INS (cfg->cbb, cmp);
                                ins->type = STACK_I4;
-                               ins->dreg = alloc_dreg (cfg, ins->type);
+                               ins->dreg = alloc_dreg (cfg, (MonoStackType)ins->type);
                                type_from_op (cfg, ins, arg1, arg2);
 
                                if (cmp->opcode == OP_FCOMPARE || cmp->opcode == OP_RCOMPARE) {
@@ -13701,7 +13720,7 @@ mono_handle_global_vregs (MonoCompile *cfg)
        MonoBasicBlock *bb;
        int i, pos;
 
-       vreg_to_bb = mono_mempool_alloc0 (cfg->mempool, sizeof (gint32*) * cfg->next_vreg + 1);
+       vreg_to_bb = (gint32 *)mono_mempool_alloc0 (cfg->mempool, sizeof (gint32*) * cfg->next_vreg + 1);
 
 #ifdef MONO_ARCH_SIMD_INTRINSICS
        if (cfg->uses_simd_intrinsics)
@@ -13944,7 +13963,7 @@ mono_spill_global_vars (MonoCompile *cfg, gboolean *need_local_opts)
        guint32 *lvregs;
        guint32 i, lvregs_len;
        gboolean dest_has_lvreg = FALSE;
-       guint32 stacktypes [128];
+       MonoStackType stacktypes [128];
        MonoInst **live_range_start, **live_range_end;
        MonoBasicBlock **live_range_start_bb, **live_range_end_bb;
        int *gsharedvt_vreg_to_idx = NULL;
@@ -14008,7 +14027,7 @@ mono_spill_global_vars (MonoCompile *cfg, gboolean *need_local_opts)
        }
 
        if (cfg->gsharedvt) {
-               gsharedvt_vreg_to_idx = mono_mempool_alloc0 (cfg->mempool, sizeof (int) * cfg->next_vreg);
+               gsharedvt_vreg_to_idx = (int *)mono_mempool_alloc0 (cfg->mempool, sizeof (int) * cfg->next_vreg);
 
                for (i = 0; i < cfg->num_varinfo; ++i) {
                        MonoInst *ins = cfg->varinfo [i];
@@ -14038,8 +14057,8 @@ mono_spill_global_vars (MonoCompile *cfg, gboolean *need_local_opts)
         * the variable again.
         */
        orig_next_vreg = cfg->next_vreg;
-       vreg_to_lvreg = mono_mempool_alloc0 (cfg->mempool, sizeof (guint32) * cfg->next_vreg);
-       lvregs = mono_mempool_alloc (cfg->mempool, sizeof (guint32) * 1024);
+       vreg_to_lvreg = (guint32 *)mono_mempool_alloc0 (cfg->mempool, sizeof (guint32) * cfg->next_vreg);
+       lvregs = (guint32 *)mono_mempool_alloc (cfg->mempool, sizeof (guint32) * 1024);
        lvregs_len = 0;
 
        /* 
@@ -14090,7 +14109,7 @@ mono_spill_global_vars (MonoCompile *cfg, gboolean *need_local_opts)
                         * when variable addresses are known.
                         */
                        if (ins->opcode == OP_LDADDR) {
-                               MonoInst *var = ins->inst_p0;
+                               MonoInst *var = (MonoInst *)ins->inst_p0;
 
                                if (var->opcode == OP_VTARG_ADDR) {
                                        /* Happens on SPARC/S390 where vtypes are passed by reference */

diff --git a/mono/mini/mini-amd64.c b/mono/mini/mini-amd64.c
index 1abbd14540854d1fcf16e946999897b98b0e684f..3b92f4c72e8a1de69486d1cdd665b8c3982bd5d9 100644 (file)
--- a/mono/mini/mini-amd64.c
+++ b/mono/mini/mini-amd64.c
@@ -61,8 +61,8 @@ static gboolean optimize_for_xen = TRUE;
 #endif
 
 /* This mutex protects architecture specific caches */
-#define mono_mini_arch_lock() mono_mutex_lock (&mini_arch_mutex)
-#define mono_mini_arch_unlock() mono_mutex_unlock (&mini_arch_mutex)
+#define mono_mini_arch_lock() mono_os_mutex_lock (&mini_arch_mutex)
+#define mono_mini_arch_unlock() mono_os_mutex_unlock (&mini_arch_mutex)
 static mono_mutex_t mini_arch_mutex;
 
 /* The single step trampoline */
@@ -1142,9 +1142,9 @@ get_call_info (MonoMemPool *mp, MonoMethodSignature *sig)
        gboolean is_pinvoke = sig->pinvoke;
 
        if (mp)
-               cinfo = mono_mempool_alloc0 (mp, sizeof (CallInfo) + (sizeof (ArgInfo) * n));
+               cinfo = (CallInfo *)mono_mempool_alloc0 (mp, sizeof (CallInfo) + (sizeof (ArgInfo) * n));
        else
-               cinfo = g_malloc0 (sizeof (CallInfo) + (sizeof (ArgInfo) * n));
+               cinfo = (CallInfo *)g_malloc0 (sizeof (CallInfo) + (sizeof (ArgInfo) * n));
 
        cinfo->nargs = n;
 
@@ -1449,7 +1449,7 @@ mono_arch_cpu_init (void)
 void
 mono_arch_init (void)
 {
-       mono_mutex_init_recursive (&mini_arch_mutex);
+       mono_os_mutex_init_recursive (&mini_arch_mutex);
 #if defined(__native_client_codegen__)
        mono_native_tls_alloc (&nacl_instruction_depth, NULL);
        mono_native_tls_set_value (nacl_instruction_depth, (gpointer)0);
@@ -1472,7 +1472,7 @@ mono_arch_init (void)
 void
 mono_arch_cleanup (void)
 {
-       mono_mutex_destroy (&mini_arch_mutex);
+       mono_os_mutex_destroy (&mini_arch_mutex);
 #if defined(__native_client_codegen__)
        mono_native_tls_free (nacl_instruction_depth);
        mono_native_tls_free (nacl_rex_tag);
@@ -1593,7 +1593,7 @@ mono_arch_compute_omit_fp (MonoCompile *cfg)
 
        if (!cfg->arch.cinfo)
                cfg->arch.cinfo = get_call_info (cfg->mempool, sig);
-       cinfo = cfg->arch.cinfo;
+       cinfo = (CallInfo *)cfg->arch.cinfo;
 
        /*
         * FIXME: Remove some of the restrictions.
@@ -1776,7 +1776,7 @@ mono_arch_fill_argument_info (MonoCompile *cfg)
 
        sig = mono_method_signature (cfg->method);
 
-       cinfo = cfg->arch.cinfo;
+       cinfo = (CallInfo *)cfg->arch.cinfo;
        sig_ret = mini_get_underlying_type (sig->ret);
 
        /*
@@ -1843,7 +1843,7 @@ mono_arch_allocate_vars (MonoCompile *cfg)
 
        sig = mono_method_signature (cfg->method);
 
-       cinfo = cfg->arch.cinfo;
+       cinfo = (CallInfo *)cfg->arch.cinfo;
        sig_ret = mini_get_underlying_type (sig->ret);
 
        mono_arch_compute_omit_fp (cfg);
@@ -2071,7 +2071,7 @@ mono_arch_create_vars (MonoCompile *cfg)
 
        if (!cfg->arch.cinfo)
                cfg->arch.cinfo = get_call_info (cfg->mempool, sig);
-       cinfo = cfg->arch.cinfo;
+       cinfo = (CallInfo *)cfg->arch.cinfo;
 
        if (cinfo->ret.storage == ArgValuetypeInReg)
                cfg->ret_var_is_local = TRUE;
@@ -2984,7 +2984,7 @@ mono_arch_finish_dyn_call (MonoDynCallInfo *info, guint8 *buf)
 } while (0);
 
 static guint8*
-emit_call_body (MonoCompile *cfg, guint8 *code, guint32 patch_type, gconstpointer data)
+emit_call_body (MonoCompile *cfg, guint8 *code, MonoJumpInfoType patch_type, gconstpointer data)
 {
        gboolean no_patch = FALSE;
 
@@ -3018,7 +3018,7 @@ emit_call_body (MonoCompile *cfg, guint8 *code, guint32 patch_type, gconstpointe
                                 * The call might go directly to a native function without
                                 * the wrapper.
                                 */
-                               MonoJitICallInfo *mi = mono_find_jit_icall_by_name (data);
+                               MonoJitICallInfo *mi = mono_find_jit_icall_by_name ((const char *)data);
                                if (mi) {
                                        gconstpointer target = mono_icall_get_wrapper (mi);
                                        if ((((guint64)target) >> 32) != 0)
@@ -3030,7 +3030,7 @@ emit_call_body (MonoCompile *cfg, guint8 *code, guint32 patch_type, gconstpointe
                        MonoJumpInfo *jinfo = NULL;
 
                        if (cfg->abs_patches)
-                               jinfo = g_hash_table_lookup (cfg->abs_patches, data);
+                               jinfo = (MonoJumpInfo *)g_hash_table_lookup (cfg->abs_patches, data);
                        if (jinfo) {
                                if (jinfo->type == MONO_PATCH_INFO_JIT_ICALL_ADDR) {
                                        MonoJitICallInfo *mi = mono_find_jit_icall_by_name (jinfo->data.name);
@@ -3109,7 +3109,7 @@ emit_call_body (MonoCompile *cfg, guint8 *code, guint32 patch_type, gconstpointe
 }
 
 static inline guint8*
-emit_call (MonoCompile *cfg, guint8 *code, guint32 patch_type, gconstpointer data, gboolean win64_adjust_stack)
+emit_call (MonoCompile *cfg, guint8 *code, MonoJumpInfoType patch_type, gconstpointer data, gboolean win64_adjust_stack)
 {
 #ifdef TARGET_WIN32
        if (win64_adjust_stack)
@@ -3597,7 +3597,7 @@ emit_move_return_value (MonoCompile *cfg, MonoInst *ins, guint8 *code)
        case OP_VCALL2_MEMBASE:
                cinfo = get_call_info (cfg->mempool, ((MonoCallInst*)ins)->signature);
                if (cinfo->ret.storage == ArgValuetypeInReg) {
-                       MonoInst *loc = cfg->arch.vret_addr_loc;
+                       MonoInst *loc = (MonoInst *)cfg->arch.vret_addr_loc;
 
                        /* Load the destination address */
                        g_assert (loc->opcode == OP_REGOFFSET);
@@ -3966,7 +3966,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 
                if (G_UNLIKELY (offset > (cfg->code_size - max_len - EXTRA_CODE_SPACE))) {
                        cfg->code_size *= 2;
-                       cfg->native_code = mono_realloc_native_code(cfg);
+                       cfg->native_code = (unsigned char *)mono_realloc_native_code(cfg);
                        code = cfg->native_code + offset;
                        cfg->stat_code_reallocs++;
                }
@@ -4314,7 +4314,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        break;
                case OP_SEQ_POINT: {
                        if (ins->flags & MONO_INST_SINGLE_STEP_LOC) {
-                               MonoInst *var = cfg->arch.ss_tramp_var;
+                               MonoInst *var = (MonoInst *)cfg->arch.ss_tramp_var;
                                guint8 *label;
 
                                /* Load ss_tramp_var */
@@ -4338,7 +4338,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        if (cfg->compile_aot) {
                                guint32 offset = code - cfg->native_code;
                                guint32 val;
-                               MonoInst *info_var = cfg->arch.seq_point_info_var;
+                               MonoInst *info_var = (MonoInst *)cfg->arch.seq_point_info_var;
                                guint8 *label;
 
                                /* Load info var */
@@ -4353,7 +4353,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                                amd64_call_reg (code, AMD64_R11);
                                amd64_patch (label, code);
                        } else {
-                               MonoInst *var = cfg->arch.bp_tramp_var;
+                               MonoInst *var = (MonoInst *)cfg->arch.bp_tramp_var;
                                guint8 *label;
 
                                /*
@@ -5224,21 +5224,21 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_COND_EXC_IGE_UN:
                case OP_COND_EXC_ILE:
                case OP_COND_EXC_ILE_UN:
-                       EMIT_COND_SYSTEM_EXCEPTION (cc_table [mono_opcode_to_cond (ins->opcode)], cc_signed_table [mono_opcode_to_cond (ins->opcode)], ins->inst_p1);
+                       EMIT_COND_SYSTEM_EXCEPTION (cc_table [mono_opcode_to_cond (ins->opcode)], cc_signed_table [mono_opcode_to_cond (ins->opcode)], (const char *)ins->inst_p1);
                        break;
                case OP_COND_EXC_OV:
                case OP_COND_EXC_NO:
                case OP_COND_EXC_C:
                case OP_COND_EXC_NC:
                        EMIT_COND_SYSTEM_EXCEPTION (branch_cc_table [ins->opcode - OP_COND_EXC_EQ], 
-                                                   (ins->opcode < OP_COND_EXC_NE_UN), ins->inst_p1);
+                                                   (ins->opcode < OP_COND_EXC_NE_UN), (const char *)ins->inst_p1);
                        break;
                case OP_COND_EXC_IOV:
                case OP_COND_EXC_INO:
                case OP_COND_EXC_IC:
                case OP_COND_EXC_INC:
                        EMIT_COND_SYSTEM_EXCEPTION (branch_cc_table [ins->opcode - OP_COND_EXC_IEQ], 
-                                                   (ins->opcode < OP_COND_EXC_INE_UN), ins->inst_p1);
+                                                   (ins->opcode < OP_COND_EXC_INE_UN), (const char *)ins->inst_p1);
                        break;
 
                /* floating point opcodes */
@@ -6857,7 +6857,7 @@ mono_arch_emit_prolog (MonoCompile *cfg)
        cfg->code_size = MAX (cfg->header->code_size * 4, 1024);
 
 #if defined(__default_codegen__)
-       code = cfg->native_code = g_malloc (cfg->code_size);
+       code = cfg->native_code = (unsigned char *)g_malloc (cfg->code_size);
 #elif defined(__native_client_codegen__)
        /* native_code_alloc is not 32-byte aligned, native_code is. */
        cfg->native_code_alloc = g_malloc (cfg->code_size + kNaClAlignment);
@@ -6968,7 +6968,7 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                if (G_UNLIKELY (required_code_size >= (cfg->code_size - offset))) {
                        while (required_code_size >= (cfg->code_size - offset))
                                cfg->code_size *= 2;
-                       cfg->native_code = mono_realloc_native_code (cfg);
+                       cfg->native_code = (unsigned char *)mono_realloc_native_code (cfg);
                        code = cfg->native_code + offset;
                        cfg->stat_code_reallocs++;
                }
@@ -7138,7 +7138,7 @@ mono_arch_emit_prolog (MonoCompile *cfg)
        sig = mono_method_signature (method);
        pos = 0;
 
-       cinfo = cfg->arch.cinfo;
+       cinfo = (CallInfo *)cfg->arch.cinfo;
 
        if (sig->ret->type != MONO_TYPE_VOID) {
                /* Save volatile arguments to the stack */
@@ -7243,7 +7243,7 @@ mono_arch_emit_prolog (MonoCompile *cfg)
 
        if (trace) {
                args_clobbered = TRUE;
-               code = mono_arch_instrument_prolog (cfg, mono_trace_enter_method, code, TRUE);
+               code = (guint8 *)mono_arch_instrument_prolog (cfg, mono_trace_enter_method, code, TRUE);
        }
 
        if (cfg->prof_options & MONO_PROFILE_ENTER_LEAVE)
@@ -7318,7 +7318,7 @@ mono_arch_emit_prolog (MonoCompile *cfg)
        }
 
        if (cfg->gen_sdb_seq_points) {
-               MonoInst *info_var = cfg->arch.seq_point_info_var;
+               MonoInst *info_var = (MonoInst *)cfg->arch.seq_point_info_var;
 
                /* Initialize seq_point_info_var */
                if (cfg->compile_aot) {
@@ -7332,7 +7332,7 @@ mono_arch_emit_prolog (MonoCompile *cfg)
 
                if (cfg->compile_aot) {
                        /* Initialize ss_tramp_var */
-                       ins = cfg->arch.ss_tramp_var;
+                       ins = (MonoInst *)cfg->arch.ss_tramp_var;
                        g_assert (ins->opcode == OP_REGOFFSET);
 
                        amd64_mov_reg_membase (code, AMD64_R11, info_var->inst_basereg, info_var->inst_offset, 8);
@@ -7340,14 +7340,14 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                        amd64_mov_membase_reg (code, ins->inst_basereg, ins->inst_offset, AMD64_R11, 8);
                } else {
                        /* Initialize ss_tramp_var */
-                       ins = cfg->arch.ss_tramp_var;
+                       ins = (MonoInst *)cfg->arch.ss_tramp_var;
                        g_assert (ins->opcode == OP_REGOFFSET);
 
                        amd64_mov_reg_imm (code, AMD64_R11, (guint64)&ss_trampoline);
                        amd64_mov_membase_reg (code, ins->inst_basereg, ins->inst_offset, AMD64_R11, 8);
 
                        /* Initialize bp_tramp_var */
-                       ins = cfg->arch.bp_tramp_var;
+                       ins = (MonoInst *)cfg->arch.bp_tramp_var;
                        g_assert (ins->opcode == OP_REGOFFSET);
 
                        amd64_mov_reg_imm (code, AMD64_R11, (guint64)&bp_trampoline);
@@ -7377,7 +7377,7 @@ mono_arch_emit_epilog (MonoCompile *cfg)
 
        while (cfg->code_len + max_epilog_size > (cfg->code_size - 16)) {
                cfg->code_size *= 2;
-               cfg->native_code = mono_realloc_native_code (cfg);
+               cfg->native_code = (unsigned char *)mono_realloc_native_code (cfg);
                cfg->stat_code_reallocs++;
        }
        code = cfg->native_code + cfg->code_len;
@@ -7391,7 +7391,7 @@ mono_arch_emit_epilog (MonoCompile *cfg)
        mono_emit_unwind_op_remember_state (cfg, code);
 
        if (mono_jit_trace_calls != NULL && mono_trace_eval (method))
-               code = mono_arch_instrument_epilog (cfg, mono_trace_leave_method, code, TRUE);
+               code = (guint8 *)mono_arch_instrument_epilog (cfg, mono_trace_leave_method, code, TRUE);
 
        /* the code restoring the registers must be kept in sync with OP_TAILCALL */
        
@@ -7432,7 +7432,7 @@ mono_arch_emit_epilog (MonoCompile *cfg)
        }
 
        /* Load returned vtypes into registers if needed */
-       cinfo = cfg->arch.cinfo;
+       cinfo = (CallInfo *)cfg->arch.cinfo;
        if (cinfo->ret.storage == ArgValuetypeInReg) {
                ArgInfo *ainfo = &cinfo->ret;
                MonoInst *inst = cfg->ret;
@@ -7507,7 +7507,7 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
 
        while (cfg->code_len + code_size > (cfg->code_size - 16)) {
                cfg->code_size *= 2;
-               cfg->native_code = mono_realloc_native_code (cfg);
+               cfg->native_code = (unsigned char *)mono_realloc_native_code (cfg);
                cfg->stat_code_reallocs++;
        }
 
@@ -7699,7 +7699,7 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
 void*
 mono_arch_instrument_prolog (MonoCompile *cfg, void *func, void *p, gboolean enable_arguments)
 {
-       guchar *code = p;
+       guchar *code = (guchar *)p;
        MonoMethodSignature *sig;
        MonoInst *inst;
        int i, n, stack_area = 0;
@@ -7750,7 +7750,7 @@ enum {
 void*
 mono_arch_instrument_epilog_full (MonoCompile *cfg, void *func, void *p, gboolean enable_arguments, gboolean preserve_argument_registers)
 {
-       guchar *code = p;
+       guchar *code = (guchar *)p;
        int save_mode = SAVE_NONE;
        MonoMethod *method = cfg->method;
        MonoType *ret_type = mini_get_underlying_type (mono_method_signature (method)->ret);
@@ -8009,7 +8009,7 @@ get_delegate_invoke_impl (MonoTrampInfo **info, gboolean has_target, guint32 par
        unwind_ops = mono_arch_get_cie_program ();
 
        if (has_target) {
-               start = code = mono_global_codeman_reserve (64);
+               start = code = (guint8 *)mono_global_codeman_reserve (64);
 
                /* Replace the this argument with the target */
                amd64_mov_reg_reg (code, AMD64_RAX, AMD64_ARG_REG1, 8);
@@ -8018,7 +8018,7 @@ get_delegate_invoke_impl (MonoTrampInfo **info, gboolean has_target, guint32 par
 
                g_assert ((code - start) < 64);
        } else {
-               start = code = mono_global_codeman_reserve (64);
+               start = code = (guint8 *)mono_global_codeman_reserve (64);
 
                if (param_count == 0) {
                        amd64_jump_membase (code, AMD64_ARG_REG1, MONO_STRUCT_OFFSET (MonoDelegate, method_ptr));
@@ -8080,7 +8080,7 @@ get_delegate_virtual_invoke_impl (MonoTrampInfo **info, gboolean load_imt_reg, i
        if (offset / (int)sizeof (gpointer) > MAX_VIRTUAL_DELEGATE_OFFSET)
                return NULL;
 
-       start = code = mono_global_codeman_reserve (size);
+       start = code = (guint8 *)mono_global_codeman_reserve (size);
 
        unwind_ops = mono_arch_get_cie_program ();
 
@@ -8160,10 +8160,10 @@ mono_arch_get_delegate_invoke_impl (MonoMethodSignature *sig, gboolean has_targe
                        return cached;
 
                if (mono_aot_only) {
-                       start = mono_aot_get_trampoline ("delegate_invoke_impl_has_target");
+                       start = (guint8 *)mono_aot_get_trampoline ("delegate_invoke_impl_has_target");
                } else {
                        MonoTrampInfo *info;
-                       start = get_delegate_invoke_impl (&info, TRUE, 0);
+                       start = (guint8 *)get_delegate_invoke_impl (&info, TRUE, 0);
                        mono_tramp_info_register (info, NULL);
                }
 
@@ -8184,11 +8184,11 @@ mono_arch_get_delegate_invoke_impl (MonoMethodSignature *sig, gboolean has_targe
 
                if (mono_aot_only) {
                        char *name = g_strdup_printf ("delegate_invoke_impl_target_%d", sig->param_count);
-                       start = mono_aot_get_trampoline (name);
+                       start = (guint8 *)mono_aot_get_trampoline (name);
                        g_free (name);
                } else {
                        MonoTrampInfo *info;
-                       start = get_delegate_invoke_impl (&info, FALSE, sig->param_count);
+                       start = (guint8 *)get_delegate_invoke_impl (&info, FALSE, sig->param_count);
                        mono_tramp_info_register (info, NULL);
                }
 
@@ -8326,9 +8326,9 @@ mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckI
        code = mono_domain_code_reserve (domain, size);
 #else
        if (fail_tramp)
-               code = mono_method_alloc_generic_virtual_thunk (domain, size);
+               code = (guint8 *)mono_method_alloc_generic_virtual_thunk (domain, size);
        else
-               code = mono_domain_code_reserve (domain, size);
+               code = (guint8 *)mono_domain_code_reserve (domain, size);
 #endif
        start = code;
 
@@ -8550,8 +8550,8 @@ mono_arch_install_handler_block_guard (MonoJitInfo *ji, MonoJitExceptionInfo *cl
        char *bp;
 
        /*Load the spvar*/
-       bp = MONO_CONTEXT_GET_BP (ctx);
-       sp = *(gpointer*)(bp + clause->exvar_offset);
+       bp = (char *)MONO_CONTEXT_GET_BP (ctx);
+       sp = (gpointer *)*(gpointer*)(bp + clause->exvar_offset);
 
        old_value = *sp;
        if (old_value < ji->code_start || (char*)old_value > ((char*)ji->code_start + ji->code_size))
@@ -8570,7 +8570,7 @@ mono_arch_install_handler_block_guard (MonoJitInfo *ji, MonoJitExceptionInfo *cl
  * On AMD64, the result is placed into R11.
  */
 guint8*
-mono_arch_emit_load_aotconst (guint8 *start, guint8 *code, MonoJumpInfo **ji, int tramp_type, gconstpointer target)
+mono_arch_emit_load_aotconst (guint8 *start, guint8 *code, MonoJumpInfo **ji, MonoJumpInfoType tramp_type, gconstpointer target)
 {
        *ji = mono_patch_info_list_prepend (*ji, code - start, tramp_type, target);
        amd64_mov_reg_membase (code, AMD64_R11, AMD64_RIP, 0, 8);
@@ -8606,7 +8606,7 @@ mono_arch_set_breakpoint (MonoJitInfo *ji, guint8 *ip)
 
        if (ji->from_aot) {
                guint32 native_offset = ip - (guint8*)ji->code_start;
-               SeqPointInfo *info = mono_arch_get_seq_point_info (mono_domain_get (), ji->code_start);
+               SeqPointInfo *info = (SeqPointInfo *)mono_arch_get_seq_point_info (mono_domain_get (), (guint8 *)ji->code_start);
 
                g_assert (info->bp_addrs [native_offset] == 0);
                info->bp_addrs [native_offset] = mini_get_breakpoint_trampoline ();
@@ -8630,7 +8630,7 @@ mono_arch_clear_breakpoint (MonoJitInfo *ji, guint8 *ip)
 
        if (ji->from_aot) {
                guint32 native_offset = ip - (guint8*)ji->code_start;
-               SeqPointInfo *info = mono_arch_get_seq_point_info (mono_domain_get (), ji->code_start);
+               SeqPointInfo *info = (SeqPointInfo *)mono_arch_get_seq_point_info (mono_domain_get (), (guint8 *)ji->code_start);
 
                info->bp_addrs [native_offset] = NULL;
        } else {
@@ -8719,7 +8719,7 @@ mono_arch_get_seq_point_info (MonoDomain *domain, guint8 *code)
        // FIXME: Add a free function
 
        mono_domain_lock (domain);
-       info = g_hash_table_lookup (domain_jit_info (domain)->arch_seq_points,
+       info = (SeqPointInfo *)g_hash_table_lookup (domain_jit_info (domain)->arch_seq_points,
                                                                code);
        mono_domain_unlock (domain);
 
@@ -8728,7 +8728,7 @@ mono_arch_get_seq_point_info (MonoDomain *domain, guint8 *code)
                g_assert (ji);
 
                // FIXME: Optimize the size
-               info = g_malloc0 (sizeof (SeqPointInfo) + (ji->code_size * sizeof (gpointer)));
+               info = (SeqPointInfo *)g_malloc0 (sizeof (SeqPointInfo) + (ji->code_size * sizeof (gpointer)));
 
                info->ss_tramp_addr = &ss_trampoline;
 

diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h
index 25d2877a68068b7de8d6e1013583b5c9b964ce4f..7292aae2ffeb5c7599af3facb205c87429bfb3d3 100644 (file)
--- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h
@@ -341,7 +341,6 @@ typedef struct {
 #define MONO_ARCH_DYN_CALL_SUPPORTED 1
 #define MONO_ARCH_DYN_CALL_PARAM_AREA 0
 
-#define MONO_ARCH_HAVE_LLVM_IMT_TRAMPOLINE 1
 #define MONO_ARCH_LLVM_SUPPORTED 1
 #define MONO_ARCH_HAVE_HANDLER_BLOCK_GUARD 1
 #define MONO_ARCH_HAVE_CARD_TABLE_WBARRIER 1

diff --git a/mono/mini/mini-arm.c b/mono/mini/mini-arm.c
index 2798808809f1167c428ac397f996c6d98be4ecf8..a2c8541e260be1434415cf45dee0e82cf2998eab 100644 (file)
--- a/mono/mini/mini-arm.c
+++ b/mono/mini/mini-arm.c
@@ -95,8 +95,8 @@ void sys_icache_invalidate (void *start, size_t len);
 #endif
 
 /* This mutex protects architecture specific caches */
-#define mono_mini_arch_lock() mono_mutex_lock (&mini_arch_mutex)
-#define mono_mini_arch_unlock() mono_mutex_unlock (&mini_arch_mutex)
+#define mono_mini_arch_lock() mono_os_mutex_lock (&mini_arch_mutex)
+#define mono_mini_arch_unlock() mono_os_mutex_unlock (&mini_arch_mutex)
 static mono_mutex_t mini_arch_mutex;
 
 static gboolean v5_supported = FALSE;
@@ -916,7 +916,7 @@ mono_arch_init (void)
 {
        const char *cpu_arch;
 
-       mono_mutex_init_recursive (&mini_arch_mutex);
+       mono_os_mutex_init_recursive (&mini_arch_mutex);
        if (mini_get_debug_options ()->soft_breakpoints) {
                breakpoint_tramp = mini_get_breakpoint_trampoline ();
        } else {
@@ -4084,6 +4084,12 @@ mono_arm_emit_load_imm (guint8 *code, int dreg, guint32 val)
        code += 4;
        return code;
 #endif
+       if (mini_get_debug_options()->single_imm_size && v7_supported) {
+               ARM_MOVW_REG_IMM (code, dreg, val & 0xffff);
+               ARM_MOVT_REG_IMM (code, dreg, (val >> 16) & 0xffff);
+               return code;
+       }
+
        if ((imm8 = mono_arm_is_rotated_imm8 (val, &rot_amount)) >= 0) {
                ARM_MOV_REG_IMM (code, dreg, imm8, rot_amount);
        } else if ((imm8 = mono_arm_is_rotated_imm8 (~val, &rot_amount)) >= 0) {

diff --git a/mono/mini/mini-codegen.c b/mono/mini/mini-codegen.c
index 9129c800a45727924ec85a502a05b1643755b43c..83170902e4ee113fe059ea27ab3cf26949af8f3d 100644 (file)
--- a/mono/mini/mini-codegen.c
+++ b/mono/mini/mini-codegen.c
@@ -144,7 +144,7 @@ mono_regstate_assign (MonoRegState *rs)
        if (rs->next_vreg > rs->vassign_size) {
                g_free (rs->vassign);
                rs->vassign_size = MAX (rs->next_vreg, 256);
-               rs->vassign = g_malloc (rs->vassign_size * sizeof (gint32));
+               rs->vassign = (gint32 *)g_malloc (rs->vassign_size * sizeof (gint32));
        }
 
        memset (rs->isymbolic, 0, MONO_MAX_IREGS * sizeof (rs->isymbolic [0]));
@@ -295,7 +295,7 @@ resize_spill_info (MonoCompile *cfg, int bank)
 
        g_assert (bank < MONO_NUM_REGBANKS);
 
-       new_info = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoSpillInfo) * new_len);
+       new_info = (MonoSpillInfo *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoSpillInfo) * new_len);
        if (orig_info)
                memcpy (new_info, orig_info, sizeof (MonoSpillInfo) * orig_len);
        for (i = orig_len; i < new_len; ++i)
@@ -1180,10 +1180,11 @@ mono_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb)
        if (cfg->reginfo && cfg->reginfo_len < max)
                cfg->reginfo = NULL;
 
-       reginfo = cfg->reginfo;
+       reginfo = (RegTrack *)cfg->reginfo;
        if (!reginfo) {
                cfg->reginfo_len = MAX (1024, max * 2);
-               reginfo = cfg->reginfo = mono_mempool_alloc (cfg->mempool, sizeof (RegTrack) * cfg->reginfo_len);
+               reginfo = (RegTrack *)mono_mempool_alloc (cfg->mempool, sizeof (RegTrack) * cfg->reginfo_len);
+               cfg->reginfo = reginfo;
        } 
        else
                g_assert (cfg->reginfo_len >= rs->next_vreg);
@@ -2450,7 +2451,7 @@ mono_opcode_to_cond (int opcode)
        default:
                printf ("%s\n", mono_inst_name (opcode));
                g_assert_not_reached ();
-               return 0;
+               return (CompRelation)0;
        }
 }
 
@@ -2512,7 +2513,7 @@ mono_opcode_to_type (int opcode, int cmp_opcode)
                }
        } else {
                g_error ("Unknown opcode '%s' in opcode_to_type", mono_inst_name (opcode));
-               return 0;
+               return (CompType)0;
        }
 }
 

diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c
index 26c9451330e2e6786e57841f94baed3ce723afc8..8db012832c683dda702d7e504e79a97f7a2e8f83 100644 (file)
--- a/mono/mini/mini-exceptions.c
+++ b/mono/mini/mini-exceptions.c
@@ -134,7 +134,7 @@ mono_exceptions_init (void)
        if (mono_llvm_only)
                cbs.mono_raise_exception = mono_llvm_raise_exception;
        else
-               cbs.mono_raise_exception = mono_get_throw_exception ();
+               cbs.mono_raise_exception = (void (*)(MonoException *))mono_get_throw_exception ();
        cbs.mono_raise_exception_with_ctx = mono_raise_exception_with_ctx;
        cbs.mono_exception_walk_trace = mono_exception_walk_trace;
        cbs.mono_install_handler_block_guard = mono_install_handler_block_guard;
@@ -238,21 +238,21 @@ find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInfo *res, Mo
        if (prev_ji && (ip > prev_ji->code_start && ((guint8*)ip < ((guint8*)prev_ji->code_start) + prev_ji->code_size)))
                ji = prev_ji;
        else
-               ji = mini_jit_info_table_find (domain, ip, NULL);
+               ji = mini_jit_info_table_find (domain, (char *)ip, NULL);
 
        if (managed)
                *managed = FALSE;
 
        err = mono_arch_unwind_frame (domain, jit_tls, ji, ctx, new_ctx, lmf, NULL, &frame);
        if (!err)
-               return (gpointer)-1;
+               return (MonoJitInfo *)-1;
 
        if (*lmf && ((*lmf) != jit_tls->first_lmf) && ((gpointer)MONO_CONTEXT_GET_SP (new_ctx) >= (gpointer)(*lmf))) {
                /*
                 * Remove any unused lmf.
                 * Mask out the lower bits which might be used to hold additional information.
                 */
-               *lmf = (gpointer)(((gsize)(*lmf)->previous_lmf) & ~(SIZEOF_VOID_P -1));
+               *lmf = (MonoLMF *)(((gsize)(*lmf)->previous_lmf) & ~(SIZEOF_VOID_P -1));
        }
 
        /* Convert between the new and the old APIs */
@@ -397,7 +397,7 @@ mono_find_jit_info_ext (MonoDomain *domain, MonoJitTlsData *jit_tls,
        if (prev_ji && (ip > prev_ji->code_start && ((guint8*)ip < ((guint8*)prev_ji->code_start) + prev_ji->code_size)))
                ji = prev_ji;
        else
-               ji = mini_jit_info_table_find (domain, ip, &target_domain);
+               ji = mini_jit_info_table_find (domain, (char *)ip, &target_domain);
 
        if (!target_domain)
                target_domain = domain;
@@ -414,7 +414,7 @@ mono_find_jit_info_ext (MonoDomain *domain, MonoJitTlsData *jit_tls,
                 * Remove any unused lmf.
                 * Mask out the lower bits which might be used to hold additional information.
                 */
-               *lmf = (gpointer)(((gsize)(*lmf)->previous_lmf) & ~(SIZEOF_VOID_P -1));
+               *lmf = (MonoLMF *)(((gsize)(*lmf)->previous_lmf) & ~(SIZEOF_VOID_P -1));
        }
 
        if (frame->ji && !frame->ji->is_trampoline && !frame->ji->async)
@@ -524,7 +524,7 @@ get_generic_info_from_stack_frame (MonoJitInfo *ji, MonoContext *ctx)
                return info;
        } else {
                /* Avoid returning a managed object */
-               MonoObject *this_obj = info;
+               MonoObject *this_obj = (MonoObject *)info;
 
                return this_obj->vtable->klass;
        }
@@ -542,17 +542,17 @@ get_generic_context_from_stack_frame (MonoJitInfo *ji, gpointer generic_info)
        method = jinfo_get_method (ji);
        g_assert (method->is_inflated);
        if (mono_method_get_context (method)->method_inst) {
-               MonoMethodRuntimeGenericContext *mrgctx = generic_info;
+               MonoMethodRuntimeGenericContext *mrgctx = (MonoMethodRuntimeGenericContext *)generic_info;
 
                klass = mrgctx->class_vtable->klass;
                context.method_inst = mrgctx->method_inst;
                g_assert (context.method_inst);
        } else if ((method->flags & METHOD_ATTRIBUTE_STATIC) || method->klass->valuetype) {
-               MonoVTable *vtable = generic_info;
+               MonoVTable *vtable = (MonoVTable *)generic_info;
 
                klass = vtable->klass;
        } else {
-               klass = generic_info;
+               klass = (MonoClass *)generic_info;
        }
 
        //g_assert (!method->klass->generic_container);
@@ -623,7 +623,7 @@ mono_exception_walk_trace (MonoException *ex, MonoExceptionFrameWalk func, gpoin
        for (i = 0; i < len; i++) {
                gpointer ip = mono_array_get (ta, gpointer, i * 2 + 0);
                gpointer generic_info = mono_array_get (ta, gpointer, i * 2 + 1);
-               MonoJitInfo *ji = mono_jit_info_table_find (domain, ip);
+               MonoJitInfo *ji = mono_jit_info_table_find (domain, (char *)ip);
 
                if (ji == NULL) {
                        if (func (NULL, ip, 0, FALSE, user_data))
@@ -663,7 +663,7 @@ ves_icall_get_trace (MonoException *exc, gint32 skip, MonoBoolean need_file_info
                gpointer generic_info = mono_array_get (ta, gpointer, i * 2 + 1);
                MonoMethod *method;
 
-               ji = mono_jit_info_table_find (domain, ip);
+               ji = mono_jit_info_table_find (domain, (char *)ip);
                if (ji == NULL) {
                        /* Unmanaged frame */
                        mono_array_setref (res, i, sf);
@@ -726,7 +726,7 @@ static void
 mono_runtime_walk_stack_with_ctx (MonoJitStackWalk func, MonoContext *start_ctx, MonoUnwindOptions unwind_options, void *user_data)
 {
        if (!start_ctx) {
-               MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+               MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
                if (jit_tls && jit_tls->orig_ex_ctx_set)
                        start_ctx = &jit_tls->orig_ex_ctx;
        }
@@ -760,7 +760,7 @@ mono_walk_stack_with_ctx (MonoJitStackWalk func, MonoContext *start_ctx, MonoUnw
                start_ctx = &extra_ctx;
        }
 
-       mono_walk_stack_full (func, start_ctx, mono_domain_get (), thread->jit_data, mono_get_lmf (), unwind_options, user_data);
+       mono_walk_stack_full (func, start_ctx, mono_domain_get (), (MonoJitTlsData *)thread->jit_data, mono_get_lmf (), unwind_options, user_data);
 }
 
 /**
@@ -793,9 +793,9 @@ mono_walk_stack_with_state (MonoJitStackWalk func, MonoThreadUnwindState *state,
 
        mono_walk_stack_full (func,
                &state->ctx, 
-               state->unwind_data [MONO_UNWIND_DATA_DOMAIN],
-               state->unwind_data [MONO_UNWIND_DATA_JIT_TLS],
-               state->unwind_data [MONO_UNWIND_DATA_LMF],
+               (MonoDomain *)state->unwind_data [MONO_UNWIND_DATA_DOMAIN],
+               (MonoJitTlsData *)state->unwind_data [MONO_UNWIND_DATA_JIT_TLS],
+               (MonoLMF *)state->unwind_data [MONO_UNWIND_DATA_LMF],
                unwind_options, user_data);
 }
 
@@ -901,7 +901,7 @@ ves_icall_get_frame_info (gint32 skip, MonoBoolean need_file_info,
                          MonoString **file, gint32 *line, gint32 *column)
 {
        MonoDomain *domain = mono_domain_get ();
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        MonoLMF *lmf = mono_get_lmf ();
        MonoJitInfo *ji = NULL;
        MonoContext ctx, new_ctx;
@@ -1033,7 +1033,7 @@ mini_jit_info_table_find_ext (MonoDomain *domain, char *addr, gboolean allow_tra
        if (!t)
                return NULL;
 
-       refs = (t->appdomain_refs) ? *(gpointer *) t->appdomain_refs : NULL;
+       refs = (gpointer *)((t->appdomain_refs) ? *(gpointer *) t->appdomain_refs : NULL);
        for (; refs && *refs; refs++) {
                if (*refs != domain && *refs != mono_get_root_domain ()) {
                        ji = mono_jit_info_table_find_internal ((MonoDomain*) *refs, addr, TRUE, allow_trampolines);
@@ -1101,7 +1101,7 @@ wrap_non_exception_throws (MonoMethod *m)
                        if (named_type != 0x54)
                                continue;
                        name_len = mono_metadata_decode_blob_size (p, &p);
-                       name = g_malloc (name_len + 1);
+                       name = (char *)g_malloc (name_len + 1);
                        memcpy (name, p, name_len);
                        name [name_len] = 0;
                        p += name_len;
@@ -1193,12 +1193,12 @@ setup_stack_trace (MonoException *mono_ex, GSList *dynamic_methods, MonoArray *i
  * OUT_FILTER_IDX. Return TRUE if the exception is caught, FALSE otherwise.
  */
 static gboolean
-mono_handle_exception_internal_first_pass (MonoContext *ctx, gpointer obj, gint32 *out_filter_idx, MonoJitInfo **out_ji, MonoJitInfo **out_prev_ji, MonoObject *non_exception)
+mono_handle_exception_internal_first_pass (MonoContext *ctx, MonoObject *obj, gint32 *out_filter_idx, MonoJitInfo **out_ji, MonoJitInfo **out_prev_ji, MonoObject *non_exception)
 {
        MonoDomain *domain = mono_domain_get ();
        MonoJitInfo *ji = NULL;
        static int (*call_filter) (MonoContext *, gpointer) = NULL;
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        MonoLMF *lmf = mono_get_lmf ();
        MonoArray *initial_trace_ips = NULL;
        GList *trace_ips = NULL;
@@ -1214,7 +1214,7 @@ mono_handle_exception_internal_first_pass (MonoContext *ctx, gpointer obj, gint3
 
        g_assert (ctx != NULL);
 
-       if (obj == domain->stack_overflow_ex)
+       if (obj == (MonoObject *)domain->stack_overflow_ex)
                stack_overflow = TRUE;
 
        mono_ex = (MonoException*)obj;
@@ -1228,7 +1228,7 @@ mono_handle_exception_internal_first_pass (MonoContext *ctx, gpointer obj, gint3
        }
 
        if (!call_filter)
-               call_filter = mono_get_call_filter ();
+               call_filter = (int (*) (MonoContext *, void *))mono_get_call_filter ();
 
        g_assert (jit_tls->end_of_stack);
        g_assert (jit_tls->abort_func);
@@ -1413,12 +1413,12 @@ mono_handle_exception_internal_first_pass (MonoContext *ctx, gpointer obj, gint3
  * @resume: whenever to resume unwinding based on the state in MonoJitTlsData.
  */
 static gboolean
-mono_handle_exception_internal (MonoContext *ctx, gpointer obj, gboolean resume, MonoJitInfo **out_ji)
+mono_handle_exception_internal (MonoContext *ctx, MonoObject *obj, gboolean resume, MonoJitInfo **out_ji)
 {
        MonoDomain *domain = mono_domain_get ();
        MonoJitInfo *ji, *prev_ji;
        static int (*call_filter) (MonoContext *, gpointer) = NULL;
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        MonoLMF *lmf = mono_get_lmf ();
        MonoException *mono_ex;
        gboolean stack_overflow = FALSE;
@@ -1440,20 +1440,20 @@ mono_handle_exception_internal (MonoContext *ctx, gpointer obj, gboolean resume,
        /*
         * Allocate a new exception object instead of the preconstructed ones.
         */
-       if (obj == domain->stack_overflow_ex) {
+       if (obj == (MonoObject *)domain->stack_overflow_ex) {
                /*
                 * It is not a good idea to try and put even more pressure on the little stack available.
                 * obj = mono_get_exception_stack_overflow ();
                 */
                stack_overflow = TRUE;
        }
-       else if (obj == domain->null_reference_ex) {
-               obj = mono_get_exception_null_reference ();
+       else if (obj == (MonoObject *)domain->null_reference_ex) {
+               obj = (MonoObject *)mono_get_exception_null_reference ();
        }
 
        if (!mono_object_isinst (obj, mono_defaults.exception_class)) {
                non_exception = obj;
-               obj = mono_get_exception_runtime_wrapped (obj);
+               obj = (MonoObject *)mono_get_exception_runtime_wrapped (obj);
        }
 
        mono_ex = (MonoException*)obj;
@@ -1492,7 +1492,7 @@ mono_handle_exception_internal (MonoContext *ctx, gpointer obj, gboolean resume,
        }
 
        if (!call_filter)
-               call_filter = mono_get_call_filter ();
+               call_filter = (int (*)(MonoContext *, void*))mono_get_call_filter ();
 
        g_assert (jit_tls->end_of_stack);
        g_assert (jit_tls->abort_func);
@@ -1540,7 +1540,7 @@ mono_handle_exception_internal (MonoContext *ctx, gpointer obj, gboolean resume,
                if (!res) {
                        if (mini_get_debug_options ()->break_on_exc)
                                G_BREAKPOINT ();
-                       mono_debugger_agent_handle_exception (obj, ctx, NULL);
+                       mono_debugger_agent_handle_exception ((MonoException *)obj, ctx, NULL);
 
                        if (mini_get_debug_options ()->suspend_on_unhandled) {
                                mono_runtime_printf_err ("Unhandled exception, suspending...");
@@ -1567,9 +1567,9 @@ mono_handle_exception_internal (MonoContext *ctx, gpointer obj, gboolean resume,
                        }
 
                        if (unhandled)
-                               mono_debugger_agent_handle_exception (obj, ctx, NULL);
+                               mono_debugger_agent_handle_exception ((MonoException *)obj, ctx, NULL);
                        else
-                               mono_debugger_agent_handle_exception (obj, ctx, &ctx_cp);
+                               mono_debugger_agent_handle_exception ((MonoException *)obj, ctx, &ctx_cp);
                }
        }
 
@@ -1700,7 +1700,7 @@ mono_handle_exception_internal (MonoContext *ctx, gpointer obj, gboolean resume,
                                                         *      There aren't any further finally/fault handler blocks down the stack over this exception.
                                                         *   This must be ensured by the code that installs the guard trampoline.
                                                         */
-                                                       g_assert (ji == mini_jit_info_table_find (domain, MONO_CONTEXT_GET_IP (&jit_tls->handler_block_context), NULL));
+                                                       g_assert (ji == mini_jit_info_table_find (domain, (char *)MONO_CONTEXT_GET_IP (&jit_tls->handler_block_context), NULL));
 
                                                        if (!is_address_protected (ji, jit_tls->handler_block, ei->handler_start)) {
                                                                is_outside = TRUE;
@@ -1723,7 +1723,7 @@ mono_handle_exception_internal (MonoContext *ctx, gpointer obj, gboolean resume,
 #ifndef DISABLE_PERFCOUNTERS
                                        mono_perfcounters->exceptions_depth += frame_count;
 #endif
-                                       if (obj == domain->stack_overflow_ex)
+                                       if (obj == (MonoObject *)domain->stack_overflow_ex)
                                                jit_tls->handling_stack_ovf = FALSE;
 
                                        return 0;
@@ -1798,7 +1798,7 @@ mono_debugger_run_finally (MonoContext *start_ctx)
 {
        static int (*call_filter) (MonoContext *, gpointer) = NULL;
        MonoDomain *domain = mono_domain_get ();
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        MonoLMF *lmf = mono_get_lmf ();
        MonoContext ctx, new_ctx;
        MonoJitInfo *ji, rji;
@@ -1811,7 +1811,7 @@ mono_debugger_run_finally (MonoContext *start_ctx)
                return;
 
        if (!call_filter)
-               call_filter = mono_get_call_filter ();
+               call_filter = (int (*)(MonoContext *, void *))mono_get_call_filter ();
 
        for (i = 0; i < ji->num_clauses; i++) {
                MonoJitExceptionInfo *ei = &ji->clauses [i];
@@ -1829,7 +1829,7 @@ mono_debugger_run_finally (MonoContext *start_ctx)
  * @obj: the exception object
  */
 gboolean
-mono_handle_exception (MonoContext *ctx, gpointer obj)
+mono_handle_exception (MonoContext *ctx, MonoObject *obj)
 {
 #ifndef DISABLE_PERFCOUNTERS
        mono_perfcounters->exceptions_thrown++;
@@ -1944,7 +1944,7 @@ try_restore_stack_protection (MonoJitTlsData *jit_tls, int extra_bytes)
 static G_GNUC_UNUSED void
 try_more_restore (void)
 {
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        if (try_restore_stack_protection (jit_tls, 500))
                jit_tls->restore_stack_prot = NULL;
 }
@@ -1952,7 +1952,7 @@ try_more_restore (void)
 static G_GNUC_UNUSED void
 restore_stack_protection (void)
 {
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        MonoException *ex = mono_domain_get ()->stack_overflow_ex;
        /* if we can't restore the stack protection, keep a callback installed so
         * we'll try to restore as much stack as we can at each return from unmanaged
@@ -1971,7 +1971,7 @@ restore_stack_protection (void)
 gpointer
 mono_altstack_restore_prot (mgreg_t *regs, guint8 *code, gpointer *tramp_data, guint8* tramp)
 {
-       void (*func)(void) = (gpointer)tramp_data;
+       void (*func)(void) = (void (*)(void))tramp_data;
        func ();
        return NULL;
 }
@@ -2039,7 +2039,7 @@ static gboolean
 print_overflow_stack_frame (StackFrameInfo *frame, MonoContext *ctx, gpointer data)
 {
        MonoMethod *method = NULL;
-       PrintOverflowUserData *user_data = data;
+       PrintOverflowUserData *user_data = (PrintOverflowUserData *)data;
        gchar *location;
 
        if (frame->ji && frame->type != FRAME_TYPE_TRAMPOLINE)
@@ -2157,7 +2157,7 @@ mono_handle_native_sigsegv (int signal, void *ctx, MONO_SIG_HANDLER_INFO_TYPE *i
 #ifdef MONO_ARCH_USE_SIGACTION
        struct sigaction sa;
 #endif
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        const char *signal_str = (signal == SIGSEGV) ? "SIGSEGV" : "SIGABRT";
 
        if (handling_sigsegv)
@@ -2182,7 +2182,8 @@ mono_handle_native_sigsegv (int signal, void *ctx, MONO_SIG_HANDLER_INFO_TYPE *i
        if (jit_tls && mono_thread_internal_current ()) {
                mono_runtime_printf_err ("Stacktrace:\n");
 
-               mono_walk_stack (print_stack_frame_to_stderr, TRUE, NULL);
+               /* FIXME: Is MONO_UNWIND_LOOKUP_IL_OFFSET correct here? */
+               mono_walk_stack (print_stack_frame_to_stderr, MONO_UNWIND_LOOKUP_IL_OFFSET, NULL);
        }
 
 #ifdef HAVE_BACKTRACE_SYMBOLS
@@ -2371,14 +2372,14 @@ mono_print_thread_dump_from_ctx (MonoContext *ctx)
 void
 mono_resume_unwind (MonoContext *ctx)
 {
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        MonoContext new_ctx;
 
        MONO_CONTEXT_SET_IP (ctx, MONO_CONTEXT_GET_IP (&jit_tls->resume_state.ctx));
        MONO_CONTEXT_SET_SP (ctx, MONO_CONTEXT_GET_SP (&jit_tls->resume_state.ctx));
        new_ctx = *ctx;
 
-       mono_handle_exception_internal (&new_ctx, jit_tls->resume_state.ex_obj, TRUE, NULL);
+       mono_handle_exception_internal (&new_ctx, (MonoObject *)jit_tls->resume_state.ex_obj, TRUE, NULL);
 
        mono_restore_context (&new_ctx);
 }
@@ -2396,7 +2397,7 @@ find_last_handler_block (StackFrameInfo *frame, MonoContext *ctx, gpointer data)
 {
        int i;
        gpointer ip;
-       FindHandlerBlockData *pdata = data;
+       FindHandlerBlockData *pdata = (FindHandlerBlockData *)data;
        MonoJitInfo *ji = frame->ji;
 
        if (!ji)
@@ -2457,7 +2458,7 @@ gboolean
 mono_install_handler_block_guard (MonoThreadUnwindState *ctx)
 {
        FindHandlerBlockData data = { 0 };
-       MonoJitTlsData *jit_tls = ctx->unwind_data [MONO_UNWIND_DATA_JIT_TLS];
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)ctx->unwind_data [MONO_UNWIND_DATA_JIT_TLS];
        gpointer resume_ip;
 
        /* FIXME */
@@ -2505,7 +2506,7 @@ mono_set_cast_details (MonoClass *from, MonoClass *to)
        MonoJitTlsData *jit_tls = NULL;
 
        if (mini_get_debug_options ()->better_cast_details) {
-               jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+               jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
                jit_tls->class_cast_from = from;
                jit_tls->class_cast_to = to;
        }
@@ -2612,7 +2613,7 @@ mono_thread_state_init_from_current (MonoThreadUnwindState *ctx)
 static void
 mono_raise_exception_with_ctx (MonoException *exc, MonoContext *ctx)
 {
-       mono_handle_exception (ctx, exc);
+       mono_handle_exception (ctx, (MonoObject *)exc);
        mono_restore_context (ctx);
 }
 
@@ -2621,7 +2622,7 @@ void
 mono_setup_async_callback (MonoContext *ctx, void (*async_cb)(void *fun), gpointer user_data)
 {
 #ifdef MONO_ARCH_HAVE_SETUP_ASYNC_CALLBACK
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        jit_tls->ex_ctx = *ctx;
 
        mono_arch_setup_async_callback (ctx, async_cb, user_data);
@@ -2684,7 +2685,7 @@ mono_restore_context (MonoContext *ctx)
        static void (*restore_context) (MonoContext *);
 
        if (!restore_context)
-               restore_context = mono_get_restore_context ();
+               restore_context = (void (*)(MonoContext *))mono_get_restore_context ();
        restore_context (ctx);
        g_assert_not_reached ();
 }

diff --git a/mono/mini/mini-generic-sharing.c b/mono/mini/mini-generic-sharing.c
index 6bec18405f58795a689385a065de24ab4315cfe7..58094823d31f585fcebb0294a2c3ba67e9f9a4c0 100644 (file)
--- a/mono/mini/mini-generic-sharing.c
+++ b/mono/mini/mini-generic-sharing.c
@@ -27,6 +27,12 @@
 static void
 mono_class_unregister_image_generic_subclasses (MonoImage *image, gpointer user_data);
 
+/* Counters */
+static int num_templates_allocted;
+static int num_templates_bytes;
+static int num_oti_allocted;
+static int num_oti_bytes;
+
 static gboolean partial_supported = FALSE;
 
 static inline gboolean
@@ -136,35 +142,35 @@ mono_class_check_context_used (MonoClass *klass)
  * LOCKING: loader lock
  */
 static MonoRuntimeGenericContextInfoTemplate*
-get_info_templates (MonoRuntimeGenericContextTemplate *template, int type_argc)
+get_info_templates (MonoRuntimeGenericContextTemplate *template_, int type_argc)
 {
        g_assert (type_argc >= 0);
        if (type_argc == 0)
-               return template->infos;
-       return g_slist_nth_data (template->method_templates, type_argc - 1);
+               return template_->infos;
+       return (MonoRuntimeGenericContextInfoTemplate *)g_slist_nth_data (template_->method_templates, type_argc - 1);
 }
 
 /*
  * LOCKING: loader lock
  */
 static void
-set_info_templates (MonoImage *image, MonoRuntimeGenericContextTemplate *template, int type_argc,
+set_info_templates (MonoImage *image, MonoRuntimeGenericContextTemplate *template_, int type_argc,
        MonoRuntimeGenericContextInfoTemplate *oti)
 {
        g_assert (type_argc >= 0);
        if (type_argc == 0)
-               template->infos = oti;
+               template_->infos = oti;
        else {
-               int length = g_slist_length (template->method_templates);
+               int length = g_slist_length (template_->method_templates);
                GSList *list;
 
                /* FIXME: quadratic! */
                while (length < type_argc) {
-                       template->method_templates = g_slist_append_image (image, template->method_templates, NULL);
+                       template_->method_templates = g_slist_append_image (image, template_->method_templates, NULL);
                        length++;
                }
 
-               list = g_slist_nth (template->method_templates, type_argc - 1);
+               list = g_slist_nth (template_->method_templates, type_argc - 1);
                g_assert (list);
                list->data = oti;
        }
@@ -174,23 +180,23 @@ set_info_templates (MonoImage *image, MonoRuntimeGenericContextTemplate *templat
  * LOCKING: loader lock
  */
 static int
-template_get_max_argc (MonoRuntimeGenericContextTemplate *template)
+template_get_max_argc (MonoRuntimeGenericContextTemplate *template_)
 {
-       return g_slist_length (template->method_templates);
+       return g_slist_length (template_->method_templates);
 }
 
 /*
  * LOCKING: loader lock
  */
 static MonoRuntimeGenericContextInfoTemplate*
-rgctx_template_get_other_slot (MonoRuntimeGenericContextTemplate *template, int type_argc, int slot)
+rgctx_template_get_other_slot (MonoRuntimeGenericContextTemplate *template_, int type_argc, int slot)
 {
        int i;
        MonoRuntimeGenericContextInfoTemplate *oti;
 
        g_assert (slot >= 0);
 
-       for (oti = get_info_templates (template, type_argc), i = 0; i < slot; oti = oti->next, ++i) {
+       for (oti = get_info_templates (template_, type_argc), i = 0; i < slot; oti = oti->next, ++i) {
                if (!oti)
                        return NULL;
        }
@@ -202,12 +208,12 @@ rgctx_template_get_other_slot (MonoRuntimeGenericContextTemplate *template, int
  * LOCKING: loader lock
  */
 static int
-rgctx_template_num_infos (MonoRuntimeGenericContextTemplate *template, int type_argc)
+rgctx_template_num_infos (MonoRuntimeGenericContextTemplate *template_, int type_argc)
 {
        MonoRuntimeGenericContextInfoTemplate *oti;
        int i;
 
-       for (i = 0, oti = get_info_templates (template, type_argc); oti; ++i, oti = oti->next)
+       for (i = 0, oti = get_info_templates (template_, type_argc); oti; ++i, oti = oti->next)
                ;
 
        return i;
@@ -239,14 +245,14 @@ class_set_rgctx_template (MonoClass *klass, MonoRuntimeGenericContextTemplate *r
 static MonoRuntimeGenericContextTemplate*
 class_lookup_rgctx_template (MonoClass *klass)
 {
-       MonoRuntimeGenericContextTemplate *template;
+       MonoRuntimeGenericContextTemplate *template_;
 
        if (!klass->image->rgctx_template_hash)
                return NULL;
 
-       template = g_hash_table_lookup (klass->image->rgctx_template_hash, klass);
+       template_ = (MonoRuntimeGenericContextTemplate *)g_hash_table_lookup (klass->image->rgctx_template_hash, klass);
 
-       return template;
+       return template_;
 }
 
 /*
@@ -267,7 +273,7 @@ register_generic_subclass (MonoClass *klass)
        if (!generic_subclass_hash)
                generic_subclass_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
 
-       subclass = g_hash_table_lookup (generic_subclass_hash, parent);
+       subclass = (MonoClass *)g_hash_table_lookup (generic_subclass_hash, parent);
        rgctx_template->next_subclass = subclass;
        g_hash_table_insert (generic_subclass_hash, parent, klass);
 }
@@ -340,43 +346,24 @@ mono_class_unregister_image_generic_subclasses (MonoImage *image, gpointer user_
 static MonoRuntimeGenericContextTemplate*
 alloc_template (MonoClass *klass)
 {
-       static gboolean inited = FALSE;
-       static int num_allocted = 0;
-       static int num_bytes = 0;
-
        int size = sizeof (MonoRuntimeGenericContextTemplate);
 
-       if (!inited) {
-               mono_counters_register ("RGCTX template num allocted", MONO_COUNTER_GENERICS | MONO_COUNTER_INT, &num_allocted);
-               mono_counters_register ("RGCTX template bytes allocted", MONO_COUNTER_GENERICS | MONO_COUNTER_INT, &num_bytes);
-               inited = TRUE;
-       }
-
-       num_allocted++;
-       num_bytes += size;
+       num_templates_allocted++;
+       num_templates_bytes += size;
 
-       return mono_image_alloc0 (klass->image, size);
+       return (MonoRuntimeGenericContextTemplate *)mono_image_alloc0 (klass->image, size);
 }
 
+/* LOCKING: Takes the loader lock */
 static MonoRuntimeGenericContextInfoTemplate*
 alloc_oti (MonoImage *image)
 {
-       static gboolean inited = FALSE;
-       static int num_allocted = 0;
-       static int num_bytes = 0;
-
        int size = sizeof (MonoRuntimeGenericContextInfoTemplate);
 
-       if (!inited) {
-               mono_counters_register ("RGCTX oti num allocted", MONO_COUNTER_GENERICS | MONO_COUNTER_INT, &num_allocted);
-               mono_counters_register ("RGCTX oti bytes allocted", MONO_COUNTER_GENERICS | MONO_COUNTER_INT, &num_bytes);
-               inited = TRUE;
-       }
-
-       num_allocted++;
-       num_bytes += size;
+       num_oti_allocted++;
+       num_oti_bytes += size;
 
-       return mono_image_alloc0 (image, size);
+       return (MonoRuntimeGenericContextInfoTemplate *)mono_image_alloc0 (image, size);
 }
 
 #define MONO_RGCTX_SLOT_USED_MARKER    ((gpointer)&mono_defaults.object_class->byval_arg)
@@ -396,7 +383,7 @@ info_has_identity (MonoRgctxInfoType info_type)
  * LOCKING: loader lock
  */
 static void
-rgctx_template_set_slot (MonoImage *image, MonoRuntimeGenericContextTemplate *template, int type_argc,
+rgctx_template_set_slot (MonoImage *image, MonoRuntimeGenericContextTemplate *template_, int type_argc,
        int slot, gpointer data, MonoRgctxInfoType info_type)
 {
        static gboolean inited = FALSE;
@@ -404,7 +391,7 @@ rgctx_template_set_slot (MonoImage *image, MonoRuntimeGenericContextTemplate *te
        static int num_data = 0;
 
        int i;
-       MonoRuntimeGenericContextInfoTemplate *list = get_info_templates (template, type_argc);
+       MonoRuntimeGenericContextInfoTemplate *list = get_info_templates (template_, type_argc);
        MonoRuntimeGenericContextInfoTemplate **oti = &list;
 
        if (!inited) {
@@ -429,7 +416,7 @@ rgctx_template_set_slot (MonoImage *image, MonoRuntimeGenericContextTemplate *te
        (*oti)->data = data;
        (*oti)->info_type = info_type;
 
-       set_info_templates (image, template, type_argc, list);
+       set_info_templates (image, template_, type_argc, list);
 
        if (data == MONO_RGCTX_SLOT_USED_MARKER)
                ++num_markers;
@@ -543,8 +530,9 @@ inflate_info (MonoRuntimeGenericContextInfoTemplate *oti, MonoGenericContext *co
        case MONO_RGCTX_INFO_NULLABLE_CLASS_BOX:
        case MONO_RGCTX_INFO_NULLABLE_CLASS_UNBOX: {
                gpointer result = mono_class_inflate_generic_type_with_mempool (temporary ? NULL : klass->image,
-                       data, context, &error);
-               g_assert (mono_error_ok (&error)); /*FIXME proper error handling*/
+                       (MonoType *)data, context, &error);
+               if (!mono_error_ok (&error)) /*FIXME proper error handling */
+                       g_error ("Could not inflate generic type due to %s", mono_error_get_message (&error));
                return result;
        }
 
@@ -554,7 +542,7 @@ inflate_info (MonoRuntimeGenericContextInfoTemplate *oti, MonoGenericContext *co
        case MONO_RGCTX_INFO_METHOD_CONTEXT:
        case MONO_RGCTX_INFO_REMOTING_INVOKE_WITH_CHECK:
        case MONO_RGCTX_INFO_METHOD_DELEGATE_CODE: {
-               MonoMethod *method = data;
+               MonoMethod *method = (MonoMethod *)data;
                MonoMethod *inflated_method;
                MonoType *inflated_type = mono_class_inflate_generic_type (&method->klass->byval_arg, context);
                MonoClass *inflated_class = mono_class_from_mono_type (inflated_type);
@@ -579,12 +567,12 @@ inflate_info (MonoRuntimeGenericContextInfoTemplate *oti, MonoGenericContext *co
                return inflated_method;
        }
        case MONO_RGCTX_INFO_METHOD_GSHAREDVT_INFO: {
-               MonoGSharedVtMethodInfo *oinfo = data;
+               MonoGSharedVtMethodInfo *oinfo = (MonoGSharedVtMethodInfo *)data;
                MonoGSharedVtMethodInfo *res;
                MonoDomain *domain = mono_domain_get ();
                int i;
 
-               res = mono_domain_alloc0 (domain, sizeof (MonoGSharedVtMethodInfo));
+               res = (MonoGSharedVtMethodInfo *)mono_domain_alloc0 (domain, sizeof (MonoGSharedVtMethodInfo));
                /*
                res->nlocals = info->nlocals;
                res->locals_types = g_new0 (MonoType*, info->nlocals);
@@ -592,19 +580,19 @@ inflate_info (MonoRuntimeGenericContextInfoTemplate *oti, MonoGenericContext *co
                        res->locals_types [i] = mono_class_inflate_generic_type (info->locals_types [i], context);
                */
                res->num_entries = oinfo->num_entries;
-               res->entries = mono_domain_alloc0 (domain, sizeof (MonoRuntimeGenericContextInfoTemplate) * oinfo->num_entries);
+               res->entries = (MonoRuntimeGenericContextInfoTemplate *)mono_domain_alloc0 (domain, sizeof (MonoRuntimeGenericContextInfoTemplate) * oinfo->num_entries);
                for (i = 0; i < oinfo->num_entries; ++i) {
                        MonoRuntimeGenericContextInfoTemplate *otemplate = &oinfo->entries [i];
-                       MonoRuntimeGenericContextInfoTemplate *template = &res->entries [i];
+                       MonoRuntimeGenericContextInfoTemplate *template_ = &res->entries [i];
 
-                       memcpy (template, otemplate, sizeof (MonoRuntimeGenericContextInfoTemplate));
-                       template->data = inflate_info (template, context, klass, FALSE);
+                       memcpy (template_, otemplate, sizeof (MonoRuntimeGenericContextInfoTemplate));
+                       template_->data = inflate_info (template_, context, klass, FALSE);
                }
                return res;
        }
        case MONO_RGCTX_INFO_METHOD_GSHAREDVT_OUT_TRAMPOLINE:
        case MONO_RGCTX_INFO_METHOD_GSHAREDVT_OUT_TRAMPOLINE_VIRT: {
-               MonoJumpInfoGSharedVtCall *info = data;
+               MonoJumpInfoGSharedVtCall *info = (MonoJumpInfoGSharedVtCall *)data;
                MonoMethod *method = info->method;
                MonoMethod *inflated_method;
                MonoType *inflated_type = mono_class_inflate_generic_type (&method->klass->byval_arg, context);
@@ -612,7 +600,7 @@ inflate_info (MonoRuntimeGenericContextInfoTemplate *oti, MonoGenericContext *co
                MonoJumpInfoGSharedVtCall *res;
                MonoDomain *domain = mono_domain_get ();
 
-               res = mono_domain_alloc0 (domain, sizeof (MonoJumpInfoGSharedVtCall));
+               res = (MonoJumpInfoGSharedVtCall *)mono_domain_alloc0 (domain, sizeof (MonoJumpInfoGSharedVtCall));
                /* Keep the original signature */
                res->sig = info->sig;
 
@@ -640,7 +628,7 @@ inflate_info (MonoRuntimeGenericContextInfoTemplate *oti, MonoGenericContext *co
 
        case MONO_RGCTX_INFO_CLASS_FIELD:
        case MONO_RGCTX_INFO_FIELD_OFFSET: {
-               MonoClassField *field = data;
+               MonoClassField *field = (MonoClassField *)data;
                MonoType *inflated_type = mono_class_inflate_generic_type (&field->parent->byval_arg, context);
                MonoClass *inflated_class = mono_class_from_mono_type (inflated_type);
                int i = field - field->parent->fields;
@@ -654,7 +642,7 @@ inflate_info (MonoRuntimeGenericContextInfoTemplate *oti, MonoGenericContext *co
                return &inflated_class->fields [i];
        }
        case MONO_RGCTX_INFO_SIG_GSHAREDVT_OUT_TRAMPOLINE_CALLI: {
-               MonoMethodSignature *sig = data;
+               MonoMethodSignature *sig = (MonoMethodSignature *)data;
                MonoMethodSignature *isig;
                MonoError error;
 
@@ -664,14 +652,14 @@ inflate_info (MonoRuntimeGenericContextInfoTemplate *oti, MonoGenericContext *co
        }
        case MONO_RGCTX_INFO_VIRT_METHOD_CODE:
        case MONO_RGCTX_INFO_VIRT_METHOD_BOX_TYPE: {
-               MonoJumpInfoVirtMethod *info = data;
+               MonoJumpInfoVirtMethod *info = (MonoJumpInfoVirtMethod *)data;
                MonoJumpInfoVirtMethod *res;
                MonoType *t;
                MonoDomain *domain = mono_domain_get ();
                MonoError error;
 
                // FIXME: Temporary
-               res = mono_domain_alloc0 (domain, sizeof (MonoJumpInfoVirtMethod));
+               res = (MonoJumpInfoVirtMethod *)mono_domain_alloc0 (domain, sizeof (MonoJumpInfoVirtMethod));
                t = mono_class_inflate_generic_type (&info->klass->byval_arg, context);
                res->klass = mono_class_from_mono_type (t);
                mono_metadata_free_type (t);
@@ -702,7 +690,7 @@ free_inflated_info (MonoRgctxInfoType info_type, gpointer info)
        case MONO_RGCTX_INFO_TYPE:
        case MONO_RGCTX_INFO_REFLECTION_TYPE:
        case MONO_RGCTX_INFO_CAST_CACHE:
-               mono_metadata_free_type (info);
+               mono_metadata_free_type ((MonoType *)info);
                break;
        default:
                break;
@@ -741,21 +729,21 @@ get_shared_class (MonoClass *klass)
 static MonoRuntimeGenericContextTemplate*
 mono_class_get_runtime_generic_context_template (MonoClass *klass)
 {
-       MonoRuntimeGenericContextTemplate *parent_template, *template;
+       MonoRuntimeGenericContextTemplate *parent_template, *template_;
        guint32 i;
 
        klass = get_shared_class (klass);
 
        mono_loader_lock ();
-       template = class_lookup_rgctx_template (klass);
+       template_ = class_lookup_rgctx_template (klass);
        mono_loader_unlock ();
 
-       if (template)
-               return template;
+       if (template_)
+               return template_;
 
        //g_assert (get_shared_class (class) == class);
 
-       template = alloc_template (klass);
+       template_ = alloc_template (klass);
 
        mono_loader_lock ();
 
@@ -775,7 +763,7 @@ mono_class_get_runtime_generic_context_template (MonoClass *klass)
 
                                oti = class_get_rgctx_template_oti (klass->parent, type_argc, i, FALSE, FALSE, NULL);
                                if (oti.data && oti.data != MONO_RGCTX_SLOT_USED_MARKER) {
-                                       rgctx_template_set_slot (klass->image, template, type_argc, i,
+                                       rgctx_template_set_slot (klass->image, template_, type_argc, i,
                                                                                         oti.data, oti.info_type);
                                }
                        }
@@ -784,9 +772,9 @@ mono_class_get_runtime_generic_context_template (MonoClass *klass)
 
        if (class_lookup_rgctx_template (klass)) {
                /* some other thread already set the template */
-               template = class_lookup_rgctx_template (klass);
+               template_ = class_lookup_rgctx_template (klass);
        } else {
-               class_set_rgctx_template (klass, template);
+               class_set_rgctx_template (klass, template_);
 
                if (klass->parent)
                        register_generic_subclass (klass);
@@ -794,7 +782,7 @@ mono_class_get_runtime_generic_context_template (MonoClass *klass)
 
        mono_loader_unlock ();
 
-       return template;
+       return template_;
 }
 
 /*
@@ -833,11 +821,11 @@ class_get_rgctx_template_oti (MonoClass *klass, int type_argc, guint32 slot, gbo
 
                return oti;
        } else {
-               MonoRuntimeGenericContextTemplate *template;
+               MonoRuntimeGenericContextTemplate *template_;
                MonoRuntimeGenericContextInfoTemplate *oti;
 
-               template = mono_class_get_runtime_generic_context_template (klass);
-               oti = rgctx_template_get_other_slot (template, type_argc, slot);
+               template_ = mono_class_get_runtime_generic_context_template (klass);
+               oti = rgctx_template_get_other_slot (template_, type_argc, slot);
                g_assert (oti);
 
                if (temporary)
@@ -869,8 +857,8 @@ class_type_info (MonoDomain *domain, MonoClass *klass, MonoRgctxInfoType info_ty
        }
        case MONO_RGCTX_INFO_CAST_CACHE: {
                /*First slot is the cache itself, the second the vtable.*/
-               gpointer **cache_data = mono_domain_alloc0 (domain, sizeof (gpointer) * 2);
-               cache_data [1] = (gpointer)klass;
+               gpointer **cache_data = (gpointer **)mono_domain_alloc0 (domain, sizeof (gpointer) * 2);
+               cache_data [1] = (gpointer *)klass;
                return cache_data;
        }
        case MONO_RGCTX_INFO_ARRAY_ELEMENT_SIZE:
@@ -926,7 +914,7 @@ class_type_info (MonoDomain *domain, MonoClass *klass, MonoRgctxInfoType info_ty
                        if (!domain_info->memcpy_addr [size]) {
                                gpointer addr = mono_compile_method (memcpy_method [size]);
                                mono_memory_barrier ();
-                               domain_info->memcpy_addr [size] = addr;
+                               domain_info->memcpy_addr [size] = (gpointer *)addr;
                        }
                        return domain_info->memcpy_addr [size];
                } else {
@@ -946,7 +934,7 @@ class_type_info (MonoDomain *domain, MonoClass *klass, MonoRgctxInfoType info_ty
                        if (!domain_info->bzero_addr [size]) {
                                gpointer addr = mono_compile_method (bzero_method [size]);
                                mono_memory_barrier ();
-                               domain_info->bzero_addr [size] = addr;
+                               domain_info->bzero_addr [size] = (gpointer *)addr;
                        }
                        return domain_info->bzero_addr [size];
                }
@@ -968,7 +956,7 @@ class_type_info (MonoDomain *domain, MonoClass *klass, MonoRgctxInfoType info_ty
 
                addr = mono_compile_method (method);
                // The caller uses the gsharedvt call signature
-               ji = mini_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (addr), NULL);
+               ji = mini_jit_info_table_find (mono_domain_get (), (char *)mono_get_addr_from_ftnptr (addr), NULL);
                g_assert (ji);
                if (mini_jit_info_is_gsharedvt (ji))
                        return mono_create_static_rgctx_trampoline (method, addr);
@@ -1018,7 +1006,7 @@ typedef struct {
 static guint
 tramp_info_hash (gconstpointer key)
 {
-       GSharedVtTrampInfo *tramp = (gpointer)key;
+       GSharedVtTrampInfo *tramp = (GSharedVtTrampInfo *)key;
 
        return (gsize)tramp->addr;
 }
@@ -1026,8 +1014,8 @@ tramp_info_hash (gconstpointer key)
 static gboolean
 tramp_info_equal (gconstpointer a, gconstpointer b)
 {
-       GSharedVtTrampInfo *tramp1 = (gpointer)a;
-       GSharedVtTrampInfo *tramp2 = (gpointer)b;
+       GSharedVtTrampInfo *tramp1 = (GSharedVtTrampInfo *)a;
+       GSharedVtTrampInfo *tramp2 = (GSharedVtTrampInfo *)b;
 
        /* The signatures should be internalized */
        return tramp1->is_in == tramp2->is_in && tramp1->calli == tramp2->calli && tramp1->vcall_offset == tramp2->vcall_offset &&
@@ -1110,7 +1098,7 @@ mini_get_gsharedvt_wrapper (gboolean gsharedvt_in, gpointer addr, MonoMethodSign
        num_trampolines ++;
 
        /* Cache it */
-       tramp_info = mono_domain_alloc0 (domain, sizeof (GSharedVtTrampInfo));
+       tramp_info = (GSharedVtTrampInfo *)mono_domain_alloc0 (domain, sizeof (GSharedVtTrampInfo));
        memcpy (tramp_info, &tinfo, sizeof (GSharedVtTrampInfo));
 
        mono_domain_lock (domain);
@@ -1158,7 +1146,7 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
        case MONO_RGCTX_INFO_BZERO:
        case MONO_RGCTX_INFO_NULLABLE_CLASS_BOX:
        case MONO_RGCTX_INFO_NULLABLE_CLASS_UNBOX: {
-               MonoClass *arg_class = mono_class_from_mono_type (data);
+               MonoClass *arg_class = mono_class_from_mono_type ((MonoType *)data);
 
                free_inflated_info (oti->info_type, data);
                g_assert (arg_class);
@@ -1174,17 +1162,17 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
        case MONO_RGCTX_INFO_TYPE:
                return data;
        case MONO_RGCTX_INFO_REFLECTION_TYPE:
-               return mono_type_get_object (domain, data);
+               return mono_type_get_object (domain, (MonoType *)data);
        case MONO_RGCTX_INFO_METHOD:
                return data;
        case MONO_RGCTX_INFO_GENERIC_METHOD_CODE: {
                gpointer addr;
 
-               addr = mono_compile_method (data);
-               return mini_add_method_trampoline (data, addr, mono_method_needs_static_rgctx_invoke (data, FALSE), FALSE);
+               addr = mono_compile_method ((MonoMethod *)data);
+               return mini_add_method_trampoline ((MonoMethod *)data, addr, mono_method_needs_static_rgctx_invoke ((MonoMethod *)data, FALSE), FALSE);
        }
        case MONO_RGCTX_INFO_VIRT_METHOD_CODE: {
-               MonoJumpInfoVirtMethod *info = data;
+               MonoJumpInfoVirtMethod *info = (MonoJumpInfoVirtMethod *)data;
                MonoClass *iface_class = info->method->klass;
                MonoMethod *method;
                MonoError error;
@@ -1210,7 +1198,7 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
                return mini_add_method_trampoline (method, addr, mono_method_needs_static_rgctx_invoke (method, FALSE), FALSE);
        }
        case MONO_RGCTX_INFO_VIRT_METHOD_BOX_TYPE: {
-               MonoJumpInfoVirtMethod *info = data;
+               MonoJumpInfoVirtMethod *info = (MonoJumpInfoVirtMethod *)data;
                MonoClass *iface_class = info->method->klass;
                MonoMethod *method;
                MonoClass *impl_class;
@@ -1239,14 +1227,14 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
        }
 #ifndef DISABLE_REMOTING
        case MONO_RGCTX_INFO_REMOTING_INVOKE_WITH_CHECK:
-               return mono_compile_method (mono_marshal_get_remoting_invoke_with_check (data));
+               return mono_compile_method (mono_marshal_get_remoting_invoke_with_check ((MonoMethod *)data));
 #endif
        case MONO_RGCTX_INFO_METHOD_DELEGATE_CODE:
                return mono_domain_alloc0 (domain, sizeof (gpointer));
        case MONO_RGCTX_INFO_CLASS_FIELD:
                return data;
        case MONO_RGCTX_INFO_FIELD_OFFSET: {
-               MonoClassField *field = data;
+               MonoClassField *field = (MonoClassField *)data;
 
                /* The value is offset by 1 */
                if (field->parent->valuetype && !(field->type->attrs & FIELD_ATTRIBUTE_STATIC))
@@ -1255,7 +1243,7 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
                        return GUINT_TO_POINTER (field->offset + 1);
        }
        case MONO_RGCTX_INFO_METHOD_RGCTX: {
-               MonoMethodInflated *method = data;
+               MonoMethodInflated *method = (MonoMethodInflated *)data;
                MonoVTable *vtable;
 
                g_assert (method->method.method.is_inflated);
@@ -1268,7 +1256,7 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
                return mono_method_lookup_rgctx (vtable, method->context.method_inst);
        }
        case MONO_RGCTX_INFO_METHOD_CONTEXT: {
-               MonoMethodInflated *method = data;
+               MonoMethodInflated *method = (MonoMethodInflated *)data;
 
                g_assert (method->method.method.is_inflated);
                g_assert (method->context.method_inst);
@@ -1276,8 +1264,8 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
                return method->context.method_inst;
        }
        case MONO_RGCTX_INFO_SIG_GSHAREDVT_OUT_TRAMPOLINE_CALLI: {
-               MonoMethodSignature *gsig = oti->data;
-               MonoMethodSignature *sig = data;
+               MonoMethodSignature *gsig = (MonoMethodSignature *)oti->data;
+               MonoMethodSignature *sig = (MonoMethodSignature *)data;
                gpointer addr;
 
                /*
@@ -1288,12 +1276,12 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
        }
        case MONO_RGCTX_INFO_METHOD_GSHAREDVT_OUT_TRAMPOLINE:
        case MONO_RGCTX_INFO_METHOD_GSHAREDVT_OUT_TRAMPOLINE_VIRT: {
-               MonoJumpInfoGSharedVtCall *call_info = data;
+               MonoJumpInfoGSharedVtCall *call_info = (MonoJumpInfoGSharedVtCall *)data;
                MonoMethodSignature *call_sig;
                MonoMethod *method;
                gpointer addr;
                MonoJitInfo *callee_ji;
-               gboolean virtual = oti->info_type == MONO_RGCTX_INFO_METHOD_GSHAREDVT_OUT_TRAMPOLINE_VIRT;
+               gboolean virtual_ = oti->info_type == MONO_RGCTX_INFO_METHOD_GSHAREDVT_OUT_TRAMPOLINE_VIRT;
                gint32 vcall_offset;
                gboolean callee_gsharedvt;
 
@@ -1304,12 +1292,12 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
 
                g_assert (method->is_inflated);
 
-               if (!virtual)
+               if (!virtual_)
                        addr = mono_compile_method (method);
                else
                        addr = NULL;
 
-               if (virtual) {
+               if (virtual_) {
                        /* Same as in mono_emit_method_call_full () */
                        if ((method->klass->parent == mono_defaults.multicastdelegate_class) && (!strcmp (method->name, "Invoke"))) {
                                /* See mono_emit_method_call_full () */
@@ -1327,7 +1315,7 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
                }
 
                // FIXME: This loads information in the AOT case
-               callee_ji = mini_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (addr), NULL);
+               callee_ji = mini_jit_info_table_find (mono_domain_get (), (char *)mono_get_addr_from_ftnptr (addr), NULL);
                callee_gsharedvt = ji_is_gsharedvt (callee_ji);
 
                /*
@@ -1341,7 +1329,7 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
                 * caller -> out trampoline -> in trampoline -> callee
                 * This is not very efficient, but it is easy to implement.
                 */
-               if (virtual || !callee_gsharedvt) {
+               if (virtual_ || !callee_gsharedvt) {
                        MonoMethodSignature *sig, *gsig;
 
                        g_assert (method->is_inflated);
@@ -1395,21 +1383,21 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
                return addr;
        }
        case MONO_RGCTX_INFO_METHOD_GSHAREDVT_INFO: {
-               MonoGSharedVtMethodInfo *info = data;
+               MonoGSharedVtMethodInfo *info = (MonoGSharedVtMethodInfo *)data;
                MonoGSharedVtMethodRuntimeInfo *res;
                MonoType *t;
                int i, offset, align, size;
 
                // FIXME:
-               res = g_malloc0 (sizeof (MonoGSharedVtMethodRuntimeInfo) + (info->num_entries * sizeof (gpointer)));
+               res = (MonoGSharedVtMethodRuntimeInfo *)g_malloc0 (sizeof (MonoGSharedVtMethodRuntimeInfo) + (info->num_entries * sizeof (gpointer)));
 
                offset = 0;
                for (i = 0; i < info->num_entries; ++i) {
-                       MonoRuntimeGenericContextInfoTemplate *template = &info->entries [i];
+                       MonoRuntimeGenericContextInfoTemplate *template_ = &info->entries [i];
 
-                       switch (template->info_type) {
+                       switch (template_->info_type) {
                        case MONO_RGCTX_INFO_LOCAL_OFFSET:
-                               t = template->data;
+                               t = (MonoType *)template_->data;
 
                                size = mono_type_size (t, &align);
 
@@ -1425,7 +1413,7 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
                                offset += size;
                                break;
                        default:
-                               res->entries [i] = instantiate_info (domain, template, context, klass);
+                               res->entries [i] = instantiate_info (domain, template_, context, klass);
                                break;
                        }
                }
@@ -1446,14 +1434,14 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
 static void
 fill_in_rgctx_template_slot (MonoClass *klass, int type_argc, int index, gpointer data, MonoRgctxInfoType info_type)
 {
-       MonoRuntimeGenericContextTemplate *template = mono_class_get_runtime_generic_context_template (klass);
+       MonoRuntimeGenericContextTemplate *template_ = mono_class_get_runtime_generic_context_template (klass);
        MonoClass *subclass;
 
-       rgctx_template_set_slot (klass->image, template, type_argc, index, data, info_type);
+       rgctx_template_set_slot (klass->image, template_, type_argc, index, data, info_type);
 
        /* Recurse for all subclasses */
        if (generic_subclass_hash)
-               subclass = g_hash_table_lookup (generic_subclass_hash, klass);
+               subclass = (MonoClass *)g_hash_table_lookup (generic_subclass_hash, klass);
        else
                subclass = NULL;
 
@@ -1527,11 +1515,11 @@ static int
 register_info (MonoClass *klass, int type_argc, gpointer data, MonoRgctxInfoType info_type)
 {
        int i;
-       MonoRuntimeGenericContextTemplate *template = mono_class_get_runtime_generic_context_template (klass);
+       MonoRuntimeGenericContextTemplate *template_ = mono_class_get_runtime_generic_context_template (klass);
        MonoClass *parent;
        MonoRuntimeGenericContextInfoTemplate *oti;
 
-       for (i = 0, oti = get_info_templates (template, type_argc); oti; ++i, oti = oti->next) {
+       for (i = 0, oti = get_info_templates (template_, type_argc); oti; ++i, oti = oti->next) {
                if (!oti->data)
                        break;
        }
@@ -1555,7 +1543,7 @@ register_info (MonoClass *klass, int type_argc, gpointer data, MonoRgctxInfoType
                        break;
 
                rgctx_template_set_slot (parent->image, parent_template, type_argc, i,
-                                                                MONO_RGCTX_SLOT_USED_MARKER, 0);
+                                                                MONO_RGCTX_SLOT_USED_MARKER, (MonoRgctxInfoType)0);
 
                parent = parent->parent;
        }
@@ -1585,7 +1573,7 @@ info_equal (gpointer data1, gpointer data2, MonoRgctxInfoType info_type)
        case MONO_RGCTX_INFO_BZERO:
        case MONO_RGCTX_INFO_NULLABLE_CLASS_BOX:
        case MONO_RGCTX_INFO_NULLABLE_CLASS_UNBOX:
-               return mono_class_from_mono_type (data1) == mono_class_from_mono_type (data2);
+               return mono_class_from_mono_type ((MonoType *)data1) == mono_class_from_mono_type ((MonoType *)data2);
        case MONO_RGCTX_INFO_METHOD:
        case MONO_RGCTX_INFO_METHOD_GSHAREDVT_INFO:
        case MONO_RGCTX_INFO_GENERIC_METHOD_CODE:
@@ -1601,8 +1589,8 @@ info_equal (gpointer data1, gpointer data2, MonoRgctxInfoType info_type)
                return data1 == data2;
        case MONO_RGCTX_INFO_VIRT_METHOD_CODE:
        case MONO_RGCTX_INFO_VIRT_METHOD_BOX_TYPE: {
-               MonoJumpInfoVirtMethod *info1 = data1;
-               MonoJumpInfoVirtMethod *info2 = data2;
+               MonoJumpInfoVirtMethod *info1 = (MonoJumpInfoVirtMethod *)data1;
+               MonoJumpInfoVirtMethod *info2 = (MonoJumpInfoVirtMethod *)data2;
 
                return info1->klass == info2->klass && info1->method == info2->method;
        }
@@ -1642,7 +1630,7 @@ mini_rgctx_info_type_to_patch_info_type (MonoRgctxInfoType info_type)
                return MONO_PATCH_INFO_FIELD;
        default:
                g_assert_not_reached ();
-               return -1;
+               return (MonoJumpInfoType)-1;
        }
 }
 
@@ -1769,7 +1757,7 @@ alloc_rgctx_array (MonoDomain *domain, int n, gboolean is_mrgctx)
        static int mrgctx_bytes_alloced = 0;
 
        int size = mono_class_rgctx_get_array_size (n, is_mrgctx) * sizeof (gpointer);
-       gpointer array = mono_domain_alloc0 (domain, size);
+       gpointer *array = (gpointer *)mono_domain_alloc0 (domain, size);
 
        if (!inited) {
                mono_counters_register ("RGCTX num arrays alloced", MONO_COUNTER_GENERICS | MONO_COUNTER_INT, &rgctx_num_alloced);
@@ -1834,7 +1822,7 @@ fill_runtime_generic_context (MonoVTable *class_vtable, MonoRuntimeGenericContex
                }
                if (!rgctx [offset + 0])
                        rgctx [offset + 0] = alloc_rgctx_array (domain, i + 1, method_inst != NULL);
-               rgctx = rgctx [offset + 0];
+               rgctx = (void **)rgctx [offset + 0];
                first_slot += size - 1;
                size = mono_class_rgctx_get_array_size (i + 1, method_inst != NULL);
        }
@@ -1932,7 +1920,7 @@ mono_method_fill_runtime_generic_context (MonoMethodRuntimeGenericContext *mrgct
 static guint
 mrgctx_hash_func (gconstpointer key)
 {
-       const MonoMethodRuntimeGenericContext *mrgctx = key;
+       const MonoMethodRuntimeGenericContext *mrgctx = (const MonoMethodRuntimeGenericContext *)key;
 
        return mono_aligned_addr_hash (mrgctx->class_vtable) ^ mono_metadata_generic_inst_hash (mrgctx->method_inst);
 }
@@ -1940,8 +1928,8 @@ mrgctx_hash_func (gconstpointer key)
 static gboolean
 mrgctx_equal_func (gconstpointer a, gconstpointer b)
 {
-       const MonoMethodRuntimeGenericContext *mrgctx1 = a;
-       const MonoMethodRuntimeGenericContext *mrgctx2 = b;
+       const MonoMethodRuntimeGenericContext *mrgctx1 = (const MonoMethodRuntimeGenericContext *)a;
+       const MonoMethodRuntimeGenericContext *mrgctx2 = (const MonoMethodRuntimeGenericContext *)b;
 
        return mrgctx1->class_vtable == mrgctx2->class_vtable &&
                mono_metadata_generic_inst_equal (mrgctx1->method_inst, mrgctx2->method_inst);
@@ -1974,7 +1962,7 @@ mono_method_lookup_rgctx (MonoVTable *class_vtable, MonoGenericInst *method_inst
        key.class_vtable = class_vtable;
        key.method_inst = method_inst;
 
-       mrgctx = g_hash_table_lookup (domain->method_rgctx_hash, &key);
+       mrgctx = (MonoMethodRuntimeGenericContext *)g_hash_table_lookup (domain->method_rgctx_hash, &key);
 
        if (!mrgctx) {
                //int i;
@@ -2335,7 +2323,7 @@ get_object_generic_inst (int type_argc)
        MonoType **type_argv;
        int i;
 
-       type_argv = alloca (sizeof (MonoType*) * type_argc);
+       type_argv = (MonoType **)alloca (sizeof (MonoType*) * type_argc);
 
        for (i = 0; i < type_argc; ++i)
                type_argv [i] = &mono_defaults.object_class->byval_arg;
@@ -2624,6 +2612,11 @@ mini_type_stack_size_full (MonoType *t, guint32 *align, gboolean pinvoke)
 void
 mono_generic_sharing_init (void)
 {
+       mono_counters_register ("RGCTX template num allocted", MONO_COUNTER_GENERICS | MONO_COUNTER_INT, &num_templates_allocted);
+       mono_counters_register ("RGCTX template bytes allocted", MONO_COUNTER_GENERICS | MONO_COUNTER_INT, &num_templates_bytes);
+       mono_counters_register ("RGCTX oti num allocted", MONO_COUNTER_GENERICS | MONO_COUNTER_INT, &num_oti_allocted);
+       mono_counters_register ("RGCTX oti bytes allocted", MONO_COUNTER_GENERICS | MONO_COUNTER_INT, &num_oti_bytes);
+
        mono_install_image_unload_hook (mono_class_unregister_image_generic_subclasses, NULL);
 }
 
@@ -2779,38 +2772,31 @@ mini_get_shared_gparam (MonoType *t, MonoType *constraint)
        key.param.param.gshared_constraint = constraint;
 
        g_assert (mono_generic_param_info (par));
-       /* image might not be set for sre */
-       if (par->owner && par->owner->image) {
-               image = par->owner->image;
+       image = get_image_for_generic_param(par);
 
-               /*
-                * Need a cache to ensure the newly created gparam
-                * is unique wrt T/CONSTRAINT.
-                */
-               mono_image_lock (image);
-               if (!image->gshared_types) {
-                       image->gshared_types_len = MONO_TYPE_INTERNAL;
-                       image->gshared_types = g_new0 (GHashTable*, image->gshared_types_len);
-               }
-               if (!image->gshared_types [constraint->type])
-                       image->gshared_types [constraint->type] = g_hash_table_new (shared_gparam_hash, shared_gparam_equal);
-               res = g_hash_table_lookup (image->gshared_types [constraint->type], &key);
-               mono_image_unlock (image);
-               if (res)
-                       return res;
-               copy = mono_image_alloc0 (image, sizeof (MonoGSharedGenericParam));
-               memcpy (&copy->param, par, sizeof (MonoGenericParamFull));
-               name = get_shared_gparam_name (constraint->type, ((MonoGenericParamFull*)copy)->info.name);
-               copy->param.info.name = mono_image_strdup (image, name);
-               g_free (name);
-       } else {
-               /* mono_generic_param_name () expects this to be a MonoGenericParamFull */
-               copy = g_new0 (MonoGSharedGenericParam, 1);
-               memcpy (&copy->param, par, sizeof (MonoGenericParam));
-       }
-       copy->param.param.owner = NULL;
-       // FIXME:
-       copy->param.param.image = image ? image : mono_defaults.corlib;
+       /*
+        * Need a cache to ensure the newly created gparam
+        * is unique wrt T/CONSTRAINT.
+        */
+       mono_image_lock (image);
+       if (!image->gshared_types) {
+               image->gshared_types_len = MONO_TYPE_INTERNAL;
+               image->gshared_types = g_new0 (GHashTable*, image->gshared_types_len);
+       }
+       if (!image->gshared_types [constraint->type])
+               image->gshared_types [constraint->type] = g_hash_table_new (shared_gparam_hash, shared_gparam_equal);
+       res = (MonoType *)g_hash_table_lookup (image->gshared_types [constraint->type], &key);
+       mono_image_unlock (image);
+       if (res)
+               return res;
+       copy = (MonoGSharedGenericParam *)mono_image_alloc0 (image, sizeof (MonoGSharedGenericParam));
+       memcpy (&copy->param, par, sizeof (MonoGenericParamFull));
+       copy->param.info.pklass = NULL;
+       name = get_shared_gparam_name (constraint->type, ((MonoGenericParamFull*)copy)->info.name);
+       copy->param.info.name = mono_image_strdup (image, name);
+       g_free (name);
+
+       copy->param.param.owner = par->owner;
 
        copy->param.param.gshared_constraint = constraint;
        copy->parent = par;
@@ -2998,7 +2984,7 @@ mini_get_rgctx_entry_slot (MonoJumpInfoRgctxEntry *entry)
                slot = mono_method_lookup_or_register_info (entry->method, entry->in_mrgctx, entry->data->data.sig, entry->info_type, mono_method_get_context (entry->method));
                break;
        case MONO_PATCH_INFO_GSHAREDVT_CALL: {
-               MonoJumpInfoGSharedVtCall *call_info = g_malloc0 (sizeof (MonoJumpInfoGSharedVtCall)); //mono_domain_alloc0 (domain, sizeof (MonoJumpInfoGSharedVtCall));
+               MonoJumpInfoGSharedVtCall *call_info = (MonoJumpInfoGSharedVtCall *)g_malloc0 (sizeof (MonoJumpInfoGSharedVtCall)); //mono_domain_alloc0 (domain, sizeof (MonoJumpInfoGSharedVtCall));
 
                memcpy (call_info, entry->data->data.gsharedvt, sizeof (MonoJumpInfoGSharedVtCall));
                slot = mono_method_lookup_or_register_info (entry->method, entry->in_mrgctx, call_info, entry->info_type, mono_method_get_context (entry->method));
@@ -3010,15 +2996,15 @@ mini_get_rgctx_entry_slot (MonoJumpInfoRgctxEntry *entry)
                int i;
 
                /* Make a copy into the domain mempool */
-               info = g_malloc0 (sizeof (MonoGSharedVtMethodInfo)); //mono_domain_alloc0 (domain, sizeof (MonoGSharedVtMethodInfo));
+               info = (MonoGSharedVtMethodInfo *)g_malloc0 (sizeof (MonoGSharedVtMethodInfo)); //mono_domain_alloc0 (domain, sizeof (MonoGSharedVtMethodInfo));
                info->method = oinfo->method;
                info->num_entries = oinfo->num_entries;
-               info->entries = g_malloc0 (sizeof (MonoRuntimeGenericContextInfoTemplate) * info->num_entries);
+               info->entries = (MonoRuntimeGenericContextInfoTemplate *)g_malloc0 (sizeof (MonoRuntimeGenericContextInfoTemplate) * info->num_entries);
                for (i = 0; i < oinfo->num_entries; ++i) {
                        MonoRuntimeGenericContextInfoTemplate *otemplate = &oinfo->entries [i];
-                       MonoRuntimeGenericContextInfoTemplate *template = &info->entries [i];
+                       MonoRuntimeGenericContextInfoTemplate *template_ = &info->entries [i];
 
-                       memcpy (template, otemplate, sizeof (MonoRuntimeGenericContextInfoTemplate));
+                       memcpy (template_, otemplate, sizeof (MonoRuntimeGenericContextInfoTemplate));
                }
                slot = mono_method_lookup_or_register_info (entry->method, entry->in_mrgctx, info, entry->info_type, mono_method_get_context (entry->method));
                break;
@@ -3027,7 +3013,7 @@ mini_get_rgctx_entry_slot (MonoJumpInfoRgctxEntry *entry)
                MonoJumpInfoVirtMethod *info;
                MonoJumpInfoVirtMethod *oinfo = entry->data->data.virt_method;
 
-               info = g_malloc0 (sizeof (MonoJumpInfoVirtMethod));
+               info = (MonoJumpInfoVirtMethod *)g_malloc0 (sizeof (MonoJumpInfoVirtMethod));
                memcpy (info, oinfo, sizeof (MonoJumpInfoVirtMethod));
                slot = mono_method_lookup_or_register_info (entry->method, entry->in_mrgctx, info, entry->info_type, mono_method_get_context (entry->method));
                break;

diff --git a/mono/mini/mini-llvm-cpp.cpp b/mono/mini/mini-llvm-cpp.cpp
index 1d79ce0d5115ca241d05e82a4c2fbcad4709fec1..cb5ddd33e79032ea2a81781d811f6df9ef68e754 100644 (file)
--- a/mono/mini/mini-llvm-cpp.cpp
+++ b/mono/mini/mini-llvm-cpp.cpp
@@ -25,267 +25,14 @@
 #include <stdint.h>
 
 #include <llvm/Support/raw_ostream.h>
-#include <llvm/Support/Host.h>
-#include <llvm/PassManager.h>
-#include <llvm/ExecutionEngine/ExecutionEngine.h>
-#include <llvm/ExecutionEngine/JITMemoryManager.h>
-#include <llvm/ExecutionEngine/JITEventListener.h>
-#include <llvm/Target/TargetOptions.h>
-#include <llvm/Target/TargetRegisterInfo.h>
-#include <llvm/IR/Verifier.h>
-#include <llvm/Analysis/Passes.h>
-#include <llvm/Transforms/Scalar.h>
-#include <llvm/Support/CommandLine.h>
-#include <llvm/IR/LegacyPassNameParser.h>
-#include <llvm/Support/PrettyStackTrace.h>
-#include <llvm/CodeGen/Passes.h>
-#include <llvm/CodeGen/MachineFunctionPass.h>
-#include <llvm/CodeGen/MachineFunction.h>
-#include <llvm/CodeGen/MachineFrameInfo.h>
 #include <llvm/IR/Function.h>
 #include <llvm/IR/IRBuilder.h>
 #include <llvm/IR/Module.h>
 
-#include <llvm-c/Core.h>
-#include <llvm-c/ExecutionEngine.h>
-
 #include "mini-llvm-cpp.h"
 
-// extern "C" void LLVMInitializeARMTargetInfo();
-// extern "C" void LLVMInitializeARMTarget ();
-// extern "C" void LLVMInitializeARMTargetMC ();
-
 using namespace llvm;
 
-#ifndef MONO_CROSS_COMPILE
-
-static void (*unhandled_exception)() = default_mono_llvm_unhandled_exception;
-
-void
-mono_llvm_set_unhandled_exception_handler (void)
-{
-       std::set_terminate (unhandled_exception);
-}
-
-class MonoJITMemoryManager : public JITMemoryManager
-{
-private:
-       JITMemoryManager *mm;
-
-public:
-       /* Callbacks installed by mono */
-       AllocCodeMemoryCb *alloc_cb;
-       DlSymCb *dlsym_cb;
-       ExceptionTableCb *exception_cb;
-
-       MonoJITMemoryManager ();
-       ~MonoJITMemoryManager ();
-
-       void setMemoryWritable (void);
-
-       void setMemoryExecutable (void);
-
-       void AllocateGOT();
-
-    unsigned char *getGOTBase() const {
-               return mm->getGOTBase ();
-    }
-
-       void setPoisonMemory(bool) {
-       }
-
-       unsigned char *startFunctionBody(const Function *F, 
-                                                                        uintptr_t &ActualSize);
-  
-       unsigned char *allocateStub(const GlobalValue* F, unsigned StubSize,
-                                                                unsigned Alignment);
-  
-       void endFunctionBody(const Function *F, unsigned char *FunctionStart,
-                                                unsigned char *FunctionEnd);
-
-       unsigned char *allocateSpace(intptr_t Size, unsigned Alignment);
-
-       uint8_t *allocateGlobal(uintptr_t Size, unsigned Alignment);
-  
-       void deallocateMemForFunction(const Function *F);
-  
-       unsigned char*startExceptionTable(const Function* F,
-                                                                         uintptr_t &ActualSize);
-  
-       void endExceptionTable(const Function *F, unsigned char *TableStart,
-                                                  unsigned char *TableEnd, 
-                                                  unsigned char* FrameRegister);
-
-       virtual void deallocateFunctionBody(void*) {
-       }
-
-       virtual void deallocateExceptionTable(void*) {
-       }
-
-       virtual uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment, unsigned SectionID,
-                                                                                StringRef SectionName) {
-               // FIXME:
-               assert(0);
-               return NULL;
-       }
-
-       virtual uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, unsigned SectionID,
-                                                                                StringRef SectionName, bool IsReadOnly) {
-               // FIXME:
-               assert(0);
-               return NULL;
-       }
-
-       virtual bool applyPermissions(std::string*) {
-               // FIXME:
-               assert(0);
-               return false;
-       }
-
-       virtual bool finalizeMemory(std::string *ErrMsg = 0) {
-               // FIXME:
-               assert(0);
-               return false;
-       }
-
-       virtual void* getPointerToNamedFunction(const std::string &Name, bool AbortOnFailure) {
-               void *res;
-               char *err;
-
-               err = dlsym_cb (Name.c_str (), &res);
-               if (err) {
-                       outs () << "Unable to resolve: " << Name << ": " << err << "\n";
-                       assert(0);
-                       return NULL;
-               }
-               return res;
-       }
-};
-
-MonoJITMemoryManager::MonoJITMemoryManager ()
-{
-       mm = JITMemoryManager::CreateDefaultMemManager ();
-}
-
-MonoJITMemoryManager::~MonoJITMemoryManager ()
-{
-       delete mm;
-}
-
-void
-MonoJITMemoryManager::setMemoryWritable (void)
-{
-}
-
-void
-MonoJITMemoryManager::setMemoryExecutable (void)
-{
-}
-
-void
-MonoJITMemoryManager::AllocateGOT()
-{
-       mm->AllocateGOT ();
-}
-
-unsigned char *
-MonoJITMemoryManager::startFunctionBody(const Function *F, 
-                                       uintptr_t &ActualSize)
-{
-       // FIXME: This leaks memory
-       if (ActualSize == 0)
-               ActualSize = 128;
-       return alloc_cb (wrap (F), ActualSize);
-}
-  
-unsigned char *
-MonoJITMemoryManager::allocateStub(const GlobalValue* F, unsigned StubSize,
-                          unsigned Alignment)
-{
-       return alloc_cb (wrap (F), StubSize);
-}
-  
-void
-MonoJITMemoryManager::endFunctionBody(const Function *F, unsigned char *FunctionStart,
-                                 unsigned char *FunctionEnd)
-{
-}
-
-unsigned char *
-MonoJITMemoryManager::allocateSpace(intptr_t Size, unsigned Alignment)
-{
-       return new unsigned char [Size];
-}
-
-uint8_t *
-MonoJITMemoryManager::allocateGlobal(uintptr_t Size, unsigned Alignment)
-{
-       return new unsigned char [Size];
-}
-
-void
-MonoJITMemoryManager::deallocateMemForFunction(const Function *F)
-{
-}
-  
-unsigned char*
-MonoJITMemoryManager::startExceptionTable(const Function* F,
-                                         uintptr_t &ActualSize)
-{
-       return startFunctionBody(F, ActualSize);
-}
-  
-void
-MonoJITMemoryManager::endExceptionTable(const Function *F, unsigned char *TableStart,
-                                       unsigned char *TableEnd, 
-                                       unsigned char* FrameRegister)
-{
-       exception_cb (FrameRegister);
-}
-
-#else
-
-class MonoJITMemoryManager {
-};
-
-#endif /* !MONO_CROSS_COMPILE */
-
-class MonoJITEventListener : public JITEventListener {
-
-public:
-       FunctionEmittedCb *emitted_cb;
-
-       MonoJITEventListener (FunctionEmittedCb *cb) {
-               emitted_cb = cb;
-       }
-
-       virtual void NotifyFunctionEmitted(const Function &F,
-                                                                          void *Code, size_t Size,
-                                                                          const EmittedFunctionDetails &Details) {
-               emitted_cb (wrap (&F), Code, (char*)Code + Size);
-       }
-};
-
-class MonoEE {
-public:
-       ExecutionEngine *EE;
-       MonoJITMemoryManager *mm;
-       MonoJITEventListener *listener;
-       FunctionPassManager *fpm;
-};
-
-void
-mono_llvm_optimize_method (MonoEERef eeref, LLVMValueRef method)
-{
-       MonoEE *mono_ee = (MonoEE*)eeref;
-
-       /*
-        * The verifier does some checks on the whole module, leading to quadratic behavior.
-        */
-       //verifyFunction (*(unwrap<Function> (method)));
-       mono_ee->fpm->run (*unwrap<Function> (method));
-}
-
 void
 mono_llvm_dump_value (LLVMValueRef value)
 {
@@ -469,315 +216,3 @@ mono_llvm_set_call_preserveall_cc (LLVMValueRef func)
 {
        unwrap<CallInst>(func)->setCallingConv (CallingConv::PreserveAll);
 }
-
-static cl::list<const PassInfo*, bool, PassNameParser>
-PassList(cl::desc("Optimizations available:"));
-
-static void
-force_pass_linking (void)
-{
-       // Make sure the rest is linked in, but never executed
-       if (g_getenv ("FOO") != (char*)-1)
-               return;
-
-       // This is a subset of the passes in LinkAllPasses.h
-       // The utility passes and the interprocedural passes are commented out
-
-      (void) llvm::createAAEvalPass();
-      (void) llvm::createAggressiveDCEPass();
-      (void) llvm::createAliasAnalysisCounterPass();
-      (void) llvm::createAliasDebugger();
-         /*
-      (void) llvm::createArgumentPromotionPass();
-      (void) llvm::createStructRetPromotionPass();
-         */
-      (void) llvm::createBasicAliasAnalysisPass();
-      (void) llvm::createLibCallAliasAnalysisPass(0);
-      (void) llvm::createScalarEvolutionAliasAnalysisPass();
-      //(void) llvm::createBlockPlacementPass();
-      (void) llvm::createBreakCriticalEdgesPass();
-      (void) llvm::createCFGSimplificationPass();
-         /*
-      (void) llvm::createConstantMergePass();
-      (void) llvm::createConstantPropagationPass();
-         */
-         /*
-      (void) llvm::createDeadArgEliminationPass();
-         */
-      (void) llvm::createDeadCodeEliminationPass();
-      (void) llvm::createDeadInstEliminationPass();
-      (void) llvm::createDeadStoreEliminationPass();
-         /*
-      (void) llvm::createDeadTypeEliminationPass();
-      (void) llvm::createDomOnlyPrinterPass();
-      (void) llvm::createDomPrinterPass();
-      (void) llvm::createDomOnlyViewerPass();
-      (void) llvm::createDomViewerPass();
-      (void) llvm::createEdgeProfilerPass();
-      (void) llvm::createOptimalEdgeProfilerPass();
-      (void) llvm::createFunctionInliningPass();
-      (void) llvm::createAlwaysInlinerPass();
-      (void) llvm::createGlobalDCEPass();
-      (void) llvm::createGlobalOptimizerPass();
-      (void) llvm::createGlobalsModRefPass();
-      (void) llvm::createIPConstantPropagationPass();
-      (void) llvm::createIPSCCPPass();
-         */
-      (void) llvm::createIndVarSimplifyPass();
-      (void) llvm::createInstructionCombiningPass();
-         /*
-      (void) llvm::createInternalizePass(false);
-         */
-      (void) llvm::createLCSSAPass();
-      (void) llvm::createLICMPass();
-      (void) llvm::createLazyValueInfoPass();
-      //(void) llvm::createLoopDependenceAnalysisPass();
-         /*
-      (void) llvm::createLoopExtractorPass();
-         */
-      (void) llvm::createLoopSimplifyPass();
-      (void) llvm::createLoopStrengthReducePass();
-      (void) llvm::createLoopUnrollPass();
-      (void) llvm::createLoopUnswitchPass();
-      (void) llvm::createLoopRotatePass();
-      (void) llvm::createLowerInvokePass();
-         /*
-      (void) llvm::createLowerSetJmpPass();
-         */
-      (void) llvm::createLowerSwitchPass();
-      (void) llvm::createNoAAPass();
-         /*
-      (void) llvm::createNoProfileInfoPass();
-      (void) llvm::createProfileEstimatorPass();
-      (void) llvm::createProfileVerifierPass();
-      (void) llvm::createProfileLoaderPass();
-         */
-      (void) llvm::createPromoteMemoryToRegisterPass();
-      (void) llvm::createDemoteRegisterToMemoryPass();
-         /*
-      (void) llvm::createPruneEHPass();
-      (void) llvm::createPostDomOnlyPrinterPass();
-      (void) llvm::createPostDomPrinterPass();
-      (void) llvm::createPostDomOnlyViewerPass();
-      (void) llvm::createPostDomViewerPass();
-         */
-      (void) llvm::createReassociatePass();
-      (void) llvm::createSCCPPass();
-      (void) llvm::createScalarReplAggregatesPass();
-      //(void) llvm::createSimplifyLibCallsPass();
-         /*
-      (void) llvm::createSingleLoopExtractorPass();
-      (void) llvm::createStripSymbolsPass();
-      (void) llvm::createStripNonDebugSymbolsPass();
-      (void) llvm::createStripDeadDebugInfoPass();
-      (void) llvm::createStripDeadPrototypesPass();
-      (void) llvm::createTailCallEliminationPass();
-      (void) llvm::createTailDuplicationPass();
-      (void) llvm::createJumpThreadingPass();
-         */
-         /*
-      (void) llvm::createUnifyFunctionExitNodesPass();
-         */
-      (void) llvm::createInstCountPass();
-      (void) llvm::createCodeGenPreparePass();
-      (void) llvm::createGVNPass();
-      (void) llvm::createMemCpyOptPass();
-      (void) llvm::createLoopDeletionPass();
-         /*
-      (void) llvm::createPostDomTree();
-      (void) llvm::createPostDomFrontier();
-      (void) llvm::createInstructionNamerPass();
-      (void) llvm::createPartialSpecializationPass();
-      (void) llvm::createFunctionAttrsPass();
-      (void) llvm::createMergeFunctionsPass();
-      (void) llvm::createPrintModulePass(0);
-      (void) llvm::createPrintFunctionPass("", 0);
-      (void) llvm::createDbgInfoPrinterPass();
-      (void) llvm::createModuleDebugInfoPrinterPass();
-      (void) llvm::createPartialInliningPass();
-      (void) llvm::createGEPSplitterPass();
-      (void) llvm::createLintPass();
-         */
-      (void) llvm::createSinkingPass();
-}
-
-#ifndef MONO_CROSS_COMPILE
-
-static gboolean inited;
-
-static void
-init_llvm (void)
-{
-       if (inited)
-               return;
-
-  force_pass_linking ();
-
-#ifdef TARGET_ARM
-  LLVMInitializeARMTarget ();
-  LLVMInitializeARMTargetInfo ();
-  LLVMInitializeARMTargetMC ();
-#elif defined(TARGET_X86) || defined(TARGET_AMD64)
-  LLVMInitializeX86Target ();
-  LLVMInitializeX86TargetInfo ();
-  LLVMInitializeX86TargetMC ();
-#elif defined(TARGET_POWERPC)
-  LLVMInitializePowerPCTarget ();
-  LLVMInitializePowerPCTargetInfo ();
-  LLVMInitializePowerPCTargetMC ();
-#else
-  #error Unsupported mono-llvm target
-#endif
-
-  PassRegistry &Registry = *PassRegistry::getPassRegistry();
-  initializeCore(Registry);
-  initializeScalarOpts(Registry);
-  initializeAnalysis(Registry);
-  initializeIPA(Registry);
-  initializeTransformUtils(Registry);
-  initializeInstCombine(Registry);
-  initializeTarget(Registry);
-
-  llvm::cl::ParseEnvironmentOptions("mono", "MONO_LLVM", "");
-
-  inited = true;
-}
-
-MonoEERef
-mono_llvm_create_ee (LLVMModuleProviderRef MP, AllocCodeMemoryCb *alloc_cb, FunctionEmittedCb *emitted_cb, ExceptionTableCb *exception_cb, DlSymCb *dlsym_cb, LLVMExecutionEngineRef *ee)
-{
-  std::string Error;
-  MonoEE *mono_ee;
-
-  init_llvm ();
-
-  mono_ee = new MonoEE ();
-
-  MonoJITMemoryManager *mono_mm = new MonoJITMemoryManager ();
-  mono_mm->alloc_cb = alloc_cb;
-  mono_mm->dlsym_cb = dlsym_cb;
-  mono_mm->exception_cb = exception_cb;
-  mono_ee->mm = mono_mm;
-
-  /*
-   * The Default code model doesn't seem to work on amd64,
-   * test_0_fields_with_big_offsets (among others) crashes, because LLVM tries to call
-   * memset using a normal pcrel code which is in 32bit memory, while memset isn't.
-   */
-
-  TargetOptions opts;
-  opts.JITExceptionHandling = 1;
-
-  StringRef cpu_name = sys::getHostCPUName ();
-
-  // EngineBuilder no longer has a copy assignment operator (?)
-  std::unique_ptr<Module> Owner(unwrap(MP));
-  EngineBuilder b (std::move(Owner));
-  ExecutionEngine *EE = b.setJITMemoryManager (mono_mm).setTargetOptions (opts).setAllocateGVsWithCode (true).setMCPU (cpu_name).create ();
-
-  g_assert (EE);
-  mono_ee->EE = EE;
-
-  MonoJITEventListener *listener = new MonoJITEventListener (emitted_cb);
-  EE->RegisterJITEventListener (listener);
-  mono_ee->listener = listener;
-
-  FunctionPassManager *fpm = new FunctionPassManager (unwrap (MP));
-  mono_ee->fpm = fpm;
-
-  fpm->add(new DataLayoutPass(*EE->getDataLayout()));
-
-  if (PassList.size() > 0) {
-         /* Use the passes specified by the env variable */
-         /* Only the passes in force_pass_linking () can be used */
-         for (unsigned i = 0; i < PassList.size(); ++i) {
-                 const PassInfo *PassInf = PassList[i];
-                 Pass *P = 0;
-
-                 if (PassInf->getNormalCtor())
-                         P = PassInf->getNormalCtor()();
-                 fpm->add (P);
-         }
-  } else {
-         /* Use the same passes used by 'opt' by default, without the ipo passes */
-         const char *opts = "-simplifycfg -domtree -domfrontier -scalarrepl -instcombine -simplifycfg -domtree -domfrontier -scalarrepl -instcombine -simplifycfg -instcombine -simplifycfg -reassociate -domtree -loops -loop-simplify -domfrontier -loop-simplify -lcssa -loop-rotate -licm -lcssa -loop-unswitch -instcombine -scalar-evolution -loop-simplify -lcssa -iv-users -indvars -loop-deletion -loop-simplify -lcssa -loop-unroll -instcombine -memdep -gvn -memdep -memcpyopt -sccp -instcombine -domtree -memdep -dse -adce -gvn -simplifycfg";
-         char **args;
-         int i;
-
-         args = g_strsplit (opts, " ", 1000);
-         for (i = 0; args [i]; i++)
-                 ;
-         llvm::cl::ParseCommandLineOptions (i, args, "");
-         g_strfreev (args);
-
-         for (unsigned i = 0; i < PassList.size(); ++i) {
-                 const PassInfo *PassInf = PassList[i];
-                 Pass *P = 0;
-
-                 if (PassInf->getNormalCtor())
-                         P = PassInf->getNormalCtor()();
-                 g_assert (P->getPassKind () == llvm::PT_Function || P->getPassKind () == llvm::PT_Loop);
-                 fpm->add (P);
-         }
-
-         /*
-         fpm->add(createInstructionCombiningPass());
-         fpm->add(createReassociatePass());
-         fpm->add(createGVNPass());
-         fpm->add(createCFGSimplificationPass());
-         */
-  }
-
-  *ee = wrap (EE);
-
-  return mono_ee;
-}
-
-void
-mono_llvm_dispose_ee (MonoEERef *eeref)
-{
-       MonoEE *mono_ee = (MonoEE*)eeref;
-
-       delete mono_ee->EE;
-       delete mono_ee->fpm;
-       //delete mono_ee->mm;
-       delete mono_ee->listener;
-       delete mono_ee;
-}
-
-#else
-
-void
-mono_llvm_set_unhandled_exception_handler (void)
-{
-}
-
-MonoEERef
-mono_llvm_create_ee (LLVMModuleProviderRef MP, AllocCodeMemoryCb *alloc_cb, FunctionEmittedCb *emitted_cb, ExceptionTableCb *exception_cb, DlSymCb *dlsym_cb, LLVMExecutionEngineRef *ee)
-{
-       g_assert_not_reached ();
-       return NULL;
-}
-
-void
-mono_llvm_dispose_ee (MonoEERef *eeref)
-{
-       g_assert_not_reached ();
-}
-
-/* Not linked in */
-void
-LLVMAddGlobalMapping(LLVMExecutionEngineRef EE, LLVMValueRef Global,
-                                        void* Addr)
-{
-       g_assert_not_reached ();
-}
-
-void*
-LLVMGetPointerToGlobal(LLVMExecutionEngineRef EE, LLVMValueRef Global)
-{
-       g_assert_not_reached ();
-       return NULL;
-}
-
-#endif /* !MONO_CROSS_COMPILE */

diff --git a/mono/mini/mini-llvm.c b/mono/mini/mini-llvm.c
index 35c8ab6d9956e24182deadc8ab2b3aa638c19a25..c608faa5ce694c120655d18b5d8de285c0d7a753 100644 (file)
--- a/mono/mini/mini-llvm.c
+++ b/mono/mini/mini-llvm.c
@@ -1269,6 +1269,8 @@ sig_to_llvm_sig_full (EmitContext *ctx, MonoMethodSignature *sig, LLVMCallInfo *
                break;
        case LLVMArgVtypeRetAddr:
        case LLVMArgScalarRetAddr:
+       case LLVMArgGsharedvtFixed:
+       case LLVMArgGsharedvtVariable:
                vretaddr = TRUE;
                ret_type = LLVMVoidType ();
                break;
@@ -1326,6 +1328,7 @@ sig_to_llvm_sig_full (EmitContext *ctx, MonoMethodSignature *sig, LLVMCallInfo *
        if (sig->hasthis) {
                cinfo->this_arg_pindex = pindex;
                param_types [pindex ++] = ThisType ();
+               cinfo->args [0].pindex = cinfo->this_arg_pindex;
        }
        if (vretaddr && vret_arg_pindex == pindex)
                param_types [pindex ++] = IntPtrType ();
@@ -1378,6 +1381,10 @@ sig_to_llvm_sig_full (EmitContext *ctx, MonoMethodSignature *sig, LLVMCallInfo *
                case LLVMArgVtypeAsScalar:
                        g_assert_not_reached ();
                        break;
+               case LLVMArgGsharedvtFixed:
+               case LLVMArgGsharedvtVariable:
+                       param_types [pindex ++] = LLVMPointerType (type_to_llvm_arg_type (ctx, ainfo->type), 0);
+                       break;
                default:
                        param_types [pindex ++] = type_to_llvm_arg_type (ctx, ainfo->type);
                        break;
@@ -2791,6 +2798,22 @@ emit_entry_bb (EmitContext *ctx, LLVMBuilderRef builder)
                case LLVMArgVtypeAsScalar:
                        g_assert_not_reached ();
                        break;
+               case LLVMArgGsharedvtFixed: {
+                       /* These are non-gsharedvt arguments passed by ref, the rest of the IR treats them as scalars */
+                       LLVMValueRef arg = LLVMGetParam (ctx->lmethod, pindex);
+
+                       if (names [i])
+                               name = g_strdup_printf ("arg_%s", names [i]);
+                       else
+                               name = g_strdup_printf ("arg_%d", i);
+
+                       ctx->values [reg] = LLVMBuildLoad (builder, convert (ctx, arg, LLVMPointerType (type_to_llvm_type (ctx, ainfo->type), 0)), name);
+                       break;
+               }
+               case LLVMArgGsharedvtVariable:
+                       /* The IR treats these as variables with addresses */
+                       ctx->addresses [reg] = LLVMGetParam (ctx->lmethod, pindex);
+                       break;
                default:
                        ctx->values [reg] = convert_full (ctx, ctx->values [reg], llvm_type_to_stack_type (cfg, type_to_llvm_type (ctx, ainfo->type)), type_is_unsigned (ctx, ainfo->type));
                        break;
@@ -2935,7 +2958,7 @@ process_call (EmitContext *ctx, MonoBasicBlock *bb, LLVMBuilderRef *builder_ref,
        if (call->imt_arg_reg)
                cinfo->imt_arg = TRUE;
 
-       vretaddr = (cinfo->ret.storage == LLVMArgVtypeRetAddr || cinfo->ret.storage == LLVMArgVtypeByRef || cinfo->ret.storage == LLVMArgScalarRetAddr);
+       vretaddr = (cinfo->ret.storage == LLVMArgVtypeRetAddr || cinfo->ret.storage == LLVMArgVtypeByRef || cinfo->ret.storage == LLVMArgScalarRetAddr || cinfo->ret.storage == LLVMArgGsharedvtFixed || cinfo->ret.storage == LLVMArgGsharedvtVariable);
 
        llvm_sig = sig_to_llvm_sig_full (ctx, sig, cinfo);
        CHECK_FAILURE (ctx);
@@ -3231,6 +3254,10 @@ process_call (EmitContext *ctx, MonoBasicBlock *bb, LLVMBuilderRef *builder_ref,
                /* Normal scalar returned using a vtype return argument */
                values [ins->dreg] = LLVMBuildLoad (builder, convert_full (ctx, addresses [call->inst.dreg], LLVMPointerType (type_to_llvm_type (ctx, sig->ret), 0), FALSE), "");
                break;
+       case LLVMArgGsharedvtFixed:
+       case LLVMArgGsharedvtVariable:
+               g_assert_not_reached ();
+               break;
        default:
                if (sig->ret->type != MONO_TYPE_VOID)
                        /* If the method returns an unsigned value, need to zext it */
@@ -3967,6 +3994,21 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
                                LLVMBuildRetVoid (builder);
                                break;
                        }
+                       case LLVMArgGsharedvtFixed: {
+                               LLVMTypeRef ret_type = type_to_llvm_type (ctx, sig->ret);
+                               /* The return value is in lhs, need to store to the vret argument */
+                               g_assert (lhs);
+                               g_assert (cfg->vret_addr);
+                               g_assert (values [cfg->vret_addr->dreg]);
+                               LLVMBuildStore (builder, convert (ctx, lhs, ret_type), convert (ctx, values [cfg->vret_addr->dreg], LLVMPointerType (ret_type, 0)));
+                               LLVMBuildRetVoid (builder);
+                               break;
+                       }
+                       case LLVMArgGsharedvtVariable: {
+                               /* Already set */
+                               LLVMBuildRetVoid (builder);
+                               break;
+                       }
                        case LLVMArgVtypeRetAddr: {
                                LLVMBuildRetVoid (builder);
                                break;
@@ -6010,6 +6052,46 @@ get_llvm_call_info (MonoCompile *cfg, MonoMethodSignature *sig)
        LLVMCallInfo *linfo;
        int i;
 
+       if (cfg->gsharedvt && cfg->llvm_only && mini_is_gsharedvt_variable_signature (sig)) {
+               int i, n, pindex;
+
+               /*
+                * Gsharedvt methods have the following calling convention:
+                * - all arguments are passed by ref, even non generic ones
+                * - the return value is returned by ref too, using a vret
+                *   argument passed after 'this'.
+                */
+               n = sig->param_count + sig->hasthis;
+               linfo = mono_mempool_alloc0 (cfg->mempool, sizeof (LLVMCallInfo) + (sizeof (LLVMArgInfo) * n));
+
+               pindex = 0;
+               if (sig->hasthis)
+                       linfo->args [pindex ++].storage = LLVMArgNormal;
+
+               if (sig->ret->type != MONO_TYPE_VOID) {
+                       if (mini_is_gsharedvt_variable_type (sig->ret))
+                               linfo->ret.storage = LLVMArgGsharedvtVariable;
+                       else
+                               linfo->ret.storage = LLVMArgGsharedvtFixed;
+                       linfo->vret_arg_index = pindex;
+               } else {
+                       linfo->ret.storage = LLVMArgNone;
+               }
+
+               for (i = 0; i < sig->param_count; ++i) {
+                       if (sig->params [i]->byref)
+                               linfo->args [pindex].storage = LLVMArgNormal;
+                       else if (mini_is_gsharedvt_variable_type (sig->params [i]))
+                               linfo->args [pindex].storage = LLVMArgGsharedvtVariable;
+                       else
+                               linfo->args [pindex].storage = LLVMArgGsharedvtFixed;
+                       linfo->args [pindex].type = sig->params [i];
+                       pindex ++;
+               }
+               return linfo;
+       }
+
+
        linfo = mono_arch_get_llvm_call_info (cfg, sig);
        for (i = 0; i < sig->param_count; ++i)
                linfo->args [i + sig->hasthis].type = sig->params [i];
@@ -6093,7 +6175,7 @@ mono_llvm_emit_method (MonoCompile *cfg)
        lmodule = ctx->lmodule = ctx->module->lmodule;
        ctx->llvm_only = ctx->module->llvm_only;
 
-       if (cfg->gsharedvt)
+       if (cfg->gsharedvt && !cfg->llvm_only)
                LLVM_FAILURE (ctx, "gsharedvt");
 
 #if 1
@@ -6206,6 +6288,11 @@ mono_llvm_emit_method (MonoCompile *cfg)
                                name = g_strdup_printf ("p_arg_%s", names [i]);
                        else
                                name = g_strdup_printf ("p_arg_%d", i);
+               } else if (ainfo->storage == LLVMArgGsharedvtFixed) {
+                       if (names [i] && names [i][0] != '\0')
+                               name = g_strdup_printf ("p_arg_%s", names [i]);
+                       else
+                               name = g_strdup_printf ("p_arg_%d", i);
                } else {
                        if (names [i] && names [i][0] != '\0')
                                name = g_strdup_printf ("arg_%s", names [i]);
@@ -6518,7 +6605,7 @@ mono_llvm_emit_method (MonoCompile *cfg)
                int err = LLVMVerifyFunction(method,   LLVMPrintMessageAction);
                g_assert (err == 0);
        } else {
-               LLVMVerifyFunction(method, 0);
+               //LLVMVerifyFunction(method, 0);
                mono_llvm_optimize_method (ctx->module->mono_ee, method);
 
                if (cfg->verbose_level > 1)
@@ -6587,6 +6674,30 @@ mono_llvm_emit_method (MonoCompile *cfg)
        mono_loader_unlock ();
 }
 
+/*
+ * mono_llvm_create_vars:
+ *
+ *   Same as mono_arch_create_vars () for LLVM.
+ */
+void
+mono_llvm_create_vars (MonoCompile *cfg)
+{
+       MonoMethodSignature *sig;
+
+       sig = mono_method_signature (cfg->method);
+       if (cfg->gsharedvt && cfg->llvm_only) {
+               if (mini_is_gsharedvt_variable_signature (sig) && sig->ret->type != MONO_TYPE_VOID) {
+                       cfg->vret_addr = mono_compile_create_var (cfg, &mono_defaults.int_class->byval_arg, OP_ARG);
+                       if (G_UNLIKELY (cfg->verbose_level > 1)) {
+                               printf ("vret_addr = ");
+                               mono_print_ins (cfg->vret_addr);
+                       }
+               }
+       } else {
+               mono_arch_create_vars (cfg);
+       }
+}
+
 /*
  * mono_llvm_emit_call:
  *

diff --git a/mono/mini/mini-llvm.h b/mono/mini/mini-llvm.h
index 3e36b0a9bc087893ae42ef364bc79e94230a497a..bf7bdb0e4d4e803ae65620e51f692c3285205322 100644 (file)
--- a/mono/mini/mini-llvm.h
+++ b/mono/mini/mini-llvm.h
@@ -26,6 +26,7 @@ void     mono_llvm_clear_exception (void);
 MonoObject *mono_llvm_load_exception (void);
 void     mono_llvm_reset_exception (void);
 void     mono_llvm_raise_exception (MonoException *e);
+void     mono_llvm_create_vars (MonoCompile *cfg);
 
 gboolean mini_llvm_init                     (void);
 

diff --git a/mono/mini/mini-mips.c b/mono/mini/mini-mips.c
index de484d15b22cddf2b211c5f5c3624e723c13fcab..f9157a8690bc9d1ab6cdce0552381b25531de724 100644 (file)
--- a/mono/mini/mini-mips.c
+++ b/mono/mini/mini-mips.c
@@ -57,8 +57,8 @@ enum {
 };
 
 /* This mutex protects architecture specific caches */
-#define mono_mini_arch_lock() mono_mutex_lock (&mini_arch_mutex)
-#define mono_mini_arch_unlock() mono_mutex_unlock (&mini_arch_mutex)
+#define mono_mini_arch_lock() mono_os_mutex_lock (&mini_arch_mutex)
+#define mono_mini_arch_unlock() mono_os_mutex_unlock (&mini_arch_mutex)
 static mono_mutex_t mini_arch_mutex;
 
 int mono_exc_esp_offset = 0;
@@ -713,7 +713,7 @@ mono_arch_cpu_init (void)
 void
 mono_arch_init (void)
 {
-       mono_mutex_init_recursive (&mini_arch_mutex);
+       mono_os_mutex_init_recursive (&mini_arch_mutex);
 
        ss_trigger_page = mono_valloc (NULL, mono_pagesize (), MONO_MMAP_READ|MONO_MMAP_32BIT);
        bp_trigger_page = mono_valloc (NULL, mono_pagesize (), MONO_MMAP_READ|MONO_MMAP_32BIT);
@@ -726,7 +726,7 @@ mono_arch_init (void)
 void
 mono_arch_cleanup (void)
 {
-       mono_mutex_destroy (&mini_arch_mutex);
+       mono_os_mutex_destroy (&mini_arch_mutex);
 }
 
 /*

diff --git a/mono/mini/mini-posix.c b/mono/mini/mini-posix.c
index 724c4aa2c8739dadfeb23d5cc49833e71eee6775..962557058b4bedb68a655480a721c24b23230f71 100644 (file)
--- a/mono/mini/mini-posix.c
+++ b/mono/mini/mini-posix.c
@@ -130,19 +130,19 @@ mono_gdb_render_native_backtraces (pid_t crashed_pid)
 
 static GHashTable *mono_saved_signal_handlers = NULL;
 
-static gpointer
+static struct sigaction *
 get_saved_signal_handler (int signo)
 {
        if (mono_saved_signal_handlers)
                /* The hash is only modified during startup, so no need for locking */
-               return g_hash_table_lookup (mono_saved_signal_handlers, GINT_TO_POINTER (signo));
+               return (struct sigaction *)g_hash_table_lookup (mono_saved_signal_handlers, GINT_TO_POINTER (signo));
        return NULL;
 }
 
 static void
 save_old_signal_handler (int signo, struct sigaction *old_action)
 {
-       struct sigaction *handler_to_save = g_malloc (sizeof (struct sigaction));
+       struct sigaction *handler_to_save = (struct sigaction *)g_malloc (sizeof (struct sigaction));
 
        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_CONFIG,
                                "Saving old signal handler for signal %d.", signo);
@@ -189,7 +189,7 @@ gboolean
 MONO_SIG_HANDLER_SIGNATURE (mono_chain_signal)
 {
        int signal = MONO_SIG_HANDLER_GET_SIGNO ();
-       struct sigaction *saved_handler = get_saved_signal_handler (signal);
+       struct sigaction *saved_handler = (struct sigaction *)get_saved_signal_handler (signal);
 
        if (saved_handler && saved_handler->sa_handler) {
                if (!(saved_handler->sa_flags & SA_SIGINFO)) {
@@ -211,7 +211,7 @@ MONO_SIG_HANDLER_FUNC (static, sigabrt_signal_handler)
        MONO_SIG_HANDLER_GET_CONTEXT;
 
        if (mono_thread_internal_current ())
-               ji = mono_jit_info_table_find_internal (mono_domain_get (), mono_arch_ip_from_context (ctx), TRUE, TRUE);
+               ji = mono_jit_info_table_find_internal (mono_domain_get (), (char *)mono_arch_ip_from_context (ctx), TRUE, TRUE);
        if (!ji) {
         if (mono_chain_signal (MONO_SIG_HANDLER_PARAMS))
                        return;
@@ -257,15 +257,15 @@ per_thread_profiler_hit (void *ctx)
        MonoProfilerCallChainStrategy call_chain_strategy = mono_profiler_stat_get_call_chain_strategy ();
 
        if (call_chain_depth == 0) {
-               mono_profiler_stat_hit (mono_arch_ip_from_context (ctx), ctx);
+               mono_profiler_stat_hit ((guchar *)mono_arch_ip_from_context (ctx), ctx);
        } else {
-               MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+               MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
                int current_frame_index = 1;
                MonoContext mono_context;
                guchar *ips [call_chain_depth + 1];
 
                mono_sigctx_to_monoctx (ctx, &mono_context);
-               ips [0] = MONO_CONTEXT_GET_IP (&mono_context);
+               ips [0] = (guchar *)MONO_CONTEXT_GET_IP (&mono_context);
                
                if (jit_tls != NULL) {
                        if (call_chain_strategy == MONO_PROFILER_CALL_CHAIN_NATIVE) {
@@ -274,17 +274,17 @@ per_thread_profiler_hit (void *ctx)
                        guchar *stack_bottom;
                        guchar *stack_top;
                        
-                       stack_bottom = jit_tls->end_of_stack;
-                       stack_top = MONO_CONTEXT_GET_SP (&mono_context);
-                       current_frame = MONO_CONTEXT_GET_BP (&mono_context);
+                       stack_bottom = (guchar *)jit_tls->end_of_stack;
+                       stack_top = (guchar *)MONO_CONTEXT_GET_SP (&mono_context);
+                       current_frame = (guchar *)MONO_CONTEXT_GET_BP (&mono_context);
                        
                        while ((current_frame_index <= call_chain_depth) &&
                                        (stack_bottom IS_BEFORE_ON_STACK (guchar*) current_frame) &&
                                        ((guchar*) current_frame IS_BEFORE_ON_STACK stack_top)) {
-                               ips [current_frame_index] = CURRENT_FRAME_GET_RETURN_ADDRESS (current_frame);
+                               ips [current_frame_index] = (guchar *)CURRENT_FRAME_GET_RETURN_ADDRESS (current_frame);
                                current_frame_index ++;
                                stack_top = current_frame;
-                               current_frame = CURRENT_FRAME_GET_BASE_POINTER (current_frame);
+                               current_frame = (guchar *)CURRENT_FRAME_GET_BASE_POINTER (current_frame);
                        }
 #else
                                call_chain_strategy = MONO_PROFILER_CALL_CHAIN_GLIBC;
@@ -310,7 +310,7 @@ per_thread_profiler_hit (void *ctx)
                                        ji = mono_find_jit_info (domain, jit_tls, &res, NULL, &mono_context,
                                                        &new_mono_context, NULL, &lmf, &native_offset, NULL);
                                        while ((ji != NULL) && (current_frame_index <= call_chain_depth)) {
-                                               ips [current_frame_index] = MONO_CONTEXT_GET_IP (&new_mono_context);
+                                               ips [current_frame_index] = (guchar *)MONO_CONTEXT_GET_IP (&new_mono_context);
                                                current_frame_index ++;
                                                mono_context = new_mono_context;
                                                ji = mono_find_jit_info (domain, jit_tls, &res, NULL, &mono_context,
@@ -393,7 +393,7 @@ add_signal_handler (int signo, gpointer handler)
        struct sigaction previous_sa;
 
 #ifdef MONO_ARCH_USE_SIGACTION
-       sa.sa_sigaction = handler;
+       sa.sa_sigaction = (void (*)(int, siginfo_t *, void *))handler;
        sigemptyset (&sa.sa_mask);
        sa.sa_flags = SA_SIGINFO;
 #ifdef MONO_ARCH_SIGSEGV_ON_ALTSTACK
@@ -658,7 +658,7 @@ void
 mono_gdb_render_native_backtraces (pid_t crashed_pid)
 {
        const char *argv [9];
-       char template [] = "/tmp/mono-lldb-commands.XXXXXX";
+       char template_ [] = "/tmp/mono-lldb-commands.XXXXXX";
        char buf1 [128];
        FILE *commands;
        gboolean using_lldb = FALSE;
@@ -673,10 +673,10 @@ mono_gdb_render_native_backtraces (pid_t crashed_pid)
                return;
 
        if (using_lldb) {
-               if (mkstemp (template) == -1)
+               if (mkstemp (template_) == -1)
                        return;
 
-               commands = fopen (template, "w");
+               commands = fopen (template_, "w");
 
                fprintf (commands, "process attach --pid %ld\n", (long) crashed_pid);
                fprintf (commands, "thread list\n");
@@ -688,7 +688,7 @@ mono_gdb_render_native_backtraces (pid_t crashed_pid)
                fclose (commands);
 
                argv [1] = "--source";
-               argv [2] = template;
+               argv [2] = template_;
                argv [3] = 0;
        } else {
                argv [1] = "-ex";
@@ -705,7 +705,7 @@ mono_gdb_render_native_backtraces (pid_t crashed_pid)
        execv (argv [0], (char**)argv);
 
        if (using_lldb)
-               unlink (template);
+               unlink (template_);
 }
 #endif
 #endif /* __native_client__ */

diff --git a/mono/mini/mini-ppc.c b/mono/mini/mini-ppc.c
index 4ddce9efeacacb169ebdcfe86b308954869feef0..530e82cd3bf73395c0ab99958b3fcef98b319757 100644 (file)
--- a/mono/mini/mini-ppc.c
+++ b/mono/mini/mini-ppc.c
@@ -62,8 +62,8 @@ enum {
 #define BREAKPOINT_SIZE (PPC_LOAD_SEQUENCE_LENGTH + 4)
 
 /* This mutex protects architecture specific caches */
-#define mono_mini_arch_lock() mono_mutex_lock (&mini_arch_mutex)
-#define mono_mini_arch_unlock() mono_mutex_unlock (&mini_arch_mutex)
+#define mono_mini_arch_lock() mono_os_mutex_lock (&mini_arch_mutex)
+#define mono_mini_arch_unlock() mono_os_mutex_unlock (&mini_arch_mutex)
 static mono_mutex_t mini_arch_mutex;
 
 int mono_exc_esp_offset = 0;
@@ -625,13 +625,16 @@ mono_arch_init (void)
        if (mono_cpu_count () > 1)
                cpu_hw_caps |= PPC_SMP_CAPABLE;
 
-       mono_mutex_init_recursive (&mini_arch_mutex);
+       mono_os_mutex_init_recursive (&mini_arch_mutex);
 
        ss_trigger_page = mono_valloc (NULL, mono_pagesize (), MONO_MMAP_READ|MONO_MMAP_32BIT);
        bp_trigger_page = mono_valloc (NULL, mono_pagesize (), MONO_MMAP_READ|MONO_MMAP_32BIT);
        mono_mprotect (bp_trigger_page, mono_pagesize (), 0);
 
        mono_aot_register_jit_icall ("mono_ppc_throw_exception", mono_ppc_throw_exception);
+
+       // FIXME: Fix partial sharing for power and remove this
+       mono_set_partial_sharing_supported (FALSE);
 }
 
 /*
@@ -640,7 +643,7 @@ mono_arch_init (void)
 void
 mono_arch_cleanup (void)
 {
-       mono_mutex_destroy (&mini_arch_mutex);
+       mono_os_mutex_destroy (&mini_arch_mutex);
 }
 
 /*
@@ -5969,7 +5972,7 @@ mono_arch_emit_load_got_addr (guint8 *start, guint8 *code, MonoCompile *cfg, Mon
  * r12.
  */
 guint8*
-mono_arch_emit_load_aotconst (guint8 *start, guint8 *code, MonoJumpInfo **ji, int tramp_type, gconstpointer target)
+mono_arch_emit_load_aotconst (guint8 *start, guint8 *code, MonoJumpInfo **ji, MonoJumpInfoType tramp_type, gconstpointer target)
 {
        /* Load the mscorlib got address */
        ppc_ldptr (code, ppc_r12, sizeof (gpointer), ppc_r30);

diff --git a/mono/mini/mini-runtime.c b/mono/mini/mini-runtime.c
index 3583d587c611043dab0f9e5eb7f58f9b0734c88e..9cf0f042c8f0b86759d1dea1ee1e4f5a56cc2b18 100644 (file)
--- a/mono/mini/mini-runtime.c
+++ b/mono/mini/mini-runtime.c
@@ -109,8 +109,8 @@ int mini_verbose = 0;
  */
 gboolean mono_use_llvm = FALSE;
 
-#define mono_jit_lock() mono_mutex_lock (&jit_mutex)
-#define mono_jit_unlock() mono_mutex_unlock (&jit_mutex)
+#define mono_jit_lock() mono_os_mutex_lock (&jit_mutex)
+#define mono_jit_unlock() mono_os_mutex_unlock (&jit_mutex)
 static mono_mutex_t jit_mutex;
 
 static MonoCodeManager *global_codeman;
@@ -167,7 +167,7 @@ get_method_from_ip (void *ip)
        if (!domain)
                domain = mono_get_root_domain ();
 
-       ji = mono_jit_info_table_find_internal (domain, ip, TRUE, TRUE);
+       ji = mono_jit_info_table_find_internal (domain, (char *)ip, TRUE, TRUE);
        if (!ji) {
                user_data.ip = ip;
                user_data.method = NULL;
@@ -244,9 +244,9 @@ mono_print_method_from_ip (void *ip)
        MonoGenericSharingContext*gsctx;
        const char *shared_type;
 
-       ji = mini_jit_info_table_find_ext (domain, ip, TRUE, &target_domain);
+       ji = mini_jit_info_table_find_ext (domain, (char *)ip, TRUE, &target_domain);
        if (ji && ji->is_trampoline) {
-               MonoTrampInfo *tinfo = ji->d.tramp_info;
+               MonoTrampInfo *tinfo = (MonoTrampInfo *)ji->d.tramp_info;
 
                printf ("IP %p is at offset 0x%x of trampoline '%s'.\n", ip, (int)((guint8*)ip - tinfo->code), tinfo->name);
                return;
@@ -437,7 +437,7 @@ mono_create_unwind_op (int when, int tag, int reg, int val)
 MonoJumpInfoToken *
 mono_jump_info_token_new2 (MonoMemPool *mp, MonoImage *image, guint32 token, MonoGenericContext *context)
 {
-       MonoJumpInfoToken *res = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoToken));
+       MonoJumpInfoToken *res = (MonoJumpInfoToken *)mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoToken));
        res->image = image;
        res->token = token;
        res->has_context = context != NULL;
@@ -488,8 +488,8 @@ register_trampoline_jit_info (MonoDomain *domain, MonoTrampInfo *info)
 {
        MonoJitInfo *ji;
 
-       ji = mono_domain_alloc0 (domain, mono_jit_info_size (0, 0, 0));
-       mono_jit_info_init (ji, NULL, info->code, info->code_size, 0, 0, 0);
+       ji = (MonoJitInfo *)mono_domain_alloc0 (domain, mono_jit_info_size ((MonoJitInfoFlags)0, 0, 0));
+       mono_jit_info_init (ji, NULL, info->code, info->code_size, (MonoJitInfoFlags)0, 0, 0);
        ji->d.tramp_info = info;
        ji->is_trampoline = TRUE;
 
@@ -551,7 +551,7 @@ mono_tramp_info_cleanup (void)
        GSList *l;
 
        for (l = tramp_infos; l; l = l->next) {
-               MonoTrampInfo *info = l->data;
+               MonoTrampInfo *info = (MonoTrampInfo *)l->data;
 
                mono_tramp_info_free (info);
        }
@@ -565,7 +565,7 @@ register_trampolines (MonoDomain *domain)
        GSList *l;
 
        for (l = tramp_infos; l; l = l->next) {
-               MonoTrampInfo *info = l->data;
+               MonoTrampInfo *info = (MonoTrampInfo *)l->data;
 
                register_trampoline_jit_info (domain, info);
        }
@@ -656,7 +656,7 @@ mono_dynamic_code_hash_lookup (MonoDomain *domain, MonoMethod *method)
        MonoJitDynamicMethodInfo *res;
 
        if (domain_jit_info (domain)->dynamic_code_hash)
-               res = g_hash_table_lookup (domain_jit_info (domain)->dynamic_code_hash, method);
+               res = (MonoJitDynamicMethodInfo *)g_hash_table_lookup (domain_jit_info (domain)->dynamic_code_hash, method);
        else
                res = NULL;
        return res;
@@ -775,7 +775,7 @@ MonoLMF *
 mono_get_lmf (void)
 {
 #if defined(MONO_HAVE_FAST_TLS) && defined(MONO_ARCH_ENABLE_MONO_LMF_VAR)
-       return MONO_FAST_TLS_GET (mono_lmf);
+       return (MonoLMF *)MONO_FAST_TLS_GET (mono_lmf);
 #else
        MonoJitTlsData *jit_tls;
 
@@ -794,7 +794,7 @@ MonoLMF **
 mono_get_lmf_addr (void)
 {
 #ifdef MONO_HAVE_FAST_TLS
-       return MONO_FAST_TLS_GET (mono_lmf_addr);
+       return (MonoLMF **)MONO_FAST_TLS_GET (mono_lmf_addr);
 #else
        MonoJitTlsData *jit_tls;
 
@@ -833,7 +833,7 @@ mono_set_lmf (MonoLMF *lmf)
 MonoJitTlsData*
 mono_get_jit_tls (void)
 {
-       return mono_native_tls_get_value (mono_jit_tls_id);
+       return (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
 }
 
 static void
@@ -941,13 +941,13 @@ setup_jit_tls_data (gpointer stack_start, gpointer abort_func)
        MonoJitTlsData *jit_tls;
        MonoLMF *lmf;
 
-       jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        if (jit_tls)
                return jit_tls;
 
        jit_tls = g_new0 (MonoJitTlsData, 1);
 
-       jit_tls->abort_func = abort_func;
+       jit_tls->abort_func = (void (*)(MonoObject *))abort_func;
        jit_tls->end_of_stack = stack_start;
 
        mono_set_jit_tls (jit_tls);
@@ -1038,7 +1038,7 @@ mini_thread_cleanup (MonoNativeThreadId tid)
         * The current offender is mono_thread_manage which cleanup threads from the outside.
         */
        if (info && mono_thread_info_get_tid (info) == tid) {
-               jit_tls = info->jit_data;
+               jit_tls = (MonoJitTlsData *)info->jit_data;
                info->jit_data = NULL;
 
                mono_set_jit_tls (NULL);
@@ -1051,7 +1051,7 @@ mini_thread_cleanup (MonoNativeThreadId tid)
        } else {
                info = mono_thread_info_lookup (tid);
                if (info) {
-                       jit_tls = info->jit_data;
+                       jit_tls = (MonoJitTlsData *)info->jit_data;
                        info->jit_data = NULL;
                }
                mono_hazard_pointer_clear (mono_hazard_pointer_get (), 1);
@@ -1122,7 +1122,7 @@ mono_patch_info_list_prepend (MonoJumpInfo *list, int ip, MonoJumpInfoType type,
 MonoJumpInfo*
 mono_patch_info_dup_mp (MonoMemPool *mp, MonoJumpInfo *patch_info)
 {
-       MonoJumpInfo *res = mono_mempool_alloc (mp, sizeof (MonoJumpInfo));
+       MonoJumpInfo *res = (MonoJumpInfo *)mono_mempool_alloc (mp, sizeof (MonoJumpInfo));
        memcpy (res, patch_info, sizeof (MonoJumpInfo));
 
        switch (patch_info->type) {
@@ -1131,27 +1131,27 @@ mono_patch_info_dup_mp (MonoMemPool *mp, MonoJumpInfo *patch_info)
        case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
        case MONO_PATCH_INFO_LDTOKEN:
        case MONO_PATCH_INFO_DECLSEC:
-               res->data.token = mono_mempool_alloc (mp, sizeof (MonoJumpInfoToken));
+               res->data.token = (MonoJumpInfoToken *)mono_mempool_alloc (mp, sizeof (MonoJumpInfoToken));
                memcpy (res->data.token, patch_info->data.token, sizeof (MonoJumpInfoToken));
                break;
        case MONO_PATCH_INFO_SWITCH:
-               res->data.table = mono_mempool_alloc (mp, sizeof (MonoJumpInfoBBTable));
+               res->data.table = (MonoJumpInfoBBTable *)mono_mempool_alloc (mp, sizeof (MonoJumpInfoBBTable));
                memcpy (res->data.table, patch_info->data.table, sizeof (MonoJumpInfoBBTable));
-               res->data.table->table = mono_mempool_alloc (mp, sizeof (MonoBasicBlock*) * patch_info->data.table->table_size);
+               res->data.table->table = (MonoBasicBlock **)mono_mempool_alloc (mp, sizeof (MonoBasicBlock*) * patch_info->data.table->table_size);
                memcpy (res->data.table->table, patch_info->data.table->table, sizeof (MonoBasicBlock*) * patch_info->data.table->table_size);
                break;
        case MONO_PATCH_INFO_RGCTX_FETCH:
        case MONO_PATCH_INFO_RGCTX_SLOT_INDEX:
-               res->data.rgctx_entry = mono_mempool_alloc (mp, sizeof (MonoJumpInfoRgctxEntry));
+               res->data.rgctx_entry = (MonoJumpInfoRgctxEntry *)mono_mempool_alloc (mp, sizeof (MonoJumpInfoRgctxEntry));
                memcpy (res->data.rgctx_entry, patch_info->data.rgctx_entry, sizeof (MonoJumpInfoRgctxEntry));
                res->data.rgctx_entry->data = mono_patch_info_dup_mp (mp, res->data.rgctx_entry->data);
                break;
        case MONO_PATCH_INFO_DELEGATE_TRAMPOLINE:
-               res->data.del_tramp = mono_mempool_alloc0 (mp, sizeof (MonoDelegateClassMethodPair));
+               res->data.del_tramp = (MonoDelegateClassMethodPair *)mono_mempool_alloc0 (mp, sizeof (MonoDelegateClassMethodPair));
                memcpy (res->data.del_tramp, patch_info->data.del_tramp, sizeof (MonoDelegateClassMethodPair));
                break;
        case MONO_PATCH_INFO_GSHAREDVT_CALL:
-               res->data.gsharedvt = mono_mempool_alloc (mp, sizeof (MonoJumpInfoGSharedVtCall));
+               res->data.gsharedvt = (MonoJumpInfoGSharedVtCall *)mono_mempool_alloc (mp, sizeof (MonoJumpInfoGSharedVtCall));
                memcpy (res->data.gsharedvt, patch_info->data.gsharedvt, sizeof (MonoJumpInfoGSharedVtCall));
                break;
        case MONO_PATCH_INFO_GSHAREDVT_METHOD: {
@@ -1160,15 +1160,15 @@ mono_patch_info_dup_mp (MonoMemPool *mp, MonoJumpInfo *patch_info)
                int i;
 
                oinfo = patch_info->data.gsharedvt_method;
-               info = mono_mempool_alloc (mp, sizeof (MonoGSharedVtMethodInfo));
+               info = (MonoGSharedVtMethodInfo *)mono_mempool_alloc (mp, sizeof (MonoGSharedVtMethodInfo));
                res->data.gsharedvt_method = info;
                memcpy (info, oinfo, sizeof (MonoGSharedVtMethodInfo));
-               info->entries = mono_mempool_alloc (mp, sizeof (MonoRuntimeGenericContextInfoTemplate) * info->count_entries);
+               info->entries = (MonoRuntimeGenericContextInfoTemplate *)mono_mempool_alloc (mp, sizeof (MonoRuntimeGenericContextInfoTemplate) * info->count_entries);
                for (i = 0; i < oinfo->num_entries; ++i) {
                        MonoRuntimeGenericContextInfoTemplate *otemplate = &oinfo->entries [i];
-                       MonoRuntimeGenericContextInfoTemplate *template = &info->entries [i];
+                       MonoRuntimeGenericContextInfoTemplate *template_ = &info->entries [i];
 
-                       memcpy (template, otemplate, sizeof (MonoRuntimeGenericContextInfoTemplate));
+                       memcpy (template_, otemplate, sizeof (MonoRuntimeGenericContextInfoTemplate));
                }
                //info->locals_types = mono_mempool_alloc0 (mp, info->nlocals * sizeof (MonoType*));
                //memcpy (info->locals_types, oinfo->locals_types, info->nlocals * sizeof (MonoType*));
@@ -1179,7 +1179,7 @@ mono_patch_info_dup_mp (MonoMemPool *mp, MonoJumpInfo *patch_info)
                MonoJumpInfoVirtMethod *oinfo;
 
                oinfo = patch_info->data.virt_method;
-               info = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoVirtMethod));
+               info = (MonoJumpInfoVirtMethod *)mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoVirtMethod));
                res->data.virt_method = info;
                memcpy (info, oinfo, sizeof (MonoJumpInfoVirtMethod));
                break;
@@ -1445,12 +1445,12 @@ mono_resolve_patch_target (MonoMethod *method, MonoDomain *domain, guint8 *code,
                jump_table = g_malloc0 (sizeof(gpointer) * patch_info->data.table->table_size);
 #else
                if (method && method->dynamic) {
-                       jump_table = mono_code_manager_reserve (mono_dynamic_code_hash_lookup (domain, method)->code_mp, sizeof (gpointer) * patch_info->data.table->table_size);
+                       jump_table = (void **)mono_code_manager_reserve (mono_dynamic_code_hash_lookup (domain, method)->code_mp, sizeof (gpointer) * patch_info->data.table->table_size);
                } else {
                        if (mono_aot_only) {
-                               jump_table = mono_domain_alloc (domain, sizeof (gpointer) * patch_info->data.table->table_size);
+                               jump_table = (void **)mono_domain_alloc (domain, sizeof (gpointer) * patch_info->data.table->table_size);
                        } else {
-                               jump_table = mono_domain_code_reserve (domain, sizeof (gpointer) * patch_info->data.table->table_size);
+                               jump_table = (void **)mono_domain_code_reserve (domain, sizeof (gpointer) * patch_info->data.table->table_size);
                        }
                }
 #endif
@@ -1560,10 +1560,10 @@ mono_resolve_patch_target (MonoMethod *method, MonoDomain *domain, guint8 *code,
                if (!mono_error_ok (&error))
                        g_error ("Could not patch ldtoken due to %s", mono_error_get_message (&error));
                mono_class_init (handle_class);
-               mono_class_init (mono_class_from_mono_type (handle));
+               mono_class_init (mono_class_from_mono_type ((MonoType *)handle));
 
                target =
-                       mono_type_get_object (domain, handle);
+                       mono_type_get_object (domain, (MonoType *)handle);
                break;
        }
        case MONO_PATCH_INFO_LDTOKEN: {
@@ -1642,14 +1642,6 @@ mono_resolve_patch_target (MonoMethod *method, MonoDomain *domain, guint8 *code,
                        target = mono_arch_get_seq_point_info (domain, code);
                break;
 #endif
-       case MONO_PATCH_INFO_LLVM_IMT_TRAMPOLINE:
-#ifdef MONO_ARCH_LLVM_SUPPORTED
-               g_assert (mono_use_llvm);
-               target = mono_create_llvm_imt_trampoline (domain, patch_info->data.imt_tramp->method, patch_info->data.imt_tramp->vt_offset);
-#else
-               g_assert_not_reached ();
-#endif
-               break;
        case MONO_PATCH_INFO_GC_CARD_TABLE_ADDR: {
                int card_table_shift_bits;
                gpointer card_table_mask;
@@ -1684,7 +1676,7 @@ mono_resolve_patch_target (MonoMethod *method, MonoDomain *domain, guint8 *code,
        case MONO_PATCH_INFO_TLS_OFFSET: {
                int offset;
 
-               offset = mini_get_tls_offset (GPOINTER_TO_INT (patch_info->data.target));
+               offset = mini_get_tls_offset ((MonoTlsKey)GPOINTER_TO_INT (patch_info->data.target));
 #ifdef MONO_ARCH_HAVE_TRANSLATE_TLS_OFFSET
                offset = mono_arch_translate_tls_offset (offset);
 #endif
@@ -1699,8 +1691,8 @@ mono_resolve_patch_target (MonoMethod *method, MonoDomain *domain, guint8 *code,
                int len;
                char *s;
 
-               len = strlen (patch_info->data.target);
-               s = mono_domain_alloc0 (domain, len + 1);
+               len = strlen ((const char *)patch_info->data.target);
+               s = (char *)mono_domain_alloc0 (domain, len + 1);
                memcpy (s, patch_info->data.target, len);
                target = s;
 
@@ -1754,10 +1746,10 @@ mini_lookup_method (MonoDomain *domain, MonoMethod *method, MonoMethod *shared)
        static int failed_lookups = 0;
 
        mono_domain_jit_code_hash_lock (domain);
-       ji = mono_internal_hash_table_lookup (&domain->jit_code_hash, method);
+       ji = (MonoJitInfo *)mono_internal_hash_table_lookup (&domain->jit_code_hash, method);
        if (!ji && shared) {
                /* Try generic sharing */
-               ji = mono_internal_hash_table_lookup (&domain->jit_code_hash, shared);
+               ji = (MonoJitInfo *)mono_internal_hash_table_lookup (&domain->jit_code_hash, shared);
                if (ji && !ji->has_generic_jit_info)
                        ji = NULL;
                if (!inited) {
@@ -1950,7 +1942,7 @@ mono_jit_compile_method_with_opt (MonoMethod *method, guint32 opt, MonoException
                /*
                 * SGEN requires the JIT info for these methods to be registered, see is_ip_in_managed_allocator ().
                 */
-               ji = mini_jit_info_table_find (mono_domain_get (), code, &d);
+               ji = mini_jit_info_table_find (mono_domain_get (), (char *)code, &d);
                g_assert (ji);
        }
 
@@ -2037,13 +2029,13 @@ mono_jit_free_method (MonoDomain *domain, MonoMethod *method)
 
                remove = NULL;
                for (tmp = jlist->list; tmp; tmp = tmp->next) {
-                       guint8 *ip = tmp->data;
+                       guint8 *ip = (guint8 *)tmp->data;
 
                        if (ip >= (guint8*)ji->ji->code_start && ip < (guint8*)ji->ji->code_start + ji->ji->code_size)
                                remove = g_slist_prepend (remove, tmp);
                }
                for (tmp = remove; tmp; tmp = tmp->next) {
-                       jlist->list = g_slist_delete_link (jlist->list, tmp->data);
+                       jlist->list = g_slist_delete_link ((GSList *)jlist->list, (GSList *)tmp->data);
                }
                g_slist_free (remove);
        }
@@ -2170,7 +2162,7 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
 
        domain_info = domain_jit_info (domain);
 
-       info = mono_conc_hashtable_lookup (domain_info->runtime_invoke_hash, method);
+       info = (RuntimeInvokeInfo *)mono_conc_hashtable_lookup (domain_info->runtime_invoke_hash, method);
 
        if (!info) {
                if (mono_security_core_clr_enabled ()) {
@@ -2315,7 +2307,7 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
                        info->runtime_invoke = mono_jit_compile_method (invoke);
 
                mono_domain_lock (domain);
-               info2 = mono_conc_hashtable_insert (domain_info->runtime_invoke_hash, method, info);
+               info2 = (RuntimeInvokeInfo *)mono_conc_hashtable_insert (domain_info->runtime_invoke_hash, method, info);
                mono_domain_unlock (domain);
                if (info2) {
                        g_free (info);
@@ -2323,7 +2315,7 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
                }
        }
 
-       runtime_invoke = info->runtime_invoke;
+       runtime_invoke = (MonoObject *(*)(MonoObject *, void **, MonoObject **, void *))info->runtime_invoke;
 
        /*
         * We need this here because mono_marshal_get_runtime_invoke can place
@@ -2347,17 +2339,17 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
                gpointer *args;
                static RuntimeInvokeDynamicFunction dyn_runtime_invoke;
                int i, pindex;
-               guint8 buf [256];
+               guint8 buf [512];
                guint8 retval [256];
                gpointer rgctx;
 
                if (!dyn_runtime_invoke) {
                        invoke = mono_marshal_get_runtime_invoke_dynamic ();
-                       dyn_runtime_invoke = mono_jit_compile_method (invoke);
+                       dyn_runtime_invoke = (RuntimeInvokeDynamicFunction)mono_jit_compile_method (invoke);
                }
 
                /* Convert the arguments to the format expected by start_dyn_call () */
-               args = g_alloca ((sig->param_count + sig->hasthis + info->needs_rgctx) * sizeof (gpointer));
+               args = (void **)g_alloca ((sig->param_count + sig->hasthis + info->needs_rgctx) * sizeof (gpointer));
                pindex = 0;
                if (sig->hasthis)
                        args [pindex ++] = &obj;
@@ -2398,15 +2390,15 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
                gpointer *args;
                int i, pindex;
 
-               args = g_alloca ((sig->param_count + sig->hasthis + info->needs_rgctx) * sizeof (gpointer));
+               args = (void **)g_alloca ((sig->param_count + sig->hasthis + info->needs_rgctx) * sizeof (gpointer));
                pindex = 0;
                rgctx = mini_method_get_rgctx (method);
                for (i = 0; i < sig->param_count; ++i)
                        args [pindex ++] = params [i];
                args [pindex ++] = &rgctx;
-               return runtime_invoke (obj, args, exc, info->compiled_method);
+               return runtime_invoke ((MonoObject *)obj, args, exc, info->compiled_method);
        } else {
-               return runtime_invoke (obj, params, exc, info->compiled_method);
+               return runtime_invoke ((MonoObject *)obj, params, exc, info->compiled_method);
        }
 }
 
@@ -2417,7 +2409,7 @@ MONO_SIG_HANDLER_FUNC (, mono_sigfpe_signal_handler)
        MONO_SIG_HANDLER_INFO_TYPE *info = MONO_SIG_HANDLER_GET_INFO ();
        MONO_SIG_HANDLER_GET_CONTEXT;
 
-       ji = mono_jit_info_table_find_internal (mono_domain_get (), mono_arch_ip_from_context (ctx), TRUE, TRUE);
+       ji = mono_jit_info_table_find_internal (mono_domain_get (), (char *)mono_arch_ip_from_context (ctx), TRUE, TRUE);
 
 #if defined(MONO_ARCH_HAVE_IS_INT_OVERFLOW)
        if (mono_arch_is_int_overflow (ctx, info))
@@ -2463,7 +2455,7 @@ MONO_SIG_HANDLER_FUNC (, mono_sigill_signal_handler)
 MONO_SIG_HANDLER_FUNC (, mono_sigsegv_signal_handler)
 {
        MonoJitInfo *ji;
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        gpointer fault_addr = NULL;
 #ifdef HAVE_SIG_INFO
        MONO_SIG_HANDLER_INFO_TYPE *info = MONO_SIG_HANDLER_GET_INFO ();
@@ -2503,7 +2495,7 @@ MONO_SIG_HANDLER_FUNC (, mono_sigsegv_signal_handler)
        }
 #endif
 
-       ji = mono_jit_info_table_find_internal (mono_domain_get (), mono_arch_ip_from_context (ctx), TRUE, TRUE);
+       ji = mono_jit_info_table_find_internal (mono_domain_get (), (char *)mono_arch_ip_from_context (ctx), TRUE, TRUE);
 
 #ifdef MONO_ARCH_SIGSEGV_ON_ALTSTACK
        if (mono_handle_soft_stack_ovf (jit_tls, ji, ctx, info, (guint8*)info->si_addr))
@@ -2587,10 +2579,10 @@ mono_jit_create_remoting_trampoline (MonoDomain *domain, MonoMethod *method, Mon
        if ((method->flags & METHOD_ATTRIBUTE_ABSTRACT) ||
            (mono_method_signature (method)->hasthis && (mono_class_is_marshalbyref (method->klass) || method->klass == mono_defaults.object_class))) {
                nm = mono_marshal_get_remoting_invoke_for_target (method, target);
-               addr = mono_compile_method (nm);
+               addr = (guint8 *)mono_compile_method (nm);
        } else
        {
-               addr = mono_compile_method (method);
+               addr = (guint8 *)mono_compile_method (method);
        }
        return mono_get_addr_from_ftnptr (addr);
 }
@@ -2641,7 +2633,7 @@ mini_get_vtable_trampoline (int slot_index)
                                memcpy (new_table, vtable_trampolines, vtable_trampolines_size * sizeof (gpointer));
                        g_free (vtable_trampolines);
                        mono_memory_barrier ();
-                       vtable_trampolines = new_table;
+                       vtable_trampolines = (void **)new_table;
                        vtable_trampolines_size = new_size;
                }
                mono_jit_unlock ();
@@ -2708,10 +2700,10 @@ mono_get_delegate_virtual_invoke_impl (MonoMethodSignature *sig, MonoMethod *met
                int ind = (load_imt_reg ? (-offset) : offset) / SIZEOF_VOID_P;
 
                sprintf (tramp_name, "delegate_virtual_invoke%s_%d", imt, ind);
-               cache [idx] = mono_aot_get_trampoline (tramp_name);
+               cache [idx] = (guint8 *)mono_aot_get_trampoline (tramp_name);
                g_assert (cache [idx]);
        } else {
-               cache [idx] = mono_arch_get_delegate_virtual_invoke_impl (sig, method, offset, load_imt_reg);
+               cache [idx] = (guint8 *)mono_arch_get_delegate_virtual_invoke_impl (sig, method, offset, load_imt_reg);
        }
        return cache [idx];
 }
@@ -2872,8 +2864,8 @@ static void runtime_invoke_info_free (gpointer value);
 static gint
 class_method_pair_equal (gconstpointer ka, gconstpointer kb)
 {
-       const MonoClassMethodPair *apair = ka;
-       const MonoClassMethodPair *bpair = kb;
+       const MonoClassMethodPair *apair = (const MonoClassMethodPair *)ka;
+       const MonoClassMethodPair *bpair = (const MonoClassMethodPair *)kb;
 
        return apair->klass == bpair->klass && apair->method == bpair->method ? 1 : 0;
 }
@@ -2881,7 +2873,7 @@ class_method_pair_equal (gconstpointer ka, gconstpointer kb)
 static guint
 class_method_pair_hash (gconstpointer data)
 {
-       const MonoClassMethodPair *pair = data;
+       const MonoClassMethodPair *pair = (const MonoClassMethodPair *)data;
 
        return (gsize)pair->klass ^ (gsize)pair->method;
 }
@@ -2906,21 +2898,21 @@ mini_create_jit_domain_info (MonoDomain *domain)
 static void
 delete_jump_list (gpointer key, gpointer value, gpointer user_data)
 {
-       MonoJumpList *jlist = value;
+       MonoJumpList *jlist = (MonoJumpList *)value;
        g_slist_free (jlist->list);
 }
 
 static void
 delete_got_slot_list (gpointer key, gpointer value, gpointer user_data)
 {
-       GSList *list = value;
+       GSList *list = (GSList *)value;
        g_slist_free (list);
 }
 
 static void
 dynamic_method_info_free (gpointer key, gpointer value, gpointer user_data)
 {
-       MonoJitDynamicMethodInfo *di = value;
+       MonoJitDynamicMethodInfo *di = (MonoJitDynamicMethodInfo *)value;
        mono_code_manager_destroy (di->code_mp);
        g_free (di);
 }
@@ -3030,7 +3022,7 @@ mini_init (const char *filename, const char *runtime_version)
        }
 #endif
 
-       mono_mutex_init_recursive (&jit_mutex);
+       mono_os_mutex_init_recursive (&jit_mutex);
 
        mono_cross_helpers_run ();
 
@@ -3568,7 +3560,7 @@ mini_cleanup (MonoDomain *domain)
        mono_runtime_cleanup (domain);
 #endif
 
-       free_jit_tls_data (mono_native_tls_get_value (mono_jit_tls_id));
+       free_jit_tls_data ((MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id));
 
        mono_icall_cleanup ();
 
@@ -3611,7 +3603,7 @@ mini_cleanup (MonoDomain *domain)
 
        mono_native_tls_free (mono_jit_tls_id);
 
-       mono_mutex_destroy (&jit_mutex);
+       mono_os_mutex_destroy (&jit_mutex);
 
        mono_code_manager_cleanup ();
 
@@ -3746,8 +3738,8 @@ typedef struct MonoJumpTableChunk {
 } MonoJumpTableChunk;
 
 static MonoJumpTableChunk* g_jumptable;
-#define mono_jumptable_lock() mono_mutex_lock (&jumptable_mutex)
-#define mono_jumptable_unlock() mono_mutex_unlock (&jumptable_mutex)
+#define mono_jumptable_lock() mono_os_mutex_lock (&jumptable_mutex)
+#define mono_jumptable_unlock() mono_os_mutex_unlock (&jumptable_mutex)
 static mono_mutex_t jumptable_mutex;
 
 static  MonoJumpTableChunk*
@@ -3763,7 +3755,7 @@ void
 mono_jumptable_init (void)
 {
        if (g_jumptable == NULL) {
-               mono_mutex_init_recursive (&jumptable_mutex);
+               mono_os_mutex_init_recursive (&jumptable_mutex);
                g_jumptable = mono_create_jumptable_chunk (DEFAULT_JUMPTABLE_CHUNK_ELEMENTS);
        }
 }
@@ -3819,7 +3811,7 @@ mono_jumptable_cleanup (void)
                        current = prev;
                }
                g_jumptable = NULL;
-               mono_mutex_destroy (&jumptable_mutex);
+               mono_os_mutex_destroy (&jumptable_mutex);
        }
 }
 

diff --git a/mono/mini/mini-s390x.c b/mono/mini/mini-s390x.c
index 1c775f80341a30a556350c99fc5193f9b58b5b14..8c27ecee48800ef818ba54ad87b8a01a66c69ca3 100644 (file)
--- a/mono/mini/mini-s390x.c
+++ b/mono/mini/mini-s390x.c
@@ -246,8 +246,8 @@ if (ins->inst_target_bb->native_offset) {                                   \
 #define JUMP_SIZE      6
 #define ENABLE_WRONG_METHOD_CHECK 0
 
-#define mono_mini_arch_lock() mono_mutex_lock (&mini_arch_mutex)
-#define mono_mini_arch_unlock() mono_mutex_unlock (&mini_arch_mutex)
+#define mono_mini_arch_lock() mono_os_mutex_lock (&mini_arch_mutex)
+#define mono_mini_arch_unlock() mono_os_mutex_unlock (&mini_arch_mutex)
 
 /*========================= End of Defines =========================*/
 
@@ -1310,7 +1310,7 @@ mono_arch_init (void)
 {
        guint8 *code;
 
-       mono_mutex_init_recursive (&mini_arch_mutex);
+       mono_os_mutex_init_recursive (&mini_arch_mutex);
 
        ss_trigger_page = mono_valloc (NULL, mono_pagesize (), MONO_MMAP_READ);
        bp_trigger_page = mono_valloc (NULL, mono_pagesize (), MONO_MMAP_READ);
@@ -1341,7 +1341,7 @@ mono_arch_cleanup (void)
                mono_vfree (ss_trigger_page, mono_pagesize ());
        if (bp_trigger_page)
                mono_vfree (bp_trigger_page, mono_pagesize ());
-       mono_mutex_destroy (&mini_arch_mutex);
+       mono_os_mutex_destroy (&mini_arch_mutex);
 }
 
 /*========================= End of Function ========================*/

diff --git a/mono/mini/mini-trampolines.c b/mono/mini/mini-trampolines.c
index fb6d1f62e1dc12978dcfddeabc8e587e5ec142aa..b9790e99681a5d03fe9ef348e7bfb13259910bdc 100644 (file)
--- a/mono/mini/mini-trampolines.c
+++ b/mono/mini/mini-trampolines.c
@@ -27,8 +27,8 @@ static GHashTable *rgctx_lazy_fetch_trampoline_hash;
 static GHashTable *rgctx_lazy_fetch_trampoline_hash_addr;
 static guint32 trampoline_calls, jit_trampolines, unbox_trampolines, static_rgctx_trampolines;
 
-#define mono_trampolines_lock() mono_mutex_lock (&trampolines_mutex)
-#define mono_trampolines_unlock() mono_mutex_unlock (&trampolines_mutex)
+#define mono_trampolines_lock() mono_os_mutex_lock (&trampolines_mutex)
+#define mono_trampolines_unlock() mono_os_mutex_unlock (&trampolines_mutex)
 static mono_mutex_t trampolines_mutex;
 
 #ifdef MONO_ARCH_GSHARED_SUPPORTED
@@ -41,8 +41,8 @@ typedef struct {
 static gint
 rgctx_tramp_info_equal (gconstpointer ka, gconstpointer kb)
 {
-       const RgctxTrampInfo *i1 = ka;
-       const RgctxTrampInfo *i2 = kb;
+       const RgctxTrampInfo *i1 = (const RgctxTrampInfo *)ka;
+       const RgctxTrampInfo *i2 = (const RgctxTrampInfo *)kb;
 
        if (i1->m == i2->m && i1->addr == i2->addr)
                return 1;
@@ -53,7 +53,7 @@ rgctx_tramp_info_equal (gconstpointer ka, gconstpointer kb)
 static guint
 rgctx_tramp_info_hash (gconstpointer data)
 {
-       const RgctxTrampInfo *info = data;
+       const RgctxTrampInfo *info = (const RgctxTrampInfo *)data;
 
        return GPOINTER_TO_UINT (info->m) ^ GPOINTER_TO_UINT (info->addr);
 }
@@ -112,11 +112,11 @@ mono_create_static_rgctx_trampoline (MonoMethod *m, gpointer addr)
        if (mono_aot_only)
                res = mono_aot_get_static_rgctx_trampoline (ctx, addr);
        else
-               res = mono_arch_get_static_rgctx_trampoline (m, ctx, addr);
+               res = mono_arch_get_static_rgctx_trampoline (m, (MonoMethodRuntimeGenericContext *)ctx, addr);
 
        mono_domain_lock (domain);
        /* Duplicates inserted while we didn't hold the lock are OK */
-       info = mono_domain_alloc (domain, sizeof (RgctxTrampInfo));
+       info = (RgctxTrampInfo *)mono_domain_alloc (domain, sizeof (RgctxTrampInfo));
        info->m = m;
        info->addr = addr;
        g_hash_table_insert (domain_jit_info (domain)->static_rgctx_trampoline_hash, info, res);
@@ -167,7 +167,7 @@ mini_resolve_imt_method (MonoVTable *vt, gpointer *vtable_slot, MonoMethod *imt_
        /* This has to be variance aware since imt_method can be from an interface that vt->klass doesn't directly implement */
        interface_offset = mono_class_interface_offset_with_variance (vt->klass, imt_method->klass, &variance_used);
        if (interface_offset < 0)
-               g_error ("%s doesn't implement interface %s\n", mono_type_get_name_full (&vt->klass->byval_arg, 0), mono_type_get_name_full (&imt_method->klass->byval_arg, 0));
+               g_error ("%s doesn't implement interface %s\n", mono_type_get_name_full (&vt->klass->byval_arg, MONO_TYPE_NAME_FORMAT_IL), mono_type_get_name_full (&imt_method->klass->byval_arg, MONO_TYPE_NAME_FORMAT_IL));
 
        *variant_iface = NULL;
        if (imt_method->is_inflated && ((MonoMethodInflated*)imt_method)->context.method_inst) {
@@ -203,7 +203,7 @@ mini_resolve_imt_method (MonoVTable *vt, gpointer *vtable_slot, MonoMethod *imt_
        } else {
                /* Avoid loading metadata or creating a generic vtable if possible */
                if (lookup_aot && !vt->klass->valuetype)
-                       aot_addr = mono_aot_get_method_from_vt_slot (mono_domain_get (), vt, interface_offset + mono_method_get_vtable_slot (imt_method));
+                       aot_addr = (guint8 *)mono_aot_get_method_from_vt_slot (mono_domain_get (), vt, interface_offset + mono_method_get_vtable_slot (imt_method));
                else
                        aot_addr = NULL;
                if (aot_addr)
@@ -298,7 +298,7 @@ mini_add_method_trampoline (MonoMethod *m, gpointer compiled_method, gboolean ad
        MonoJitInfo *ji;
 
        // FIXME: This loads information from AOT (perf problem)
-       ji = mini_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (compiled_method), NULL);
+       ji = mini_jit_info_table_find (mono_domain_get (), (char *)mono_get_addr_from_ftnptr (compiled_method), NULL);
        callee_gsharedvt = mini_jit_info_is_gsharedvt (ji);
 
        callee_array_helper = FALSE;
@@ -391,18 +391,18 @@ common_call_trampoline_inner (mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVT
        MonoMethod *declaring = NULL;
        MonoMethod *generic_virtual = NULL, *variant_iface = NULL;
        int context_used;
-       gboolean imt_call, virtual;
+       gboolean imt_call, virtual_;
        gpointer *orig_vtable_slot, *vtable_slot_to_patch = NULL;
        MonoJitInfo *ji = NULL;
 
-       virtual = vt && (gpointer)vtable_slot > (gpointer)vt;
+       virtual_ = vt && (gpointer)vtable_slot > (gpointer)vt;
        imt_call = vt && (gpointer)vtable_slot < (gpointer)vt;
 
        /*
         * rgctx trampolines are needed when the call is indirect so the caller can't pass
         * the rgctx argument needed by the callee.
         */
-       if (virtual && m)
+       if (virtual_ && m)
                need_rgctx_tramp = mono_method_needs_static_rgctx_invoke (m, FALSE);
 
        orig_vtable_slot = vtable_slot;
@@ -416,7 +416,7 @@ common_call_trampoline_inner (mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVT
                g_assert (vtable_slot);
 
                imt_method = mono_arch_find_imt_method (regs, code);
-               this_arg = mono_arch_get_this_arg_from_call (regs, code);
+               this_arg = (MonoObject *)mono_arch_get_this_arg_from_call (regs, code);
 
                if (mono_object_is_transparent_proxy (this_arg)) {
                        /* Use the slow path for now */
@@ -451,7 +451,7 @@ common_call_trampoline_inner (mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVT
         * The virtual check is needed because is_generic_method_definition (m) could
         * return TRUE for methods used in IMT calls too.
         */
-       if (virtual && is_generic_method_definition (m)) {
+       if (virtual_ && is_generic_method_definition (m)) {
                MonoError error;
                MonoGenericContext context = { NULL, NULL };
                MonoMethod *declaring;
@@ -499,7 +499,7 @@ common_call_trampoline_inner (mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVT
 
                        klass = vtable->klass;
                } else {
-                       MonoObject *this_argument = mono_arch_get_this_arg_from_call (regs, code);
+                       MonoObject *this_argument = (MonoObject *)mono_arch_get_this_arg_from_call (regs, code);
 
                        vt = this_argument->vtable;
                        vtable_slot = orig_vtable_slot;
@@ -605,10 +605,10 @@ common_call_trampoline_inner (mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVT
                        GSList *list, *tmp;
 
                        mono_domain_lock (domain);
-                       list = g_hash_table_lookup (domain_jit_info (domain)->jump_target_got_slot_hash, m);
+                       list = (GSList *)g_hash_table_lookup (domain_jit_info (domain)->jump_target_got_slot_hash, m);
                        if (list) {
                                for (tmp = list; tmp; tmp = tmp->next) {
-                                       gpointer *got_slot = tmp->data;
+                                       gpointer *got_slot = (gpointer *)tmp->data;
                                        *got_slot = addr;
                                }
                                g_hash_table_remove (domain_jit_info (domain)->jump_target_got_slot_hash, m);
@@ -635,7 +635,7 @@ common_call_trampoline_inner (mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVT
                if (plt_entry) {
                        if (generic_shared) {
                                target_ji =
-                                       mini_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (compiled_method), NULL);
+                                       mini_jit_info_table_find (mono_domain_get (), (char *)mono_get_addr_from_ftnptr (compiled_method), NULL);
                                if (!ji)
                                        ji = mini_jit_info_table_find (mono_domain_get (), (char*)code, NULL);
 
@@ -644,7 +644,7 @@ common_call_trampoline_inner (mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVT
                                }
                        }
                        if (!no_patch)
-                               mono_aot_patch_plt_entry (code, plt_entry, NULL, regs, addr);
+                               mono_aot_patch_plt_entry (code, plt_entry, NULL, regs, (guint8 *)addr);
                } else {
                        if (generic_shared) {
                                if (m->wrapper_type != MONO_WRAPPER_NONE)
@@ -654,7 +654,7 @@ common_call_trampoline_inner (mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVT
 
                        /* Patch calling code */
                        target_ji =
-                               mini_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (compiled_method), NULL);
+                               mini_jit_info_table_find (mono_domain_get (), (char *)mono_get_addr_from_ftnptr (compiled_method), NULL);
                        if (!ji)
                                ji = mini_jit_info_table_find (mono_domain_get (), (char*)code, NULL);
 
@@ -668,7 +668,7 @@ common_call_trampoline_inner (mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVT
                        }
 
                        if (!no_patch && mono_method_same_domain (ji, target_ji))
-                               mono_arch_patch_callsite (ji->code_start, code, addr);
+                               mono_arch_patch_callsite ((guint8 *)ji->code_start, code, (guint8 *)addr);
                }
        }
 
@@ -695,7 +695,7 @@ mono_magic_trampoline (mgreg_t *regs, guint8 *code, gpointer arg, guint8* tramp)
 {
        trampoline_calls ++;
 
-       return common_call_trampoline (regs, code, arg, NULL, NULL);
+       return common_call_trampoline (regs, code, (MonoMethod *)arg, NULL, NULL);
 }
 
 /**
@@ -725,7 +725,7 @@ mono_vcall_trampoline (mgreg_t *regs, guint8 *code, int slot, guint8 *tramp)
        /*
         * Obtain the vtable from the 'this' arg.
         */
-       this_arg = mono_arch_get_this_arg_from_call (regs, code);
+       this_arg = (MonoObject *)mono_arch_get_this_arg_from_call (regs, code);
        g_assert (this_arg);
 
        vt = this_arg->vtable;
@@ -823,7 +823,7 @@ mono_aot_trampoline (mgreg_t *regs, guint8 *code, guint8 *token_info,
 
        trampoline_calls ++;
 
-       image = *(gpointer*)(gpointer)token_info;
+       image = (MonoImage *)*(gpointer*)(gpointer)token_info;
        token_info += sizeof (gpointer);
        token = *(guint32*)(gpointer)token_info;
 
@@ -842,7 +842,7 @@ mono_aot_trampoline (mgreg_t *regs, guint8 *code, guint8 *token_info,
        plt_entry = mono_aot_get_plt_entry (code);
        g_assert (plt_entry);
 
-       mono_aot_patch_plt_entry (code, plt_entry, NULL, regs, addr);
+       mono_aot_patch_plt_entry (code, plt_entry, NULL, regs, (guint8 *)addr);
 
        return addr;
 }
@@ -894,9 +894,9 @@ mono_rgctx_lazy_fetch_trampoline (mgreg_t *regs, guint8 *code, gpointer data, gu
        num_lookups++;
 
        if (mrgctx)
-               return mono_method_fill_runtime_generic_context (arg, index);
+               return mono_method_fill_runtime_generic_context ((MonoMethodRuntimeGenericContext *)arg, index);
        else
-               return mono_class_fill_runtime_generic_context (arg, index);
+               return mono_class_fill_runtime_generic_context ((MonoVTable *)arg, index);
 }
 
 /*
@@ -914,7 +914,7 @@ create_delegate_trampoline_data (MonoDomain *domain, MonoClass *klass, MonoMetho
        invoke = mono_get_delegate_invoke (klass);
        g_assert (invoke);
 
-       tramp_data = mono_domain_alloc0 (domain, sizeof (MonoDelegateTrampInfo));
+       tramp_data = (MonoDelegateTrampInfo *)mono_domain_alloc0 (domain, sizeof (MonoDelegateTrampInfo));
        tramp_data->invoke = invoke;
        tramp_data->invoke_sig = mono_method_signature (invoke);
        tramp_data->impl_this = mono_arch_get_delegate_invoke_impl (mono_method_signature (invoke), TRUE);
@@ -949,8 +949,8 @@ mono_delegate_trampoline (mgreg_t *regs, guint8 *code, gpointer *arg, guint8* tr
        gboolean enable_caching = TRUE;
        MonoDelegateTrampInfo *tramp_info = (MonoDelegateTrampInfo*)arg;
        MonoMethod *invoke = tramp_info->invoke;
-       guint8 *impl_this = tramp_info->impl_this;
-       guint8 *impl_nothis = tramp_info->impl_nothis;
+       guint8 *impl_this = (guint8 *)tramp_info->impl_this;
+       guint8 *impl_nothis = (guint8 *)tramp_info->impl_nothis;
        MonoError err;
        MonoMethodSignature *sig;
        gpointer addr, compiled_method;
@@ -959,7 +959,7 @@ mono_delegate_trampoline (mgreg_t *regs, guint8 *code, gpointer *arg, guint8* tr
        trampoline_calls ++;
 
        /* Obtain the delegate object according to the calling convention */
-       delegate = mono_arch_get_this_arg_from_call (regs, code);
+       delegate = (MonoDelegate *)mono_arch_get_this_arg_from_call (regs, code);
        g_assert (mono_class_has_parent (mono_object_class (delegate), mono_defaults.multicastdelegate_class));
 
        if (delegate->method) {
@@ -1009,7 +1009,7 @@ mono_delegate_trampoline (mgreg_t *regs, guint8 *code, gpointer *arg, guint8* tr
        // ftnptrs are being used.  "method" would end up null on archtitectures without
        // ftnptrs so we can just skip this.
        } else if (delegate->method_ptr) {
-               ji = mono_jit_info_table_find (domain, mono_get_addr_from_ftnptr (delegate->method_ptr));
+               ji = mono_jit_info_table_find (domain, (char *)mono_get_addr_from_ftnptr (delegate->method_ptr));
                if (ji)
                        method = jinfo_get_method (ji);
        }
@@ -1073,7 +1073,7 @@ mono_delegate_trampoline (mgreg_t *regs, guint8 *code, gpointer *arg, guint8* tr
                        addr = mini_add_method_trampoline (method, compiled_method, need_rgctx_tramp, need_unbox_tramp);
                        delegate->method_ptr = addr;
                        if (enable_caching && delegate->method_code)
-                               *delegate->method_code = delegate->method_ptr;
+                               *delegate->method_code = (guint8 *)delegate->method_ptr;
                }
        } else {
                if (need_rgctx_tramp)
@@ -1095,8 +1095,8 @@ mono_delegate_trampoline (mgreg_t *regs, guint8 *code, gpointer *arg, guint8* tr
        if (!code) {
                /* The general, unoptimized case */
                m = mono_marshal_get_delegate_invoke (invoke, delegate);
-               code = mono_compile_method (m);
-               code = mini_add_method_trampoline (m, code, mono_method_needs_static_rgctx_invoke (m, FALSE), FALSE);
+               code = (guint8 *)mono_compile_method (m);
+               code = (guint8 *)mini_add_method_trampoline (m, code, mono_method_needs_static_rgctx_invoke (m, FALSE), FALSE);
        }
 
        delegate->invoke_impl = mono_get_addr_from_ftnptr (code);
@@ -1114,7 +1114,7 @@ mono_handler_block_guard_trampoline (mgreg_t *regs, guint8 *code, gpointer *tram
 {
        MonoContext ctx;
        MonoException *exc;
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        gpointer resume_ip = jit_tls->handler_block_return_address;
 
        memcpy (&ctx, &jit_tls->handler_block_context, sizeof (MonoContext));
@@ -1129,7 +1129,7 @@ mono_handler_block_guard_trampoline (mgreg_t *regs, guint8 *code, gpointer *tram
                exc = mono_thread_resume_interruption ();
 
        if (exc) {
-               mono_handle_exception (&ctx, exc);
+               mono_handle_exception (&ctx, (MonoObject *)exc);
                mono_restore_context (&ctx);
        }
 
@@ -1220,7 +1220,7 @@ create_trampoline_code (MonoTrampolineType tramp_type)
 void
 mono_trampolines_init (void)
 {
-       mono_mutex_init_recursive (&trampolines_mutex);
+       mono_os_mutex_init_recursive (&trampolines_mutex);
 
        if (mono_aot_only)
                return;
@@ -1257,7 +1257,7 @@ mono_trampolines_cleanup (void)
        if (rgctx_lazy_fetch_trampoline_hash_addr)
                g_hash_table_destroy (rgctx_lazy_fetch_trampoline_hash_addr);
 
-       mono_mutex_destroy (&trampolines_mutex);
+       mono_os_mutex_destroy (&trampolines_mutex);
 }
 
 guint8 *
@@ -1306,7 +1306,7 @@ mono_create_jump_trampoline (MonoDomain *domain, MonoMethod *method, gboolean ad
        code = mono_create_specific_trampoline (method, MONO_TRAMPOLINE_JUMP, mono_domain_get (), &code_size);
        g_assert (code_size);
 
-       ji = mono_domain_alloc0 (domain, MONO_SIZEOF_JIT_INFO);
+       ji = (MonoJitInfo *)mono_domain_alloc0 (domain, MONO_SIZEOF_JIT_INFO);
        ji->code_start = code;
        ji->code_size = code_size;
        ji->d.method = method;
@@ -1383,7 +1383,7 @@ mono_create_jit_trampoline_from_token (MonoImage *image, guint32 token)
        MonoDomain *domain = mono_domain_get ();
        guint8 *buf, *start;
 
-       buf = start = mono_domain_alloc0 (domain, 2 * sizeof (gpointer));
+       buf = start = (guint8 *)mono_domain_alloc0 (domain, 2 * sizeof (gpointer));
 
        *(gpointer*)(gpointer)buf = image;
        buf += sizeof (gpointer);
@@ -1412,7 +1412,7 @@ mono_create_delegate_trampoline_info (MonoDomain *domain, MonoClass *klass, Mono
        pair.klass = klass;
        pair.method = method;
        mono_domain_lock (domain);
-       tramp_info = g_hash_table_lookup (domain_jit_info (domain)->delegate_trampoline_hash, &pair);
+       tramp_info = (MonoDelegateTrampInfo *)g_hash_table_lookup (domain_jit_info (domain)->delegate_trampoline_hash, &pair);
        mono_domain_unlock (domain);
        if (tramp_info)
                return tramp_info;
@@ -1422,7 +1422,7 @@ mono_create_delegate_trampoline_info (MonoDomain *domain, MonoClass *klass, Mono
        tramp_info->invoke_impl = mono_create_specific_trampoline (tramp_info, MONO_TRAMPOLINE_DELEGATE, domain, &code_size);
        g_assert (code_size);
 
-       dpair = mono_domain_alloc0 (domain, sizeof (MonoClassMethodPair));
+       dpair = (MonoClassMethodPair *)mono_domain_alloc0 (domain, sizeof (MonoClassMethodPair));
        memcpy (dpair, &pair, sizeof (MonoClassMethodPair));
 
        /* store trampoline address */
@@ -1502,26 +1502,6 @@ mono_create_rgctx_lazy_fetch_trampoline (guint32 offset)
 
        return ptr;
 }
- 
-#ifdef MONO_ARCH_LLVM_SUPPORTED
-/*
- * mono_create_llvm_imt_trampoline:
- *
- *   LLVM compiled code can't pass in the IMT argument, so we use this trampoline, which
- * sets the IMT argument, then branches to the contents of the vtable slot given by
- * vt_offset in the vtable which is obtained from the argument list.
- */
-gpointer
-mono_create_llvm_imt_trampoline (MonoDomain *domain, MonoMethod *m, int vt_offset)
-{
-#ifdef MONO_ARCH_HAVE_LLVM_IMT_TRAMPOLINE
-       return mono_arch_get_llvm_imt_trampoline (domain, m, vt_offset);
-#else
-       g_assert_not_reached ();
-       return NULL;
-#endif
-}
-#endif
 
 guint32
 mono_find_rgctx_lazy_fetch_trampoline_by_addr (gconstpointer addr)

diff --git a/mono/mini/mini-x86.c b/mono/mini/mini-x86.c
index a837d0d74dc6a998a7b190b3c1705c7fda5cc231..a74765570f76a2139af0e55533dacdfb50ab8a66 100644 (file)
--- a/mono/mini/mini-x86.c
+++ b/mono/mini/mini-x86.c
@@ -52,8 +52,8 @@ static gpointer ss_trampoline;
 static gpointer bp_trampoline;
 
 /* This mutex protects architecture specific caches */
-#define mono_mini_arch_lock() mono_mutex_lock (&mini_arch_mutex)
-#define mono_mini_arch_unlock() mono_mutex_unlock (&mini_arch_mutex)
+#define mono_mini_arch_lock() mono_os_mutex_lock (&mini_arch_mutex)
+#define mono_mini_arch_unlock() mono_os_mutex_unlock (&mini_arch_mutex)
 static mono_mutex_t mini_arch_mutex;
 
 #define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
@@ -754,7 +754,7 @@ mono_arch_cpu_init (void)
 void
 mono_arch_init (void)
 {
-       mono_mutex_init_recursive (&mini_arch_mutex);
+       mono_os_mutex_init_recursive (&mini_arch_mutex);
 
        if (!mono_aot_only)
                bp_trampoline = mini_get_breakpoint_trampoline ();
@@ -772,7 +772,7 @@ mono_arch_init (void)
 void
 mono_arch_cleanup (void)
 {
-       mono_mutex_destroy (&mini_arch_mutex);
+       mono_os_mutex_destroy (&mini_arch_mutex);
 }
 
 /*
@@ -6652,7 +6652,7 @@ emit_load_aotconst (guint8 *start, guint8 *code, MonoCompile *cfg, MonoJumpInfo
  * EAX.
  */
 guint8*
-mono_arch_emit_load_aotconst (guint8 *start, guint8 *code, MonoJumpInfo **ji, int tramp_type, gconstpointer target)
+mono_arch_emit_load_aotconst (guint8 *start, guint8 *code, MonoJumpInfo **ji, MonoJumpInfoType tramp_type, gconstpointer target)
 {
        /* Load the mscorlib got address */
        x86_mov_reg_membase (code, X86_EAX, MONO_ARCH_GOT_REG, sizeof (gpointer), 4);

diff --git a/mono/mini/mini-x86.h b/mono/mini/mini-x86.h
index 0547b2c807eaf15c14fb52004f094f87c1073965..212f844af4ca27f1076c08c4b917081aeac08c4e 100644 (file)
--- a/mono/mini/mini-x86.h
+++ b/mono/mini/mini-x86.h
@@ -234,7 +234,6 @@ typedef struct {
 #define MONO_ARCH_AOT_SUPPORTED 1
 
 #define MONO_ARCH_GSHARED_SUPPORTED 1
-#define MONO_ARCH_HAVE_LLVM_IMT_TRAMPOLINE 1
 #define MONO_ARCH_LLVM_SUPPORTED 1
 
 #define MONO_ARCH_SOFT_DEBUG_SUPPORTED 1

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index 4bc45b46f3223b6e17d911f07ea4e8bdb52c5334..89ae9d56a9d79d181cfce419ff1ea90f65c36b95 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -83,8 +83,8 @@ int mono_break_at_bb_bb_num;
 gboolean mono_do_x86_stack_align = TRUE;
 gboolean mono_using_xdebug;
 
-#define mono_jit_lock() mono_mutex_lock (&jit_mutex)
-#define mono_jit_unlock() mono_mutex_unlock (&jit_mutex)
+#define mono_jit_lock() mono_os_mutex_lock (&jit_mutex)
+#define mono_jit_unlock() mono_os_mutex_unlock (&jit_mutex)
 static mono_mutex_t jit_mutex;
 
 MonoBackend *current_backend;
@@ -214,8 +214,8 @@ typedef struct MonoJumpTableChunk {
 } MonoJumpTableChunk;
 
 static MonoJumpTableChunk* g_jumptable;
-#define mono_jumptable_lock() mono_mutex_lock (&jumptable_mutex)
-#define mono_jumptable_unlock() mono_mutex_unlock (&jumptable_mutex)
+#define mono_jumptable_lock() mono_os_mutex_lock (&jumptable_mutex)
+#define mono_jumptable_unlock() mono_os_mutex_unlock (&jumptable_mutex)
 static mono_mutex_t jumptable_mutex;
 
 static  MonoJumpTableChunk*
@@ -231,7 +231,7 @@ void
 mono_jumptable_init (void)
 {
        if (g_jumptable == NULL) {
-               mono_mutex_init_recursive (&jumptable_mutex);
+               mono_os_mutex_init_recursive (&jumptable_mutex);
                g_jumptable = mono_create_jumptable_chunk (DEFAULT_JUMPTABLE_CHUNK_ELEMENTS);
        }
 }
@@ -287,7 +287,7 @@ mono_jumptable_cleanup (void)
                        current = prev;
                }
                g_jumptable = NULL;
-               mono_mutex_destroy (&jumptable_mutex);
+               mono_os_mutex_destroy (&jumptable_mutex);
        }
 }
 
@@ -314,7 +314,7 @@ typedef struct {
 void
 mono_emit_unwind_op (MonoCompile *cfg, int when, int tag, int reg, int val)
 {
-       MonoUnwindOp *op = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoUnwindOp));
+       MonoUnwindOp *op = (MonoUnwindOp *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoUnwindOp));
 
        op->op = tag;
        op->reg = reg;
@@ -465,7 +465,7 @@ mono_find_spvar_for_region (MonoCompile *cfg, int region)
 {
        region = mono_get_block_region_notry (cfg, region);
 
-       return g_hash_table_lookup (cfg->spvars, GINT_TO_POINTER (region));
+       return (MonoInst *)g_hash_table_lookup (cfg->spvars, GINT_TO_POINTER (region));
 }
 
 static void
@@ -787,7 +787,7 @@ set_vreg_to_inst (MonoCompile *cfg, int vreg, MonoInst *inst)
 
                while (vreg >= cfg->vreg_to_inst_len)
                        cfg->vreg_to_inst_len = cfg->vreg_to_inst_len ? cfg->vreg_to_inst_len * 2 : 32;
-               cfg->vreg_to_inst = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst*) * cfg->vreg_to_inst_len);
+               cfg->vreg_to_inst = (MonoInst **)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst*) * cfg->vreg_to_inst_len);
                if (size)
                        memcpy (cfg->vreg_to_inst, tmp, size * sizeof (MonoInst*));
        }
@@ -949,7 +949,7 @@ mono_mark_vreg_as_ref (MonoCompile *cfg, int vreg)
 
                while (vreg >= cfg->vreg_is_ref_len)
                        cfg->vreg_is_ref_len = cfg->vreg_is_ref_len ? cfg->vreg_is_ref_len * 2 : 32;
-               cfg->vreg_is_ref = mono_mempool_alloc0 (cfg->mempool, sizeof (gboolean) * cfg->vreg_is_ref_len);
+               cfg->vreg_is_ref = (gboolean *)mono_mempool_alloc0 (cfg->mempool, sizeof (gboolean) * cfg->vreg_is_ref_len);
                if (size)
                        memcpy (cfg->vreg_is_ref, tmp, size * sizeof (gboolean));
        }
@@ -965,7 +965,7 @@ mono_mark_vreg_as_mp (MonoCompile *cfg, int vreg)
 
                while (vreg >= cfg->vreg_is_mp_len)
                        cfg->vreg_is_mp_len = cfg->vreg_is_mp_len ? cfg->vreg_is_mp_len * 2 : 32;
-               cfg->vreg_is_mp = mono_mempool_alloc0 (cfg->mempool, sizeof (gboolean) * cfg->vreg_is_mp_len);
+               cfg->vreg_is_mp = (gboolean *)mono_mempool_alloc0 (cfg->mempool, sizeof (gboolean) * cfg->vreg_is_mp_len);
                if (size)
                        memcpy (cfg->vreg_is_mp, tmp, size * sizeof (gboolean));
        }
@@ -1079,10 +1079,10 @@ mono_add_ins_to_end (MonoBasicBlock *bb, MonoInst *inst)
 void
 mono_create_jump_table (MonoCompile *cfg, MonoInst *label, MonoBasicBlock **bbs, int num_blocks)
 {
-       MonoJumpInfo *ji = mono_mempool_alloc (cfg->mempool, sizeof (MonoJumpInfo));
+       MonoJumpInfo *ji = (MonoJumpInfo *)mono_mempool_alloc (cfg->mempool, sizeof (MonoJumpInfo));
        MonoJumpInfoBBTable *table;
 
-       table = mono_mempool_alloc (cfg->mempool, sizeof (MonoJumpInfoBBTable));
+       table = (MonoJumpInfoBBTable *)mono_mempool_alloc (cfg->mempool, sizeof (MonoJumpInfoBBTable));
        table->table = bbs;
        table->table_size = num_blocks;
        
@@ -1104,7 +1104,7 @@ mono_get_array_new_va_signature (int arity)
        if (!sighash) {
                sighash = g_hash_table_new (NULL, NULL);
        }
-       else if ((res = g_hash_table_lookup (sighash, GINT_TO_POINTER (arity)))) {
+       else if ((res = (MonoMethodSignature *)g_hash_table_lookup (sighash, GINT_TO_POINTER (arity)))) {
                mono_jit_unlock ();
                return res;
        }
@@ -1269,7 +1269,7 @@ mono_dynamic_code_hash_lookup (MonoDomain *domain, MonoMethod *method)
        MonoJitDynamicMethodInfo *res;
 
        if (domain_jit_info (domain)->dynamic_code_hash)
-               res = g_hash_table_lookup (domain_jit_info (domain)->dynamic_code_hash, method);
+               res = (MonoJitDynamicMethodInfo *)g_hash_table_lookup (domain_jit_info (domain)->dynamic_code_hash, method);
        else
                res = NULL;
        return res;
@@ -1319,11 +1319,11 @@ mono_allocate_stack_slots2 (MonoCompile *cfg, gboolean backward, guint32 *stack_
 
        LSCAN_DEBUG (printf ("Allocate Stack Slots 2 for %s:\n", mono_method_full_name (cfg->method, TRUE)));
 
-       scalar_stack_slots = mono_mempool_alloc0 (cfg->mempool, sizeof (StackSlotInfo) * MONO_TYPE_PINNED);
+       scalar_stack_slots = (StackSlotInfo *)mono_mempool_alloc0 (cfg->mempool, sizeof (StackSlotInfo) * MONO_TYPE_PINNED);
        vtype_stack_slots = NULL;
        nvtypes = 0;
 
-       offsets = mono_mempool_alloc (cfg->mempool, sizeof (gint32) * cfg->num_varinfo);
+       offsets = (gint32 *)mono_mempool_alloc (cfg->mempool, sizeof (gint32) * cfg->num_varinfo);
        for (i = 0; i < cfg->num_varinfo; ++i)
                offsets [i] = -1;
 
@@ -1355,7 +1355,7 @@ mono_allocate_stack_slots2 (MonoCompile *cfg, gboolean backward, guint32 *stack_
        offset = 0;
        *stack_align = 0;
        for (unhandled = vars; unhandled; unhandled = unhandled->next) {
-               MonoMethodVar *current = unhandled->data;
+               MonoMethodVar *current = (MonoMethodVar *)unhandled->data;
 
                vmv = current;
                inst = cfg->varinfo [vmv->idx];
@@ -1393,7 +1393,7 @@ mono_allocate_stack_slots2 (MonoCompile *cfg, gboolean backward, guint32 *stack_
                        /* Fall through */
                case MONO_TYPE_VALUETYPE:
                        if (!vtype_stack_slots)
-                               vtype_stack_slots = mono_mempool_alloc0 (cfg->mempool, sizeof (StackSlotInfo) * 256);
+                               vtype_stack_slots = (StackSlotInfo *)mono_mempool_alloc0 (cfg->mempool, sizeof (StackSlotInfo) * 256);
                        for (i = 0; i < nvtypes; ++i)
                                if (t->data.klass == vtype_stack_slots [i].vtype)
                                        break;
@@ -1632,11 +1632,11 @@ mono_allocate_stack_slots (MonoCompile *cfg, gboolean backward, guint32 *stack_s
        if ((cfg->num_varinfo > 0) && MONO_VARINFO (cfg, 0)->interval)
                return mono_allocate_stack_slots2 (cfg, backward, stack_size, stack_align);
 
-       scalar_stack_slots = mono_mempool_alloc0 (cfg->mempool, sizeof (StackSlotInfo) * MONO_TYPE_PINNED);
+       scalar_stack_slots = (StackSlotInfo *)mono_mempool_alloc0 (cfg->mempool, sizeof (StackSlotInfo) * MONO_TYPE_PINNED);
        vtype_stack_slots = NULL;
        nvtypes = 0;
 
-       offsets = mono_mempool_alloc (cfg->mempool, sizeof (gint32) * cfg->num_varinfo);
+       offsets = (gint32 *)mono_mempool_alloc (cfg->mempool, sizeof (gint32) * cfg->num_varinfo);
        for (i = 0; i < cfg->num_varinfo; ++i)
                offsets [i] = -1;
 
@@ -1654,7 +1654,7 @@ mono_allocate_stack_slots (MonoCompile *cfg, gboolean backward, guint32 *stack_s
        offset = 0;
        *stack_align = sizeof(mgreg_t);
        for (l = vars; l; l = l->next) {
-               vmv = l->data;
+               vmv = (MonoMethodVar *)l->data;
                inst = cfg->varinfo [vmv->idx];
 
                t = mono_type_get_underlying_type (inst->inst_vtype);
@@ -1692,7 +1692,7 @@ mono_allocate_stack_slots (MonoCompile *cfg, gboolean backward, guint32 *stack_s
                        /* Fall through */
                case MONO_TYPE_VALUETYPE:
                        if (!vtype_stack_slots)
-                               vtype_stack_slots = mono_mempool_alloc0 (cfg->mempool, sizeof (StackSlotInfo) * 256);
+                               vtype_stack_slots = (StackSlotInfo *)mono_mempool_alloc0 (cfg->mempool, sizeof (StackSlotInfo) * 256);
                        for (i = 0; i < nvtypes; ++i)
                                if (t->data.klass == vtype_stack_slots [i].vtype)
                                        break;
@@ -1893,8 +1893,8 @@ mini_register_opcode_emulation (int opcode, const char *name, const char *sigstr
        if (emul_opcode_num >= emul_opcode_alloced) {
                int incr = emul_opcode_alloced? emul_opcode_alloced/2: 16;
                emul_opcode_alloced += incr;
-               emul_opcode_map = g_realloc (emul_opcode_map, sizeof (emul_opcode_map [0]) * emul_opcode_alloced);
-               emul_opcode_opcodes = g_realloc (emul_opcode_opcodes, sizeof (emul_opcode_opcodes [0]) * emul_opcode_alloced);
+               emul_opcode_map = (MonoJitICallInfo **)g_realloc (emul_opcode_map, sizeof (emul_opcode_map [0]) * emul_opcode_alloced);
+               emul_opcode_opcodes = (short *)g_realloc (emul_opcode_opcodes, sizeof (emul_opcode_opcodes [0]) * emul_opcode_alloced);
        }
        emul_opcode_map [emul_opcode_num] = info;
        emul_opcode_opcodes [emul_opcode_num] = opcode;
@@ -2070,7 +2070,7 @@ mono_destroy_compile (MonoCompile *cfg)
        if (cfg->exvars)
                g_hash_table_destroy (cfg->exvars);
        for (l = cfg->headers_to_free; l; l = l->next)
-               mono_metadata_free_mh (l->data);
+               mono_metadata_free_mh ((MonoMethodHeader *)l->data);
        g_list_free (cfg->ldstr_list);
        g_hash_table_destroy (cfg->token_info_hash);
        if (cfg->abs_patches)
@@ -2174,7 +2174,7 @@ mono_get_lmf_addr_intrinsic (MonoCompile* cfg)
 void
 mono_add_patch_info (MonoCompile *cfg, int ip, MonoJumpInfoType type, gconstpointer target)
 {
-       MonoJumpInfo *ji = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoJumpInfo));
+       MonoJumpInfo *ji = (MonoJumpInfo *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoJumpInfo));
 
        ji->ip.i = ip;
        ji->type = type;
@@ -2187,7 +2187,7 @@ mono_add_patch_info (MonoCompile *cfg, int ip, MonoJumpInfoType type, gconstpoin
 void
 mono_add_patch_info_rel (MonoCompile *cfg, int ip, MonoJumpInfoType type, gconstpointer target, int relocation)
 {
-       MonoJumpInfo *ji = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoJumpInfo));
+       MonoJumpInfo *ji = (MonoJumpInfo *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoJumpInfo));
 
        ji->ip.i = ip;
        ji->type = type;
@@ -2225,7 +2225,7 @@ mono_add_seq_point (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins, int nat
 void
 mono_add_var_location (MonoCompile *cfg, MonoInst *var, gboolean is_reg, int reg, int offset, int from, int to)
 {
-       MonoDwarfLocListEntry *entry = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoDwarfLocListEntry));
+       MonoDwarfLocListEntry *entry = (MonoDwarfLocListEntry *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoDwarfLocListEntry));
 
        if (is_reg)
                g_assert (offset == 0);
@@ -2261,7 +2261,7 @@ mono_compile_create_vars (MonoCompile *cfg)
        if (cfg->verbose_level > 2)
                g_print ("creating vars\n");
 
-       cfg->args = mono_mempool_alloc0 (cfg->mempool, (sig->param_count + sig->hasthis) * sizeof (MonoInst*));
+       cfg->args = (MonoInst **)mono_mempool_alloc0 (cfg->mempool, (sig->param_count + sig->hasthis) * sizeof (MonoInst*));
 
        if (sig->hasthis)
                cfg->args [0] = mono_compile_create_var (cfg, &cfg->method->klass->this_arg, OP_ARG);
@@ -2288,7 +2288,7 @@ mono_compile_create_vars (MonoCompile *cfg)
        }
 
        cfg->locals_start = cfg->num_varinfo;
-       cfg->locals = mono_mempool_alloc0 (cfg->mempool, header->num_locals * sizeof (MonoInst*));
+       cfg->locals = (MonoInst **)mono_mempool_alloc0 (cfg->mempool, header->num_locals * sizeof (MonoInst*));
 
        if (cfg->verbose_level > 2)
                g_print ("creating locals\n");
@@ -2348,7 +2348,7 @@ mono_postprocess_patches (MonoCompile *cfg)
 
                        if (patch_info->type == MONO_PATCH_INFO_ABS) {
                                if (cfg->abs_patches) {
-                                       MonoJumpInfo *abs_ji = g_hash_table_lookup (cfg->abs_patches, patch_info->data.target);
+                                       MonoJumpInfo *abs_ji = (MonoJumpInfo *)g_hash_table_lookup (cfg->abs_patches, patch_info->data.target);
                                        if (abs_ji) {
                                                patch_info->type = abs_ji->type;
                                                patch_info->data.target = abs_ji->data.target;
@@ -2367,9 +2367,9 @@ mono_postprocess_patches (MonoCompile *cfg)
                        table = g_malloc0 (sizeof(gpointer) * patch_info->data.table->table_size);
 #else
                        if (cfg->method->dynamic) {
-                               table = mono_code_manager_reserve (cfg->dynamic_info->code_mp, sizeof (gpointer) * patch_info->data.table->table_size);
+                               table = (void **)mono_code_manager_reserve (cfg->dynamic_info->code_mp, sizeof (gpointer) * patch_info->data.table->table_size);
                        } else {
-                               table = mono_domain_code_reserve (cfg->domain, sizeof (gpointer) * patch_info->data.table->table_size);
+                               table = (void **)mono_domain_code_reserve (cfg->domain, sizeof (gpointer) * patch_info->data.table->table_size);
                        }
 #endif
 
@@ -2397,9 +2397,9 @@ mono_postprocess_patches (MonoCompile *cfg)
 #endif
 
                        mono_domain_lock (domain);
-                       jlist = g_hash_table_lookup (domain_jit_info (domain)->jump_target_hash, patch_info->data.method);
+                       jlist = (MonoJumpList *)g_hash_table_lookup (domain_jit_info (domain)->jump_target_hash, patch_info->data.method);
                        if (!jlist) {
-                               jlist = mono_domain_alloc0 (domain, sizeof (MonoJumpList));
+                               jlist = (MonoJumpList *)mono_domain_alloc0 (domain, sizeof (MonoJumpList));
                                g_hash_table_insert (domain_jit_info (domain)->jump_target_hash, patch_info->data.method, jlist);
                        }
                        jlist->list = g_slist_prepend (jlist->list, ip);
@@ -2515,11 +2515,11 @@ mono_codegen (MonoCompile *cfg)
 
                if (mono_using_xdebug)
                        /* See the comment for cfg->code_domain */
-                       code = mono_domain_code_reserve (code_domain, cfg->code_size + cfg->thunk_area + unwindlen);
+                       code = (guint8 *)mono_domain_code_reserve (code_domain, cfg->code_size + cfg->thunk_area + unwindlen);
                else
-                       code = mono_code_manager_reserve (cfg->dynamic_info->code_mp, cfg->code_size + cfg->thunk_area + unwindlen);
+                       code = (guint8 *)mono_code_manager_reserve (cfg->dynamic_info->code_mp, cfg->code_size + cfg->thunk_area + unwindlen);
        } else {
-               code = mono_domain_code_reserve (code_domain, cfg->code_size + cfg->thunk_area + unwindlen);
+               code = (guint8 *)mono_domain_code_reserve (code_domain, cfg->code_size + cfg->thunk_area + unwindlen);
        }
 #if defined(__native_client_codegen__) && defined(__native_client__)
        nacl_allow_target_modification (TRUE);
@@ -2685,7 +2685,7 @@ create_jit_info (MonoCompile *cfg, MonoMethod *method_to_compile)
        header = cfg->header;
 
        if (cfg->gshared)
-               flags |= JIT_INFO_HAS_GENERIC_JIT_INFO;
+               flags = (MonoJitInfoFlags)(flags | JIT_INFO_HAS_GENERIC_JIT_INFO);
 
        if (cfg->arch_eh_jit_info) {
                MonoJitArgumentInfo *arg_info;
@@ -2699,18 +2699,18 @@ create_jit_info (MonoCompile *cfg, MonoMethod *method_to_compile)
                stack_size = mono_arch_get_argument_info (sig, sig->param_count, arg_info);
 
                if (stack_size)
-                       flags |= JIT_INFO_HAS_ARCH_EH_INFO;
+                       flags = (MonoJitInfoFlags)(flags | JIT_INFO_HAS_ARCH_EH_INFO);
        }
 
        if (cfg->has_unwind_info_for_epilog && !(flags & JIT_INFO_HAS_ARCH_EH_INFO))
-               flags |= JIT_INFO_HAS_ARCH_EH_INFO;
+               flags = (MonoJitInfoFlags)(flags | JIT_INFO_HAS_ARCH_EH_INFO);
 
        if (cfg->thunk_area)
-               flags |= JIT_INFO_HAS_THUNK_INFO;
+               flags = (MonoJitInfoFlags)(flags | JIT_INFO_HAS_THUNK_INFO);
 
        if (cfg->try_block_holes) {
                for (tmp = cfg->try_block_holes; tmp; tmp = tmp->next) {
-                       TryBlockHole *hole = tmp->data;
+                       TryBlockHole *hole = (TryBlockHole *)tmp->data;
                        MonoExceptionClause *ec = hole->clause;
                        int hole_end = hole->basic_block->native_offset + hole->basic_block->native_length;
                        MonoBasicBlock *clause_last_bb = cfg->cil_offset_to_bb [ec->try_offset + ec->try_len];
@@ -2721,7 +2721,7 @@ create_jit_info (MonoCompile *cfg, MonoMethod *method_to_compile)
                                ++num_holes;
                }
                if (num_holes)
-                       flags |= JIT_INFO_HAS_TRY_BLOCK_HOLES;
+                       flags = (MonoJitInfoFlags)(flags | JIT_INFO_HAS_TRY_BLOCK_HOLES);
                if (G_UNLIKELY (cfg->verbose_level >= 4))
                        printf ("Number of try block holes %d\n", num_holes);
        }
@@ -2732,9 +2732,9 @@ create_jit_info (MonoCompile *cfg, MonoMethod *method_to_compile)
                num_clauses = header->num_clauses;
 
        if (cfg->method->dynamic)
-               jinfo = g_malloc0 (mono_jit_info_size (flags, num_clauses, num_holes));
+               jinfo = (MonoJitInfo *)g_malloc0 (mono_jit_info_size (flags, num_clauses, num_holes));
        else
-               jinfo = mono_domain_alloc0 (cfg->domain, mono_jit_info_size (flags, num_clauses, num_holes));
+               jinfo = (MonoJitInfo *)mono_domain_alloc0 (cfg->domain, mono_jit_info_size (flags, num_clauses, num_holes));
        mono_jit_info_init (jinfo, cfg->method_to_register, cfg->native_code, cfg->code_len, flags, num_clauses, num_holes);
        jinfo->domain_neutral = (cfg->opt & MONO_OPT_SHARED) != 0;
 
@@ -2752,7 +2752,7 @@ create_jit_info (MonoCompile *cfg, MonoMethod *method_to_compile)
                if (cfg->method->dynamic)
                        gi->generic_sharing_context = g_new0 (MonoGenericSharingContext, 1);
                else
-                       gi->generic_sharing_context = mono_domain_alloc0 (cfg->domain, sizeof (MonoGenericSharingContext));
+                       gi->generic_sharing_context = (MonoGenericSharingContext *)mono_domain_alloc0 (cfg->domain, sizeof (MonoGenericSharingContext));
                mini_init_gsctx (cfg->method->dynamic ? NULL : cfg->domain, NULL, cfg->gsctx_context, gi->generic_sharing_context);
 
                if ((method_to_compile->flags & METHOD_ATTRIBUTE_STATIC) ||
@@ -2782,9 +2782,9 @@ create_jit_info (MonoCompile *cfg, MonoMethod *method_to_compile)
 
                        gi->nlocs = g_slist_length (loclist);
                        if (cfg->method->dynamic)
-                               gi->locations = g_malloc0 (gi->nlocs * sizeof (MonoDwarfLocListEntry));
+                               gi->locations = (MonoDwarfLocListEntry *)g_malloc0 (gi->nlocs * sizeof (MonoDwarfLocListEntry));
                        else
-                               gi->locations = mono_domain_alloc0 (cfg->domain, gi->nlocs * sizeof (MonoDwarfLocListEntry));
+                               gi->locations = (MonoDwarfLocListEntry *)mono_domain_alloc0 (cfg->domain, gi->nlocs * sizeof (MonoDwarfLocListEntry));
                        i = 0;
                        for (l = loclist; l; l = l->next) {
                                memcpy (&(gi->locations [i]), l->data, sizeof (MonoDwarfLocListEntry));
@@ -2825,7 +2825,7 @@ create_jit_info (MonoCompile *cfg, MonoMethod *method_to_compile)
                for (tmp = cfg->try_block_holes; tmp; tmp = tmp->next) {
                        guint32 start_bb_offset;
                        MonoTryBlockHoleJitInfo *hole;
-                       TryBlockHole *hole_data = tmp->data;
+                       TryBlockHole *hole_data = (TryBlockHole *)tmp->data;
                        MonoExceptionClause *ec = hole_data->clause;
                        int hole_end = hole_data->basic_block->native_offset + hole_data->basic_block->native_length;
                        MonoBasicBlock *clause_last_bb = cfg->cil_offset_to_bb [ec->try_offset + ec->try_len];
@@ -2933,7 +2933,7 @@ create_jit_info (MonoCompile *cfg, MonoMethod *method_to_compile)
                        ei->handler_start = cfg->native_code + tblock->native_offset;
 
                        for (tmp = cfg->try_block_holes; tmp; tmp = tmp->next) {
-                               TryBlockHole *hole = tmp->data;
+                               TryBlockHole *hole = (TryBlockHole *)tmp->data;
                                gpointer hole_end = cfg->native_code + (hole->basic_block->native_offset + hole->basic_block->native_length);
                                if (hole->clause == ec && hole_end == ei->try_end) {
                                        if (G_UNLIKELY (cfg->verbose_level >= 4))
@@ -3288,8 +3288,10 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
                try_generic_shared = mono_class_generic_sharing_enabled (method->klass) &&
                        (opts & MONO_OPT_GSHARED) && mono_method_is_generic_sharable (method, FALSE);
                if (mini_is_gsharedvt_sharable_method (method)) {
+                       /*
                        if (!mono_debug_count ())
                                try_generic_shared = FALSE;
+                       */
                }
        }
 
@@ -3456,7 +3458,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
                if (COMPILE_LLVM (cfg)) {
                        mono_llvm_check_method_supported (cfg);
                        if (cfg->disable_llvm) {
-                               if (cfg->verbose_level >= cfg->llvm_only ? 0 : 1) {
+                               if (cfg->verbose_level >= (cfg->llvm_only ? 0 : 1)) {
                                        //nm = mono_method_full_name (cfg->method, TRUE);
                                        printf ("LLVM failed for '%s': %s\n", method->name, cfg->exception_message);
                                        //g_free (nm);
@@ -3548,7 +3550,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
                }
        }
 
-       cfg->intvars = mono_mempool_alloc0 (cfg->mempool, sizeof (guint16) * STACK_MAX * header->max_stack);
+       cfg->intvars = (guint16 *)mono_mempool_alloc0 (cfg->mempool, sizeof (guint16) * STACK_MAX * header->max_stack);
 
        if (cfg->verbose_level > 0) {
                char *method_name;
@@ -3690,7 +3692,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
        mono_threads_safepoint ();
 
        /* Depth-first ordering on basic blocks */
-       cfg->bblocks = mono_mempool_alloc (cfg->mempool, sizeof (MonoBasicBlock*) * (cfg->num_bblocks + 1));
+       cfg->bblocks = (MonoBasicBlock **)mono_mempool_alloc (cfg->mempool, sizeof (MonoBasicBlock*) * (cfg->num_bblocks + 1));
 
        cfg->max_block_num = cfg->num_bblocks;
 
@@ -3830,10 +3832,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
        if (COMPILE_SOFT_FLOAT (cfg))
                mono_decompose_soft_float (cfg);
 #endif
-       if (COMPILE_LLVM (cfg))
-               mono_decompose_vtype_opts_llvm (cfg);
-       else
-               mono_decompose_vtype_opts (cfg);
+       mono_decompose_vtype_opts (cfg);
        if (cfg->flags & MONO_CFG_HAS_ARRAY_ACCESS)
                mono_decompose_array_access_opts (cfg);
 
@@ -3933,7 +3932,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
 
                                        bb->last_ins->opcode = mono_reverse_branch_op (bb->last_ins->opcode);
                                } else {                        
-                                       MonoInst *inst = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst));
+                                       MonoInst *inst = (MonoInst *)mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst));
                                        inst->opcode = OP_BR;
                                        inst->inst_target_bb = bb->last_ins->inst_false_bb;
                                        mono_bblock_add_inst (bb, inst);
@@ -3975,7 +3974,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
                if (!cfg->disable_llvm)
                        mono_llvm_emit_method (cfg);
                if (cfg->disable_llvm) {
-                       if (cfg->verbose_level >= cfg->llvm_only ? 0 : 1) {
+                       if (cfg->verbose_level >= (cfg->llvm_only ? 0 : 1)) {
                                //nm = mono_method_full_name (cfg->method, TRUE);
                                printf ("LLVM failed for '%s': %s\n", method->name, cfg->exception_message);
                                //g_free (nm);
@@ -4078,7 +4077,7 @@ mono_arch_instrument_epilog (MonoCompile *cfg, void *func, void *p, gboolean ena
 void
 mono_cfg_add_try_hole (MonoCompile *cfg, MonoExceptionClause *clause, guint8 *start, MonoBasicBlock *bb)
 {
-       TryBlockHole *hole = mono_mempool_alloc (cfg->mempool, sizeof (TryBlockHole));
+       TryBlockHole *hole = (TryBlockHole *)mono_mempool_alloc (cfg->mempool, sizeof (TryBlockHole));
        hole->clause = clause;
        hole->start_offset = start - cfg->native_code;
        hole->basic_block = bb;
@@ -4109,7 +4108,7 @@ create_jit_info_for_trampoline (MonoMethod *wrapper, MonoTrampInfo *info)
                uw_info = mono_unwind_ops_encode (info->unwind_ops, &info_len);
        }
 
-       jinfo = mono_domain_alloc0 (domain, MONO_SIZEOF_JIT_INFO);
+       jinfo = (MonoJitInfo *)mono_domain_alloc0 (domain, MONO_SIZEOF_JIT_INFO);
        jinfo->d.method = wrapper;
        jinfo->code_start = info->code;
        jinfo->code_size = info->code_size;
@@ -4157,9 +4156,9 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
                }
                nm = mono_marshal_get_native_wrapper (method, TRUE, mono_aot_only);
                code = mono_get_addr_from_ftnptr (mono_compile_method (nm));
-               jinfo = mono_jit_info_table_find (target_domain, code);
+               jinfo = mono_jit_info_table_find (target_domain, (char *)code);
                if (!jinfo)
-                       jinfo = mono_jit_info_table_find (mono_domain_get (), code);
+                       jinfo = mono_jit_info_table_find (mono_domain_get (), (char *)code);
                if (jinfo)
                        mono_profiler_method_end_jit (method, jinfo, MONO_PROFILE_OK);
                return code;
@@ -4274,7 +4273,7 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
                        ex = mono_loader_error_prepare_exception (error);
                } else {
                        if (cfg->exception_ptr) {
-                               ex = mono_class_get_exception_for_failure (cfg->exception_ptr);
+                               ex = mono_class_get_exception_for_failure ((MonoClass *)cfg->exception_ptr);
                        } else {
                                if (cfg->exception_type == MONO_EXCEPTION_MISSING_FIELD)
                                        ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "MissingFieldException", cfg->exception_message);
@@ -4305,7 +4304,7 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
                ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "FieldAccessException", cfg->exception_message);
                break;
        case MONO_EXCEPTION_OBJECT_SUPPLIED: {
-               MonoException *exp = cfg->exception_ptr;
+               MonoException *exp = (MonoException *)cfg->exception_ptr;
                MONO_GC_UNREGISTER_ROOT (cfg->exception_ptr);
 
                ex = exp;
@@ -4389,7 +4388,7 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
                MonoJumpInfo patch_info;
                MonoJumpList *jlist;
                GSList *tmp;
-               jlist = g_hash_table_lookup (domain_jit_info (target_domain)->jump_target_hash, method);
+               jlist = (MonoJumpList *)g_hash_table_lookup (domain_jit_info (target_domain)->jump_target_hash, method);
                if (jlist) {
                        patch_info.next = NULL;
                        patch_info.ip.i = 0;
@@ -4403,8 +4402,8 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
 #endif
 #ifdef MONO_ARCH_HAVE_PATCH_CODE_NEW
                        for (tmp = jlist->list; tmp; tmp = tmp->next) {
-                               gpointer target = mono_resolve_patch_target (NULL, target_domain, tmp->data, &patch_info, TRUE);
-                               mono_arch_patch_code_new (NULL, target_domain, tmp->data, &patch_info, target);
+                               gpointer target = mono_resolve_patch_target (NULL, target_domain, (guint8 *)tmp->data, &patch_info, TRUE);
+                               mono_arch_patch_code_new (NULL, target_domain, (guint8 *)tmp->data, &patch_info, target);
                        }
 #else
                        for (tmp = jlist->list; tmp; tmp = tmp->next)
@@ -4466,7 +4465,7 @@ mini_get_underlying_type (MonoType *type)
 void
 mini_jit_init (void)
 {
-       mono_mutex_init_recursive (&jit_mutex);
+       mono_os_mutex_init_recursive (&jit_mutex);
 #ifndef DISABLE_JIT
        current_backend = g_new0 (MonoBackend, 1);
        init_backend (current_backend);

diff --git a/mono/mini/mini.h b/mono/mini/mini.h
index c355233ad961b5697780a19bf543fa9bc213008a..e27511ce33827a03b57829d9affd873a4c5adbc7 100644 (file)
--- a/mono/mini/mini.h
+++ b/mono/mini/mini.h
@@ -111,7 +111,7 @@
 #endif
 
 /* Version number of the AOT file format */
-#define MONO_AOT_FILE_VERSION 127
+#define MONO_AOT_FILE_VERSION 128
 
 //TODO: This is x86/amd64 specific.
 #define mono_simd_shuffle_mask(a,b,c,d) ((a) | ((b) << 2) | ((c) << 4) | ((d) << 6))
@@ -389,7 +389,7 @@ enum {
        } while (0)
 
 #define MONO_INST_NEW(cfg,dest,op) do {        \
-               (dest) = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoInst));       \
+               (dest) = (MonoInst *)mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoInst));   \
                (dest)->opcode = (op);  \
                (dest)->dreg = -1;                          \
                MONO_INST_NULLIFY_SREGS ((dest));           \
@@ -397,7 +397,7 @@ enum {
        } while (0)
 
 #define MONO_INST_NEW_CALL(cfg,dest,op) do {   \
-               (dest) = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoCallInst));   \
+               (dest) = (MonoCallInst *)mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoCallInst));   \
                (dest)->inst.opcode = (op);     \
                (dest)->inst.dreg = -1;                                 \
                MONO_INST_NULLIFY_SREGS (&(dest)->inst);                \
@@ -741,6 +741,10 @@ typedef enum {
        LLVMArgVtypeByVal,
        LLVMArgVtypeRetAddr, /* On on cinfo->ret */
        LLVMArgGSharedVt,
+       /* Fixed sized argument passed to/returned from gsharedvt method by ref */
+       LLVMArgGsharedvtFixed,
+       /* Variable sized argument passed to/returned from gsharedvt method by ref */
+       LLVMArgGsharedvtVariable,
        /* Vtype passed as one int array argument */
        LLVMArgAsIArgs,
        /* Vtype passed as a set of fp arguments */
@@ -2173,7 +2177,7 @@ mono_bb_last_inst (MonoBasicBlock *bb, int filter)
 /* main function */
 MONO_API int         mono_main                      (int argc, char* argv[]);
 MONO_API void        mono_set_defaults              (int verbose_level, guint32 opts);
-MONO_API void        mono_parse_env_options         (int argc, char *argv []);
+MONO_API void        mono_parse_env_options         (int *ref_argc, char **ref_argv []);
 MonoDomain* mini_init                      (const char *filename, const char *runtime_version);
 void        mini_cleanup                   (MonoDomain *domain);
 MONO_API MonoDebugOptions *mini_get_debug_options   (void);
@@ -2436,7 +2440,6 @@ gpointer          mono_create_monitor_enter_trampoline (void);
 gpointer          mono_create_monitor_enter_v4_trampoline (void);
 gpointer          mono_create_monitor_exit_trampoline (void);
 gpointer          mono_create_static_rgctx_trampoline (MonoMethod *m, gpointer addr);
-gpointer          mono_create_llvm_imt_trampoline (MonoDomain *domain, MonoMethod *m, int vt_offset) MONO_LLVM_INTERNAL;
 MonoVTable*       mono_find_class_init_trampoline_by_addr (gconstpointer addr);
 guint32           mono_find_rgctx_lazy_fetch_trampoline_by_addr (gconstpointer addr);
 gpointer          mono_magic_trampoline (mgreg_t *regs, guint8 *code, gpointer arg, guint8* tramp);
@@ -2505,7 +2508,6 @@ int               mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoB
 MonoInst         *mono_decompose_opcode (MonoCompile *cfg, MonoInst *ins);
 void              mono_decompose_long_opts (MonoCompile *cfg);
 void              mono_decompose_vtype_opts (MonoCompile *cfg);
-void              mono_decompose_vtype_opts_llvm (MonoCompile *cfg);
 void              mono_decompose_array_access_opts (MonoCompile *cfg);
 void              mono_decompose_soft_float (MonoCompile *cfg);
 void              mono_handle_global_vregs (MonoCompile *cfg);
@@ -2574,7 +2576,7 @@ void      mono_arch_decompose_long_opts         (MonoCompile *cfg, MonoInst *ins
 GSList*   mono_arch_get_delegate_invoke_impls   (void);
 LLVMCallInfo* mono_arch_get_llvm_call_info      (MonoCompile *cfg, MonoMethodSignature *sig) MONO_LLVM_INTERNAL;
 guint8*   mono_arch_emit_load_got_addr          (guint8 *start, guint8 *code, MonoCompile *cfg, MonoJumpInfo **ji);
-guint8*   mono_arch_emit_load_aotconst          (guint8 *start, guint8 *code, MonoJumpInfo **ji, int tramp_type, gconstpointer target);
+guint8*   mono_arch_emit_load_aotconst          (guint8 *start, guint8 *code, MonoJumpInfo **ji, MonoJumpInfoType tramp_type, gconstpointer target);
 GSList*   mono_arch_get_cie_program             (void);
 void      mono_arch_set_target                  (char *mtriple);
 gboolean  mono_arch_gsharedvt_sig_supported     (MonoMethodSignature *sig);
@@ -2695,7 +2697,7 @@ mono_thread_state_init_from_handle (MonoThreadUnwindState *tctx, MonoThreadInfo
 typedef gboolean (*MonoJitStackWalk)            (StackFrameInfo *frame, MonoContext *ctx, gpointer data);
 
 void     mono_exceptions_init                   (void);
-gboolean mono_handle_exception                  (MonoContext *ctx, gpointer obj);
+gboolean mono_handle_exception                  (MonoContext *ctx, MonoObject *obj);
 void     mono_handle_native_sigsegv             (int signal, void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *siginfo);
 MONO_API void     mono_print_thread_dump                 (void *sigctx);
 MONO_API void     mono_print_thread_dump_from_ctx        (MonoContext *ctx);

diff --git a/mono/mini/objects.cs b/mono/mini/objects.cs
index 3de372c89d034a04764fadff0a7140974f750e7a..2fe402f907f016291577350c5d7291ed91394daa 100644 (file)
--- a/mono/mini/objects.cs
+++ b/mono/mini/objects.cs
@@ -1686,6 +1686,28 @@ ncells ) {
                }
                return 0;
        }
+
+       struct Struct16 {
+               public int a, b, c, d;
+       }
+
+       [MethodImplAttribute (MethodImplOptions.NoInlining)]
+       static int pass_struct16 (object o0, object o2, object o3, object o4, object o5, object o6, object o7, Struct16 o8) {
+               // This disables LLVM
+               try {
+               } catch {
+               }
+               return o8.a;
+       }
+
+       [MethodImplAttribute (MethodImplOptions.NoInlining)]
+       static int pass_struct16 (object o0, object o2, object o3, object o6, object o7, Struct16 o8) {
+               return pass_struct16 (o0, o2, null, o3, null, o6, o7, o8);
+       }
+
+       public static int test_42_pass_16byte_struct_split () {
+               return pass_struct16 (null, null, null, null, null, new Struct16 () { a = 42 });
+       }
 }
 
 #if __MOBILE__

diff --git a/mono/mini/patch-info.h b/mono/mini/patch-info.h
index ca4ea9fd7d3641675a7f3ef6dd8591bbec0591f6..c9b9885e18ba3906b59224c477e92b7c81289047 100644 (file)
--- a/mono/mini/patch-info.h
+++ b/mono/mini/patch-info.h
@@ -41,7 +41,6 @@ PATCH_INFO(MONITOR_ENTER_V4, "monitor_enter_v4")
 PATCH_INFO(MONITOR_EXIT, "monitor_exit")
 PATCH_INFO(MSCORLIB_GOT_ADDR, "mscorlib_got_addr")
 PATCH_INFO(SEQ_POINT_INFO, "seq_point_info")
-PATCH_INFO(LLVM_IMT_TRAMPOLINE, "llvm_imt_trampoline")
 PATCH_INFO(GC_CARD_TABLE_ADDR, "gc_card_table_addr")
 PATCH_INFO(CASTCLASS_CACHE, "castclass_cache")
 PATCH_INFO(SIGNATURE, "signature")

diff --git a/mono/mini/seq-points.c b/mono/mini/seq-points.c
index c9f74b8e170b68359225bbc6e8a1fba44da6598c..ac22ca41f070d0201b7c4b55371cc597b1e97a51 100644 (file)
--- a/mono/mini/seq-points.c
+++ b/mono/mini/seq-points.c
@@ -58,7 +58,7 @@ mono_save_seq_point_info (MonoCompile *cfg)
 
        for (i = 0; i < cfg->seq_points->len; ++i) {
                SeqPoint *sp = &seq_points [i];
-               MonoInst *ins = g_ptr_array_index (cfg->seq_points, i);
+               MonoInst *ins = (MonoInst *)g_ptr_array_index (cfg->seq_points, i);
 
                sp->il_offset = ins->inst_imm;
                sp->native_offset = ins->inst_offset;
@@ -79,7 +79,7 @@ mono_save_seq_point_info (MonoCompile *cfg)
                        bb_seq_points = g_slist_reverse (bb->seq_points);
                        last = NULL;
                        for (l = bb_seq_points; l; l = l->next) {
-                               MonoInst *ins = l->data;
+                               MonoInst *ins = (MonoInst *)l->data;
 
                                if (ins->inst_imm == METHOD_ENTRY_IL_OFFSET || ins->inst_imm == METHOD_EXIT_IL_OFFSET)
                                /* Used to implement method entry/exit events */
@@ -108,13 +108,13 @@ mono_save_seq_point_info (MonoCompile *cfg)
                                 */
                                l = g_slist_last (bb->seq_points);
                                if (l) {
-                                       endfinally_seq_point = l->data;
+                                       endfinally_seq_point = (MonoInst *)l->data;
 
                                        for (bb2 = cfg->bb_entry; bb2; bb2 = bb2->next_bb) {
                                                GSList *l = g_slist_last (bb2->seq_points);
 
                                                if (l) {
-                                                       MonoInst *ins = l->data;
+                                                       MonoInst *ins = (MonoInst *)l->data;
 
                                                        if (!(ins->inst_imm == METHOD_ENTRY_IL_OFFSET || ins->inst_imm == METHOD_EXIT_IL_OFFSET) && ins != endfinally_seq_point)
                                                                next [endfinally_seq_point->backend.size] = g_slist_append (next [endfinally_seq_point->backend.size], GUINT_TO_POINTER (ins->backend.size));
@@ -198,12 +198,12 @@ mono_get_seq_points (MonoDomain *domain, MonoMethod *method)
        }
 
        mono_loader_lock ();
-       seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, method);
+       seq_points = (MonoSeqPointInfo *)g_hash_table_lookup (domain_jit_info (domain)->seq_points, method);
        if (!seq_points && method->is_inflated) {
                /* generic sharing + aot */
-               seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, declaring_generic_method);
+               seq_points = (MonoSeqPointInfo *)g_hash_table_lookup (domain_jit_info (domain)->seq_points, declaring_generic_method);
                if (!seq_points)
-                       seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, shared_method);
+                       seq_points = (MonoSeqPointInfo *)g_hash_table_lookup (domain_jit_info (domain)->seq_points, shared_method);
        }
        mono_loader_unlock ();
 
@@ -299,6 +299,6 @@ void
 mono_image_get_aot_seq_point_path (MonoImage *image, char **str)
 {
        int size = strlen (image->name) + strlen (SEQ_POINT_AOT_EXT) + 1;
-       *str = g_malloc (size);
+       *str = (char *)g_malloc (size);
        g_sprintf (*str, "%s%s", image->name, SEQ_POINT_AOT_EXT);
 }

diff --git a/mono/mini/simd-intrinsics.c b/mono/mini/simd-intrinsics.c
index 0f484a98758ab2c15d81df374257df9e9eaabe59..6bffbd05c4927183446441b0f290e53e1595debf 100644 (file)
--- a/mono/mini/simd-intrinsics.c
+++ b/mono/mini/simd-intrinsics.c
@@ -686,7 +686,7 @@ mono_simd_simplify_indirection (MonoCompile *cfg)
        }
 
        DEBUG (printf ("[simd-simplify] max vreg is %d\n", max_vreg));
-       vreg_flags = g_malloc0 (max_vreg + 1);
+       vreg_flags = (char *)g_malloc0 (max_vreg + 1);
        target_bb = g_new0 (MonoBasicBlock*, max_vreg + 1);
 
        for (i = 0; i < cfg->num_varinfo; i++) {
@@ -1482,7 +1482,7 @@ simd_version_name (guint32 version)
 static MonoInst*
 emit_intrinsics (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, MonoInst **args, const SimdIntrinsc *intrinsics, guint32 size)
 {
-       const SimdIntrinsc * result = mono_binary_search (cmethod->name, intrinsics, size, sizeof (SimdIntrinsc), &simd_intrinsic_compare_by_name);
+       const SimdIntrinsc *result = (const SimdIntrinsc *)mono_binary_search (cmethod->name, intrinsics, size, sizeof (SimdIntrinsc), &simd_intrinsic_compare_by_name);
        if (!result) {
                DEBUG (printf ("function doesn't have a simd intrinsic %s::%s/%d\n", cmethod->klass->name, cmethod->name, fsig->param_count));
                return NULL;

diff --git a/mono/mini/ssa.c b/mono/mini/ssa.c
index 95bea3006eef32939c9fbfd145f62f5b754c3816..3e79b5e3916640cb0d6a3e9e7415b0b501ba6538 100644 (file)
--- a/mono/mini/ssa.c
+++ b/mono/mini/ssa.c
@@ -141,7 +141,7 @@ static inline void
 record_use (MonoCompile *cfg, MonoInst *var, MonoBasicBlock *bb, MonoInst *ins)
 {
        MonoMethodVar *info;
-       MonoVarUsageInfo *ui = mono_mempool_alloc (cfg->mempool, sizeof (MonoVarUsageInfo));
+       MonoVarUsageInfo *ui = (MonoVarUsageInfo *)mono_mempool_alloc (cfg->mempool, sizeof (MonoVarUsageInfo));
 
        info = MONO_VARINFO (cfg, var->inst_c0);
        
@@ -352,7 +352,7 @@ mono_ssa_compute (MonoCompile *cfg)
        mono_compile_dominator_info (cfg, MONO_COMP_DOM | MONO_COMP_IDOM | MONO_COMP_DFRONTIER);
 
        bitsize = mono_bitset_alloc_size (cfg->num_bblocks, 0);
-       buf = buf_start = g_malloc0 (mono_bitset_alloc_size (cfg->num_bblocks, 0) * cfg->num_varinfo);
+       buf = buf_start = (guint8 *)g_malloc0 (mono_bitset_alloc_size (cfg->num_bblocks, 0) * cfg->num_varinfo);
 
        for (i = 0; i < cfg->num_varinfo; ++i) {
                vinfo [i].def_in = mono_bitset_mem_new (buf, cfg->num_bblocks, 0);
@@ -434,7 +434,7 @@ mono_ssa_compute (MonoCompile *cfg)
                        else
                                ins->klass = var->klass;
 
-                       ins->inst_phi_args =  mono_mempool_alloc0 (cfg->mempool, sizeof (int) * (cfg->bblocks [idx]->in_count + 1));
+                       ins->inst_phi_args = (int *)mono_mempool_alloc0 (cfg->mempool, sizeof (int) * (cfg->bblocks [idx]->in_count + 1));
                        ins->inst_phi_args [0] = cfg->bblocks [idx]->in_count;
 
                        /* For debugging */
@@ -457,7 +457,7 @@ mono_ssa_compute (MonoCompile *cfg)
 
        /* Renaming phase */
 
-       stack = alloca (sizeof (MonoInst *) * cfg->num_varinfo);
+       stack = (MonoInst **)alloca (sizeof (MonoInst *) * cfg->num_varinfo);
        memset (stack, 0, sizeof (MonoInst *) * cfg->num_varinfo);
 
        lvreg_stack = g_new0 (guint32, cfg->next_vreg);
@@ -937,7 +937,7 @@ visit_inst (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins, GList **cvars,
 
                if (MONO_IS_JUMP_TABLE (ins)) {
                        int i;
-                       MonoJumpInfoBBTable *table = MONO_JUMP_TABLE_FROM_INS (ins);
+                       MonoJumpInfoBBTable *table = (MonoJumpInfoBBTable *)MONO_JUMP_TABLE_FROM_INS (ins);
 
                        if (!ins->next || ins->next->opcode != OP_PADD) {
                                /* The PADD was optimized away */
@@ -973,7 +973,7 @@ visit_inst (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins, GList **cvars,
 
                if (ins->opcode == OP_SWITCH) {
                        int i;
-                       MonoJumpInfoBBTable *table = ins->inst_p0;
+                       MonoJumpInfoBBTable *table = (MonoJumpInfoBBTable *)ins->inst_p0;
 
                        for (i = 0; i < table->table_size; i++)
                                if (table->table [i])
@@ -1049,7 +1049,7 @@ fold_ins (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins, MonoInst **carray
 
                if (MONO_IS_JUMP_TABLE (ins)) {
                        int i;
-                       MonoJumpInfoBBTable *table = MONO_JUMP_TABLE_FROM_INS (ins);
+                       MonoJumpInfoBBTable *table = (MonoJumpInfoBBTable *)MONO_JUMP_TABLE_FROM_INS (ins);
 
                        if (!ins->next || ins->next->opcode != OP_PADD) {
                                /* The PADD was optimized away */

diff --git a/mono/mini/tasklets.c b/mono/mini/tasklets.c
index 6b5be99a733b904cf065f9e6ddfb887057846f93..9457633bafc1b81e5dcf27980522e6702e214274 100644 (file)
--- a/mono/mini/tasklets.c
+++ b/mono/mini/tasklets.c
@@ -8,8 +8,8 @@
 #if defined(MONO_SUPPORT_TASKLETS)
 
 static mono_mutex_t tasklets_mutex;
-#define tasklets_lock() mono_mutex_lock(&tasklets_mutex)
-#define tasklets_unlock() mono_mutex_unlock(&tasklets_mutex)
+#define tasklets_lock() mono_os_mutex_lock(&tasklets_mutex)
+#define tasklets_unlock() mono_os_mutex_unlock(&tasklets_mutex)
 
 /* LOCKING: tasklets_mutex is assumed to e taken */
 static void
@@ -47,7 +47,7 @@ continuation_mark_frame (MonoContinuation *cont)
        if (cont->domain)
                return mono_get_exception_argument ("cont", "Already marked");
 
-       jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        lmf = mono_get_lmf();
        cont->domain = mono_domain_get ();
        cont->thread_id = mono_native_thread_id_get ();
@@ -136,7 +136,7 @@ continuation_restore (MonoContinuation *cont, int state)
 void
 mono_tasklets_init (void)
 {
-       mono_mutex_init_recursive (&tasklets_mutex);
+       mono_os_mutex_init_recursive (&tasklets_mutex);
 
        mono_add_internal_call ("Mono.Tasklets.Continuation::alloc", continuation_alloc);
        mono_add_internal_call ("Mono.Tasklets.Continuation::free", continuation_free);

diff --git a/mono/mini/trace.c b/mono/mini/trace.c
index 3d843f3b46bc25f4163dcac47258a9cbd0492220..765bc111c09bb22e86740bdc03f19ff6b4bf29fb 100644 (file)
--- a/mono/mini/trace.c
+++ b/mono/mini/trace.c
@@ -158,7 +158,7 @@ static void get_string (void)
        }
        if (value != NULL)
                g_free (value);
-       value = g_malloc (input - start + 1);
+       value = (char *)g_malloc (input - start + 1);
        strncpy (value, start, input-start);
        value [input-start] = 0;
 }
@@ -431,11 +431,11 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
 
        sig = mono_method_signature (method);
 
-       arg_info = alloca (sizeof (MonoJitArgumentInfo) * (sig->param_count + 1));
+       arg_info = (MonoJitArgumentInfo *)alloca (sizeof (MonoJitArgumentInfo) * (sig->param_count + 1));
 
        if (method->is_inflated) {
                /* FIXME: Might be better to pass the ji itself */
-               MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), RETURN_ADDRESS (), NULL);
+               MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), (char *)RETURN_ADDRESS (), NULL);
                if (ji) {
                        gsctx = mono_jit_info_get_generic_sharing_context (ji);
                        if (gsctx && gsctx->is_gsharedvt) {
@@ -455,11 +455,11 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
        }
 
        if (mono_method_signature (method)->hasthis) {
-               gpointer *this = (gpointer *)(ebp + arg_info [0].offset);
+               gpointer *this_obj = (gpointer *)(ebp + arg_info [0].offset);
                if (method->klass->valuetype) {
-                       printf ("value:%p, ", *arg_in_stack_slot(this, gpointer *));
+                       printf ("value:%p, ", *arg_in_stack_slot(this_obj, gpointer *));
                } else {
-                       o = *arg_in_stack_slot(this, MonoObject *);
+                       o = *arg_in_stack_slot(this_obj, MonoObject *);
 
                        if (o) {
                                klass = o->vtable->klass;
@@ -486,7 +486,7 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
                
                if (type->byref) {
                        printf ("[BYREF:%p], ", *arg_in_stack_slot(cpos, gpointer *));
-               } else switch (mono_type_get_underlying_type (type)->type) {
+               } else switch (mini_get_underlying_type (type)->type) {
                        
                case MONO_TYPE_I:
                case MONO_TYPE_U:
@@ -599,7 +599,7 @@ mono_trace_leave_method (MonoMethod *method, ...)
 
        if (method->is_inflated) {
                /* FIXME: Might be better to pass the ji itself */
-               MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), RETURN_ADDRESS (), NULL);
+               MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), (char *)RETURN_ADDRESS (), NULL);
                if (ji) {
                        gsctx = mono_jit_info_get_generic_sharing_context (ji);
                        if (gsctx && gsctx->is_gsharedvt) {
@@ -610,9 +610,8 @@ mono_trace_leave_method (MonoMethod *method, ...)
                }
        }
 
-       type = mono_method_signature (method)->ret;
+       type = mini_get_underlying_type (mono_method_signature (method)->ret);
 
-handle_enum:
        switch (type->type) {
        case MONO_TYPE_VOID:
                break;
@@ -694,20 +693,16 @@ handle_enum:
                printf ("FP=%f", f);
                break;
        }
-       case MONO_TYPE_VALUETYPE: 
-               if (type->data.klass->enumtype) {
-                       type = mono_class_enum_basetype (type->data.klass);
-                       goto handle_enum;
-               } else {
-                       guint8 *p = va_arg (ap, gpointer);
-                       int j, size, align;
-                       size = mono_type_size (type, &align);
-                       printf ("[");
-                       for (j = 0; p && j < size; j++)
-                               printf ("%02x,", p [j]);
-                       printf ("]");
-               }
+       case MONO_TYPE_VALUETYPE:  {
+               guint8 *p = (guint8 *)va_arg (ap, gpointer);
+               int j, size, align;
+               size = mono_type_size (type, &align);
+               printf ("[");
+               for (j = 0; p && j < size; j++)
+                       printf ("%02x,", p [j]);
+               printf ("]");
                break;
+       }
        default:
                printf ("(unknown return type %x)", mono_method_signature (method)->ret->type);
        }

diff --git a/mono/mini/tramp-amd64.c b/mono/mini/tramp-amd64.c
index 4468ad30869360109c099a0d5801983aa098b522..b3712467479efe6b1b80a2f02b81663cb63136b8 100644 (file)
--- a/mono/mini/tramp-amd64.c
+++ b/mono/mini/tramp-amd64.c
@@ -57,7 +57,7 @@ mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr)
 
        this_reg = mono_arch_get_this_arg_reg (NULL);
 
-       start = code = mono_domain_code_reserve (domain, size);
+       start = code = (guint8 *)mono_domain_code_reserve (domain, size);
 
        unwind_ops = mono_arch_get_cie_program ();
 
@@ -101,7 +101,7 @@ mono_arch_get_static_rgctx_trampoline (MonoMethod *m, MonoMethodRuntimeGenericCo
                buf_len = NACL_SIZE (30, 32);
 #endif
 
-       start = code = mono_domain_code_reserve (domain, buf_len);
+       start = code = (guint8 *)mono_domain_code_reserve (domain, buf_len);
 
        unwind_ops = mono_arch_get_cie_program ();
 
@@ -118,36 +118,6 @@ mono_arch_get_static_rgctx_trampoline (MonoMethod *m, MonoMethodRuntimeGenericCo
        return start;
 }
 
-gpointer
-mono_arch_get_llvm_imt_trampoline (MonoDomain *domain, MonoMethod *m, int vt_offset)
-{
-       guint8 *code, *start;
-       int buf_len;
-       int this_reg;
-
-       buf_len = 32;
-
-       start = code = mono_domain_code_reserve (domain, buf_len);
-
-       this_reg = mono_arch_get_this_arg_reg (NULL);
-
-       /* Set imt arg */
-       amd64_mov_reg_imm (code, MONO_ARCH_IMT_REG, m);
-       /* Load vtable address */
-       amd64_mov_reg_membase (code, AMD64_RAX, this_reg, 0, 8);
-       amd64_jump_membase (code, AMD64_RAX, vt_offset);
-       amd64_ret (code);
-
-       g_assert ((code - start) < buf_len);
-
-       nacl_domain_code_validate (domain, &start, buf_len, &code);
-
-       mono_arch_flush_icache (start, code - start);
-       mono_profiler_code_buffer_new (start, code - start, MONO_PROFILER_CODE_BUFFER_IMT_TRAMPOLINE, NULL);
-
-       return start;
-}
-
 #ifdef _WIN64
 // Workaround lack of Valgrind support for 64-bit Windows
 #define VALGRIND_DISCARD_TRANSLATIONS(...)
@@ -185,7 +155,7 @@ mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr)
                                 */
                                guint8 *thunk_start, *thunk_code;
 
-                               thunk_start = thunk_code = mono_domain_code_reserve (mono_domain_get (), 32);
+                               thunk_start = thunk_code = (guint8 *)mono_domain_code_reserve (mono_domain_get (), 32);
                                amd64_jump_membase (thunk_code, AMD64_RIP, 0);
                                *(guint64*)thunk_code = (guint64)addr;
                                addr = thunk_start;
@@ -252,7 +222,7 @@ mono_arch_create_llvm_native_thunk (MonoDomain *domain, guint8 *addr)
         */
        guint8 *thunk_start, *thunk_code;
 
-       thunk_start = thunk_code = mono_domain_code_reserve (mono_domain_get (), 32);
+       thunk_start = thunk_code = (guint8 *)mono_domain_code_reserve (mono_domain_get (), 32);
        amd64_jump_membase (thunk_code, AMD64_RIP, 0);
        *(guint64*)thunk_code = (guint64)addr;
        addr = thunk_start;
@@ -324,7 +294,7 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf
        else
                has_caller = TRUE;
 
-       code = buf = mono_global_codeman_reserve (kMaxCodeSize);
+       code = buf = (guint8 *)mono_global_codeman_reserve (kMaxCodeSize);
 
        /* Compute stack frame size and offsets */
        offset = 0;
@@ -648,7 +618,7 @@ mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_ty
        else
                size = 5 + 1 + 8;
 
-       code = buf = mono_domain_code_reserve_align (domain, size, 1);
+       code = buf = (guint8 *)mono_domain_code_reserve_align (domain, size, 1);
 
        if (((gint64)tramp - (gint64)code) >> 31 != 0 && ((gint64)tramp - (gint64)code) >> 31 != -1) {
 #ifndef MONO_ARCH_NOMAP32BIT
@@ -656,7 +626,7 @@ mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_ty
 #endif
                far_addr = TRUE;
                size += 16;
-               code = buf = mono_domain_code_reserve_align (domain, size, 1);
+               code = buf = (guint8 *)mono_domain_code_reserve_align (domain, size, 1);
        }
 #elif defined(__native_client_codegen__)
        size = 5 + 1 + 4;
@@ -732,11 +702,11 @@ mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info
 
        tramp_size = NACL_SIZE (64 + 8 * depth, 128 + 8 * depth);
 
-       code = buf = mono_global_codeman_reserve (tramp_size);
+       code = buf = (guint8 *)mono_global_codeman_reserve (tramp_size);
 
        unwind_ops = mono_arch_get_cie_program ();
 
-       rgctx_null_jumps = g_malloc (sizeof (guint8*) * (depth + 2));
+       rgctx_null_jumps = (guint8 **)g_malloc (sizeof (guint8*) * (depth + 2));
 
        if (mrgctx) {
                /* get mrgctx ptr */
@@ -786,7 +756,7 @@ mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info
                code = mono_arch_emit_load_aotconst (buf, code, &ji, MONO_PATCH_INFO_JIT_ICALL_ADDR, g_strdup_printf ("specific_trampoline_lazy_fetch_%u", slot));
                amd64_jump_reg (code, AMD64_R11);
        } else {
-               tramp = mono_arch_create_specific_trampoline (GUINT_TO_POINTER (slot), MONO_TRAMPOLINE_RGCTX_LAZY_FETCH, mono_get_root_domain (), NULL);
+               tramp = (guint8 *)mono_arch_create_specific_trampoline (GUINT_TO_POINTER (slot), MONO_TRAMPOLINE_RGCTX_LAZY_FETCH, mono_get_root_domain (), NULL);
 
                /* jump to the actual trampoline */
                amd64_jump_code (code, tramp);
@@ -809,7 +779,7 @@ void
 mono_arch_invalidate_method (MonoJitInfo *ji, void *func, gpointer func_arg)
 {
        /* FIXME: This is not thread safe */
-       guint8 *code = ji->code_start;
+       guint8 *code = (guint8 *)ji->code_start;
 
        amd64_mov_reg_imm (code, AMD64_ARG_REG1, func_arg);
        amd64_mov_reg_imm (code, AMD64_R11, func);
@@ -822,7 +792,7 @@ mono_arch_invalidate_method (MonoJitInfo *ji, void *func, gpointer func_arg)
 static void
 handler_block_trampoline_helper (gpointer *ptr)
 {
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       MonoJitTlsData *jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        *ptr = jit_tls->handler_block_return_address;
 }
 
@@ -837,7 +807,7 @@ mono_arch_create_handler_block_trampoline (MonoTrampInfo **info, gboolean aot)
 
        g_assert (!aot);
 
-       code = buf = mono_global_codeman_reserve (tramp_size);
+       code = buf = (guint8 *)mono_global_codeman_reserve (tramp_size);
 
        unwind_ops = mono_arch_get_cie_program ();
 
@@ -922,7 +892,7 @@ mono_arch_create_sdb_trampoline (gboolean single_step, MonoTrampInfo **info, gbo
        GSList *unwind_ops = NULL;
        MonoJumpInfo *ji = NULL;
 
-       code = buf = mono_global_codeman_reserve (tramp_size);
+       code = buf = (guint8 *)mono_global_codeman_reserve (tramp_size);
 
        framesize = 0;
 #ifdef TARGET_WIN32

diff --git a/mono/mini/tramp-x86.c b/mono/mini/tramp-x86.c
index 3644a936639adb502acb1082a3ca2fa1db912ab6..2b4475f0a67e929629a8b46cee381cf8e911c365 100644 (file)
--- a/mono/mini/tramp-x86.c
+++ b/mono/mini/tramp-x86.c
@@ -90,37 +90,6 @@ mono_arch_get_static_rgctx_trampoline (MonoMethod *m, MonoMethodRuntimeGenericCo
        return start;
 }
 
-gpointer
-mono_arch_get_llvm_imt_trampoline (MonoDomain *domain, MonoMethod *m, int vt_offset)
-{
-       guint8 *code, *start;
-       int buf_len;
-       int this_offset;
-
-       buf_len = 32;
-
-       start = code = mono_domain_code_reserve (domain, buf_len);
-
-       this_offset = mono_x86_get_this_arg_offset (mono_method_signature (m));
-
-       /* Set imt arg */
-       x86_mov_reg_imm (code, MONO_ARCH_IMT_REG, m);
-       /* Load this */
-       x86_mov_reg_membase (code, X86_EAX, X86_ESP, this_offset + 4, 4);
-       /* Load vtable address */
-       x86_mov_reg_membase (code, X86_EAX, X86_EAX, 0, 4);
-       x86_jump_membase (code, X86_EAX, vt_offset);
-
-       g_assert ((code - start) < buf_len);
-
-       nacl_domain_code_validate (domain, &start, buf_len, &code);
-
-       mono_arch_flush_icache (start, code - start);
-       mono_profiler_code_buffer_new (start, code - start, MONO_PROFILER_CODE_BUFFER_IMT_TRAMPOLINE, NULL);
-
-       return start;
-}
-
 void
 mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr)
 {
@@ -789,6 +758,7 @@ mono_arch_create_sdb_trampoline (gboolean single_step, MonoTrampInfo **info, gbo
        /* Argument area */
        framesize += sizeof (mgreg_t);
 
+       framesize = ALIGN_TO (framesize, 8);
        ctx_offset = framesize;
        framesize += sizeof (MonoContext);
 

diff --git a/mono/mini/unwind.c b/mono/mini/unwind.c
index 1fbd5c9f63bbfed5c3b6bf580c31fb63a4770743..82f14d7882255940ad311339fbe8c50073075a1b 100644 (file)
--- a/mono/mini/unwind.c
+++ b/mono/mini/unwind.c
@@ -41,8 +41,8 @@ static GSList *cached_info_list;
 /* Statistics */
 static int unwind_info_size;
 
-#define unwind_lock() mono_mutex_lock (&unwind_mutex)
-#define unwind_unlock() mono_mutex_unlock (&unwind_mutex)
+#define unwind_lock() mono_os_mutex_lock (&unwind_mutex)
+#define unwind_unlock() mono_os_mutex_unlock (&unwind_mutex)
 
 #ifdef TARGET_AMD64
 static int map_hw_reg_to_dwarf_reg [] = { 0, 2, 1, 3, 7, 6, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
@@ -361,7 +361,7 @@ mono_unwind_ops_encode_full (GSList *unwind_ops, guint32 *out_len, gboolean enab
        for (; l; l = l->next) {
                int reg;
 
-               op = l->data;
+               op = (MonoUnwindOp *)l->data;
 
                /* Convert the register from the hw encoding to the dwarf encoding */
                reg = mono_hw_reg_to_dwarf_reg (op->reg);
@@ -446,7 +446,7 @@ mono_unwind_ops_encode_full (GSList *unwind_ops, guint32 *out_len, gboolean enab
        
        g_assert (p - buf < 4096);
        *out_len = p - buf;
-       res = g_malloc (p - buf);
+       res = (guint8 *)g_malloc (p - buf);
        memcpy (res, buf, p - buf);
        return res;
 }
@@ -632,7 +632,7 @@ mono_unwind_frame (guint8 *unwind_info, guint32 unwind_info_len,
 void
 mono_unwind_init (void)
 {
-       mono_mutex_init_recursive (&unwind_mutex);
+       mono_os_mutex_init_recursive (&unwind_mutex);
 
        mono_counters_register ("Unwind info size", MONO_COUNTER_JIT | MONO_COUNTER_INT, &unwind_info_size);
 }
@@ -642,7 +642,7 @@ mono_unwind_cleanup (void)
 {
        int i;
 
-       mono_mutex_destroy (&unwind_mutex);
+       mono_os_mutex_destroy (&unwind_mutex);
 
        if (!cached_info)
                return;
@@ -688,7 +688,7 @@ mono_cache_unwind_info (guint8 *unwind_info, guint32 unwind_info_len)
                }
        }
 
-       info = g_malloc (sizeof (MonoUnwindInfo) + unwind_info_len);
+       info = (MonoUnwindInfo *)g_malloc (sizeof (MonoUnwindInfo) + unwind_info_len);
        info->len = unwind_info_len;
        memcpy (&info->info, unwind_info, unwind_info_len);
 
@@ -881,11 +881,11 @@ decode_lsda (guint8 *lsda, guint8 *code, MonoJitExceptionInfo **ex_info, guint32
        p = (guint8*)ALIGN_TO ((mgreg_t)p, 4);
 
        if (ex_info) {
-               *ex_info = g_malloc0 (ncall_sites * sizeof (MonoJitExceptionInfo));
+               *ex_info = (MonoJitExceptionInfo *)g_malloc0 (ncall_sites * sizeof (MonoJitExceptionInfo));
                *ex_info_len = ncall_sites;
        }
        if (type_info)
-               *type_info = g_malloc0 (ncall_sites * sizeof (gpointer));
+               *type_info = (gpointer *)g_malloc0 (ncall_sites * sizeof (gpointer));
 
        for (i = 0; i < ncall_sites; ++i) {
                int block_start_offset, block_size, landing_pad;
@@ -1058,7 +1058,7 @@ mono_unwind_decode_fde (guint8 *fde, guint32 *out_len, guint32 *code_len, MonoJi
        g_assert (return_reg == DWARF_PC_REG);
 
        buf_len = (cie + cie_len + 4 - cie_cfi) + (fde + fde_len + 4 - fde_cfi);
-       buf = g_malloc0 (buf_len);
+       buf = (guint8 *)g_malloc0 (buf_len);
 
        i = 0;
        p = cie_cfi;
@@ -1084,7 +1084,7 @@ mono_unwind_decode_fde (guint8 *fde, guint32 *out_len, guint32 *code_len, MonoJi
 
        *out_len = i;
 
-       return g_realloc (buf, i);
+       return (guint8 *)g_realloc (buf, i);
 }
 
 /*
@@ -1158,7 +1158,7 @@ mono_unwind_decode_llvm_mono_fde (guint8 *fde, int fde_len, guint8 *cie, guint8
        cie_cfi_len = p - cie_cfi;
        fde_cfi_len = (fde + fde_len - fde_cfi);
 
-       buf = g_malloc0 (cie_cfi_len + fde_cfi_len);
+       buf = (guint8 *)g_malloc0 (cie_cfi_len + fde_cfi_len);
        memcpy (buf, cie_cfi, cie_cfi_len);
        memcpy (buf + cie_cfi_len, fde_cfi, fde_cfi_len);
 

diff --git a/mono/profiler/decode.c b/mono/profiler/decode.c
index 4ee385504bea1c339957a3080e005c3bfaf02b41..e57211635ee700b0ea1bea48015d8709333b89fd 100644 (file)
--- a/mono/profiler/decode.c
+++ b/mono/profiler/decode.c
@@ -133,7 +133,7 @@ static char*
 pstrdup (const char *s)
 {
        int len = strlen (s) + 1;
-       char *p = malloc (len);
+       char *p = (char *)malloc (len);
        memcpy (p, s, len);
        return p;
 }
@@ -196,7 +196,7 @@ add_counter_to_section (Counter *counter)
        CounterSection *csection, *s;
        CounterList *clist;
 
-       clist = calloc (1, sizeof (CounterList));
+       clist = (CounterList *)calloc (1, sizeof (CounterList));
        clist->counter = counter;
 
        for (csection = counters_sections; csection; csection = csection->next) {
@@ -212,7 +212,7 @@ add_counter_to_section (Counter *counter)
        }
 
        /* If section does not exist */
-       csection = calloc (1, sizeof (CounterSection));
+       csection = (CounterSection *)calloc (1, sizeof (CounterSection));
        csection->value = counter->section;
        csection->counters = clist;
        csection->counters_last = clist;
@@ -237,7 +237,7 @@ add_counter (const char *section, const char *name, int type, int unit, int vari
                if (list->counter->index == index)
                        return;
 
-       counter = calloc (1, sizeof (Counter));
+       counter = (Counter *)calloc (1, sizeof (Counter));
        counter->section = section;
        counter->name = name;
        counter->type = type;
@@ -245,7 +245,7 @@ add_counter (const char *section, const char *name, int type, int unit, int vari
        counter->variance = variance;
        counter->index = index;
 
-       list = calloc (1, sizeof (CounterList));
+       list = (CounterList *)calloc (1, sizeof (CounterList));
        list->counter = counter;
 
        if (!counters) {
@@ -268,7 +268,7 @@ add_counter_to_timestamp (uint64_t timestamp, Counter *counter)
        CounterSection *csection;
        CounterList *clist;
 
-       clist = calloc (1, sizeof (CounterList));
+       clist = (CounterList *)calloc (1, sizeof (CounterList));
        clist->counter = counter;
 
        for (ctimestamp = counters_timestamps; ctimestamp; ctimestamp = ctimestamp->next) {
@@ -286,7 +286,7 @@ add_counter_to_timestamp (uint64_t timestamp, Counter *counter)
                        }
 
                        /* if timestamp exist and section does not exist */
-                       csection = calloc (1, sizeof (CounterSection));
+                       csection = (CounterSection *)calloc (1, sizeof (CounterSection));
                        csection->value = counter->section;
                        csection->counters = clist;
                        csection->counters_last = clist;
@@ -301,12 +301,12 @@ add_counter_to_timestamp (uint64_t timestamp, Counter *counter)
        }
 
        /* If timestamp do not exist and section does not exist */
-       csection = calloc (1, sizeof (CounterSection));
+       csection = (CounterSection *)calloc (1, sizeof (CounterSection));
        csection->value = counter->section;
        csection->counters = clist;
        csection->counters_last = clist;
 
-       ctimestamp = calloc (1, sizeof (CounterTimestamp));
+       ctimestamp = (CounterTimestamp *)calloc (1, sizeof (CounterTimestamp));
        ctimestamp->value = timestamp;
        ctimestamp->sections = csection;
        ctimestamp->sections_last = csection;
@@ -564,7 +564,7 @@ static void
 add_image (intptr_t image, char *name)
 {
        int slot = ((image >> 2) & 0xffff) % SMALL_HASH_SIZE;
-       ImageDesc *cd = malloc (sizeof (ImageDesc));
+       ImageDesc *cd = (ImageDesc *)malloc (sizeof (ImageDesc));
        cd->image = image;
        cd->filename = pstrdup (name);
        cd->next = image_hash [slot];
@@ -587,7 +587,7 @@ static void
 add_assembly (intptr_t assembly, char *name)
 {
        int slot = ((assembly >> 2) & 0xffff) % SMALL_HASH_SIZE;
-       AssemblyDesc *cd = malloc (sizeof (AssemblyDesc));
+       AssemblyDesc *cd = (AssemblyDesc *)malloc (sizeof (AssemblyDesc));
        cd->assembly = assembly;
        cd->asmname = pstrdup (name);
        cd->next = assembly_hash [slot];
@@ -635,7 +635,7 @@ add_class (intptr_t klass, const char *name)
                cd->name = pstrdup (name);
                return cd;
        }
-       cd = calloc (sizeof (ClassDesc), 1);
+       cd = (ClassDesc *)calloc (sizeof (ClassDesc), 1);
        cd->klass = klass;
        cd->name = pstrdup (name);
        cd->next = class_hash [slot];
@@ -701,7 +701,7 @@ add_method (intptr_t method, const char *name, intptr_t code, int len)
                cd->name = pstrdup (name);
                return cd;
        }
-       cd = calloc (sizeof (MethodDesc), 1);
+       cd = (MethodDesc *)calloc (sizeof (MethodDesc), 1);
        cd->method = method;
        cd->name = pstrdup (name);
        cd->code = code;
@@ -743,8 +743,8 @@ add_stat_sample (int type, uintptr_t ip) {
                size_stat_samples *= 2;
                if (!size_stat_samples)
                size_stat_samples = 32;
-               stat_samples = realloc (stat_samples, size_stat_samples * sizeof (uintptr_t));
-               stat_sample_desc = realloc (stat_sample_desc, size_stat_samples * sizeof (int));
+               stat_samples = (uintptr_t *)realloc (stat_samples, size_stat_samples * sizeof (uintptr_t));
+               stat_sample_desc = (int *)realloc (stat_sample_desc, size_stat_samples * sizeof (int));
        }
        stat_samples [num_stat_samples] = ip;
        stat_sample_desc [num_stat_samples++] = type;
@@ -772,8 +772,8 @@ lookup_method_by_ip (uintptr_t ip)
 static int
 compare_method_samples (const void *a, const void *b)
 {
-       MethodDesc *const*A = a;
-       MethodDesc *const*B = b;
+       MethodDesc *const *A = (MethodDesc *const *)a;
+       MethodDesc *const *B = (MethodDesc *const *)b;
        if ((*A)->sample_hits == (*B)->sample_hits)
                return 0;
        if ((*B)->sample_hits < (*A)->sample_hits)
@@ -798,8 +798,8 @@ static int usymbols_num = 0;
 static int
 compare_usymbol_addr (const void *a, const void *b)
 {
-       UnmanagedSymbol *const*A = a;
-       UnmanagedSymbol *const*B = b;
+       UnmanagedSymbol *const *A = (UnmanagedSymbol *const *)a;
+       UnmanagedSymbol *const *B = (UnmanagedSymbol *const *)b;
        if ((*B)->addr == (*A)->addr)
                return 0;
        if ((*B)->addr > (*A)->addr)
@@ -810,8 +810,8 @@ compare_usymbol_addr (const void *a, const void *b)
 static int
 compare_usymbol_samples (const void *a, const void *b)
 {
-       UnmanagedSymbol *const*A = a;
-       UnmanagedSymbol *const*B = b;
+       UnmanagedSymbol *const *A = (UnmanagedSymbol *const *)a;
+       UnmanagedSymbol *const *B = (UnmanagedSymbol *const *)b;
        if ((*B)->sample_hits == (*A)->sample_hits)
                return 0;
        if ((*B)->sample_hits < (*A)->sample_hits)
@@ -827,10 +827,10 @@ add_unmanaged_symbol (uintptr_t addr, char *name, uintptr_t size)
                int new_size = usymbols_size * 2;
                if (!new_size)
                        new_size = 16;
-               usymbols = realloc (usymbols, sizeof (void*) * new_size);
+               usymbols = (UnmanagedSymbol **)realloc (usymbols, sizeof (void*) * new_size);
                usymbols_size = new_size;
        }
-       sym = calloc (sizeof (UnmanagedSymbol), 1);
+       sym = (UnmanagedSymbol *)calloc (sizeof (UnmanagedSymbol), 1);
        sym->addr = addr;
        sym->name = name;
        sym->size = size;
@@ -875,10 +875,10 @@ add_unmanaged_binary (uintptr_t addr, char *name, uintptr_t size)
                int new_size = ubinaries_size * 2;
                if (!new_size)
                        new_size = 16;
-               ubinaries = realloc (ubinaries, sizeof (void*) * new_size);
+               ubinaries = (UnmanagedSymbol **)realloc (ubinaries, sizeof (void*) * new_size);
                ubinaries_size = new_size;
        }
-       sym = calloc (sizeof (UnmanagedSymbol), 1);
+       sym = (UnmanagedSymbol *)calloc (sizeof (UnmanagedSymbol), 1);
        sym->addr = addr;
        sym->name = name;
        sym->size = size;
@@ -965,7 +965,7 @@ dump_samples (void)
                                        msize *= 2;
                                        if (!msize)
                                                msize = 4;
-                                       cachedm = realloc (cachedm, sizeof (void*) * msize);
+                                       cachedm = (MethodDesc **)realloc (cachedm, sizeof (void*) * msize);
                                }
                                cachedm [count++] = m;
                        }
@@ -983,7 +983,7 @@ dump_samples (void)
                                                usize *= 2;
                                                if (!usize)
                                                        usize = 4;
-                                               cachedus = realloc (cachedus, sizeof (void*) * usize);
+                                               cachedus = (UnmanagedSymbol **)realloc (cachedus, sizeof (void*) * usize);
                                        }
                                        cachedus [ucount++] = usym;
                                }
@@ -1091,7 +1091,7 @@ add_heap_class_rev (HeapClassDesc *from, HeapClassDesc *to)
                to->rev_hash_size *= 2;
                if (to->rev_hash_size == 0)
                        to->rev_hash_size = 4;
-               n = calloc (sizeof (HeapClassRevRef) * to->rev_hash_size, 1);
+               n = (HeapClassRevRef *)calloc (sizeof (HeapClassRevRef) * to->rev_hash_size, 1);
                for (i = 0; i < old_size; ++i) {
                        if (to->rev_hash [i].klass)
                                add_rev_class_hashed (n, to->rev_hash_size, to->rev_hash [i].klass, to->rev_hash [i].count);
@@ -1133,9 +1133,9 @@ static int num_heap_shots = 0;
 static HeapShot*
 new_heap_shot (uint64_t timestamp)
 {
-       HeapShot *hs = calloc (sizeof (HeapShot), 1);
+       HeapShot *hs = (HeapShot *)calloc (sizeof (HeapShot), 1);
        hs->hash_size = 4;
-       hs->class_hash = calloc (sizeof (void*), hs->hash_size);
+       hs->class_hash = (HeapClassDesc **)calloc (sizeof (void*), hs->hash_size);
        hs->timestamp = timestamp;
        num_heap_shots++;
        hs->next = heap_shots;
@@ -1181,7 +1181,7 @@ add_heap_hashed (HeapClassDesc **hash, HeapClassDesc **retv, uintptr_t hsize, Cl
                                hash [i] = *retv;
                                return 1;
                        }
-                       hash [i] = calloc (sizeof (HeapClassDesc), 1);
+                       hash [i] = (HeapClassDesc *)calloc (sizeof (HeapClassDesc), 1);
                        hash [i]->klass = klass;
                        hash [i]->total_size += size;
                        hash [i]->count += count;
@@ -1208,7 +1208,7 @@ add_heap_shot_class (HeapShot *hs, ClassDesc *klass, uint64_t size)
                hs->hash_size *= 2;
                if (hs->hash_size == 0)
                        hs->hash_size = 4;
-               n = calloc (sizeof (void*) * hs->hash_size, 1);
+               n = (HeapClassDesc **)calloc (sizeof (void*) * hs->hash_size, 1);
                for (i = 0; i < old_size; ++i) {
                        res = hs->class_hash [i];
                        if (hs->class_hash [i])
@@ -1228,7 +1228,7 @@ add_heap_shot_class (HeapShot *hs, ClassDesc *klass, uint64_t size)
 static HeapObjectDesc*
 alloc_heap_obj (uintptr_t objaddr, HeapClassDesc *hklass, uintptr_t num_refs)
 {
-       HeapObjectDesc* ho = calloc (sizeof (HeapObjectDesc) + num_refs * sizeof (uintptr_t), 1);
+       HeapObjectDesc* ho = (HeapObjectDesc *)calloc (sizeof (HeapObjectDesc) + num_refs * sizeof (uintptr_t), 1);
        ho->objaddr = objaddr;
        ho->hklass = hklass;
        ho->num_refs = num_refs;
@@ -1311,7 +1311,7 @@ add_heap_shot_obj (HeapShot *hs, HeapObjectDesc *obj)
                hs->objects_hash_size *= 2;
                if (hs->objects_hash_size == 0)
                        hs->objects_hash_size = 4;
-               n = calloc (sizeof (void*) * hs->objects_hash_size, 1);
+               n = (HeapObjectDesc **)calloc (sizeof (void*) * hs->objects_hash_size, 1);
                for (i = 0; i < old_size; ++i) {
                        if (hs->objects_hash [i])
                                add_heap_hashed_obj (n, hs->objects_hash_size, hs->objects_hash [i]);
@@ -1365,7 +1365,7 @@ heap_shot_mark_objects (HeapShot *hs)
        if (!debug)
                return;
        /* consistency checks: it seems not all the objects are walked in the heap in some cases */
-       marks = calloc (hs->objects_hash_size, 1);
+       marks = (unsigned char *)calloc (hs->objects_hash_size, 1);
        if (!marks)
                return;
        for (i = 0; i < hs->num_roots; ++i) {
@@ -1478,14 +1478,14 @@ add_backtrace (int count, MethodDesc **methods)
                        return bt;
                bt = bt->next;
        }
-       bt = malloc (sizeof (BackTrace) + ((count - 1) * sizeof (void*)));
+       bt = (BackTrace *)malloc (sizeof (BackTrace) + ((count - 1) * sizeof (void*)));
        bt->next = backtrace_hash [slot];
        backtrace_hash [slot] = bt;
        if (next_backtrace == num_backtraces) {
                num_backtraces *= 2;
                if (!num_backtraces)
                        num_backtraces = 16;
-               backtraces = realloc (backtraces, sizeof (void*) * num_backtraces);
+               backtraces = (BackTrace **)realloc (backtraces, sizeof (void*) * num_backtraces);
        }
        bt->id = next_backtrace++;
        backtraces [bt->id] = bt;
@@ -1562,7 +1562,7 @@ static void
 ensure_buffer (ProfContext *ctx, int size)
 {
        if (ctx->size < size) {
-               ctx->buf = realloc (ctx->buf, size);
+               ctx->buf = (unsigned char *)realloc (ctx->buf, size);
                ctx->size = size;
        }
 }
@@ -1600,16 +1600,16 @@ get_thread (ProfContext *ctx, intptr_t thread_id)
                }
                thread = thread->next;
        }
-       thread = calloc (sizeof (ThreadContext), 1);
+       thread = (ThreadContext *)calloc (sizeof (ThreadContext), 1);
        thread->next = ctx->threads;
        ctx->threads = thread;
        thread->thread_id = thread_id;
        thread->last_time = 0;
        thread->stack_id = 0;
        thread->stack_size = 32;
-       thread->stack = malloc (thread->stack_size * sizeof (void*));
-       thread->time_stack = malloc (thread->stack_size * sizeof (uint64_t));
-       thread->callee_time_stack = malloc (thread->stack_size * sizeof (uint64_t));
+       thread->stack = (MethodDesc **)malloc (thread->stack_size * sizeof (void*));
+       thread->time_stack = (uint64_t *)malloc (thread->stack_size * sizeof (uint64_t));
+       thread->callee_time_stack = (uint64_t *)malloc (thread->stack_size * sizeof (uint64_t));
        return thread;
 }
 
@@ -1628,7 +1628,7 @@ get_domain (ProfContext *ctx, intptr_t domain_id)
                domain = domain->next;
        }
 
-       domain = calloc (sizeof (DomainContext), 1);
+       domain = (DomainContext *)calloc (sizeof (DomainContext), 1);
        domain->next = ctx->domains;
        ctx->domains = domain;
        domain->domain_id = domain_id;
@@ -1651,7 +1651,7 @@ get_remctx (ProfContext *ctx, intptr_t remctx_id)
                remctx = remctx->next;
        }
 
-       remctx = calloc (sizeof (RemCtxContext), 1);
+       remctx = (RemCtxContext *)calloc (sizeof (RemCtxContext), 1);
        remctx->next = ctx->remctxs;
        ctx->remctxs = remctx;
        remctx->remctx_id = remctx_id;
@@ -1672,9 +1672,9 @@ ensure_thread_stack (ThreadContext *thread)
 {
        if (thread->stack_id == thread->stack_size) {
                thread->stack_size *= 2;
-               thread->stack = realloc (thread->stack, thread->stack_size * sizeof (void*));
-               thread->time_stack = realloc (thread->time_stack, thread->stack_size * sizeof (uint64_t));
-               thread->callee_time_stack = realloc (thread->callee_time_stack, thread->stack_size * sizeof (uint64_t));
+               thread->stack = (MethodDesc **)realloc (thread->stack, thread->stack_size * sizeof (void*));
+               thread->time_stack = (uint64_t *)realloc (thread->time_stack, thread->stack_size * sizeof (uint64_t));
+               thread->callee_time_stack = (uint64_t *)realloc (thread->callee_time_stack, thread->stack_size * sizeof (uint64_t));
        }
 }
 
@@ -1715,7 +1715,7 @@ add_trace_bt (BackTrace *bt, TraceDesc *trace, uint64_t value)
                trace->size *= 2;
                if (trace->size == 0)
                        trace->size = 4;
-               n = calloc (sizeof (CallContext) * trace->size, 1);
+               n = (CallContext *)calloc (sizeof (CallContext) * trace->size, 1);
                for (i = 0; i < old_size; ++i) {
                        if (trace->traces [i].bt)
                                add_trace_hashed (n, trace->size, trace->traces [i].bt, trace->traces [i].count);
@@ -1761,9 +1761,9 @@ thread_add_root (ThreadContext *ctx, uintptr_t obj, int root_type, uintptr_t ext
                int new_size = ctx->size_roots * 2;
                if (!new_size)
                        new_size = 4;
-               ctx->roots = realloc (ctx->roots, new_size * sizeof (uintptr_t));
-               ctx->roots_extra = realloc (ctx->roots_extra, new_size * sizeof (uintptr_t));
-               ctx->roots_types = realloc (ctx->roots_types, new_size * sizeof (int));
+               ctx->roots = (uintptr_t *)realloc (ctx->roots, new_size * sizeof (uintptr_t));
+               ctx->roots_extra = (uintptr_t *)realloc (ctx->roots_extra, new_size * sizeof (uintptr_t));
+               ctx->roots_types = (int *)realloc (ctx->roots_types, new_size * sizeof (int));
                ctx->size_roots = new_size;
        }
        ctx->roots_types [ctx->num_roots] = root_type;
@@ -1774,8 +1774,8 @@ thread_add_root (ThreadContext *ctx, uintptr_t obj, int root_type, uintptr_t ext
 static int
 compare_callc (const void *a, const void *b)
 {
-       const CallContext *A = a;
-       const CallContext *B = b;
+       const CallContext *A = (const CallContext *)a;
+       const CallContext *B = (const CallContext *)b;
        if (B->count == A->count)
                return 0;
        if (B->count < A->count)
@@ -1908,7 +1908,7 @@ lookup_monitor (uintptr_t objid)
        while (cd && cd->objid != objid)
                cd = cd->next;
        if (!cd) {
-               cd = calloc (sizeof (MonitorDesc), 1);
+               cd = (MonitorDesc *)calloc (sizeof (MonitorDesc), 1);
                cd->objid = objid;
                cd->next = monitor_hash [slot];
                monitor_hash [slot] = cd;
@@ -1963,7 +1963,7 @@ decode_bt (MethodDesc** sframes, int *size, unsigned char *p, unsigned char **en
        if (flags != 0)
                return NULL;
        if (count > *size)
-               frames = malloc (count * sizeof (void*));
+               frames = (MethodDesc **)malloc (count * sizeof (void*));
        else
                frames = sframes;
        for (i = 0; i < count; ++i) {
@@ -2033,7 +2033,7 @@ static void
 found_object (uintptr_t obj)
 {
        num_tracked_objects ++;
-       tracked_objects = realloc (tracked_objects, num_tracked_objects * sizeof (tracked_objects [0]));
+       tracked_objects = (uintptr_t *)realloc (tracked_objects, num_tracked_objects * sizeof (tracked_objects [0]));
        tracked_objects [num_tracked_objects - 1] = obj;
 }
 
@@ -2120,8 +2120,8 @@ static void
 gather_coverage_statements (void)
 {
        for (guint i = 0; i < coverage_statements->len; i++) {
-               CoverageCoverage *coverage = coverage_statements->pdata[i];
-               CoverageMethod *method = g_hash_table_lookup (coverage_methods_hash, GINT_TO_POINTER (coverage->method_id));
+               CoverageCoverage *coverage = (CoverageCoverage *)coverage_statements->pdata[i];
+               CoverageMethod *method = (CoverageMethod *)g_hash_table_lookup (coverage_methods_hash, GINT_TO_POINTER (coverage->method_id));
                if (method == NULL) {
                        fprintf (outfile, "Cannot find method with ID: %d\n", coverage->method_id);
                        continue;
@@ -2163,7 +2163,7 @@ coverage_add_class (CoverageClass *klass)
        }
 
        g_ptr_array_add (coverage_classes, klass);
-       classes = g_hash_table_lookup (coverage_assembly_classes, klass->assembly_name);
+       classes = (GPtrArray *)g_hash_table_lookup (coverage_assembly_classes, klass->assembly_name);
        if (classes == NULL) {
                classes = g_ptr_array_new ();
                g_hash_table_insert (coverage_assembly_classes, klass->assembly_name, classes);
@@ -2768,7 +2768,7 @@ decode_buffer (ProfContext *ctx)
                                int codelen = decode_uleb128 (p, &p);
                                const char *name;
                                if (type == MONO_PROFILER_CODE_BUFFER_SPECIFIC_TRAMPOLINE) {
-                                       name = (void*)p;
+                                       name = (const char *)p;
                                        while (*p) p++;
                                                p++;
                                } else {
@@ -2877,7 +2877,7 @@ decode_buffer (ProfContext *ctx)
 
                                        type = decode_uleb128 (p, &p);
 
-                                       value = calloc (1, sizeof (CounterValue));
+                                       value = (CounterValue *)calloc (1, sizeof (CounterValue));
                                        value->timestamp = timestamp;
 
                                        switch (type) {
@@ -2885,11 +2885,11 @@ decode_buffer (ProfContext *ctx)
 #if SIZEOF_VOID_P == 4
                                        case MONO_COUNTER_WORD:
 #endif
-                                               value->buffer = malloc (sizeof (int32_t));
+                                               value->buffer = (unsigned char *)malloc (sizeof (int32_t));
                                                *(int32_t*)value->buffer = (int32_t)decode_sleb128 (p, &p) + (previous ? (*(int32_t*)previous->buffer) : 0);
                                                break;
                                        case MONO_COUNTER_UINT:
-                                               value->buffer = malloc (sizeof (uint32_t));
+                                               value->buffer = (unsigned char *)malloc (sizeof (uint32_t));
                                                *(uint32_t*)value->buffer = (uint32_t)decode_uleb128 (p, &p) + (previous ? (*(uint32_t*)previous->buffer) : 0);
                                                break;
                                        case MONO_COUNTER_LONG:
@@ -2897,15 +2897,15 @@ decode_buffer (ProfContext *ctx)
                                        case MONO_COUNTER_WORD:
 #endif
                                        case MONO_COUNTER_TIME_INTERVAL:
-                                               value->buffer = malloc (sizeof (int64_t));
+                                               value->buffer = (unsigned char *)malloc (sizeof (int64_t));
                                                *(int64_t*)value->buffer = (int64_t)decode_sleb128 (p, &p) + (previous ? (*(int64_t*)previous->buffer) : 0);
                                                break;
                                        case MONO_COUNTER_ULONG:
-                                               value->buffer = malloc (sizeof (uint64_t));
+                                               value->buffer = (unsigned char *)malloc (sizeof (uint64_t));
                                                *(uint64_t*)value->buffer = (uint64_t)decode_uleb128 (p, &p) + (previous ? (*(uint64_t*)previous->buffer) : 0);
                                                break;
                                        case MONO_COUNTER_DOUBLE:
-                                               value->buffer = malloc (sizeof (double));
+                                               value->buffer = (unsigned char *)malloc (sizeof (double));
 #if TARGET_BYTE_ORDER == G_LITTLE_ENDIAN
                                                for (i = 0; i < sizeof (double); i++)
 #else
@@ -2939,11 +2939,11 @@ decode_buffer (ProfContext *ctx)
                                int token, n_offsets, method_id;
 
                                p++;
-                               assembly = (void *)p; while (*p) p++; p++;
-                               klass = (void *)p; while (*p) p++; p++;
-                               name = (void *)p; while (*p) p++; p++;
-                               sig = (void *)p; while (*p) p++; p++;
-                               filename = (void *)p; while (*p) p++; p++;
+                               assembly = (const char *)p; while (*p) p++; p++;
+                               klass = (const char *)p; while (*p) p++; p++;
+                               name = (const char *)p; while (*p) p++; p++;
+                               sig = (const char *)p; while (*p) p++; p++;
+                               filename = (const char *)p; while (*p) p++; p++;
 
                                token = decode_uleb128 (p, &p);
                                method_id = decode_uleb128 (p, &p);
@@ -2989,9 +2989,9 @@ decode_buffer (ProfContext *ctx)
                                int number_of_methods, fully_covered, partially_covered;
                                p++;
 
-                               name = (void *)p; while (*p) p++; p++;
-                               guid = (void *)p; while (*p) p++; p++;
-                               filename = (void *)p; while (*p) p++; p++;
+                               name = (char *)p; while (*p) p++; p++;
+                               guid = (char *)p; while (*p) p++; p++;
+                               filename = (char *)p; while (*p) p++; p++;
                                number_of_methods = decode_uleb128 (p, &p);
                                fully_covered = decode_uleb128 (p, &p);
                                partially_covered = decode_uleb128 (p, &p);
@@ -3012,8 +3012,8 @@ decode_buffer (ProfContext *ctx)
                                int number_of_methods, fully_covered, partially_covered;
                                p++;
 
-                               assembly_name = (void *)p; while (*p) p++; p++;
-                               class_name = (void *)p; while (*p) p++; p++;
+                               assembly_name = (char *)p; while (*p) p++; p++;
+                               class_name = (char *)p; while (*p) p++; p++;
                                number_of_methods = decode_uleb128 (p, &p);
                                fully_covered = decode_uleb128 (p, &p);
                                partially_covered = decode_uleb128 (p, &p);
@@ -3049,7 +3049,7 @@ static ProfContext*
 load_file (char *name)
 {
        unsigned char *p;
-       ProfContext *ctx = calloc (sizeof (ProfContext), 1);
+       ProfContext *ctx = (ProfContext *)calloc (sizeof (ProfContext), 1);
        if (strcmp (name, "-") == 0)
                ctx->file = stdin;
        else
@@ -3091,8 +3091,8 @@ static int alloc_sort_mode = ALLOC_SORT_BYTES;
 static int
 compare_class (const void *a, const void *b)
 {
-       ClassDesc *const*A = a;
-       ClassDesc *const*B = b;
+       ClassDesc *const *A = (ClassDesc *const *)a;
+       ClassDesc *const *B = (ClassDesc *const *)b;
        uint64_t vala, valb;
        if (alloc_sort_mode == ALLOC_SORT_BYTES) {
                vala = (*A)->alloc_size;
@@ -3190,8 +3190,8 @@ dump_exceptions (void)
 static int
 compare_monitor (const void *a, const void *b)
 {
-       MonitorDesc *const*A = a;
-       MonitorDesc *const*B = b;
+       MonitorDesc *const *A = (MonitorDesc *const *)a;
+       MonitorDesc *const *B = (MonitorDesc *const *)b;
        if ((*B)->wait_time == (*A)->wait_time)
                return 0;
        if ((*B)->wait_time < (*A)->wait_time)
@@ -3206,7 +3206,7 @@ dump_monitors (void)
        int i, j;
        if (!num_monitors)
                return;
-       monitors = malloc (sizeof (void*) * num_monitors);
+       monitors = (MonitorDesc **)malloc (sizeof (void*) * num_monitors);
        for (i = 0, j = 0; i < SMALL_HASH_SIZE; ++i) {
                MonitorDesc *mdesc = monitor_hash [i];
                while (mdesc) {
@@ -3288,7 +3288,7 @@ dump_allocations (void)
        intptr_t allocs = 0;
        uint64_t size = 0;
        int header_done = 0;
-       ClassDesc **classes = malloc (num_classes * sizeof (void*));
+       ClassDesc **classes = (ClassDesc **)malloc (num_classes * sizeof (void*));
        ClassDesc *cd;
        c = 0;
        for (i = 0; i < HASH_SIZE; ++i) {
@@ -3331,8 +3331,8 @@ static int method_sort_mode = METHOD_SORT_TOTAL;
 static int
 compare_method (const void *a, const void *b)
 {
-       MethodDesc *const*A = a;
-       MethodDesc *const*B = b;
+       MethodDesc *const *A = (MethodDesc *const *)a;
+       MethodDesc *const *B = (MethodDesc *const *)b;
        uint64_t vala, valb;
        if (method_sort_mode == METHOD_SORT_SELF) {
                vala = (*A)->self_time;
@@ -3387,7 +3387,7 @@ dump_methods (void)
        int i, c;
        uint64_t calls = 0;
        int header_done = 0;
-       MethodDesc **methods = malloc (num_methods * sizeof (void*));
+       MethodDesc **methods = (MethodDesc **)malloc (num_methods * sizeof (void*));
        MethodDesc *cd;
        c = 0;
        for (i = 0; i < HASH_SIZE; ++i) {
@@ -3428,8 +3428,8 @@ dump_methods (void)
 static int
 compare_heap_class (const void *a, const void *b)
 {
-       HeapClassDesc *const*A = a;
-       HeapClassDesc *const*B = b;
+       HeapClassDesc *const *A = (HeapClassDesc *const *)a;
+       HeapClassDesc *const *B = (HeapClassDesc *const *)b;
        uint64_t vala, valb;
        if (alloc_sort_mode == ALLOC_SORT_BYTES) {
                vala = (*A)->total_size;
@@ -3448,8 +3448,8 @@ compare_heap_class (const void *a, const void *b)
 static int
 compare_rev_class (const void *a, const void *b)
 {
-       const HeapClassRevRef *A = a;
-       const HeapClassRevRef *B = b;
+       const HeapClassRevRef *A = (const HeapClassRevRef *)a;
+       const HeapClassRevRef *B = (const HeapClassRevRef *)b;
        if (B->count == A->count)
                return 0;
        if (B->count < A->count)
@@ -3482,7 +3482,7 @@ heap_shot_summary (HeapShot *hs, int hs_num, HeapShot *last_hs)
        int i;
        HeapClassDesc *cd;
        HeapClassDesc **sorted;
-       sorted = malloc (sizeof (void*) * hs->class_count);
+       sorted = (HeapClassDesc **)malloc (sizeof (void*) * hs->class_count);
        for (i = 0; i < hs->hash_size; ++i) {
                cd = hs->class_hash [i];
                if (!cd)
@@ -3523,7 +3523,7 @@ heap_shot_summary (HeapShot *hs, int hs_num, HeapShot *last_hs)
                }
                if (!collect_traces)
                        continue;
-               rev_sorted = malloc (cd->rev_count * sizeof (HeapClassRevRef));
+               rev_sorted = (HeapClassRevRef *)malloc (cd->rev_count * sizeof (HeapClassRevRef));
                k = 0;
                for (j = 0; j < cd->rev_hash_size; ++j) {
                        if (cd->rev_hash [j].klass)
@@ -3542,8 +3542,8 @@ heap_shot_summary (HeapShot *hs, int hs_num, HeapShot *last_hs)
 static int
 compare_heap_shots (const void *a, const void *b)
 {
-       HeapShot *const*A = a;
-       HeapShot *const*B = b;
+       HeapShot *const *A = (HeapShot *const *)a;
+       HeapShot *const *B = (HeapShot *const *)b;
        if ((*B)->timestamp == (*A)->timestamp)
                return 0;
        if ((*B)->timestamp > (*A)->timestamp)
@@ -3560,7 +3560,7 @@ dump_heap_shots (void)
        int i;
        if (!heap_shots)
                return;
-       hs_sorted = malloc (num_heap_shots * sizeof (void*));
+       hs_sorted = (HeapShot **)malloc (num_heap_shots * sizeof (void*));
        fprintf (outfile, "\nHeap shot summary\n");
        i = 0;
        for (hs = heap_shots; hs; hs = hs->next)
@@ -3650,7 +3650,7 @@ dump_coverage (void)
        g_ptr_array_sort (coverage_assemblies, sort_assemblies);
 
        for (guint i = 0; i < coverage_assemblies->len; i++) {
-               CoverageAssembly *assembly = coverage_assemblies->pdata[i];
+               CoverageAssembly *assembly = (CoverageAssembly *)coverage_assemblies->pdata[i];
                GPtrArray *classes;
 
                if (assembly->number_of_methods != 0) {
@@ -3670,10 +3670,10 @@ dump_coverage (void)
                        g_free (escaped_filename);
                }
 
-               classes = g_hash_table_lookup (coverage_assembly_classes, assembly->name);
+               classes = (GPtrArray *)g_hash_table_lookup (coverage_assembly_classes, assembly->name);
                if (classes) {
                        for (guint j = 0; j < classes->len; j++) {
-                               CoverageClass *klass = classes->pdata[j];
+                               CoverageClass *klass = (CoverageClass *)classes->pdata [j];
 
                                if (klass->number_of_methods > 0) {
                                        int percentage = ((klass->fully_covered + klass->partially_covered) * 100) / klass->number_of_methods;
@@ -3693,7 +3693,7 @@ dump_coverage (void)
        }
 
        for (guint i = 0; i < coverage_methods->len; i++) {
-               CoverageMethod *method = coverage_methods->pdata[i];
+               CoverageMethod *method = (CoverageMethod *)coverage_methods->pdata [i];
 
                if (coverage_outfile) {
                        char *escaped_assembly, *escaped_class, *escaped_method, *escaped_sig, *escaped_filename;
@@ -3713,7 +3713,7 @@ dump_coverage (void)
                        g_free (escaped_filename);
 
                        for (guint j = 0; j < method->coverage->len; j++) {
-                               CoverageCoverage *coverage = method->coverage->pdata[j];
+                               CoverageCoverage *coverage = (CoverageCoverage *)method->coverage->pdata [j];
                                fprintf (coverage_outfile, "\t\t<statement offset=\"%d\" counter=\"%d\" line=\"%d\" column=\"%d\"/>\n", coverage->offset, coverage->count, coverage->line, coverage->column);
                        }
                        fprintf (coverage_outfile, "\t</method>\n");

diff --git a/mono/profiler/mono-profiler-aot.c b/mono/profiler/mono-profiler-aot.c
index ba614b4de7e0f6c55e4cd49ce7c433522f6344c1..79d80717aaabb9fed6e46a05a8403e7a5f2cd43e 100644 (file)
--- a/mono/profiler/mono-profiler-aot.c
+++ b/mono/profiler/mono-profiler-aot.c
@@ -124,7 +124,7 @@ prof_jit_leave (MonoProfiler *prof, MonoMethod *method, int result)
        MonoImage *image = mono_class_get_image (mono_method_get_class (method));
        PerImageData *data;
 
-       data = g_hash_table_lookup (prof->images, image);
+       data = (PerImageData *)g_hash_table_lookup (prof->images, image);
        if (!data) {
                data = g_new0 (PerImageData, 1);
                g_hash_table_insert (prof->images, image, data);

diff --git a/mono/profiler/mono-profiler-iomap.c b/mono/profiler/mono-profiler-iomap.c
index bc0dd2c1b65cc1ad70d71a62ae54332c18750afa..0dff9e980880e9e276e33182ceb53ea43ff693e4 100644 (file)
--- a/mono/profiler/mono-profiler-iomap.c
+++ b/mono/profiler/mono-profiler-iomap.c
@@ -23,7 +23,7 @@
 #include <mono/metadata/threads.h>
 #include <mono/metadata/profiler.h>
 #include <mono/metadata/loader.h>
-#include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-os-mutex.h>
 
 #define LOCATION_INDENT "        "
 #define BACKTRACE_SIZE 64
@@ -112,7 +112,7 @@ static void mismatched_stats_foreach_func (gpointer key, gpointer value, gpointe
                return;
        }
 
-       location = g_hash_table_lookup (prof->string_locations_hash, &hash);
+       location = (StringLocation *)g_hash_table_lookup (prof->string_locations_hash, &hash);
        while (location) {
                if (location->hint && strlen (location->hint) > 0) {
                        if (!bannerShown) {
@@ -243,7 +243,7 @@ static gboolean saved_strings_find_func (gpointer key, gpointer value, gpointer
 
 static inline void store_string_location (MonoProfiler *prof, const gchar *string, guint32 hash, size_t len)
 {
-       StringLocation *location = g_hash_table_lookup (prof->string_locations_hash, &hash);
+       StringLocation *location = (StringLocation *)g_hash_table_lookup (prof->string_locations_hash, &hash);
        SavedString *saved;
        SavedStringFindInfo info;
        guint32 *hashptr;
@@ -461,7 +461,7 @@ static void mono_portability_remember_string (MonoProfiler *prof, MonoDomain *do
                return;
        }
 
-       mono_mutex_lock (&mismatched_files_section);
+       mono_os_mutex_lock (&mismatched_files_section);
        head = (SavedString*)g_hash_table_lookup (prof->saved_strings_hash, (gpointer)str);
        if (head) {
                while (head->next)
@@ -469,7 +469,7 @@ static void mono_portability_remember_string (MonoProfiler *prof, MonoDomain *do
                head->next = entry;
        } else
                g_hash_table_insert (prof->saved_strings_hash, (gpointer)str, (gpointer)entry);
-       mono_mutex_unlock (&mismatched_files_section);
+       mono_os_mutex_unlock (&mismatched_files_section);
 }
 
 static MonoClass *string_class = NULL;
@@ -489,7 +489,7 @@ static void mono_portability_iomap_event (MonoProfiler *prof, const char *report
        if (!runtime_initialized)
                return;
 
-       mono_mutex_lock (&mismatched_files_section);
+       mono_os_mutex_lock (&mismatched_files_section);
        hash = calc_strings_hash (pathname, new_pathname, &pathnameHash);
        stats = (MismatchedFilesStats*)g_hash_table_lookup (prof->mismatched_files_hash, &hash);
        if (stats == NULL) {
@@ -507,11 +507,11 @@ static void mono_portability_iomap_event (MonoProfiler *prof, const char *report
                        g_error ("Out of memory allocating integer pointer for mismatched files hash table.");
 
                store_string_location (prof, (const gchar*)stats->requestedName, pathnameHash, strlen (stats->requestedName));
-               mono_mutex_unlock (&mismatched_files_section);
+               mono_os_mutex_unlock (&mismatched_files_section);
 
                print_report ("%s -     Found file path: '%s'\n", report, new_pathname);
        } else {
-               mono_mutex_unlock (&mismatched_files_section);
+               mono_os_mutex_unlock (&mismatched_files_section);
                stats->count++;
        }
 }
@@ -525,14 +525,14 @@ static void runtime_initialized_cb (MonoProfiler *prof)
 static void profiler_shutdown (MonoProfiler *prof)
 {
        print_mismatched_stats (prof);
-       mono_mutex_destroy (&mismatched_files_section);
+       mono_os_mutex_destroy (&mismatched_files_section);
 }
 
 void mono_profiler_startup (const char *desc)
 {
        MonoProfiler *prof = g_new0 (MonoProfiler, 1);
 
-       mono_mutex_init (&mismatched_files_section);
+       mono_os_mutex_init (&mismatched_files_section);
        prof->mismatched_files_hash = g_hash_table_new (mismatched_files_guint32_hash, mismatched_files_guint32_equal);
        prof->saved_strings_hash = g_hash_table_new (NULL, NULL);
        prof->string_locations_hash = g_hash_table_new (mismatched_files_guint32_hash, mismatched_files_guint32_equal);
@@ -542,5 +542,5 @@ void mono_profiler_startup (const char *desc)
        mono_profiler_install_iomap (mono_portability_iomap_event);
        mono_profiler_install_allocation (mono_portability_remember_alloc);
 
-       mono_profiler_set_events (MONO_PROFILE_ALLOCATIONS | MONO_PROFILE_IOMAP_EVENTS);
+       mono_profiler_set_events ((MonoProfileFlags)(MONO_PROFILE_ALLOCATIONS | MONO_PROFILE_IOMAP_EVENTS));
 }

diff --git a/mono/profiler/proflog.c b/mono/profiler/proflog.c
index 83871f2689210cd08b77777f9ae207a27f101654..9120ae06916850b4154f96828b7bb34757b40a41 100644 (file)
--- a/mono/profiler/proflog.c
+++ b/mono/profiler/proflog.c
@@ -23,7 +23,7 @@
 #include <mono/utils/atomic.h>
 #include <mono/utils/mono-membar.h>
 #include <mono/utils/mono-counters.h>
-#include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-os-mutex.h>
 #include <mono/utils/mono-conc-hashtable.h>
 #include <mono/utils/lock-free-queue.h>
 #include <stdlib.h>
@@ -522,7 +522,7 @@ static char*
 pstrdup (const char *s)
 {
        int len = strlen (s) + 1;
-       char *p = malloc (len);
+       char *p = (char *)malloc (len);
        memcpy (p, s, len);
        return p;
 }
@@ -530,7 +530,7 @@ pstrdup (const char *s)
 static StatBuffer*
 create_stat_buffer (void)
 {
-       StatBuffer* buf = alloc_buffer (BUFFER_SIZE);
+       StatBuffer* buf = (StatBuffer *)alloc_buffer (BUFFER_SIZE);
        buf->size = BUFFER_SIZE;
        buf->data_end = (uintptr_t*)((unsigned char*)buf + buf->size);
        buf->data = buf->buf;
@@ -540,7 +540,7 @@ create_stat_buffer (void)
 static LogBuffer*
 create_buffer (void)
 {
-       LogBuffer* buf = alloc_buffer (BUFFER_SIZE);
+       LogBuffer* buf = (LogBuffer *)alloc_buffer (BUFFER_SIZE);
        buf->size = BUFFER_SIZE;
        buf->time_base = current_time ();
        buf->last_time = buf->time_base;
@@ -571,29 +571,29 @@ ensure_logbuf_inner (LogBuffer *old, int bytes)
        if (old && old->data + bytes + 100 < old->data_end)
                return old;
 
-       LogBuffer *new = create_buffer ();
-       new->thread_id = thread_id ();
-       new->next = old;
+       LogBuffer *new_ = (LogBuffer *)create_buffer ();
+       new_->thread_id = thread_id ();
+       new_->next = old;
 
        if (old)
-               new->call_depth = old->call_depth;
+               new_->call_depth = old->call_depth;
 
-       return new;
+       return new_;
 }
 
 static LogBuffer*
 ensure_logbuf (int bytes)
 {
        LogBuffer *old = TLS_GET (LogBuffer, tlsbuffer);
-       LogBuffer *new = ensure_logbuf_inner (old, bytes);
+       LogBuffer *new_ = ensure_logbuf_inner (old, bytes);
 
-       if (new == old)
+       if (new_ == old)
                return old; // Still enough space.
 
-       TLS_SET (tlsbuffer, new);
+       TLS_SET (tlsbuffer, new_);
        init_thread ();
 
-       return new;
+       return new_;
 }
 
 static void
@@ -720,7 +720,7 @@ register_method_local (MonoProfiler *prof, MonoMethod *method, MonoJitInfo *ji)
                 */
                //g_assert (ji);
 
-               MethodInfo *info = malloc (sizeof (MethodInfo));
+               MethodInfo *info = (MethodInfo *)malloc (sizeof (MethodInfo));
 
                info->method = method;
                info->ji = ji;
@@ -845,7 +845,7 @@ dump_header (MonoProfiler *profiler)
 static void
 send_buffer (MonoProfiler *prof, GPtrArray *methods, LogBuffer *buffer)
 {
-       WriterQueueEntry *entry = calloc (1, sizeof (WriterQueueEntry));
+       WriterQueueEntry *entry = (WriterQueueEntry *)calloc (1, sizeof (WriterQueueEntry));
        mono_lock_free_queue_node_init (&entry->node, FALSE);
        entry->methods = methods;
        entry->buffer = buffer;
@@ -1056,7 +1056,7 @@ static int num_frames = MAX_FRAMES;
 static mono_bool
 walk_stack (MonoMethod *method, int32_t native_offset, int32_t il_offset, mono_bool managed, void* data)
 {
-       FrameData *frame = data;
+       FrameData *frame = (FrameData *)data;
        if (method && frame->count < num_frames) {
                frame->il_offsets [frame->count] = il_offset;
                frame->native_offsets [frame->count] = native_offset;
@@ -1271,7 +1271,7 @@ type_name (MonoClass *klass)
        char buf [1024];
        char *p;
        push_nesting (buf, klass);
-       p = malloc (strlen (buf) + 1);
+       p = (char *)malloc (strlen (buf) + 1);
        strcpy (p, buf);
        return p;
 }
@@ -1595,7 +1595,7 @@ code_buffer_new (MonoProfiler *prof, void *buffer, int size, MonoProfilerCodeBuf
        char *name;
        LogBuffer *logbuffer;
        if (type == MONO_PROFILER_CODE_BUFFER_SPECIFIC_TRAMPOLINE) {
-               name = data;
+               name = (char *)data;
                nlen = strlen (name) + 1;
        } else {
                name = NULL;
@@ -1959,7 +1959,7 @@ typedef struct {
 static mono_bool
 async_walk_stack (MonoMethod *method, MonoDomain *domain, void *base_address, int offset, void *data)
 {
-       AsyncFrameData *frame = data;
+       AsyncFrameData *frame = (AsyncFrameData *)data;
        if (frame->count < num_frames) {
                frame->data [frame->count].method = method;
                frame->data [frame->count].domain = domain;
@@ -2017,7 +2017,7 @@ mono_sample_hit (MonoProfiler *profiler, unsigned char *ip, void *context)
                do {
                        oldsb = profiler->stat_buffers;
                        sbuf->next = oldsb;
-                       foundsb = InterlockedCompareExchangePointer ((void * volatile*)&profiler->stat_buffers, sbuf, oldsb);
+                       foundsb = (StatBuffer *)InterlockedCompareExchangePointer ((void * volatile*)&profiler->stat_buffers, sbuf, oldsb);
                } while (foundsb != oldsb);
                if (do_debug)
                        ign_res (write (2, "overflow\n", 9));
@@ -2032,7 +2032,7 @@ mono_sample_hit (MonoProfiler *profiler, unsigned char *ip, void *context)
        do {
                old_data = sbuf->data;
                new_data = old_data + SAMPLE_EVENT_SIZE_IN_SLOTS (bt_data.count);
-               data = InterlockedCompareExchangePointer ((void * volatile*)&sbuf->data, new_data, old_data);
+               data = (uintptr_t *)InterlockedCompareExchangePointer ((void * volatile*)&sbuf->data, new_data, old_data);
        } while (data != old_data);
        if (old_data >= sbuf->data_end)
                return; /* lost event */
@@ -2089,7 +2089,7 @@ add_code_pointer (uintptr_t ip)
                size_code_pages *= 2;
                if (size_code_pages == 0)
                        size_code_pages = 16;
-               n = calloc (sizeof (uintptr_t) * size_code_pages, 1);
+               n = (uintptr_t *)calloc (sizeof (uintptr_t) * size_code_pages, 1);
                for (i = 0; i < old_size; ++i) {
                        if (code_pages [i])
                                add_code_page (n, size_code_pages, code_pages [i]);
@@ -2425,7 +2425,7 @@ dump_sample_hits (MonoProfiler *prof, StatBuffer *sbuf)
        g_ptr_array_sort (prof->sorted_sample_events, compare_sample_events);
 
        for (guint sidx = 0; sidx < prof->sorted_sample_events->len; sidx++) {
-               uintptr_t *sample = g_ptr_array_index (prof->sorted_sample_events, sidx);
+               uintptr_t *sample = (uintptr_t *)g_ptr_array_index (prof->sorted_sample_events, sidx);
                int count = sample [0] & 0xff;
                int mbt_count = (sample [0] & 0xff00) >> 8;
                int type = sample [0] >> 16;
@@ -2438,7 +2438,7 @@ dump_sample_hits (MonoProfiler *prof, StatBuffer *sbuf)
                        void *address = (void*)managed_sample_base [i * 4 + 2];
 
                        if (!method) {
-                               MonoJitInfo *ji = mono_jit_info_table_find (domain, address);
+                               MonoJitInfo *ji = mono_jit_info_table_find (domain, (char *)address);
 
                                if (ji)
                                        managed_sample_base [i * 4 + 0] = (uintptr_t)mono_jit_info_get_method (ji);
@@ -2781,7 +2781,7 @@ counters_add_agent (MonoCounter *counter)
        if (!counters_initialized)
                return;
 
-       mono_mutex_lock (&counters_mutex);
+       mono_os_mutex_lock (&counters_mutex);
 
        for (agent = counters; agent; agent = agent->next) {
                if (agent->counter == counter) {
@@ -2790,12 +2790,12 @@ counters_add_agent (MonoCounter *counter)
                                free (agent->value);
                                agent->value = NULL;
                        }
-                       mono_mutex_unlock (&counters_mutex);
+                       mono_os_mutex_unlock (&counters_mutex);
                        return;
                }
        }
 
-       agent = malloc (sizeof (MonoCounterAgent));
+       agent = (MonoCounterAgent *)malloc (sizeof (MonoCounterAgent));
        agent->counter = counter;
        agent->value = NULL;
        agent->value_size = 0;
@@ -2812,7 +2812,7 @@ counters_add_agent (MonoCounter *counter)
                item->next = agent;
        }
 
-       mono_mutex_unlock (&counters_mutex);
+       mono_os_mutex_unlock (&counters_mutex);
 }
 
 static mono_bool
@@ -2827,7 +2827,7 @@ counters_init (MonoProfiler *profiler)
 {
        assert (!counters_initialized);
 
-       mono_mutex_init (&counters_mutex);
+       mono_os_mutex_init (&counters_mutex);
 
        counters_initialized = TRUE;
 
@@ -2849,7 +2849,7 @@ counters_emit (MonoProfiler *profiler)
        if (!counters_initialized)
                return;
 
-       mono_mutex_lock (&counters_mutex);
+       mono_os_mutex_lock (&counters_mutex);
 
        for (agent = counters; agent; agent = agent->next) {
                if (agent->emitted)
@@ -2868,7 +2868,7 @@ counters_emit (MonoProfiler *profiler)
        }
 
        if (!len) {
-               mono_mutex_unlock (&counters_mutex);
+               mono_os_mutex_unlock (&counters_mutex);
                return;
        }
 
@@ -2897,7 +2897,7 @@ counters_emit (MonoProfiler *profiler)
 
        safe_send (profiler, logbuffer);
 
-       mono_mutex_unlock (&counters_mutex);
+       mono_os_mutex_unlock (&counters_mutex);
 }
 
 static void
@@ -2919,7 +2919,7 @@ counters_sample (MonoProfiler *profiler, uint64_t timestamp)
        buffer_size = 8;
        buffer = calloc (1, buffer_size);
 
-       mono_mutex_lock (&counters_mutex);
+       mono_os_mutex_lock (&counters_mutex);
 
        size =
                EVENT_SIZE /* event */ +
@@ -3028,7 +3028,7 @@ counters_sample (MonoProfiler *profiler, uint64_t timestamp)
 
        safe_send (profiler, logbuffer);
 
-       mono_mutex_unlock (&counters_mutex);
+       mono_os_mutex_unlock (&counters_mutex);
 }
 
 typedef struct _PerfCounterAgent PerfCounterAgent;
@@ -3144,7 +3144,7 @@ perfcounters_sample (MonoProfiler *profiler, uint64_t timestamp)
        if (!counters_initialized)
                return;
 
-       mono_mutex_lock (&counters_mutex);
+       mono_os_mutex_lock (&counters_mutex);
 
        /* mark all perfcounters as deleted, foreach will unmark them as necessary */
        for (pcagent = perfcounters; pcagent; pcagent = pcagent->next)
@@ -3194,7 +3194,7 @@ perfcounters_sample (MonoProfiler *profiler, uint64_t timestamp)
 
        safe_send (profiler, logbuffer);
 
-       mono_mutex_unlock (&counters_mutex);
+       mono_os_mutex_unlock (&counters_mutex);
 }
 
 static void
@@ -3275,7 +3275,7 @@ parse_generic_type_names(char *name)
        if (name == NULL || *name == '\0')
                return g_strdup ("");
 
-       if (!(ret = new_name = calloc (strlen (name) * 4 + 1, sizeof (char))))
+       if (!(ret = new_name = (char *)calloc (strlen (name) * 4 + 1, sizeof (char))))
                return NULL;
 
        do {
@@ -3340,7 +3340,7 @@ build_method_buffer (gpointer key, gpointer value, gpointer userdata)
        method_name = mono_method_get_name (method);
 
        if (coverage_data->len != 0) {
-               CoverageEntry *entry = coverage_data->pdata[0];
+               CoverageEntry *entry = (CoverageEntry *)coverage_data->pdata[0];
                first_filename = entry->filename ? entry->filename : "";
        } else
                first_filename = "";
@@ -3377,7 +3377,7 @@ build_method_buffer (gpointer key, gpointer value, gpointer userdata)
        safe_send (prof, logbuffer);
 
        for (i = 0; i < coverage_data->len; i++) {
-               CoverageEntry *entry = coverage_data->pdata[i];
+               CoverageEntry *entry = (CoverageEntry *)coverage_data->pdata[i];
 
                logbuffer = ensure_logbuf (
                        EVENT_SIZE /* event */ +
@@ -3473,7 +3473,7 @@ build_class_buffer (gpointer key, gpointer value, gpointer userdata)
 static void
 get_coverage_for_image (MonoImage *image, int *number_of_methods, guint *fully_covered, int *partially_covered)
 {
-       MonoLockFreeQueue *image_methods = mono_conc_hashtable_lookup (image_to_methods, image);
+       MonoLockFreeQueue *image_methods = (MonoLockFreeQueue *)mono_conc_hashtable_lookup (image_to_methods, image);
 
        *number_of_methods = mono_image_get_table_rows (image, MONO_TABLE_METHOD);
        if (image_methods)
@@ -3538,11 +3538,11 @@ dump_coverage (MonoProfiler *prof)
        COVERAGE_DEBUG(fprintf (stderr, "Coverage: Started dump\n");)
        method_id = 0;
 
-       mono_mutex_lock (&coverage_mutex);
+       mono_os_mutex_lock (&coverage_mutex);
        mono_conc_hashtable_foreach (coverage_assemblies, build_assembly_buffer, prof);
        mono_conc_hashtable_foreach (coverage_classes, build_class_buffer, prof);
        mono_conc_hashtable_foreach (coverage_methods, build_method_buffer, prof);
-       mono_mutex_unlock (&coverage_mutex);
+       mono_os_mutex_unlock (&coverage_mutex);
 
        COVERAGE_DEBUG(fprintf (stderr, "Coverage: Finished dump\n");)
 }
@@ -3562,15 +3562,15 @@ process_method_enter_coverage (MonoProfiler *prof, MonoMethod *method)
        if (mono_conc_hashtable_lookup (suppressed_assemblies, (gpointer) mono_image_get_name (image)))
                return;
 
-       mono_mutex_lock (&coverage_mutex);
+       mono_os_mutex_lock (&coverage_mutex);
        mono_conc_hashtable_insert (entered_methods, method, method);
-       mono_mutex_unlock (&coverage_mutex);
+       mono_os_mutex_unlock (&coverage_mutex);
 }
 
 static MonoLockFreeQueueNode *
 create_method_node (MonoMethod *method)
 {
-       MethodNode *node = g_malloc (sizeof (MethodNode));
+       MethodNode *node = (MethodNode *)g_malloc (sizeof (MethodNode));
        mono_lock_free_queue_node_init ((MonoLockFreeQueueNode *) node, FALSE);
        node->method = method;
 
@@ -3631,7 +3631,7 @@ coverage_filter (MonoProfiler *prof, MonoMethod *method)
                has_positive = FALSE;
                found = FALSE;
                for (guint i = 0; i < prof->coverage_filters->len; ++i) {
-                       char *filter = g_ptr_array_index (prof->coverage_filters, i);
+                       char *filter = (char *)g_ptr_array_index (prof->coverage_filters, i);
 
                        if (filter [0] == '+') {
                                filter = &filter [1];
@@ -3651,9 +3651,9 @@ coverage_filter (MonoProfiler *prof, MonoMethod *method)
                if (has_positive && !found) {
                        COVERAGE_DEBUG(fprintf (stderr, "   Positive match was not found\n");)
 
-                       mono_mutex_lock (&coverage_mutex);
+                       mono_os_mutex_lock (&coverage_mutex);
                        mono_conc_hashtable_insert (filtered_classes, klass, klass);
-                       mono_mutex_unlock (&coverage_mutex);
+                       mono_os_mutex_unlock (&coverage_mutex);
                        g_free (fqn);
                        g_free (classname);
 
@@ -3662,7 +3662,7 @@ coverage_filter (MonoProfiler *prof, MonoMethod *method)
 
                for (guint i = 0; i < prof->coverage_filters->len; ++i) {
                        // FIXME: Is substring search sufficient?
-                       char *filter = g_ptr_array_index (prof->coverage_filters, i);
+                       char *filter = (char *)g_ptr_array_index (prof->coverage_filters, i);
                        if (filter [0] == '+')
                                continue;
 
@@ -3673,9 +3673,9 @@ coverage_filter (MonoProfiler *prof, MonoMethod *method)
                        if (strstr (fqn, filter) != NULL) {
                                COVERAGE_DEBUG(fprintf (stderr, "matched\n");)
 
-                               mono_mutex_lock (&coverage_mutex);
+                               mono_os_mutex_lock (&coverage_mutex);
                                mono_conc_hashtable_insert (filtered_classes, klass, klass);
-                               mono_mutex_unlock (&coverage_mutex);
+                               mono_os_mutex_unlock (&coverage_mutex);
                                g_free (fqn);
                                g_free (classname);
 
@@ -3696,32 +3696,32 @@ coverage_filter (MonoProfiler *prof, MonoMethod *method)
 
        assembly = mono_image_get_assembly (image);
 
-       mono_mutex_lock (&coverage_mutex);
+       mono_os_mutex_lock (&coverage_mutex);
        mono_conc_hashtable_insert (coverage_methods, method, method);
        mono_conc_hashtable_insert (coverage_assemblies, assembly, assembly);
-       mono_mutex_unlock (&coverage_mutex);
+       mono_os_mutex_unlock (&coverage_mutex);
 
-       image_methods = mono_conc_hashtable_lookup (image_to_methods, image);
+       image_methods = (MonoLockFreeQueue *)mono_conc_hashtable_lookup (image_to_methods, image);
 
        if (image_methods == NULL) {
-               image_methods = g_malloc (sizeof (MonoLockFreeQueue));
+               image_methods = (MonoLockFreeQueue *)g_malloc (sizeof (MonoLockFreeQueue));
                mono_lock_free_queue_init (image_methods);
-               mono_mutex_lock (&coverage_mutex);
+               mono_os_mutex_lock (&coverage_mutex);
                mono_conc_hashtable_insert (image_to_methods, image, image_methods);
-               mono_mutex_unlock (&coverage_mutex);
+               mono_os_mutex_unlock (&coverage_mutex);
        }
 
        node = create_method_node (method);
        mono_lock_free_queue_enqueue (image_methods, node);
 
-       class_methods = mono_conc_hashtable_lookup (coverage_classes, klass);
+       class_methods = (MonoLockFreeQueue *)mono_conc_hashtable_lookup (coverage_classes, klass);
 
        if (class_methods == NULL) {
-               class_methods = g_malloc (sizeof (MonoLockFreeQueue));
+               class_methods = (MonoLockFreeQueue *)g_malloc (sizeof (MonoLockFreeQueue));
                mono_lock_free_queue_init (class_methods);
-               mono_mutex_lock (&coverage_mutex);
+               mono_os_mutex_lock (&coverage_mutex);
                mono_conc_hashtable_insert (coverage_classes, klass, class_methods);
-               mono_mutex_unlock (&coverage_mutex);
+               mono_os_mutex_unlock (&coverage_mutex);
        }
 
        node = create_method_node (method);
@@ -3756,7 +3756,7 @@ get_file_content (FILE *stream)
        if (filesize > MAX_FILE_SIZE)
          return NULL;
 
-       buffer = g_malloc ((filesize + 1) * sizeof (char));
+       buffer = (char *)g_malloc ((filesize + 1) * sizeof (char));
        while ((bytes_read = fread (buffer + offset, 1, LINE_BUFFER_SIZE, stream)) > 0)
                offset += bytes_read;
 
@@ -3824,7 +3824,7 @@ coverage_init (MonoProfiler *prof)
 
        COVERAGE_DEBUG(fprintf (stderr, "Coverage initialized\n");)
 
-       mono_mutex_init (&coverage_mutex);
+       mono_os_mutex_init (&coverage_mutex);
        coverage_methods = mono_conc_hashtable_new (NULL, NULL);
        coverage_assemblies = mono_conc_hashtable_new (NULL, NULL);
        coverage_classes = mono_conc_hashtable_new (NULL, NULL);
@@ -3883,7 +3883,7 @@ log_shutdown (MonoProfiler *prof)
                fclose (prof->file);
 
        mono_conc_hashtable_destroy (prof->method_table);
-       mono_mutex_destroy (&prof->method_table_mutex);
+       mono_os_mutex_destroy (&prof->method_table_mutex);
 
        if (coverage_initialized) {
                mono_conc_hashtable_destroy (coverage_methods);
@@ -3894,7 +3894,7 @@ log_shutdown (MonoProfiler *prof)
                mono_conc_hashtable_destroy (entered_methods);
                mono_conc_hashtable_destroy (image_to_methods);
                mono_conc_hashtable_destroy (suppressed_assemblies);
-               mono_mutex_destroy (&coverage_mutex);
+               mono_os_mutex_destroy (&coverage_mutex);
        }
 
        free (prof);
@@ -3932,7 +3932,7 @@ new_filename (const char* filename)
                1900 + ts->tm_year, 1 + ts->tm_mon, ts->tm_mday, ts->tm_hour, ts->tm_min, ts->tm_sec);
        s_date = strlen (time_buf);
        s_pid = strlen (pid_buf);
-       d = res = malloc (strlen (filename) + s_date * count_dates + s_pid * count_pids);
+       d = res = (char *)malloc (strlen (filename) + s_date * count_dates + s_pid * count_pids);
        for (p = filename; *p; p++) {
                if (*p != '%') {
                        *d++ = *p;
@@ -3967,7 +3967,7 @@ extern void mono_threads_attach_tools_thread (void);
 static void*
 helper_thread (void* arg)
 {
-       MonoProfiler* prof = arg;
+       MonoProfiler* prof = (MonoProfiler *)arg;
        int command_socket;
        int len;
        char buf [64];
@@ -4153,7 +4153,7 @@ start_helper_thread (MonoProfiler* prof)
 static void *
 writer_thread (void *arg)
 {
-       MonoProfiler *prof = arg;
+       MonoProfiler *prof = (MonoProfiler *)arg;
 
        mono_threads_attach_tools_thread ();
 
@@ -4175,7 +4175,7 @@ writer_thread (void *arg)
                         * methods have metadata emitted before they're referenced.
                         */
                        for (guint i = 0; i < entry->methods->len; i++) {
-                               MethodInfo *info = g_ptr_array_index (entry->methods, i);
+                               MethodInfo *info = (MethodInfo *)g_ptr_array_index (entry->methods, i);
 
                                if (mono_conc_hashtable_lookup (prof->method_table, info->method))
                                        continue;
@@ -4192,9 +4192,9 @@ writer_thread (void *arg)
                                 * method lists will just be empty for the rest of the
                                 * app's lifetime.
                                 */
-                               mono_mutex_lock (&prof->method_table_mutex);
+                               mono_os_mutex_lock (&prof->method_table_mutex);
                                mono_conc_hashtable_insert (prof->method_table, info->method, info->method);
-                               mono_mutex_unlock (&prof->method_table_mutex);
+                               mono_os_mutex_unlock (&prof->method_table_mutex);
 
                                char *name = mono_method_full_name (info->method, 1);
                                int nlen = strlen (name) + 1;
@@ -4274,7 +4274,7 @@ create_profiler (const char *filename, GPtrArray *filters)
        MonoProfiler *prof;
        char *nf;
        int force_delete = 0;
-       prof = calloc (1, sizeof (MonoProfiler));
+       prof = (MonoProfiler *)calloc (1, sizeof (MonoProfiler));
 
        prof->command_port = command_port;
        if (filename && *filename == '-') {
@@ -4291,7 +4291,7 @@ create_profiler (const char *filename, GPtrArray *filters)
                nf = new_filename (filename);
                if (do_report) {
                        int s = strlen (nf) + 32;
-                       char *p = malloc (s);
+                       char *p = (char *)malloc (s);
                        snprintf (p, s, "|mprof-report '--out=%s' -", nf);
                        free (nf);
                        nf = p;
@@ -4344,7 +4344,7 @@ create_profiler (const char *filename, GPtrArray *filters)
 #endif
 
        mono_lock_free_queue_init (&prof->writer_queue);
-       mono_mutex_init (&prof->method_table_mutex);
+       mono_os_mutex_init (&prof->method_table_mutex);
        prof->method_table = mono_conc_hashtable_new (NULL, NULL);
 
        if (do_coverage)
@@ -4404,7 +4404,7 @@ match_option (const char* p, const char *opt, char **rval)
                                } else {
                                        l = end - opt;
                                }
-                               val = malloc (l + 1);
+                               val = (char *)malloc (l + 1);
                                memcpy (val, opt, l);
                                val [l] = 0;
                                *rval = val;
@@ -4756,7 +4756,7 @@ mono_profiler_startup (const char *desc)
                mono_profiler_install_statistical (mono_sample_hit);
        }
 
-       mono_profiler_set_events (events);
+       mono_profiler_set_events ((MonoProfileFlags)events);
 
        TLS_INIT (tlsbuffer);
        TLS_INIT (tlsmethodlist);

diff --git a/mono/sgen/gc-internal-agnostic.h b/mono/sgen/gc-internal-agnostic.h
index 6b8a1a3dda85bab21a230052341e579d1f390806..a609c69d86fdb5e8185662c48775eea22ce5bb87 100644 (file)
--- a/mono/sgen/gc-internal-agnostic.h
+++ b/mono/sgen/gc-internal-agnostic.h
@@ -67,7 +67,7 @@ typedef enum {
 
 #define MONO_GC_HANDLE_TYPE_SHIFT (3)
 #define MONO_GC_HANDLE_TYPE_MASK ((1 << MONO_GC_HANDLE_TYPE_SHIFT) - 1)
-#define MONO_GC_HANDLE_TYPE(x) (((x) & MONO_GC_HANDLE_TYPE_MASK) - 1)
+#define MONO_GC_HANDLE_TYPE(x) ((GCHandleType)(((x) & MONO_GC_HANDLE_TYPE_MASK) - 1))
 #define MONO_GC_HANDLE_SLOT(x) ((x) >> MONO_GC_HANDLE_TYPE_SHIFT)
 #define MONO_GC_HANDLE_TYPE_IS_WEAK(x) ((x) <= HANDLE_WEAK_TRACK)
 #define MONO_GC_HANDLE(slot, type) (((slot) << MONO_GC_HANDLE_TYPE_SHIFT) | (((type) & MONO_GC_HANDLE_TYPE_MASK) + 1))

diff --git a/mono/sgen/sgen-alloc.c b/mono/sgen/sgen-alloc.c
index 413388810f8b4ec8053fe82bd6acd65f235a9af1..0832bc161fe896cbef159ba53ac33473d584bb41 100644 (file)
--- a/mono/sgen/sgen-alloc.c
+++ b/mono/sgen/sgen-alloc.c
@@ -196,7 +196,7 @@ sgen_alloc_obj_nolock (GCVTable vtable, size_t size)
         */
 
        if (real_size > SGEN_MAX_SMALL_OBJ_SIZE) {
-               p = sgen_los_alloc_large_inner (vtable, ALIGN_UP (real_size));
+               p = (void **)sgen_los_alloc_large_inner (vtable, ALIGN_UP (real_size));
        } else {
                /* tlab_next and tlab_temp_end are TLS vars so accessing them might be expensive */
 
@@ -252,7 +252,7 @@ sgen_alloc_obj_nolock (GCVTable vtable, size_t size)
                        available_in_tlab = (int)(TLAB_REAL_END - TLAB_NEXT);//We'll never have tlabs > 2Gb
                        if (size > tlab_size || available_in_tlab > SGEN_MAX_NURSERY_WASTE) {
                                /* Allocate directly from the nursery */
-                               p = sgen_nursery_alloc (size);
+                               p = (void **)sgen_nursery_alloc (size);
                                if (!p) {
                                        /*
                                         * We couldn't allocate from the nursery, so we try
@@ -273,7 +273,7 @@ sgen_alloc_obj_nolock (GCVTable vtable, size_t size)
                                         */
                                        sgen_ensure_free_space (real_size);
                                        if (!degraded_mode)
-                                               p = sgen_nursery_alloc (size);
+                                               p = (void **)sgen_nursery_alloc (size);
                                }
                                if (!p)
                                        return alloc_degraded (vtable, size, FALSE);
@@ -285,12 +285,12 @@ sgen_alloc_obj_nolock (GCVTable vtable, size_t size)
                                        SGEN_LOG (3, "Retire TLAB: %p-%p [%ld]", TLAB_START, TLAB_REAL_END, (long)(TLAB_REAL_END - TLAB_NEXT - size));
                                sgen_nursery_retire_region (p, available_in_tlab);
 
-                               p = sgen_nursery_alloc_range (tlab_size, size, &alloc_size);
+                               p = (void **)sgen_nursery_alloc_range (tlab_size, size, &alloc_size);
                                if (!p) {
                                        /* See comment above in similar case. */
                                        sgen_ensure_free_space (tlab_size);
                                        if (!degraded_mode)
-                                               p = sgen_nursery_alloc_range (tlab_size, size, &alloc_size);
+                                               p = (void **)sgen_nursery_alloc_range (tlab_size, size, &alloc_size);
                                }
                                if (!p)
                                        return alloc_degraded (vtable, size, FALSE);
@@ -304,7 +304,7 @@ sgen_alloc_obj_nolock (GCVTable vtable, size_t size)
                                zero_tlab_if_necessary (TLAB_START, alloc_size);
 
                                /* Allocate from the TLAB */
-                               p = (void*)TLAB_NEXT;
+                               p = (void **)TLAB_NEXT;
                                TLAB_NEXT += size;
                                sgen_set_nursery_scan_start ((char*)p);
                        }
@@ -349,7 +349,7 @@ sgen_try_alloc_obj_nolock (GCVTable vtable, size_t size)
 
        if (G_UNLIKELY (size > tlab_size)) {
                /* Allocate directly from the nursery */
-               p = sgen_nursery_alloc (size);
+               p = (void **)sgen_nursery_alloc (size);
                if (!p)
                        return NULL;
                sgen_set_nursery_scan_start ((char*)p);
@@ -380,7 +380,7 @@ sgen_try_alloc_obj_nolock (GCVTable vtable, size_t size)
                        }
                } else if (available_in_tlab > SGEN_MAX_NURSERY_WASTE) {
                        /* Allocate directly from the nursery */
-                       p = sgen_nursery_alloc (size);
+                       p = (void **)sgen_nursery_alloc (size);
                        if (!p)
                                return NULL;
 
@@ -389,7 +389,7 @@ sgen_try_alloc_obj_nolock (GCVTable vtable, size_t size)
                        size_t alloc_size = 0;
 
                        sgen_nursery_retire_region (p, available_in_tlab);
-                       new_next = sgen_nursery_alloc_range (tlab_size, size, &alloc_size);
+                       new_next = (char *)sgen_nursery_alloc_range (tlab_size, size, &alloc_size);
                        p = (void**)new_next;
                        if (!p)
                                return NULL;
@@ -478,7 +478,7 @@ sgen_alloc_obj_pinned (GCVTable vtable, size_t size)
 
        if (size > SGEN_MAX_SMALL_OBJ_SIZE) {
                /* large objects are always pinned anyway */
-               p = sgen_los_alloc_large_inner (vtable, size);
+               p = (GCObject *)sgen_los_alloc_large_inner (vtable, size);
        } else {
                SGEN_ASSERT (9, sgen_client_vtable_is_inited (vtable), "class %s:%s is not initialized", sgen_client_vtable_get_namespace (vtable), sgen_client_vtable_get_name (vtable));
                p = major_collector.alloc_small_pinned_obj (vtable, size, SGEN_VTABLE_HAS_REFERENCES (vtable));

diff --git a/mono/sgen/sgen-cardtable.c b/mono/sgen/sgen-cardtable.c
index 21da2d0df848ba32e69c2126d1d8d9fb3ffeee3e..b6e9479f1479e6a7f65a4acbd2433b470ed9dee1 100644 (file)
--- a/mono/sgen/sgen-cardtable.c
+++ b/mono/sgen/sgen-cardtable.c
@@ -86,8 +86,8 @@ sgen_card_table_wbarrier_set_field (GCObject *obj, gpointer field_ptr, GCObject*
 static void
 sgen_card_table_wbarrier_arrayref_copy (gpointer dest_ptr, gpointer src_ptr, int count)
 {
-       gpointer *dest = dest_ptr;
-       gpointer *src = src_ptr;
+       gpointer *dest = (gpointer *)dest_ptr;
+       gpointer *src = (gpointer *)src_ptr;
 
        /*overlapping that required backward copying*/
        if (src < dest && (src + count) > dest) {
@@ -284,7 +284,7 @@ sgen_card_table_find_address (char *addr)
 static gboolean
 sgen_card_table_find_address_with_cards (char *cards_start, guint8 *cards, char *addr)
 {
-       cards_start = sgen_card_table_align_pointer (cards_start);
+       cards_start = (char *)sgen_card_table_align_pointer (cards_start);
        return cards [(addr - cards_start) >> CARD_BITS];
 }
 
@@ -292,15 +292,18 @@ static void
 update_mod_union (guint8 *dest, guint8 *start_card, size_t num_cards)
 {
        int i;
-       for (i = 0; i < num_cards; ++i)
-               dest [i] |= start_card [i];
+       /* Marking from another thread can happen while we mark here */
+       for (i = 0; i < num_cards; ++i) {
+               if (start_card [i])
+                       dest [i] = 1;
+       }
 }
 
 guint8*
 sgen_card_table_alloc_mod_union (char *obj, mword obj_size)
 {
        size_t num_cards = sgen_card_table_number_of_cards_in_range ((mword) obj, obj_size);
-       guint8 *mod_union = sgen_alloc_internal_dynamic (num_cards, INTERNAL_MEM_CARDTABLE_MOD_UNION, TRUE);
+       guint8 *mod_union = (guint8 *)sgen_alloc_internal_dynamic (num_cards, INTERNAL_MEM_CARDTABLE_MOD_UNION, TRUE);
        memset (mod_union, 0, num_cards);
        return mod_union;
 }
@@ -570,10 +573,10 @@ sgen_card_tables_collect_stats (gboolean begin)
 void
 sgen_card_table_init (SgenRememberedSet *remset)
 {
-       sgen_cardtable = sgen_alloc_os_memory (CARD_COUNT_IN_BYTES, SGEN_ALLOC_INTERNAL | SGEN_ALLOC_ACTIVATE, "card table");
+       sgen_cardtable = (guint8 *)sgen_alloc_os_memory (CARD_COUNT_IN_BYTES, (SgenAllocFlags)(SGEN_ALLOC_INTERNAL | SGEN_ALLOC_ACTIVATE), "card table");
 
 #ifdef SGEN_HAVE_OVERLAPPING_CARDS
-       sgen_shadow_cardtable = sgen_alloc_os_memory (CARD_COUNT_IN_BYTES, SGEN_ALLOC_INTERNAL | SGEN_ALLOC_ACTIVATE, "shadow card table");
+       sgen_shadow_cardtable = (guint8 *)sgen_alloc_os_memory (CARD_COUNT_IN_BYTES, (SgenAllocFlags)(SGEN_ALLOC_INTERNAL | SGEN_ALLOC_ACTIVATE), "shadow card table");
 #endif
 
 #ifdef HEAVY_STATISTICS

diff --git a/mono/sgen/sgen-copy-object.h b/mono/sgen/sgen-copy-object.h
index 847269d5d72b575174d6366fd6236e8652b6dc7b..2b7bc60670a3751b20566b5c35f100d1b0d8ecf8 100644 (file)
--- a/mono/sgen/sgen-copy-object.h
+++ b/mono/sgen/sgen-copy-object.h
@@ -50,15 +50,15 @@ par_copy_object_no_checks (char *destination, GCVTable vt, void *obj, mword objs
        obj = destination;
        if (queue) {
                SGEN_LOG (9, "Enqueuing gray object %p (%s)", obj, sgen_client_vtable_get_name (vt));
-               GRAY_OBJECT_ENQUEUE (queue, obj, sgen_vtable_get_descriptor (vt));
+               GRAY_OBJECT_ENQUEUE (queue, (GCObject *)obj, sgen_vtable_get_descriptor (vt));
        }
 }
 
 /*
  * This can return OBJ itself on OOM.
  */
-static MONO_NEVER_INLINE void*
-copy_object_no_checks (void *obj, SgenGrayQueue *queue)
+static MONO_NEVER_INLINE GCObject *
+copy_object_no_checks (GCObject *obj, SgenGrayQueue *queue)
 {
        GCVTable vt = SGEN_LOAD_VTABLE_UNCHECKED (obj);
        gboolean has_references = SGEN_VTABLE_HAS_REFERENCES (vt);
@@ -76,11 +76,11 @@ copy_object_no_checks (void *obj, SgenGrayQueue *queue)
        if (!has_references)
                queue = NULL;
 
-       par_copy_object_no_checks (destination, vt, obj, objsize, queue);
+       par_copy_object_no_checks ((char *)destination, vt, obj, objsize, queue);
        /* FIXME: mark mod union cards if necessary */
 
        /* set the forwarding pointer */
        SGEN_FORWARD_OBJECT (obj, destination);
 
-       return destination;
+       return (GCObject *)destination;
 }

diff --git a/mono/sgen/sgen-debug.c b/mono/sgen/sgen-debug.c
index 79e23ed453bea3003b1ed3947e7fdc786770ec73..a7f61cc8f4eacc5a7ee0f731b0e4ed434193d3a5 100644 (file)
--- a/mono/sgen/sgen-debug.c
+++ b/mono/sgen/sgen-debug.c
@@ -113,7 +113,7 @@ describe_pointer (char *ptr, gboolean need_setup)
        if (object_is_pinned (ptr))
                printf ("Object is pinned.\n");
 
-       if ((forwarded = object_is_forwarded (ptr))) {
+       if ((forwarded = (char *)object_is_forwarded (ptr))) {
                printf ("Object is forwarded to %p:\n", forwarded);
                ptr = forwarded;
                goto restart;
@@ -334,7 +334,7 @@ static void
 setup_valid_nursery_objects (void)
 {
        if (!valid_nursery_objects)
-               valid_nursery_objects = sgen_alloc_os_memory (DEFAULT_NURSERY_SIZE, SGEN_ALLOC_INTERNAL | SGEN_ALLOC_ACTIVATE, "debugging data");
+               valid_nursery_objects = (GCObject **)sgen_alloc_os_memory (DEFAULT_NURSERY_SIZE, (SgenAllocFlags)(SGEN_ALLOC_INTERNAL | SGEN_ALLOC_ACTIVATE), "debugging data");
        valid_nursery_object_count = 0;
        sgen_scan_area_with_callback (nursery_section->data, nursery_section->end_data, setup_mono_sgen_scan_area_with_callback, NULL, FALSE, FALSE);
 }
@@ -542,7 +542,7 @@ find_pinning_reference (char *obj, size_t size)
        RootRecord *root;
        char *endobj = obj + size;
 
-       SGEN_HASH_TABLE_FOREACH (&roots_hash [ROOT_TYPE_NORMAL], start, root) {
+       SGEN_HASH_TABLE_FOREACH (&roots_hash [ROOT_TYPE_NORMAL], char **, start, RootRecord *, root) {
                /* if desc is non-null it has precise info */
                if (!root->root_desc) {
                        while (start < (char**)root->end_root) {
@@ -786,7 +786,7 @@ scan_roots_for_specific_ref (GCObject *key, int root_type)
        RootRecord *root;
        check_key = key;
 
-       SGEN_HASH_TABLE_FOREACH (&roots_hash [root_type], start_root, root) {
+       SGEN_HASH_TABLE_FOREACH (&roots_hash [root_type], void **, start_root, RootRecord *, root) {
                SgenDescriptor desc = root->root_desc;
 
                check_root = root;
@@ -796,13 +796,13 @@ scan_roots_for_specific_ref (GCObject *key, int root_type)
                        desc >>= ROOT_DESC_TYPE_SHIFT;
                        while (desc) {
                                if (desc & 1)
-                                       check_root_obj_specific_ref (root, key, *start_root);
+                                       check_root_obj_specific_ref (root, key, (GCObject *)*start_root);
                                desc >>= 1;
                                start_root++;
                        }
                        return;
                case ROOT_DESC_COMPLEX: {
-                       gsize *bitmap_data = sgen_get_complex_descriptor_bitmap (desc);
+                       gsize *bitmap_data = (gsize *)sgen_get_complex_descriptor_bitmap (desc);
                        int bwords = (int) ((*bitmap_data) - 1);
                        void **start_run = start_root;
                        bitmap_data++;
@@ -811,7 +811,7 @@ scan_roots_for_specific_ref (GCObject *key, int root_type)
                                void **objptr = start_run;
                                while (bmap) {
                                        if (bmap & 1)
-                                               check_root_obj_specific_ref (root, key, *objptr);
+                                               check_root_obj_specific_ref (root, key, (GCObject *)*objptr);
                                        bmap >>= 1;
                                        ++objptr;
                                }
@@ -853,9 +853,9 @@ mono_gc_scan_for_specific_ref (GCObject *key, gboolean precise)
        scan_roots_for_specific_ref (key, ROOT_TYPE_NORMAL);
        scan_roots_for_specific_ref (key, ROOT_TYPE_WBARRIER);
 
-       SGEN_HASH_TABLE_FOREACH (&roots_hash [ROOT_TYPE_PINNED], ptr, root) {
+       SGEN_HASH_TABLE_FOREACH (&roots_hash [ROOT_TYPE_PINNED], void **, ptr, RootRecord *, root) {
                while (ptr < (void**)root->end_root) {
-                       check_root_obj_specific_ref (root, *ptr, key);
+                       check_root_obj_specific_ref (root, (GCObject *)*ptr, key);
                        ++ptr;
                }
        } SGEN_HASH_TABLE_FOREACH_END;
@@ -887,7 +887,7 @@ sgen_scan_for_registered_roots_in_domain (MonoDomain *domain, int root_type)
        void **start_root;
        RootRecord *root;
        check_domain = domain;
-       SGEN_HASH_TABLE_FOREACH (&roots_hash [root_type], start_root, root) {
+       SGEN_HASH_TABLE_FOREACH (&roots_hash [root_type], void **, start_root, RootRecord *, root) {
                SgenDescriptor desc = root->root_desc;
 
                /* The MonoDomain struct is allowed to hold
@@ -900,13 +900,13 @@ sgen_scan_for_registered_roots_in_domain (MonoDomain *domain, int root_type)
                        desc >>= ROOT_DESC_TYPE_SHIFT;
                        while (desc) {
                                if ((desc & 1) && *start_root)
-                                       check_obj_not_in_domain (*start_root);
+                                       check_obj_not_in_domain ((MonoObject **)*start_root);
                                desc >>= 1;
                                start_root++;
                        }
                        break;
                case ROOT_DESC_COMPLEX: {
-                       gsize *bitmap_data = sgen_get_complex_descriptor_bitmap (desc);
+                       gsize *bitmap_data = (gsize *)sgen_get_complex_descriptor_bitmap (desc);
                        int bwords = (int)((*bitmap_data) - 1);
                        void **start_run = start_root;
                        bitmap_data++;
@@ -915,7 +915,7 @@ sgen_scan_for_registered_roots_in_domain (MonoDomain *domain, int root_type)
                                void **objptr = start_run;
                                while (bmap) {
                                        if ((bmap & 1) && *objptr)
-                                               check_obj_not_in_domain (*objptr);
+                                               check_obj_not_in_domain ((MonoObject **)*objptr);
                                        bmap >>= 1;
                                        ++objptr;
                                }
@@ -985,7 +985,7 @@ check_reference_for_xdomain (GCObject **ptr, GCObject *obj, MonoDomain *domain)
 {
        MonoObject *ref = *ptr;
        size_t offset = (char*)(ptr) - (char*)obj;
-       MonoClass *class;
+       MonoClass *klass;
        MonoClassField *field;
        char *str;
 
@@ -995,12 +995,12 @@ check_reference_for_xdomain (GCObject **ptr, GCObject *obj, MonoDomain *domain)
                return;
 
        field = NULL;
-       for (class = obj->vtable->klass; class; class = class->parent) {
+       for (klass = obj->vtable->klass; klass; klass = klass->parent) {
                int i;
 
-               for (i = 0; i < class->field.count; ++i) {
-                       if (class->fields[i].offset == offset) {
-                               field = &class->fields[i];
+               for (i = 0; i < klass->field.count; ++i) {
+                       if (klass->fields[i].offset == offset) {
+                               field = &klass->fields[i];
                                break;
                        }
                }
@@ -1113,7 +1113,7 @@ dump_object (GCObject *obj, gboolean dump_location)
 #ifndef SGEN_WITHOUT_MONO
        static char class_name [1024];
 
-       MonoClass *class = mono_object_class (obj);
+       MonoClass *klass = mono_object_class (obj);
        int i, j;
 
        /*
@@ -1121,16 +1121,16 @@ dump_object (GCObject *obj, gboolean dump_location)
         * in strings, so we just ignore them;
         */
        i = j = 0;
-       while (class->name [i] && j < sizeof (class_name) - 1) {
-               if (!strchr ("<>\"", class->name [i]))
-                       class_name [j++] = class->name [i];
+       while (klass->name [i] && j < sizeof (class_name) - 1) {
+               if (!strchr ("<>\"", klass->name [i]))
+                       class_name [j++] = klass->name [i];
                ++i;
        }
        g_assert (j < sizeof (class_name));
        class_name [j] = 0;
 
        fprintf (heap_dump_file, "<object class=\"%s.%s\" size=\"%zd\"",
-                       class->name_space, class_name,
+                       klass->name_space, class_name,
                        safe_object_get_size (obj));
        if (dump_location) {
                const char *location;
@@ -1181,7 +1181,7 @@ sgen_debug_dump_heap (const char *type, int num, const char *reason)
        fprintf (heap_dump_file, "<pinned-objects>\n");
        pinned_objects = sgen_pin_stats_get_object_list ();
        for (i = 0; i < pinned_objects->next_slot; ++i)
-               dump_object (pinned_objects->data [i], TRUE);
+               dump_object ((GCObject *)pinned_objects->data [i], TRUE);
        fprintf (heap_dump_file, "</pinned-objects>\n");
 
        sgen_dump_section (nursery_section, "nursery");
@@ -1201,7 +1201,7 @@ static GCObject *found_obj;
 static void
 find_object_for_ptr_callback (GCObject *obj, size_t size, void *user_data)
 {
-       char *ptr = user_data;
+       char *ptr = (char *)user_data;
 
        if (ptr >= (char*)obj && ptr < (char*)obj + size) {
                g_assert (!found_obj);

diff --git a/mono/sgen/sgen-descriptor.c b/mono/sgen/sgen-descriptor.c
index 1cae87f4bc201ba3fe8ba2810bedc3bf87a94910..177ba02c8745981eb62ba9ea08f94399681d09d6 100644 (file)
--- a/mono/sgen/sgen-descriptor.c
+++ b/mono/sgen/sgen-descriptor.c
@@ -95,7 +95,7 @@ alloc_complex_descriptor (gsize *bitmap, int numbits)
        }
        if (complex_descriptors_next + nwords > complex_descriptors_size) {
                int new_size = complex_descriptors_size * 2 + nwords;
-               complex_descriptors = g_realloc (complex_descriptors, new_size * sizeof (gsize));
+               complex_descriptors = (gsize *)g_realloc (complex_descriptors, new_size * sizeof (gsize));
                complex_descriptors_size = new_size;
        }
        SGEN_LOG (6, "Complex descriptor %d, size: %d (total desc memory: %d)", res, nwords, complex_descriptors_size);
@@ -293,7 +293,7 @@ mono_gc_make_root_descr_all_refs (int numbits)
        if (numbits < 32 && all_ref_root_descrs [numbits])
                return all_ref_root_descrs [numbits];
 
-       gc_bitmap = g_malloc0 (ALIGN_TO (ALIGN_TO (numbits, 8) + 1, sizeof (gsize)));
+       gc_bitmap = (gsize *)g_malloc0 (ALIGN_TO (ALIGN_TO (numbits, 8) + 1, sizeof (gsize)));
        memset (gc_bitmap, 0xff, num_bytes);
        if (numbits < ((sizeof (*gc_bitmap) * 8) - ROOT_DESC_TYPE_SHIFT)) 
                gc_bitmap[0] = GUINT64_TO_LE(gc_bitmap[0]);

diff --git a/mono/sgen/sgen-fin-weak-hash.c b/mono/sgen/sgen-fin-weak-hash.c
index 9641594483eec65cc456942dfaf37e235916ea16..a8ffed926faca04cd3ac14f5d3138eb7a47b78b1 100644 (file)
--- a/mono/sgen/sgen-fin-weak-hash.c
+++ b/mono/sgen/sgen-fin-weak-hash.c
@@ -121,7 +121,7 @@ sgen_collect_bridge_objects (int generation, ScanCopyContext ctx)
        if (no_finalize)
                return;
 
-       SGEN_HASH_TABLE_FOREACH (hash_table, object, dummy) {
+       SGEN_HASH_TABLE_FOREACH (hash_table, GCObject *, object, gpointer, dummy) {
                int tag = tagged_object_get_tag (object);
                object = tagged_object_get_object (object);
 
@@ -191,7 +191,7 @@ sgen_finalize_in_range (int generation, ScanCopyContext ctx)
 
        if (no_finalize)
                return;
-       SGEN_HASH_TABLE_FOREACH (hash_table, object, dummy) {
+       SGEN_HASH_TABLE_FOREACH (hash_table, GCObject *, object, gpointer, dummy) {
                int tag = tagged_object_get_tag (object);
                object = tagged_object_get_object (object);
                if (!major_collector.is_object_live (object)) {
@@ -578,7 +578,7 @@ finalizers_with_predicate (SgenObjectPredicateFunc predicate, void *user_data, G
        if (no_finalize || !out_size || !out_array)
                return 0;
        count = 0;
-       SGEN_HASH_TABLE_FOREACH (hash_table, object, dummy) {
+       SGEN_HASH_TABLE_FOREACH (hash_table, GCObject *, object, gpointer, dummy) {
                object = tagged_object_get_object (object);
 
                if (predicate (object, user_data)) {
@@ -634,7 +634,7 @@ sgen_remove_finalizers_if (SgenObjectPredicateFunc predicate, void *user_data, i
        GCObject *object;
        gpointer dummy G_GNUC_UNUSED;
 
-       SGEN_HASH_TABLE_FOREACH (hash_table, object, dummy) {
+       SGEN_HASH_TABLE_FOREACH (hash_table, GCObject *, object, gpointer, dummy) {
                object = tagged_object_get_object (object);
 
                if (predicate (object, user_data)) {

diff --git a/mono/sgen/sgen-gc.c b/mono/sgen/sgen-gc.c
index 865916a3b88e959407a951f889290794b7ee9c9f..b73c1d88ff1d2d1330fccfa95dd7c106ee86724c 100644 (file)
--- a/mono/sgen/sgen-gc.c
+++ b/mono/sgen/sgen-gc.c
@@ -239,12 +239,6 @@ static gboolean do_concurrent_checks = FALSE;
    each collection */
 static gboolean do_scan_starts_check = FALSE;
 
-/*
- * If the major collector is concurrent and this is FALSE, we will
- * never initiate a synchronous major collection, unless requested via
- * GC.Collect().
- */
-static gboolean allow_synchronous_major = TRUE;
 static gboolean disable_minor_collections = FALSE;
 static gboolean disable_major_collections = FALSE;
 static gboolean do_verify_nursery = FALSE;
@@ -346,7 +340,7 @@ nursery_canaries_enabled (void)
  * ########  Global data.
  * ######################################################################
  */
-LOCK_DECLARE (gc_mutex);
+MonoCoopMutex gc_mutex;
 gboolean sgen_try_free_some_memory;
 
 #define SCAN_START_SIZE        SGEN_SCAN_START_SIZE
@@ -359,7 +353,7 @@ GCMemSection *nursery_section = NULL;
 static volatile mword lowest_heap_address = ~(mword)0;
 static volatile mword highest_heap_address = 0;
 
-LOCK_DECLARE (sgen_interruption_mutex);
+MonoCoopMutex sgen_interruption_mutex;
 
 int current_collection_generation = -1;
 static volatile gboolean concurrent_collection_in_progress = FALSE;
@@ -444,7 +438,7 @@ gray_queue_redirect (SgenGrayQueue *queue)
                GrayQueueSection *section = sgen_gray_object_dequeue_section (queue);
                if (!section)
                        break;
-               sgen_section_gray_queue_enqueue (queue->alloc_prepare_data, section);
+               sgen_section_gray_queue_enqueue ((SgenSectionGrayQueue *)queue->alloc_prepare_data, section);
                wake = TRUE;
        }
 
@@ -477,7 +471,7 @@ sgen_scan_area_with_callback (char *start, char *end, IterateObjectCallbackFunc
                }
 
                if (allow_flags) {
-                       if (!(obj = SGEN_OBJECT_IS_FORWARDED (start)))
+                       if (!(obj = (char *)SGEN_OBJECT_IS_FORWARDED (start)))
                                obj = start;
                } else {
                        obj = start;
@@ -506,7 +500,7 @@ sgen_scan_area_with_callback (char *start, char *end, IterateObjectCallbackFunc
  * lock must be held.  For serial collectors that is not necessary.
  */
 void
-sgen_add_to_global_remset (gpointer ptr, gpointer obj)
+sgen_add_to_global_remset (gpointer ptr, GCObject *obj)
 {
        SGEN_ASSERT (5, sgen_ptr_in_nursery (obj), "Target pointer of global remset must be in the nursery");
 
@@ -868,7 +862,7 @@ pin_from_roots (void *start_nursery, void *end_nursery, ScanCopyContext ctx)
        RootRecord *root;
        SGEN_LOG (2, "Scanning pinned roots (%d bytes, %d/%d entries)", (int)roots_size, roots_hash [ROOT_TYPE_NORMAL].num_entries, roots_hash [ROOT_TYPE_PINNED].num_entries);
        /* objects pinned from the API are inside these roots */
-       SGEN_HASH_TABLE_FOREACH (&roots_hash [ROOT_TYPE_PINNED], start_root, root) {
+       SGEN_HASH_TABLE_FOREACH (&roots_hash [ROOT_TYPE_PINNED], void **, start_root, RootRecord *, root) {
                SGEN_LOG (6, "Pinned roots %p-%p", start_root, root->end_root);
                sgen_conservatively_pin_objects_from (start_root, (void**)root->end_root, start_nursery, end_nursery, PIN_TYPE_OTHER);
        } SGEN_HASH_TABLE_FOREACH_END;
@@ -885,7 +879,7 @@ pin_from_roots (void *start_nursery, void *end_nursery, ScanCopyContext ctx)
 static void
 single_arg_user_copy_or_mark (GCObject **obj, void *gc_data)
 {
-       ScanCopyContext *ctx = gc_data;
+       ScanCopyContext *ctx = (ScanCopyContext *)gc_data;
        ctx->ops->copy_or_mark_object (obj, ctx->queue);
 }
 
@@ -916,7 +910,7 @@ precisely_scan_objects_from (void** start_root, void** end_root, char* n_start,
                }
                return;
        case ROOT_DESC_COMPLEX: {
-               gsize *bitmap_data = sgen_get_complex_descriptor_bitmap (desc);
+               gsize *bitmap_data = (gsize *)sgen_get_complex_descriptor_bitmap (desc);
                gsize bwords = (*bitmap_data) - 1;
                void **start_run = start_root;
                bitmap_data++;
@@ -992,21 +986,21 @@ alloc_nursery (void)
         * objects in the existing nursery.
         */
        /* FIXME: handle OOM */
-       section = sgen_alloc_internal (INTERNAL_MEM_SECTION);
+       section = (GCMemSection *)sgen_alloc_internal (INTERNAL_MEM_SECTION);
 
        alloc_size = sgen_nursery_size;
 
        /* If there isn't enough space even for the nursery we should simply abort. */
        g_assert (sgen_memgov_try_alloc_space (alloc_size, SPACE_NURSERY));
 
-       data = major_collector.alloc_heap (alloc_size, alloc_size, DEFAULT_NURSERY_BITS);
+       data = (char *)major_collector.alloc_heap (alloc_size, alloc_size, DEFAULT_NURSERY_BITS);
        sgen_update_heap_boundaries ((mword)data, (mword)(data + sgen_nursery_size));
        SGEN_LOG (4, "Expanding nursery size (%p-%p): %lu, total: %lu", data, data + alloc_size, (unsigned long)sgen_nursery_size, (unsigned long)sgen_gc_get_total_heap_allocation ());
        section->data = section->next_data = data;
        section->size = alloc_size;
        section->end_data = data + sgen_nursery_size;
        scan_starts = (alloc_size + SCAN_START_SIZE - 1) / SCAN_START_SIZE;
-       section->scan_starts = sgen_alloc_internal_dynamic (sizeof (char*) * scan_starts, INTERNAL_MEM_SCAN_STARTS, TRUE);
+       section->scan_starts = (char **)sgen_alloc_internal_dynamic (sizeof (char*) * scan_starts, INTERNAL_MEM_SCAN_STARTS, TRUE);
        section->num_scan_start = scan_starts;
 
        nursery_section = section;
@@ -1028,7 +1022,7 @@ scan_finalizer_entries (SgenPointerQueue *fin_queue, ScanCopyContext ctx)
        size_t i;
 
        for (i = 0; i < fin_queue->next_slot; ++i) {
-               GCObject *obj = fin_queue->data [i];
+               GCObject *obj = (GCObject *)fin_queue->data [i];
                if (!obj)
                        continue;
                SGEN_LOG (5, "Scan of fin ready object: %p (%s)\n", obj, sgen_client_vtable_get_name (SGEN_LOAD_VTABLE (obj)));
@@ -1223,7 +1217,7 @@ scan_from_registered_roots (char *addr_start, char *addr_end, int root_type, Sca
 {
        void **start_root;
        RootRecord *root;
-       SGEN_HASH_TABLE_FOREACH (&roots_hash [root_type], start_root, root) {
+       SGEN_HASH_TABLE_FOREACH (&roots_hash [root_type], void **, start_root, RootRecord *, root) {
                SGEN_LOG (6, "Precise root scan %p-%p (desc: %p)", start_root, root->end_root, (void*)root->root_desc);
                precisely_scan_objects_from (start_root, (void**)root->end_root, addr_start, addr_end, root->root_desc, ctx);
        } SGEN_HASH_TABLE_FOREACH_END;
@@ -1331,7 +1325,7 @@ typedef struct {
 static void
 job_remembered_set_scan (void *worker_data_untyped, SgenThreadPoolJob *job)
 {
-       WorkerData *worker_data = worker_data_untyped;
+       WorkerData *worker_data = (WorkerData *)worker_data_untyped;
        ScanJob *job_data = (ScanJob*)job;
        ScanCopyContext ctx = CONTEXT_FROM_OBJECT_OPERATIONS (job_data->ops, sgen_workers_get_job_gray_queue (worker_data));
        remset.scan_remsets (ctx);
@@ -1348,7 +1342,7 @@ typedef struct {
 static void
 job_scan_from_registered_roots (void *worker_data_untyped, SgenThreadPoolJob *job)
 {
-       WorkerData *worker_data = worker_data_untyped;
+       WorkerData *worker_data = (WorkerData *)worker_data_untyped;
        ScanFromRegisteredRootsJob *job_data = (ScanFromRegisteredRootsJob*)job;
        ScanCopyContext ctx = CONTEXT_FROM_OBJECT_OPERATIONS (job_data->ops, sgen_workers_get_job_gray_queue (worker_data));
 
@@ -1365,7 +1359,7 @@ typedef struct {
 static void
 job_scan_thread_data (void *worker_data_untyped, SgenThreadPoolJob *job)
 {
-       WorkerData *worker_data = worker_data_untyped;
+       WorkerData *worker_data = (WorkerData *)worker_data_untyped;
        ScanThreadDataJob *job_data = (ScanThreadDataJob*)job;
        ScanCopyContext ctx = CONTEXT_FROM_OBJECT_OPERATIONS (job_data->ops, sgen_workers_get_job_gray_queue (worker_data));
 
@@ -1381,7 +1375,7 @@ typedef struct {
 static void
 job_scan_finalizer_entries (void *worker_data_untyped, SgenThreadPoolJob *job)
 {
-       WorkerData *worker_data = worker_data_untyped;
+       WorkerData *worker_data = (WorkerData *)worker_data_untyped;
        ScanFinalizerEntriesJob *job_data = (ScanFinalizerEntriesJob*)job;
        ScanCopyContext ctx = CONTEXT_FROM_OBJECT_OPERATIONS (job_data->ops, sgen_workers_get_job_gray_queue (worker_data));
 
@@ -1391,7 +1385,7 @@ job_scan_finalizer_entries (void *worker_data_untyped, SgenThreadPoolJob *job)
 static void
 job_scan_major_mod_union_card_table (void *worker_data_untyped, SgenThreadPoolJob *job)
 {
-       WorkerData *worker_data = worker_data_untyped;
+       WorkerData *worker_data = (WorkerData *)worker_data_untyped;
        ScanJob *job_data = (ScanJob*)job;
        ScanCopyContext ctx = CONTEXT_FROM_OBJECT_OPERATIONS (job_data->ops, sgen_workers_get_job_gray_queue (worker_data));
 
@@ -1402,7 +1396,7 @@ job_scan_major_mod_union_card_table (void *worker_data_untyped, SgenThreadPoolJo
 static void
 job_scan_los_mod_union_card_table (void *worker_data_untyped, SgenThreadPoolJob *job)
 {
-       WorkerData *worker_data = worker_data_untyped;
+       WorkerData *worker_data = (WorkerData *)worker_data_untyped;
        ScanJob *job_data = (ScanJob*)job;
        ScanCopyContext ctx = CONTEXT_FROM_OBJECT_OPERATIONS (job_data->ops, sgen_workers_get_job_gray_queue (worker_data));
 
@@ -2244,17 +2238,6 @@ sgen_perform_collection (size_t requested_size, int generation_to_collect, const
                goto done;
        }
 
-       /*
-        * If we've been asked to do a major collection, and the major collector wants to
-        * run synchronously (to evacuate), we set the flag to do that.
-        */
-       if (generation_to_collect == GENERATION_OLD &&
-                       allow_synchronous_major &&
-                       major_collector.want_synchronous_collection &&
-                       *major_collector.want_synchronous_collection) {
-               wait_to_finish = TRUE;
-       }
-
        SGEN_ASSERT (0, !concurrent_collection_in_progress, "Why did this not get handled above?");
 
        /*
@@ -2449,11 +2432,11 @@ sgen_gc_invoke_finalizers (void)
                if (!sgen_pointer_queue_is_empty (&fin_ready_queue)) {
                        pending_unqueued_finalizer = TRUE;
                        mono_memory_write_barrier ();
-                       obj = sgen_pointer_queue_pop (&fin_ready_queue);
+                       obj = (GCObject *)sgen_pointer_queue_pop (&fin_ready_queue);
                } else if (!sgen_pointer_queue_is_empty (&critical_fin_queue)) {
                        pending_unqueued_finalizer = TRUE;
                        mono_memory_write_barrier ();
-                       obj = sgen_pointer_queue_pop (&critical_fin_queue);
+                       obj = (GCObject *)sgen_pointer_queue_pop (&critical_fin_queue);
                } else {
                        obj = NULL;
                }
@@ -2502,7 +2485,7 @@ sgen_register_root (char *start, size_t size, SgenDescriptor descr, int root_typ
        int i;
        LOCK_GC;
        for (i = 0; i < ROOT_TYPE_NUM; ++i) {
-               RootRecord *root = sgen_hash_table_lookup (&roots_hash [i], start);
+               RootRecord *root = (RootRecord *)sgen_hash_table_lookup (&roots_hash [i], start);
                /* we allow changing the size and the descriptor (for thread statics etc) */
                if (root) {
                        size_t old_size = root->end_root - start;
@@ -2663,7 +2646,7 @@ mono_gc_wbarrier_generic_store_atomic (gpointer ptr, GCObject *value)
 
        SGEN_LOG (8, "Wbarrier atomic store at %p to %p (%s)", ptr, value, value ? sgen_client_vtable_get_name (SGEN_LOAD_VTABLE (value)) : "null");
 
-       InterlockedWritePointer (ptr, value);
+       InterlockedWritePointer ((volatile gpointer *)ptr, value);
 
        if (ptr_in_nursery (value) || concurrent_collection_in_progress)
                mono_gc_wbarrier_generic_nostore (ptr);
@@ -2674,8 +2657,8 @@ mono_gc_wbarrier_generic_store_atomic (gpointer ptr, GCObject *value)
 void
 sgen_wbarrier_value_copy_bitmap (gpointer _dest, gpointer _src, int size, unsigned bitmap)
 {
-       GCObject **dest = _dest;
-       GCObject **src = _src;
+       GCObject **dest = (GCObject **)_dest;
+       GCObject **src = (GCObject **)_src;
 
        while (size) {
                if (bitmap & 0x1)
@@ -2726,16 +2709,6 @@ sgen_gc_get_used_size (void)
        return tot;
 }
 
-gboolean
-sgen_set_allow_synchronous_major (gboolean flag)
-{
-       if (!major_collector.is_concurrent)
-               return flag;
-
-       allow_synchronous_major = flag;
-       return TRUE;
-}
-
 void
 sgen_env_var_error (const char *env_var, const char *fallback, const char *description_format, ...)
 {
@@ -2807,11 +2780,11 @@ sgen_gc_init (void)
        mono_thread_smr_init ();
 #endif
 
-       LOCK_INIT (gc_mutex);
+       mono_coop_mutex_init (&gc_mutex);
 
        gc_debug_file = stderr;
 
-       LOCK_INIT (sgen_interruption_mutex);
+       mono_coop_mutex_init (&sgen_interruption_mutex);
 
        if ((env = g_getenv (MONO_GC_PARAMS_NAME))) {
                opts = g_strsplit (env, ",", -1);
@@ -2952,23 +2925,6 @@ sgen_gc_init (void)
                                }
                                continue;
                        }
-                       if (g_str_has_prefix (opt, "allow-synchronous-major=")) {
-                               if (!major_collector.is_concurrent) {
-                                       sgen_env_var_error (MONO_GC_PARAMS_NAME, "Ignoring.", "`allow-synchronous-major` is only valid for the concurrent major collector.");
-                                       continue;
-                               }
-
-                               opt = strchr (opt, '=') + 1;
-
-                               if (!strcmp (opt, "yes")) {
-                                       allow_synchronous_major = TRUE;
-                               } else if (!strcmp (opt, "no")) {
-                                       allow_synchronous_major = FALSE;
-                               } else {
-                                       sgen_env_var_error (MONO_GC_PARAMS_NAME, "Using default value.", "`allow-synchronous-major` must be either `yes' or `no'.");
-                                       continue;
-                               }
-                       }
 
                        if (!strcmp (opt, "cementing")) {
                                cement_enabled = TRUE;
@@ -3001,8 +2957,6 @@ sgen_gc_init (void)
                        fprintf (stderr, "  minor=COLLECTOR (where COLLECTOR is `simple' or `split')\n");
                        fprintf (stderr, "  wbarrier=WBARRIER (where WBARRIER is `remset' or `cardtable')\n");
                        fprintf (stderr, "  [no-]cementing\n");
-                       if (major_collector.is_concurrent)
-                               fprintf (stderr, "  allow-synchronous-major=FLAG (where FLAG is `yes' or `no')\n");
                        if (major_collector.print_gc_param_usage)
                                major_collector.print_gc_param_usage ();
                        if (sgen_minor_collector.print_gc_param_usage)
@@ -3191,7 +3145,7 @@ sgen_get_nursery_clear_policy (void)
 void
 sgen_gc_lock (void)
 {
-       LOCK_GC;
+       mono_coop_mutex_lock (&gc_mutex);
 }
 
 void
@@ -3199,7 +3153,7 @@ sgen_gc_unlock (void)
 {
        gboolean try_free = sgen_try_free_some_memory;
        sgen_try_free_some_memory = FALSE;
-       mono_mutex_unlock (&gc_mutex);
+       mono_coop_mutex_unlock (&gc_mutex);
        if (try_free)
                mono_thread_hazardous_try_free_some ();
 }

diff --git a/mono/sgen/sgen-gc.h b/mono/sgen/sgen-gc.h
index b7e1b68e0c78375a85a1648d420a5f8bd448f345..9e022e12ba902d4bac866957dc71ccbfe3c4c1e3 100644 (file)
--- a/mono/sgen/sgen-gc.h
+++ b/mono/sgen/sgen-gc.h
@@ -39,7 +39,8 @@ typedef struct _SgenThreadInfo SgenThreadInfo;
 #include <stdint.h>
 #include "mono/utils/mono-compiler.h"
 #include "mono/utils/atomic.h"
-#include "mono/utils/mono-mutex.h"
+#include "mono/utils/mono-os-mutex.h"
+#include "mono/utils/mono-coop-mutex.h"
 #include "mono/sgen/sgen-conf.h"
 #include "mono/sgen/sgen-hash-table.h"
 #include "mono/sgen/sgen-protocol.h"
@@ -89,23 +90,14 @@ struct _GCMemSection {
 #define LOCK_DECLARE(name) mono_mutex_t name
 /* if changing LOCK_INIT to something that isn't idempotent, look at
    its use in mono_gc_base_init in sgen-gc.c */
-#define LOCK_INIT(name)        mono_mutex_init (&(name))
-#define LOCK_GC do {                                           \
-               MONO_TRY_BLOCKING       \
-               mono_mutex_lock (&gc_mutex);                    \
-               MONO_FINISH_TRY_BLOCKING        \
-       } while (0)
+#define LOCK_INIT(name)        mono_os_mutex_init (&(name))
+#define LOCK_GC do { sgen_gc_lock (); } while (0)
 #define UNLOCK_GC do { sgen_gc_unlock (); } while (0)
 
-extern LOCK_DECLARE (sgen_interruption_mutex);
-
-#define LOCK_INTERRUPTION do { \
-       MONO_TRY_BLOCKING       \
-       mono_mutex_lock (&sgen_interruption_mutex);     \
-       MONO_FINISH_TRY_BLOCKING        \
-} while (0)
+extern MonoCoopMutex sgen_interruption_mutex;
 
-#define UNLOCK_INTERRUPTION mono_mutex_unlock (&sgen_interruption_mutex)
+#define LOCK_INTERRUPTION mono_coop_mutex_lock (&sgen_interruption_mutex)
+#define UNLOCK_INTERRUPTION mono_coop_mutex_unlock (&sgen_interruption_mutex)
 
 /* FIXME: Use InterlockedAdd & InterlockedAdd64 to reduce the CAS cost. */
 #define SGEN_CAS       InterlockedCompareExchange
@@ -245,8 +237,8 @@ sgen_get_nursery_end (void)
 #define SGEN_POINTER_UNTAG_VTABLE(p)           SGEN_POINTER_UNTAG_ALL((p))
 
 /* returns NULL if not forwarded, or the forwarded address */
-#define SGEN_VTABLE_IS_FORWARDED(vtable) (SGEN_POINTER_IS_TAGGED_FORWARDED ((vtable)) ? SGEN_POINTER_UNTAG_VTABLE ((vtable)) : NULL)
-#define SGEN_OBJECT_IS_FORWARDED(obj) (SGEN_VTABLE_IS_FORWARDED (((mword*)(obj))[0]))
+#define SGEN_VTABLE_IS_FORWARDED(vtable) ((GCVTable *)(SGEN_POINTER_IS_TAGGED_FORWARDED ((vtable)) ? SGEN_POINTER_UNTAG_VTABLE ((vtable)) : NULL))
+#define SGEN_OBJECT_IS_FORWARDED(obj) ((GCObject *)SGEN_VTABLE_IS_FORWARDED (((mword*)(obj))[0]))
 
 #define SGEN_VTABLE_IS_PINNED(vtable) SGEN_POINTER_IS_TAGGED_PINNED ((vtable))
 #define SGEN_OBJECT_IS_PINNED(obj) (SGEN_VTABLE_IS_PINNED (((mword*)(obj))[0]))
@@ -272,7 +264,7 @@ sgen_get_nursery_end (void)
  * Since we set bits in the vtable, use the macro to load it from the pointer to
  * an object that is potentially pinned.
  */
-#define SGEN_LOAD_VTABLE(obj)          ((GCVTable)(SGEN_POINTER_UNTAG_ALL (SGEN_LOAD_VTABLE_UNCHECKED ((obj)))))
+#define SGEN_LOAD_VTABLE(obj)          ((GCVTable)(SGEN_POINTER_UNTAG_ALL (SGEN_LOAD_VTABLE_UNCHECKED ((GCObject *)(obj)))))
 
 /*
 List of what each bit on of the vtable gc bits means. 
@@ -449,7 +441,7 @@ void sgen_pin_stats_register_global_remset (GCObject *obj);
 void sgen_pin_stats_print_class_stats (void);
 
 void sgen_sort_addresses (void **array, size_t size);
-void sgen_add_to_global_remset (gpointer ptr, gpointer obj);
+void sgen_add_to_global_remset (gpointer ptr, GCObject *obj);
 
 int sgen_get_current_collection_generation (void);
 gboolean sgen_collection_is_concurrent (void);
@@ -607,13 +599,6 @@ struct _SgenMajorCollector {
        gboolean supports_cardtable;
        gboolean sweeps_lazily;
 
-       /*
-        * This is set to TRUE by the sweep if the next major
-        * collection should be synchronous (for evacuation).  For
-        * non-concurrent collectors, this should be NULL.
-        */
-       gboolean *want_synchronous_collection;
-
        void* (*alloc_heap) (mword nursery_size, mword nursery_align, int nursery_bits);
        gboolean (*is_object_live) (GCObject *obj);
        GCObject* (*alloc_small_pinned_obj) (GCVTable vtable, size_t size, gboolean has_references);
@@ -966,7 +951,7 @@ extern guint32 tlab_size;
 extern NurseryClearPolicy nursery_clear_policy;
 extern gboolean sgen_try_free_some_memory;
 
-extern LOCK_DECLARE (gc_mutex);
+extern MonoCoopMutex gc_mutex;
 
 /* Nursery helpers. */
 

diff --git a/mono/sgen/sgen-gchandles.c b/mono/sgen/sgen-gchandles.c
index 11216ffd21d410171c5a4ae171e5eff1338c99c4..f4b352eac1185d6befd2f9fb5ac8d440d0376a3c 100644 (file)
--- a/mono/sgen/sgen-gchandles.c
+++ b/mono/sgen/sgen-gchandles.c
@@ -105,17 +105,17 @@ static void
 protocol_gchandle_update (int handle_type, gpointer link, gpointer old_value, gpointer new_value)
 {
        gboolean old = MONO_GC_HANDLE_IS_OBJECT_POINTER (old_value);
-       gboolean new = MONO_GC_HANDLE_IS_OBJECT_POINTER (new_value);
+       gboolean new_ = MONO_GC_HANDLE_IS_OBJECT_POINTER (new_value);
        gboolean track = handle_type == HANDLE_WEAK_TRACK;
 
        if (!MONO_GC_HANDLE_TYPE_IS_WEAK (handle_type))
                return;
 
-       if (!old && new)
+       if (!old && new_)
                binary_protocol_dislink_add (link, MONO_GC_REVEAL_POINTER (new_value, TRUE), track);
-       else if (old && !new)
+       else if (old && !new_)
                binary_protocol_dislink_remove (link, track);
-       else if (old && new && old_value != new_value)
+       else if (old && new_ && old_value != new_value)
                binary_protocol_dislink_update (link, MONO_GC_REVEAL_POINTER (new_value, TRUE), track);
 }
 
@@ -123,15 +123,15 @@ protocol_gchandle_update (int handle_type, gpointer link, gpointer old_value, gp
 static inline gpointer
 try_set_slot (volatile gpointer *slot, GCObject *obj, gpointer old, GCHandleType type)
 {
-       gpointer new;
+       gpointer new_;
        if (obj)
-               new = MONO_GC_HANDLE_OBJECT_POINTER (obj, GC_HANDLE_TYPE_IS_WEAK (type));
+               new_ = MONO_GC_HANDLE_OBJECT_POINTER (obj, GC_HANDLE_TYPE_IS_WEAK (type));
        else
-               new = MONO_GC_HANDLE_METADATA_POINTER (sgen_client_default_metadata (), GC_HANDLE_TYPE_IS_WEAK (type));
-       SGEN_ASSERT (0, new, "Why is the occupied bit not set?");
-       if (InterlockedCompareExchangePointer (slot, new, old) == old) {
-               protocol_gchandle_update (type, (gpointer)slot, old, new);
-               return new;
+               new_ = MONO_GC_HANDLE_METADATA_POINTER (sgen_client_default_metadata (), GC_HANDLE_TYPE_IS_WEAK (type));
+       SGEN_ASSERT (0, new_, "Why is the occupied bit not set?");
+       if (InterlockedCompareExchangePointer (slot, new_, old) == old) {
+               protocol_gchandle_update (type, (gpointer)slot, old, new_);
+               return new_;
        }
        return NULL;
 }
@@ -143,7 +143,7 @@ try_occupy_slot (HandleData *handles, guint bucket, guint offset, GCObject *obj,
        volatile gpointer *link_addr = &(handles->entries [bucket] [offset]);
        if (MONO_GC_HANDLE_OCCUPIED (*link_addr))
                return FALSE;
-       return try_set_slot (link_addr, obj, NULL, handles->type) != NULL;
+       return try_set_slot (link_addr, obj, NULL, (GCHandleType)handles->type) != NULL;
 }
 
 static HandleData gc_handles [] = {
@@ -216,7 +216,7 @@ handle_data_grow (HandleData *handles, guint32 old_capacity)
        const size_t new_bucket_size = sizeof (**handles->entries) * growth;
        if (handles->capacity >= new_capacity)
                return;
-       entries = g_malloc0 (new_bucket_size);
+       entries = (gpointer *)g_malloc0 (new_bucket_size);
        if (handles->type == HANDLE_PINNED)
                sgen_register_root ((char *)entries, new_bucket_size, SGEN_DESCRIPTOR_NULL, ROOT_TYPE_PINNED, MONO_ROOT_SOURCE_GC_HANDLE, "pinned gc handles");
        /* The zeroing of the newly allocated bucket must be complete before storing
@@ -446,7 +446,7 @@ GCObject*
 mono_gchandle_get_target (guint32 gchandle)
 {
        guint index = MONO_GC_HANDLE_SLOT (gchandle);
-       guint type = MONO_GC_HANDLE_TYPE (gchandle);
+       GCHandleType type = MONO_GC_HANDLE_TYPE (gchandle);
        HandleData *handles = gc_handles_for_type (type);
        /* Invalid handles are possible; accessing one should produce NULL. (#34276) */
        if (!handles)
@@ -461,7 +461,7 @@ void
 sgen_gchandle_set_target (guint32 gchandle, GCObject *obj)
 {
        guint index = MONO_GC_HANDLE_SLOT (gchandle);
-       guint type = MONO_GC_HANDLE_TYPE (gchandle);
+       GCHandleType type = MONO_GC_HANDLE_TYPE (gchandle);
        HandleData *handles = gc_handles_for_type (type);
        if (!handles)
                return;
@@ -474,7 +474,7 @@ sgen_gchandle_set_target (guint32 gchandle, GCObject *obj)
        do {
                slot = handles->entries [bucket] [offset];
                SGEN_ASSERT (0, MONO_GC_HANDLE_OCCUPIED (slot), "Why are we setting the target on an unoccupied slot?");
-       } while (!try_set_slot (&handles->entries [bucket] [offset], obj, slot, handles->type));
+       } while (!try_set_slot (&handles->entries [bucket] [offset], obj, slot, (GCHandleType)handles->type));
 }
 
 static gpointer
@@ -487,7 +487,7 @@ retry:
        if (!MONO_GC_HANDLE_OCCUPIED (slot))
                return NULL;
        if (MONO_GC_HANDLE_IS_OBJECT_POINTER (slot)) {
-               GCObject *obj = MONO_GC_REVEAL_POINTER (slot, is_weak);
+               GCObject *obj = (GCObject *)MONO_GC_REVEAL_POINTER (slot, is_weak);
                /* See note [dummy use]. */
                sgen_dummy_use (obj);
                /*
@@ -511,7 +511,7 @@ gpointer
 sgen_gchandle_get_metadata (guint32 gchandle)
 {
        guint index = MONO_GC_HANDLE_SLOT (gchandle);
-       guint type = MONO_GC_HANDLE_TYPE (gchandle);
+       GCHandleType type = MONO_GC_HANDLE_TYPE (gchandle);
        HandleData *handles = gc_handles_for_type (type);
        if (!handles)
                return NULL;
@@ -534,7 +534,7 @@ void
 mono_gchandle_free (guint32 gchandle)
 {
        guint index = MONO_GC_HANDLE_SLOT (gchandle);
-       guint type = MONO_GC_HANDLE_TYPE (gchandle);
+       GCHandleType type = MONO_GC_HANDLE_TYPE (gchandle);
        HandleData *handles = gc_handles_for_type (type);
        if (!handles)
                return;
@@ -566,7 +566,7 @@ null_link_if_necessary (gpointer hidden, GCHandleType handle_type, int max_gener
        if (!MONO_GC_HANDLE_VALID (hidden))
                return hidden;
 
-       obj = MONO_GC_REVEAL_POINTER (hidden, MONO_GC_HANDLE_TYPE_IS_WEAK (handle_type));
+       obj = (GCObject *)MONO_GC_REVEAL_POINTER (hidden, MONO_GC_HANDLE_TYPE_IS_WEAK (handle_type));
        SGEN_ASSERT (0, obj, "Why is the hidden pointer NULL?");
 
        if (object_older_than (obj, max_generation))
@@ -607,7 +607,7 @@ null_link_if (gpointer hidden, GCHandleType handle_type, int max_generation, gpo
        if (!MONO_GC_HANDLE_VALID (hidden))
                return hidden;
 
-       obj = MONO_GC_REVEAL_POINTER (hidden, MONO_GC_HANDLE_TYPE_IS_WEAK (handle_type));
+       obj = (GCObject *)MONO_GC_REVEAL_POINTER (hidden, MONO_GC_HANDLE_TYPE_IS_WEAK (handle_type));
        SGEN_ASSERT (0, obj, "Why is the hidden pointer NULL?");
 
        if (object_older_than (obj, max_generation))

diff --git a/mono/sgen/sgen-gray.c b/mono/sgen/sgen-gray.c
index fd561d50ff4319174803a13980ab0c18728609f6..cb6694342fe484cc50bfdff9b940ca12ad0d6e92 100644 (file)
--- a/mono/sgen/sgen-gray.c
+++ b/mono/sgen/sgen-gray.c
@@ -66,7 +66,7 @@ sgen_gray_object_alloc_queue_section (SgenGrayQueue *queue)
                STATE_TRANSITION (section, GRAY_QUEUE_SECTION_STATE_FREE_LIST, GRAY_QUEUE_SECTION_STATE_FLOATING);
        } else {
                /* Allocate a new section */
-               section = sgen_alloc_internal (INTERNAL_MEM_GRAY_QUEUE);
+               section = (GrayQueueSection *)sgen_alloc_internal (INTERNAL_MEM_GRAY_QUEUE);
                STATE_SET (section, GRAY_QUEUE_SECTION_STATE_FLOATING);
        }
 
@@ -292,7 +292,7 @@ lock_section_queue (SgenSectionGrayQueue *queue)
        if (!queue->locked)
                return;
 
-       mono_mutex_lock (&queue->lock);
+       mono_os_mutex_lock (&queue->lock);
 }
 
 static void
@@ -301,7 +301,7 @@ unlock_section_queue (SgenSectionGrayQueue *queue)
        if (!queue->locked)
                return;
 
-       mono_mutex_unlock (&queue->lock);
+       mono_os_mutex_unlock (&queue->lock);
 }
 
 void
@@ -311,7 +311,7 @@ sgen_section_gray_queue_init (SgenSectionGrayQueue *queue, gboolean locked, Gray
 
        queue->locked = locked;
        if (locked) {
-               mono_mutex_init_recursive (&queue->lock);
+               mono_os_mutex_init_recursive (&queue->lock);
        }
 
 #ifdef SGEN_CHECK_GRAY_OBJECT_ENQUEUE

diff --git a/mono/sgen/sgen-hash-table.c b/mono/sgen/sgen-hash-table.c
index 61c78e9bf56b703bc1c96edf51de6e0a827338df..42856fc65d846a016638bf1ed9b043792540d17e 100644 (file)
--- a/mono/sgen/sgen-hash-table.c
+++ b/mono/sgen/sgen-hash-table.c
@@ -53,7 +53,7 @@ rehash (SgenHashTable *hash_table)
                new_size = g_spaced_primes_closest (hash_table->num_entries);
        }
 
-       new_hash = sgen_alloc_internal_dynamic (new_size * sizeof (SgenHashTableEntry*), hash_table->table_mem_type, TRUE);
+       new_hash = (SgenHashTableEntry **)sgen_alloc_internal_dynamic (new_size * sizeof (SgenHashTableEntry*), hash_table->table_mem_type, TRUE);
        for (i = 0; i < old_hash_size; ++i) {
                for (entry = old_hash [i]; entry; entry = next) {
                        hash = hash_table->hash_func (entry->key) % new_size;
@@ -132,7 +132,7 @@ sgen_hash_table_replace (SgenHashTable *hash_table, gpointer key, gpointer new_v
                return FALSE;
        }
 
-       entry = sgen_alloc_internal (hash_table->entry_mem_type);
+       entry = (SgenHashTableEntry *)sgen_alloc_internal (hash_table->entry_mem_type);
        entry->key = key;
        memcpy (entry->data, new_value, hash_table->data_size);
 

diff --git a/mono/sgen/sgen-hash-table.h b/mono/sgen/sgen-hash-table.h
index e6cfe43a5a051b65ee7408724afa9e84c0a24b85..5144cab12702b55ce432e22ae37c785bbc429fb6 100644 (file)
--- a/mono/sgen/sgen-hash-table.h
+++ b/mono/sgen/sgen-hash-table.h
@@ -42,9 +42,9 @@ void sgen_init_hash_table (void);
 
 #define sgen_hash_table_num_entries(h) ((h)->num_entries)
 
-#define sgen_hash_table_key_for_value_pointer(v)       (((SgenHashTableEntry*)((char*)(v) - G_STRUCT_OFFSET (SgenHashTableEntry, data)))->key)
+#define sgen_hash_table_key_for_value_pointer(v)       ((GCObject *)(((SgenHashTableEntry*)((char*)(v) - G_STRUCT_OFFSET (SgenHashTableEntry, data)))->key))
 
-#define SGEN_HASH_TABLE_FOREACH(h,k,v) do {                            \
+#define SGEN_HASH_TABLE_FOREACH(h,tk,k,tv,v) do {                              \
                SgenHashTable *__hash_table = (h);                      \
                SgenHashTableEntry **__table = __hash_table->table;     \
                guint __i;                                              \
@@ -53,8 +53,8 @@ void sgen_init_hash_table (void);
                        for (__iter = &__table [__i]; *__iter; __iter = __next) {       \
                                SgenHashTableEntry *__entry = *__iter;  \
                                __next = &__entry->next;        \
-                               (k) = __entry->key;                     \
-                               (v) = (gpointer)__entry->data;
+                               (k) = (tk)__entry->key;                 \
+                               (v) = (tv)__entry->data;
 
 /* The loop must be continue'd after using this! */
 #define SGEN_HASH_TABLE_FOREACH_REMOVE(free)   do {                    \

diff --git a/mono/sgen/sgen-internal.c b/mono/sgen/sgen-internal.c
index 4ccff748aef06c97f0e39bee2255358a76611921..e5327399c584f0a83868b64313fb7679b7e2a26b 100644 (file)
--- a/mono/sgen/sgen-internal.c
+++ b/mono/sgen/sgen-internal.c
@@ -165,7 +165,7 @@ sgen_alloc_internal_dynamic (size_t size, int type, gboolean assert_on_failure)
        void *p;
 
        if (size > allocator_sizes [NUM_ALLOCATORS - 1]) {
-               p = sgen_alloc_os_memory (size, SGEN_ALLOC_INTERNAL | SGEN_ALLOC_ACTIVATE, NULL);
+               p = sgen_alloc_os_memory (size, (SgenAllocFlags)(SGEN_ALLOC_INTERNAL | SGEN_ALLOC_ACTIVATE), NULL);
                if (!p)
                        sgen_assert_memory_alloc (NULL, size, description_for_type (type));
        } else {

diff --git a/mono/sgen/sgen-los.c b/mono/sgen/sgen-los.c
index ea1ba4692ea64a635a639476aba2be9c22ba16d6..2421150fcfb93ba9bf7087d8e5fe9c587ecf16b5 100644 (file)
--- a/mono/sgen/sgen-los.c
+++ b/mono/sgen/sgen-los.c
@@ -238,7 +238,7 @@ get_los_section_memory (size_t size)
        if (!sgen_memgov_try_alloc_space (LOS_SECTION_SIZE, SPACE_LOS))
                return NULL;
 
-       section = sgen_alloc_os_memory_aligned (LOS_SECTION_SIZE, LOS_SECTION_SIZE, SGEN_ALLOC_HEAP | SGEN_ALLOC_ACTIVATE, NULL);
+       section = (LOSSection *)sgen_alloc_os_memory_aligned (LOS_SECTION_SIZE, LOS_SECTION_SIZE, (SgenAllocFlags)(SGEN_ALLOC_HEAP | SGEN_ALLOC_ACTIVATE), NULL);
 
        if (!section)
                return NULL;
@@ -379,7 +379,7 @@ sgen_los_alloc_large_inner (GCVTable vtable, size_t size)
                alloc_size += pagesize - 1;
                alloc_size &= ~(pagesize - 1);
                if (sgen_memgov_try_alloc_space (alloc_size, SPACE_LOS)) {
-                       obj = sgen_alloc_os_memory (alloc_size, SGEN_ALLOC_HEAP | SGEN_ALLOC_ACTIVATE, NULL);
+                       obj = (LOSObject *)sgen_alloc_os_memory (alloc_size, (SgenAllocFlags)(SGEN_ALLOC_HEAP | SGEN_ALLOC_ACTIVATE), NULL);
                }
        } else {
                obj = get_los_section_memory (size + sizeof (LOSObject));
@@ -593,7 +593,7 @@ get_cardtable_mod_union_for_object (LOSObject *obj)
        if (mod_union)
                return mod_union;
        mod_union = sgen_card_table_alloc_mod_union ((char*)obj->data, size);
-       other = SGEN_CAS_PTR ((gpointer*)&obj->cardtable_mod_union, mod_union, NULL);
+       other = (guint8 *)SGEN_CAS_PTR ((gpointer*)&obj->cardtable_mod_union, mod_union, NULL);
        if (!other) {
                SGEN_ASSERT (0, obj->cardtable_mod_union == mod_union, "Why did CAS not replace?");
                return mod_union;

diff --git a/mono/sgen/sgen-marksweep-drain-gray-stack.h b/mono/sgen/sgen-marksweep-drain-gray-stack.h
index dce3be7344ad528c712be144fd775d38becfa295..56efcf2694d669d25ba25535ffa9867d15237ec1 100644 (file)
--- a/mono/sgen/sgen-marksweep-drain-gray-stack.h
+++ b/mono/sgen/sgen-marksweep-drain-gray-stack.h
@@ -74,7 +74,7 @@ COPY_OR_MARK_FUNCTION_NAME (GCObject **ptr, GCObject *obj, SgenGrayQueue *queue)
                        HEAVY_STAT (++stat_optimized_copy_nursery_pinned);
                        return TRUE;
                }
-               if ((forwarded = SGEN_VTABLE_IS_FORWARDED (vtable_word))) {
+               if ((forwarded = (GCObject *)SGEN_VTABLE_IS_FORWARDED (vtable_word))) {
                        HEAVY_STAT (++stat_optimized_copy_nursery_forwarded);
                        SGEN_UPDATE_REFERENCE (ptr, forwarded);
                        return sgen_ptr_in_nursery (forwarded);
@@ -142,7 +142,7 @@ COPY_OR_MARK_FUNCTION_NAME (GCObject **ptr, GCObject *obj, SgenGrayQueue *queue)
 #ifdef COPY_OR_MARK_WITH_EVACUATION
                {
                        GCObject *forwarded;
-                       if ((forwarded = SGEN_VTABLE_IS_FORWARDED (vtable_word))) {
+                       if ((forwarded = (GCObject *)SGEN_VTABLE_IS_FORWARDED (vtable_word))) {
                                HEAVY_STAT (++stat_optimized_copy_major_forwarded);
                                SGEN_UPDATE_REFERENCE (ptr, forwarded);
                                SGEN_ASSERT (9, !sgen_ptr_in_nursery (forwarded), "Cannot be forwarded to nursery.");
@@ -166,16 +166,21 @@ COPY_OR_MARK_FUNCTION_NAME (GCObject **ptr, GCObject *obj, SgenGrayQueue *queue)
 
                        block = MS_BLOCK_FOR_OBJ (obj);
 
+#ifdef COPY_OR_MARK_CONCURRENT
+                       if (G_UNLIKELY (major_block_is_evacuating (block))) {
+                               /*
+                                * We don't copy within the concurrent phase. These objects will
+                                * be handled below in the finishing pause, by scanning the mod-union
+                                * card table.
+                                */
+                               return FALSE;
+                       }
+#endif
+
 #ifdef COPY_OR_MARK_WITH_EVACUATION
-                       {
-                               int size_index = block->obj_size_index;
-
-                               if (evacuate_block_obj_sizes [size_index] && !block->has_pinned) {
-                                       HEAVY_STAT (++stat_optimized_copy_major_small_evacuate);
-                                       if (block->is_to_space)
-                                               return FALSE;
-                                       goto do_copy_object;
-                               }
+                       if (major_block_is_evacuating (block)) {
+                               HEAVY_STAT (++stat_optimized_copy_major_small_evacuate);
+                               goto do_copy_object;
                        }
 #endif
 
@@ -218,23 +223,30 @@ SCAN_OBJECT_FUNCTION_NAME (GCObject *full_object, SgenDescriptor desc, SgenGrayQ
 #ifdef COPY_OR_MARK_CONCURRENT
 #define HANDLE_PTR(ptr,obj)    do {                                    \
                GCObject *__old = *(ptr);                               \
-               binary_protocol_scan_process_reference ((obj), (ptr), __old); \
+               binary_protocol_scan_process_reference ((full_object), (ptr), __old); \
                if (__old && !sgen_ptr_in_nursery (__old)) {            \
-                       PREFETCH_READ (__old);                          \
-                       COPY_OR_MARK_FUNCTION_NAME ((ptr), __old, queue); \
+                       MSBlockInfo *block = MS_BLOCK_FOR_OBJ (__old);  \
+                       if (G_UNLIKELY (!sgen_ptr_in_nursery (ptr) &&   \
+                                       sgen_safe_object_is_small (__old, sgen_obj_get_descriptor (__old) & DESC_TYPE_MASK) && \
+                                       major_block_is_evacuating (block))) { \
+                               mark_mod_union_card ((full_object), (void**)(ptr), __old); \
+                       } else {                                        \
+                               PREFETCH_READ (__old);                  \
+                               COPY_OR_MARK_FUNCTION_NAME ((ptr), __old, queue); \
+                       }                                               \
                } else {                                                \
                        if (G_UNLIKELY (sgen_ptr_in_nursery (__old) && !sgen_ptr_in_nursery ((ptr)))) \
-                               mark_mod_union_card ((full_object), (void**)(ptr)); \
+                               mark_mod_union_card ((full_object), (void**)(ptr), __old); \
                        }                                               \
                } while (0)
 #else
 #define HANDLE_PTR(ptr,obj)    do {                                    \
-               void *__old = *(ptr);                                   \
-               binary_protocol_scan_process_reference ((obj), (ptr), __old); \
+               GCObject *__old = *(ptr);                                       \
+               binary_protocol_scan_process_reference ((full_object), (ptr), __old); \
                if (__old) {                                            \
                        gboolean __still_in_nursery = COPY_OR_MARK_FUNCTION_NAME ((ptr), __old, queue); \
                        if (G_UNLIKELY (__still_in_nursery && !sgen_ptr_in_nursery ((ptr)) && !SGEN_OBJECT_IS_CEMENTED (*(ptr)))) { \
-                               void *__copy = *(ptr);                  \
+                               GCObject *__copy = *(ptr);                      \
                                sgen_add_to_global_remset ((ptr), __copy); \
                        }                                               \
                }                                                       \

diff --git a/mono/sgen/sgen-marksweep-scan-object-concurrent.h b/mono/sgen/sgen-marksweep-scan-object-concurrent.h
index 8ebd8eee2a14a2a05ae799eb74d6f12b6076bd73..541a0a2b52fec22415a6468147e50a8aec241584 100644 (file)
--- a/mono/sgen/sgen-marksweep-scan-object-concurrent.h
+++ b/mono/sgen/sgen-marksweep-scan-object-concurrent.h
@@ -32,12 +32,12 @@
 
 #undef HANDLE_PTR
 #define HANDLE_PTR(ptr,obj)     do {                                    \
-                void *__old = *(ptr);                                   \
-                binary_protocol_scan_process_reference ((obj), (ptr), __old); \
+                GCObject *__old = *(ptr);                                   \
+                binary_protocol_scan_process_reference ((full_object), (ptr), __old); \
                 if (__old) {                                            \
-                        gboolean __still_in_nursery = major_copy_or_mark_object_no_evacuation ((ptr), __old, queue); \
+                        gboolean __still_in_nursery = major_copy_or_mark_object_with_evacuation ((ptr), __old, queue); \
                         if (G_UNLIKELY (__still_in_nursery && !sgen_ptr_in_nursery ((ptr)) && !SGEN_OBJECT_IS_CEMENTED (*(ptr)))) { \
-                                void *__copy = *(ptr);                  \
+                                GCObject *__copy = *(ptr);                  \
                                 sgen_add_to_global_remset ((ptr), __copy); \
                         }                                              \
                 }                                                       \

diff --git a/mono/sgen/sgen-marksweep.c b/mono/sgen/sgen-marksweep.c
index e2261e20034a266192e3925f313b792da58db22c..ba92ab36e729c385e29eef1870151a17cd7e7612 100644 (file)
--- a/mono/sgen/sgen-marksweep.c
+++ b/mono/sgen/sgen-marksweep.c
@@ -121,7 +121,7 @@ struct _MSBlockInfo {
 
 #define MS_BLOCK_FOR_BLOCK_INFO(b)     ((char*)(b))
 
-#define MS_BLOCK_OBJ(b,i)              ((void*)(MS_BLOCK_FOR_BLOCK_INFO(b) + MS_BLOCK_SKIP + (b)->obj_size * (i)))
+#define MS_BLOCK_OBJ(b,i)              ((GCObject *)(MS_BLOCK_FOR_BLOCK_INFO(b) + MS_BLOCK_SKIP + (b)->obj_size * (i)))
 #define MS_BLOCK_OBJ_FOR_SIZE(b,i,obj_size)            (MS_BLOCK_FOR_BLOCK_INFO(b) + MS_BLOCK_SKIP + (obj_size) * (i))
 #define MS_BLOCK_DATA_FOR_OBJ(o)       ((char*)((mword)(o) & ~(mword)(MS_BLOCK_SIZE - 1)))
 
@@ -170,8 +170,6 @@ static int fast_block_obj_size_indexes [MS_NUM_FAST_BLOCK_OBJ_SIZE_INDEXES];
 
 static gboolean *evacuate_block_obj_sizes;
 static float evacuation_threshold = 0.666f;
-static float concurrent_evacuation_threshold = 0.666f;
-static gboolean want_evacuation = FALSE;
 
 static gboolean lazy_sweep = FALSE;
 
@@ -194,7 +192,7 @@ static gboolean concurrent_sweep = TRUE;
 #define BLOCK_IS_TAGGED_CHECKING(bl)           SGEN_POINTER_IS_TAGGED_2 ((bl))
 #define BLOCK_TAG_CHECKING(bl)                 SGEN_POINTER_TAG_2 ((bl))
 
-#define BLOCK_UNTAG(bl)                                SGEN_POINTER_UNTAG_12 ((bl))
+#define BLOCK_UNTAG(bl)                                ((MSBlockInfo *)SGEN_POINTER_UNTAG_12 ((bl)))
 
 #define BLOCK_TAG(bl)                          ((bl)->has_references ? BLOCK_TAG_HAS_REFERENCES ((bl)) : (bl))
 
@@ -216,7 +214,7 @@ static size_t num_empty_blocks = 0;
        size_t __index;                                                 \
        SGEN_ASSERT (0, sgen_is_world_stopped () && !sweep_in_progress (), "Can't iterate blocks while the world is running or sweep is in progress."); \
        for (__index = 0; __index < allocated_blocks.next_slot; ++__index) { \
-               (bl) = allocated_blocks.data [__index];                 \
+               (bl) = (MSBlockInfo *)allocated_blocks.data [__index];                  \
                (hr) = BLOCK_IS_TAGGED_HAS_REFERENCES ((bl));           \
                (bl) = BLOCK_UNTAG ((bl));
 #define END_FOREACH_BLOCK_NO_LOCK      } }
@@ -245,7 +243,6 @@ static MSBlockInfo * volatile *free_block_lists [MS_BLOCK_TYPE_MAX];
 static guint64 stat_major_blocks_alloced = 0;
 static guint64 stat_major_blocks_freed = 0;
 static guint64 stat_major_blocks_lazy_swept = 0;
-static guint64 stat_major_objects_evacuated = 0;
 
 #if SIZEOF_VOID_P != 8
 static guint64 stat_major_blocks_freed_ideal = 0;
@@ -271,9 +268,9 @@ add_scanned_object (void *ptr)
        if (!binary_protocol_is_enabled ())
                return;
 
-       mono_mutex_lock (&scanned_objects_list_lock);
+       mono_os_mutex_lock (&scanned_objects_list_lock);
        sgen_pointer_queue_add (&scanned_objects_list, ptr);
-       mono_mutex_unlock (&scanned_objects_list_lock);
+       mono_os_mutex_unlock (&scanned_objects_list_lock);
 }
 #endif
 
@@ -304,9 +301,9 @@ major_alloc_heap (mword nursery_size, mword nursery_align, int the_nursery_bits)
 {
        char *start;
        if (nursery_align)
-               start = sgen_alloc_os_memory_aligned (nursery_size, nursery_align, SGEN_ALLOC_HEAP | SGEN_ALLOC_ACTIVATE, "nursery");
+               start = (char *)sgen_alloc_os_memory_aligned (nursery_size, nursery_align, (SgenAllocFlags)(SGEN_ALLOC_HEAP | SGEN_ALLOC_ACTIVATE), "nursery");
        else
-               start = sgen_alloc_os_memory (nursery_size, SGEN_ALLOC_HEAP | SGEN_ALLOC_ACTIVATE, "nursery");
+               start = (char *)sgen_alloc_os_memory (nursery_size, (SgenAllocFlags)(SGEN_ALLOC_HEAP | SGEN_ALLOC_ACTIVATE), "nursery");
 
        return start;
 }
@@ -336,8 +333,9 @@ ms_get_empty_block (void)
                 */
                int alloc_num = MS_BLOCK_ALLOC_NUM;
                for (;;) {
-                       p = sgen_alloc_os_memory_aligned (MS_BLOCK_SIZE * alloc_num, MS_BLOCK_SIZE, SGEN_ALLOC_HEAP | SGEN_ALLOC_ACTIVATE,
-                                       alloc_num == 1 ? "major heap section" : NULL);
+                       p = (char *)sgen_alloc_os_memory_aligned (MS_BLOCK_SIZE * alloc_num, MS_BLOCK_SIZE,
+                               (SgenAllocFlags)(SGEN_ALLOC_HEAP | SGEN_ALLOC_ACTIVATE),
+                               alloc_num == 1 ? "major heap section" : NULL);
                        if (p)
                                break;
                        alloc_num >>= 1;
@@ -502,7 +500,7 @@ add_free_block (MSBlockInfo * volatile *free_blocks, int size_index, MSBlockInfo
        MSBlockInfo *old;
        do {
                block->next_free = old = free_blocks [size_index];
-       } while (SGEN_CAS_PTR ((gpointer)&free_blocks [size_index], block, old) != old);
+       } while (SGEN_CAS_PTR ((volatile gpointer *)&free_blocks [size_index], block, old) != old);
 }
 
 static void major_finish_sweep_checking (void);
@@ -533,10 +531,11 @@ ms_alloc_block (int size_index, gboolean pinned, gboolean has_references)
         * Blocks that are to-space are not evacuated from.  During an major collection
         * blocks are allocated for two reasons: evacuating objects from the nursery and
         * evacuating them from major blocks marked for evacuation.  In both cases we don't
-        * want further evacuation.
+        * want further evacuation. We also don't want to evacuate objects allocated during
+        * the concurrent mark since it would add pointless stress on the finishing pause.
         */
-       info->is_to_space = (sgen_get_current_collection_generation () == GENERATION_OLD);
-       info->state = (info->is_to_space || sgen_concurrent_collection_in_progress ()) ? BLOCK_STATE_MARKING : BLOCK_STATE_SWEPT;
+       info->is_to_space = (sgen_get_current_collection_generation () == GENERATION_OLD) || sgen_concurrent_collection_in_progress ();
+       info->state = info->is_to_space ? BLOCK_STATE_MARKING : BLOCK_STATE_SWEPT;
        SGEN_ASSERT (6, !sweep_in_progress () || info->state == BLOCK_STATE_SWEPT, "How do we add a new block to be swept while sweeping?");
        info->cardtable_mod_union = NULL;
 
@@ -630,12 +629,12 @@ unlink_slot_from_free_list_uncontested (MSBlockInfo * volatile *free_blocks, int
 
        next_free_slot = *(void**)obj;
        if (next_free_slot) {
-               block->free_list = next_free_slot;
+               block->free_list = (gpointer *)next_free_slot;
                return obj;
        }
 
        next_free_block = block->next_free;
-       if (SGEN_CAS_PTR ((gpointer)&free_blocks [size_index], next_free_block, block) != block)
+       if (SGEN_CAS_PTR ((volatile gpointer *)&free_blocks [size_index], next_free_block, block) != block)
                goto retry;
 
        block->free_list = NULL;
@@ -661,7 +660,7 @@ alloc_obj (GCVTable vtable, size_t size, gboolean pinned, gboolean has_reference
        /* FIXME: assumes object layout */
        *(GCVTable*)obj = vtable;
 
-       return obj;
+       return (GCObject *)obj;
 }
 
 static GCObject*
@@ -726,7 +725,7 @@ major_alloc_small_pinned_obj (GCVTable vtable, size_t size, gboolean has_referen
                sgen_perform_collection (0, GENERATION_OLD, "pinned alloc failure", TRUE);
                res = alloc_obj (vtable, size, TRUE, has_references);
         }
-        return res;
+        return (GCObject *)res;
 }
 
 static void
@@ -792,7 +791,7 @@ major_ptr_is_in_non_pinned_space (char *ptr, char **start)
                        *start = NULL;
                        for (i = 0; i <= count; ++i) {
                                if (ptr >= (char*)MS_BLOCK_OBJ (block, i) && ptr < (char*)MS_BLOCK_OBJ (block, i + 1)) {
-                                       *start = MS_BLOCK_OBJ (block, i);
+                                       *start = (char *)MS_BLOCK_OBJ (block, i);
                                        break;
                                }
                        }
@@ -803,16 +802,16 @@ major_ptr_is_in_non_pinned_space (char *ptr, char **start)
 }
 
 static gboolean
-try_set_sweep_state (int new, int expected)
+try_set_sweep_state (int new_, int expected)
 {
-       int old = SGEN_CAS (&sweep_state, new, expected);
+       int old = SGEN_CAS (&sweep_state, new_, expected);
        return old == expected;
 }
 
 static void
-set_sweep_state (int new, int expected)
+set_sweep_state (int new_, int expected)
 {
-       gboolean success = try_set_sweep_state (new, expected);
+       gboolean success = try_set_sweep_state (new_, expected);
        SGEN_ASSERT (0, success, "Could not set sweep state.");
 }
 
@@ -986,8 +985,8 @@ static void
 major_dump_heap (FILE *heap_dump_file)
 {
        MSBlockInfo *block;
-       int *slots_available = alloca (sizeof (int) * num_block_obj_sizes);
-       int *slots_used = alloca (sizeof (int) * num_block_obj_sizes);
+       int *slots_available = (int *)alloca (sizeof (int) * num_block_obj_sizes);
+       int *slots_used = (int *)alloca (sizeof (int) * num_block_obj_sizes);
        int i;
 
        for (i = 0; i < num_block_obj_sizes; ++i)
@@ -1024,7 +1023,7 @@ major_dump_heap (FILE *heap_dump_file)
                                        start = i;
                        } else {
                                if (start >= 0) {
-                                       sgen_dump_occupied (MS_BLOCK_OBJ (block, start), MS_BLOCK_OBJ (block, i), MS_BLOCK_FOR_BLOCK_INFO (block));
+                                       sgen_dump_occupied ((char *)MS_BLOCK_OBJ (block, start), (char *)MS_BLOCK_OBJ (block, i), MS_BLOCK_FOR_BLOCK_INFO (block));
                                        start = -1;
                                }
                        }
@@ -1044,7 +1043,7 @@ get_cardtable_mod_union_for_block (MSBlockInfo *block, gboolean allocate)
        else if (!allocate)
                return NULL;
        mod_union = sgen_card_table_alloc_mod_union (MS_BLOCK_FOR_BLOCK_INFO (block), MS_BLOCK_SIZE);
-       other = SGEN_CAS_PTR ((gpointer*)&block->cardtable_mod_union, mod_union, NULL);
+       other = (guint8 *)SGEN_CAS_PTR ((gpointer*)&block->cardtable_mod_union, mod_union, NULL);
        if (!other) {
                SGEN_ASSERT (0, block->cardtable_mod_union == mod_union, "Why did CAS not replace?");
                return mod_union;
@@ -1067,7 +1066,7 @@ major_get_cardtable_mod_union_for_reference (char *ptr)
  * Mark the mod-union card for `ptr`, which must be a reference within the object `obj`.
  */
 static void
-mark_mod_union_card (GCObject *obj, void **ptr)
+mark_mod_union_card (GCObject *obj, void **ptr, GCObject *value_obj)
 {
        int type = sgen_obj_get_descriptor (obj) & DESC_TYPE_MASK;
        if (sgen_safe_object_is_small (obj, type)) {
@@ -1077,6 +1076,18 @@ mark_mod_union_card (GCObject *obj, void **ptr)
        } else {
                sgen_los_mark_mod_union_card (obj, ptr);
        }
+
+       binary_protocol_mod_union_remset (obj, ptr, value_obj, SGEN_LOAD_VTABLE (value_obj));
+}
+
+static inline gboolean
+major_block_is_evacuating (MSBlockInfo *block)
+{
+       if (evacuate_block_obj_sizes [block->obj_size_index] &&
+                       !block->has_pinned &&
+                       !block->is_to_space)
+               return TRUE;
+       return FALSE;
 }
 
 #define LOAD_VTABLE    SGEN_LOAD_VTABLE
@@ -1166,8 +1177,6 @@ static guint64 stat_drain_prefetch_fill_failures;
 static guint64 stat_drain_loops;
 #endif
 
-static void major_scan_object_with_evacuation (GCObject *start, mword desc, SgenGrayQueue *queue);
-
 #define COPY_OR_MARK_FUNCTION_NAME     major_copy_or_mark_object_no_evacuation
 #define SCAN_OBJECT_FUNCTION_NAME      major_scan_object_no_evacuation
 #define DRAIN_GRAY_STACK_FUNCTION_NAME drain_gray_stack_no_evacuation
@@ -1221,7 +1230,7 @@ major_copy_or_mark_object_concurrent_canonical (GCObject **ptr, SgenGrayQueue *q
 static void
 major_copy_or_mark_object_concurrent_finish_canonical (GCObject **ptr, SgenGrayQueue *queue)
 {
-       major_copy_or_mark_object_no_evacuation (ptr, *ptr, queue);
+       major_copy_or_mark_object_with_evacuation (ptr, *ptr, queue);
 }
 
 static void
@@ -1275,7 +1284,7 @@ sweep_block_for_size (MSBlockInfo *block, int count, int obj_size)
                                memset (obj, 0, obj_size);
                        }
                        *(void**)obj = block->free_list;
-                       block->free_list = obj;
+                       block->free_list = (void **)obj;
                }
        }
 }
@@ -1355,9 +1364,9 @@ sweep_block (MSBlockInfo *block)
                void *next = *(void**)block->free_list;
                *(void**)block->free_list = reversed;
                reversed = block->free_list;
-               block->free_list = next;
+               block->free_list = (void **)next;
        }
-       block->free_list = reversed;
+       block->free_list = (void **)reversed;
 
        mono_memory_write_barrier ();
 
@@ -1610,8 +1619,6 @@ sweep_job_func (void *thread_data_untyped, SgenThreadPoolJob *job)
 static void
 sweep_finish (void)
 {
-       mword total_evacuate_heap = 0;
-       mword total_evacuate_saved = 0;
        int i;
 
        for (i = 0; i < num_block_obj_sizes; ++i) {
@@ -1625,16 +1632,8 @@ sweep_finish (void)
                } else {
                        evacuate_block_obj_sizes [i] = FALSE;
                }
-               {
-                       mword total_bytes = block_obj_sizes [i] * sweep_slots_available [i];
-                       total_evacuate_heap += total_bytes;
-                       if (evacuate_block_obj_sizes [i])
-                               total_evacuate_saved += total_bytes - block_obj_sizes [i] * sweep_slots_used [i];
-               }
        }
 
-       want_evacuation = (float)total_evacuate_saved / (float)total_evacuate_heap > (1 - concurrent_evacuation_threshold);
-
        set_sweep_state (SWEEP_STATE_SWEPT, SWEEP_STATE_COMPACTING);
 }
 
@@ -2380,16 +2379,16 @@ sgen_marksweep_init_internal (SgenMajorCollector *collector, gboolean is_concurr
        sgen_register_fixed_internal_mem_type (INTERNAL_MEM_MS_BLOCK_INFO, sizeof (MSBlockInfo));
 
        num_block_obj_sizes = ms_calculate_block_obj_sizes (MS_BLOCK_OBJ_SIZE_FACTOR, NULL);
-       block_obj_sizes = sgen_alloc_internal_dynamic (sizeof (int) * num_block_obj_sizes, INTERNAL_MEM_MS_TABLES, TRUE);
+       block_obj_sizes = (int *)sgen_alloc_internal_dynamic (sizeof (int) * num_block_obj_sizes, INTERNAL_MEM_MS_TABLES, TRUE);
        ms_calculate_block_obj_sizes (MS_BLOCK_OBJ_SIZE_FACTOR, block_obj_sizes);
 
-       evacuate_block_obj_sizes = sgen_alloc_internal_dynamic (sizeof (gboolean) * num_block_obj_sizes, INTERNAL_MEM_MS_TABLES, TRUE);
+       evacuate_block_obj_sizes = (gboolean *)sgen_alloc_internal_dynamic (sizeof (gboolean) * num_block_obj_sizes, INTERNAL_MEM_MS_TABLES, TRUE);
        for (i = 0; i < num_block_obj_sizes; ++i)
                evacuate_block_obj_sizes [i] = FALSE;
 
-       sweep_slots_available = sgen_alloc_internal_dynamic (sizeof (size_t) * num_block_obj_sizes, INTERNAL_MEM_MS_TABLES, TRUE);
-       sweep_slots_used = sgen_alloc_internal_dynamic (sizeof (size_t) * num_block_obj_sizes, INTERNAL_MEM_MS_TABLES, TRUE);
-       sweep_num_blocks = sgen_alloc_internal_dynamic (sizeof (size_t) * num_block_obj_sizes, INTERNAL_MEM_MS_TABLES, TRUE);
+       sweep_slots_available = (size_t *)sgen_alloc_internal_dynamic (sizeof (size_t) * num_block_obj_sizes, INTERNAL_MEM_MS_TABLES, TRUE);
+       sweep_slots_used = (size_t *)sgen_alloc_internal_dynamic (sizeof (size_t) * num_block_obj_sizes, INTERNAL_MEM_MS_TABLES, TRUE);
+       sweep_num_blocks = (size_t *)sgen_alloc_internal_dynamic (sizeof (size_t) * num_block_obj_sizes, INTERNAL_MEM_MS_TABLES, TRUE);
 
        /*
        {
@@ -2401,7 +2400,7 @@ sgen_marksweep_init_internal (SgenMajorCollector *collector, gboolean is_concurr
        */
 
        for (i = 0; i < MS_BLOCK_TYPE_MAX; ++i)
-               free_block_lists [i] = sgen_alloc_internal_dynamic (sizeof (MSBlockInfo*) * num_block_obj_sizes, INTERNAL_MEM_MS_TABLES, TRUE);
+               free_block_lists [i] = (MSBlockInfo *volatile *)sgen_alloc_internal_dynamic (sizeof (MSBlockInfo*) * num_block_obj_sizes, INTERNAL_MEM_MS_TABLES, TRUE);
 
        for (i = 0; i < MS_NUM_FAST_BLOCK_OBJ_SIZE_INDEXES; ++i)
                fast_block_obj_size_indexes [i] = ms_find_block_obj_size_index (i * 8);
@@ -2411,7 +2410,6 @@ sgen_marksweep_init_internal (SgenMajorCollector *collector, gboolean is_concurr
        mono_counters_register ("# major blocks allocated", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_major_blocks_alloced);
        mono_counters_register ("# major blocks freed", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_major_blocks_freed);
        mono_counters_register ("# major blocks lazy swept", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_major_blocks_lazy_swept);
-       mono_counters_register ("# major objects evacuated", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_major_objects_evacuated);
 #if SIZEOF_VOID_P != 8
        mono_counters_register ("# major blocks freed ideally", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_major_blocks_freed_ideal);
        mono_counters_register ("# major blocks freed less ideally", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_major_blocks_freed_less_ideal);
@@ -2424,10 +2422,6 @@ sgen_marksweep_init_internal (SgenMajorCollector *collector, gboolean is_concurr
        concurrent_mark = is_concurrent;
        collector->is_concurrent = is_concurrent;
        collector->needs_thread_pool = is_concurrent || concurrent_sweep;
-       if (is_concurrent)
-               collector->want_synchronous_collection = &want_evacuation;
-       else
-               collector->want_synchronous_collection = NULL;
        collector->get_and_reset_num_major_objects_marked = major_get_and_reset_num_major_objects_marked;
        collector->supports_cardtable = TRUE;
 
@@ -2481,9 +2475,9 @@ sgen_marksweep_init_internal (SgenMajorCollector *collector, gboolean is_concurr
                collector->major_ops_concurrent_start.drain_gray_stack = drain_gray_stack_concurrent;
 
                collector->major_ops_concurrent_finish.copy_or_mark_object = major_copy_or_mark_object_concurrent_finish_canonical;
-               collector->major_ops_concurrent_finish.scan_object = major_scan_object_no_evacuation;
+               collector->major_ops_concurrent_finish.scan_object = major_scan_object_with_evacuation;
                collector->major_ops_concurrent_finish.scan_vtype = major_scan_vtype_concurrent_finish;
-               collector->major_ops_concurrent_finish.drain_gray_stack = drain_gray_stack_no_evacuation;
+               collector->major_ops_concurrent_finish.drain_gray_stack = drain_gray_stack;
        }
 
 #ifdef HEAVY_STATISTICS
@@ -2494,6 +2488,7 @@ sgen_marksweep_init_internal (SgenMajorCollector *collector, gboolean is_concurr
        mono_counters_register ("Optimized copy major", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_copy_major);
        mono_counters_register ("Optimized copy major small fast", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_copy_major_small_fast);
        mono_counters_register ("Optimized copy major small slow", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_copy_major_small_slow);
+       mono_counters_register ("Optimized copy major small evacuate", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_copy_major_small_evacuate);
        mono_counters_register ("Optimized copy major large", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_copy_major_large);
        mono_counters_register ("Optimized major scan", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_major_scan);
        mono_counters_register ("Optimized major scan no refs", MONO_COUNTER_GC | MONO_COUNTER_ULONG, &stat_optimized_major_scan_no_refs);
@@ -2504,7 +2499,7 @@ sgen_marksweep_init_internal (SgenMajorCollector *collector, gboolean is_concurr
 #endif
 
 #ifdef SGEN_HEAVY_BINARY_PROTOCOL
-       mono_mutex_init (&scanned_objects_list_lock);
+       mono_os_mutex_init (&scanned_objects_list_lock);
 #endif
 
        SGEN_ASSERT (0, SGEN_MAX_SMALL_OBJ_SIZE <= MS_BLOCK_FREE / 2, "MAX_SMALL_OBJ_SIZE must be at most MS_BLOCK_FREE / 2");

diff --git a/mono/sgen/sgen-minor-scan-object.h b/mono/sgen/sgen-minor-scan-object.h
index cda7746a44d8667b4403ae0f59a839b5d24df49c..b1895985dc34e340f32093abfb423f967711f44a 100644 (file)
--- a/mono/sgen/sgen-minor-scan-object.h
+++ b/mono/sgen/sgen-minor-scan-object.h
@@ -38,7 +38,7 @@ extern guint64 stat_scan_object_called_nursery;
 #define HANDLE_PTR(ptr,obj)    do {    \
                void *__old = *(ptr);   \
                SGEN_OBJECT_LAYOUT_STATISTICS_MARK_BITMAP ((obj), (ptr)); \
-               binary_protocol_scan_process_reference ((obj), (ptr), __old); \
+               binary_protocol_scan_process_reference ((full_object), (ptr), __old); \
                if (__old) {    \
                        SERIAL_COPY_OBJECT_FROM_OBJ ((ptr), queue);     \
                        SGEN_COND_LOG (9, __old != *(ptr), "Overwrote field at %p with %p (was: %p)", (ptr), *(ptr), __old); \
@@ -46,9 +46,9 @@ extern guint64 stat_scan_object_called_nursery;
        } while (0)
 
 static void
-SERIAL_SCAN_OBJECT (GCObject *object, SgenDescriptor desc, SgenGrayQueue *queue)
+SERIAL_SCAN_OBJECT (GCObject *full_object, SgenDescriptor desc, SgenGrayQueue *queue)
 {
-       char *start = (char*)object;
+       char *start = (char*)full_object;
 
        SGEN_OBJECT_LAYOUT_STATISTICS_DECLARE_BITMAP;
 

diff --git a/mono/sgen/sgen-nursery-allocator.c b/mono/sgen/sgen-nursery-allocator.c
index dc6152c77e77b854cde2b55053d4edf837c4062d..e42e3bf64aa75efc7001025dbb4a124c254d0576 100644 (file)
--- a/mono/sgen/sgen-nursery-allocator.c
+++ b/mono/sgen/sgen-nursery-allocator.c
@@ -253,7 +253,7 @@ sgen_fragment_allocator_alloc (void)
                frag->next = frag->next_in_order = NULL;
                return frag;
        }
-       frag = sgen_alloc_internal (INTERNAL_MEM_FRAGMENT);
+       frag = (SgenFragment *)sgen_alloc_internal (INTERNAL_MEM_FRAGMENT);
        frag->next = frag->next_in_order = NULL;
        return frag;
 }
@@ -267,7 +267,7 @@ sgen_fragment_allocator_add (SgenFragmentAllocator *allocator, char *start, char
        fragment->fragment_start = start;
        fragment->fragment_next = start;
        fragment->fragment_end = end;
-       fragment->next_in_order = fragment->next = unmask (allocator->region_head);
+       fragment->next_in_order = fragment->next = (SgenFragment *)unmask (allocator->region_head);
 
        allocator->region_head = allocator->alloc_head = fragment;
        g_assert (fragment->fragment_end > fragment->fragment_start);
@@ -304,7 +304,7 @@ try_again:
                printf ("retry count for fppf is %d\n", count);
 #endif
 
-       cur = unmask (*prev);
+       cur = (SgenFragment *)unmask (*prev);
 
        while (1) {
                if (cur == NULL)
@@ -326,14 +326,14 @@ try_again:
                                return prev;
                        prev = &cur->next;
                } else {
-                       next = unmask (next);
+                       next = (SgenFragment *)unmask (next);
                        if (InterlockedCompareExchangePointer ((volatile gpointer*)prev, next, cur) != cur)
                                goto try_again;
                        /*we must make sure that the next from cur->next happens after*/
                        mono_memory_write_barrier ();
                }
 
-               cur = unmask (next);
+               cur = (SgenFragment *)unmask (next);
        }
        return NULL;
 }
@@ -448,7 +448,7 @@ sgen_fragment_allocator_par_alloc (SgenFragmentAllocator *allocator, size_t size
 #endif
 
 restart:
-       for (frag = unmask (allocator->alloc_head); unmask (frag); frag = unmask (frag->next)) {
+       for (frag = (SgenFragment *)unmask (allocator->alloc_head); unmask (frag); frag = (SgenFragment *)unmask (frag->next)) {
                HEAVY_STAT (++stat_alloc_iterations);
 
                if (size <= (size_t)(frag->fragment_end - frag->fragment_next)) {
@@ -478,7 +478,7 @@ sgen_fragment_allocator_serial_alloc (SgenFragmentAllocator *allocator, size_t s
        previous = &allocator->alloc_head;
 
        for (frag = *previous; frag; frag = *previous) {
-               char *p = serial_alloc_from_fragment (previous, frag, size);
+               char *p = (char *)serial_alloc_from_fragment (previous, frag, size);
 
                HEAVY_STAT (++stat_alloc_iterations);
 
@@ -558,7 +558,7 @@ restart:
        InterlockedIncrement (&alloc_count);
 #endif
 
-       for (frag = unmask (allocator->alloc_head); frag; frag = unmask (frag->next)) {
+       for (frag = (SgenFragment *)unmask (allocator->alloc_head); frag; frag = (SgenFragment *)unmask (frag->next)) {
                size_t frag_size = frag->fragment_end - frag->fragment_next;
 
                HEAVY_STAT (++stat_alloc_range_iterations);
@@ -618,7 +618,7 @@ sgen_clear_allocator_fragments (SgenFragmentAllocator *allocator)
 {
        SgenFragment *frag;
 
-       for (frag = unmask (allocator->alloc_head); frag; frag = unmask (frag->next)) {
+       for (frag = (SgenFragment *)unmask (allocator->alloc_head); frag; frag = (SgenFragment *)unmask (frag->next)) {
                SGEN_LOG (4, "Clear nursery frag %p-%p", frag->fragment_next, frag->fragment_end);
                sgen_clear_range (frag->fragment_next, frag->fragment_end);
 #ifdef NALLOC_DEBUG
@@ -747,7 +747,7 @@ sgen_build_nursery_fragments (GCMemSection *nursery_section, SgenGrayQueue *unpi
 
                addr0 = addr1 = sgen_nursery_end;
                if (pin_entry < pin_end)
-                       addr0 = *pin_entry;
+                       addr0 = (char *)*pin_entry;
                if (frags_ranges)
                        addr1 = frags_ranges->fragment_start;
 
@@ -802,7 +802,7 @@ sgen_build_nursery_fragments (GCMemSection *nursery_section, SgenGrayQueue *unpi
        if (!unmask (mutator_allocator.alloc_head)) {
                SGEN_LOG (1, "Nursery fully pinned");
                for (pin_entry = pin_start; pin_entry < pin_end; ++pin_entry) {
-                       void *p = *pin_entry;
+                       GCObject *p = (GCObject *)*pin_entry;
                        SGEN_LOG (3, "Bastard pinning obj %p (%s), size: %zd", p, sgen_client_vtable_get_name (SGEN_LOAD_VTABLE (p)), sgen_safe_object_get_size (p));
                }
        }
@@ -833,7 +833,7 @@ sgen_can_alloc_size (size_t size)
 
        size = SGEN_ALIGN_UP (size);
 
-       for (frag = unmask (mutator_allocator.alloc_head); frag; frag = unmask (frag->next)) {
+       for (frag = (SgenFragment *)unmask (mutator_allocator.alloc_head); frag; frag = (SgenFragment *)unmask (frag->next)) {
                if ((size_t)(frag->fragment_end - frag->fragment_next) >= size)
                        return TRUE;
        }
@@ -918,7 +918,7 @@ sgen_nursery_allocator_set_nursery_bounds (char *start, char *end)
         * since the nursery size must be a power of 2.
         */
        sgen_space_bitmap_size = (end - start + SGEN_TO_SPACE_GRANULE_IN_BYTES * 8 - 1) / (SGEN_TO_SPACE_GRANULE_IN_BYTES * 8);
-       sgen_space_bitmap = g_malloc0 (sgen_space_bitmap_size);
+       sgen_space_bitmap = (char *)g_malloc0 (sgen_space_bitmap_size);
 
        /* Setup the single first large fragment */
        sgen_minor_collector.init_nursery (&mutator_allocator, start, end);

diff --git a/mono/sgen/sgen-pinning-stats.c b/mono/sgen/sgen-pinning-stats.c
index 546f895583c44cb8017e67bee75ff895160a19f7..5edccfaabec10720fcb6658f1eb8e7d54b8ccc24 100644 (file)
--- a/mono/sgen/sgen-pinning-stats.c
+++ b/mono/sgen/sgen-pinning-stats.c
@@ -107,7 +107,7 @@ sgen_pin_stats_register_address (char *addr, int pin_type)
                        node_ptr = &node->right;
        }
 
-       node = sgen_alloc_internal_dynamic (sizeof (PinStatAddress), INTERNAL_MEM_STATISTICS, TRUE);
+       node = (PinStatAddress *)sgen_alloc_internal_dynamic (sizeof (PinStatAddress), INTERNAL_MEM_STATISTICS, TRUE);
        node->addr = addr;
        node->pin_types = pin_type_bit;
        node->left = node->right = NULL;
@@ -161,7 +161,7 @@ register_vtable (GCVTable vtable, int pin_types)
        int i;
 
        memset (&empty_entry, 0, sizeof (PinnedClassEntry));
-       entry = lookup_vtable_entry (&pinned_class_hash_table, vtable, &empty_entry);
+       entry = (PinnedClassEntry *)lookup_vtable_entry (&pinned_class_hash_table, vtable, &empty_entry);
 
        for (i = 0; i < PIN_TYPE_MAX; ++i) {
                if (pin_types & (1 << i))
@@ -194,7 +194,7 @@ sgen_pin_stats_register_global_remset (GCObject *obj)
                return;
 
        memset (&empty_entry, 0, sizeof (GlobalRemsetClassEntry));
-       entry = lookup_vtable_entry (&global_remset_class_hash_table, SGEN_LOAD_VTABLE (obj), &empty_entry);
+       entry = (GlobalRemsetClassEntry *)lookup_vtable_entry (&global_remset_class_hash_table, SGEN_LOAD_VTABLE (obj), &empty_entry);
 
        ++entry->num_remsets;
 }
@@ -210,7 +210,7 @@ sgen_pin_stats_print_class_stats (void)
                return;
 
        mono_gc_printf (gc_debug_file, "\n%-50s  %10s  %10s  %10s\n", "Class", "Stack", "Static", "Other");
-       SGEN_HASH_TABLE_FOREACH (&pinned_class_hash_table, name, pinned_entry) {
+       SGEN_HASH_TABLE_FOREACH (&pinned_class_hash_table, char *, name, PinnedClassEntry *, pinned_entry) {
                int i;
                mono_gc_printf (gc_debug_file, "%-50s", name);
                for (i = 0; i < PIN_TYPE_MAX; ++i)
@@ -219,7 +219,7 @@ sgen_pin_stats_print_class_stats (void)
        } SGEN_HASH_TABLE_FOREACH_END;
 
        mono_gc_printf (gc_debug_file, "\n%-50s  %10s\n", "Class", "#Remsets");
-       SGEN_HASH_TABLE_FOREACH (&global_remset_class_hash_table, name, remset_entry) {
+       SGEN_HASH_TABLE_FOREACH (&global_remset_class_hash_table, char *, name, GlobalRemsetClassEntry *, remset_entry) {
                mono_gc_printf (gc_debug_file, "%-50s  %10ld\n", name, remset_entry->num_remsets);
        } SGEN_HASH_TABLE_FOREACH_END;
 

diff --git a/mono/sgen/sgen-pinning.c b/mono/sgen/sgen-pinning.c
index fc0ba0bbdf6c6e977ed1b5a9c33205d90fcdd615..a94af9ddf4494db961697faac801a9273bece46b 100644 (file)
--- a/mono/sgen/sgen-pinning.c
+++ b/mono/sgen/sgen-pinning.c
@@ -173,7 +173,7 @@ sgen_dump_pin_queue (void)
        int i;
 
        for (i = 0; i < last_num_pinned; ++i) {
-               void *ptr = pin_queue.data [i];
+               GCObject *ptr = (GCObject *)pin_queue.data [i];
                SGEN_LOG (3, "Bastard pinning obj %p (%s), size: %zd", ptr, sgen_client_vtable_get_name (SGEN_LOAD_VTABLE (ptr)), sgen_safe_object_get_size (ptr));
        }
 }

diff --git a/mono/sgen/sgen-pointer-queue.c b/mono/sgen/sgen-pointer-queue.c
index 0e3fea65318f4973b78fb47040f410f80dfa95d1..196bc3010716ef21708b019d4bddafb2656b4618 100644 (file)
--- a/mono/sgen/sgen-pointer-queue.c
+++ b/mono/sgen/sgen-pointer-queue.c
@@ -43,7 +43,7 @@ static void
 realloc_queue (SgenPointerQueue *queue)
 {
        size_t new_size = queue->size ? queue->size + queue->size/2 : 1024;
-       void **new_data = sgen_alloc_internal_dynamic (sizeof (void*) * new_size, queue->mem_type, TRUE);
+       void **new_data = (void **)sgen_alloc_internal_dynamic (sizeof (void*) * new_size, queue->mem_type, TRUE);
 
        memcpy (new_data, queue->data, sizeof (void*) * queue->next_slot);
        sgen_free_internal_dynamic (queue->data, sizeof (void*) * queue->size, queue->mem_type);

diff --git a/mono/sgen/sgen-protocol-def.h b/mono/sgen/sgen-protocol-def.h
index 91094fdc1aeea4dac629e7befa0acff6bd5edf1b..6d76952b0af8a57077aa2cc475916a2209b59a62 100644 (file)
--- a/mono/sgen/sgen-protocol-def.h
+++ b/mono/sgen/sgen-protocol-def.h
@@ -112,7 +112,7 @@ MATCH_INDEX (matches_interval (ptr, entry->addr, entry->size) ? 0 : BINARY_PROTO
 IS_VTABLE_MATCH (FALSE)
 END_PROTOCOL_ENTRY_HEAVY
 
-BEGIN_PROTOCOL_ENTRY_HEAVY4 (binary_protocol_block_set_state, TYPE_POINTER, addr, TYPE_SIZE, size, TYPE_INT, old, TYPE_INT, new)
+BEGIN_PROTOCOL_ENTRY_HEAVY4 (binary_protocol_block_set_state, TYPE_POINTER, addr, TYPE_SIZE, size, TYPE_INT, old, TYPE_INT, new_)
 DEFAULT_PRINT ()
 IS_ALWAYS_MATCH (FALSE)
 MATCH_INDEX (matches_interval (ptr, entry->addr, entry->size) ? 0 : BINARY_PROTOCOL_NO_MATCH)
@@ -372,6 +372,13 @@ MATCH_INDEX (ptr == entry->cursor ? 1 : ptr == entry->value ? 2 : BINARY_PROTOCO
 IS_VTABLE_MATCH (FALSE)
 END_PROTOCOL_ENTRY_HEAVY
 
+BEGIN_PROTOCOL_ENTRY_HEAVY4 (binary_protocol_mod_union_remset, TYPE_POINTER, obj, TYPE_POINTER, ptr, TYPE_POINTER, value, TYPE_POINTER, value_vtable)
+DEFAULT_PRINT ()
+IS_ALWAYS_MATCH (FALSE)
+MATCH_INDEX (ptr == entry->obj ? 0 : ptr == entry->ptr ? 1 : ptr == entry->value ? 2 : BINARY_PROTOCOL_NO_MATCH)
+IS_VTABLE_MATCH (ptr == entry->value_vtable)
+END_PROTOCOL_ENTRY_HEAVY
+
 #undef BEGIN_PROTOCOL_ENTRY0
 #undef BEGIN_PROTOCOL_ENTRY1
 #undef BEGIN_PROTOCOL_ENTRY2

diff --git a/mono/sgen/sgen-protocol.c b/mono/sgen/sgen-protocol.c
index 4ea1ac391c9a4e083a5fa3f842d1e8ed3548ff53..5b30cbce11b832f65c640596ba7469f72be9ffb6 100644 (file)
--- a/mono/sgen/sgen-protocol.c
+++ b/mono/sgen/sgen-protocol.c
@@ -69,7 +69,7 @@ filename_for_index (int index)
 
        SGEN_ASSERT (0, file_size_limit > 0, "Indexed binary protocol filename must only be used with file size limit");
 
-       filename = sgen_alloc_internal_dynamic (strlen (filename_or_prefix) + 32, INTERNAL_MEM_BINARY_PROTOCOL, TRUE);
+       filename = (char *)sgen_alloc_internal_dynamic (strlen (filename_or_prefix) + 32, INTERNAL_MEM_BINARY_PROTOCOL, TRUE);
        sprintf (filename, "%s.%d", filename_or_prefix, index);
 
        return filename;
@@ -108,7 +108,7 @@ void
 binary_protocol_init (const char *filename, long long limit)
 {
 #ifdef HAVE_UNISTD_H
-       filename_or_prefix = sgen_alloc_internal_dynamic (strlen (filename) + 1, INTERNAL_MEM_BINARY_PROTOCOL, TRUE);
+       filename_or_prefix = (char *)sgen_alloc_internal_dynamic (strlen (filename) + 1, INTERNAL_MEM_BINARY_PROTOCOL, TRUE);
        strcpy (filename_or_prefix, filename);
 
        file_size_limit = limit;
@@ -251,7 +251,7 @@ binary_protocol_flush_buffers (gboolean force)
 
        for (buf = binary_protocol_buffers; buf != NULL; buf = buf->next)
                ++num_buffers;
-       bufs = sgen_alloc_internal_dynamic (num_buffers * sizeof (BinaryProtocolBuffer*), INTERNAL_MEM_BINARY_PROTOCOL, TRUE);
+       bufs = (BinaryProtocolBuffer **)sgen_alloc_internal_dynamic (num_buffers * sizeof (BinaryProtocolBuffer*), INTERNAL_MEM_BINARY_PROTOCOL, TRUE);
        for (buf = binary_protocol_buffers, i = 0; buf != NULL; buf = buf->next, i++)
                bufs [i] = buf;
        SGEN_ASSERT (0, i == num_buffers, "Binary protocol buffer count error");
@@ -280,7 +280,7 @@ binary_protocol_get_buffer (int length)
        if (buffer && buffer->index + length <= BINARY_PROTOCOL_BUFFER_SIZE)
                return buffer;
 
-       new_buffer = sgen_alloc_os_memory (sizeof (BinaryProtocolBuffer), SGEN_ALLOC_INTERNAL | SGEN_ALLOC_ACTIVATE, "debugging memory");
+       new_buffer = (BinaryProtocolBuffer *)sgen_alloc_os_memory (sizeof (BinaryProtocolBuffer), (SgenAllocFlags)(SGEN_ALLOC_INTERNAL | SGEN_ALLOC_ACTIVATE), "debugging memory");
        new_buffer->next = buffer;
        new_buffer->index = 0;
 

diff --git a/mono/sgen/sgen-split-nursery.c b/mono/sgen/sgen-split-nursery.c
index ea427f6a21fee793d5738222aa793cdf3ee52bf8..588651fbc0b67965c946fadc800602c16ca05b0d 100644 (file)
--- a/mono/sgen/sgen-split-nursery.c
+++ b/mono/sgen/sgen-split-nursery.c
@@ -179,8 +179,8 @@ mark_bit (char *space_bitmap, char *pos)
 static void
 mark_bits_in_range (char *space_bitmap, char *start, char *end)
 {
-       start = align_down (start, SGEN_TO_SPACE_GRANULE_BITS);
-       end = align_up (end, SGEN_TO_SPACE_GRANULE_BITS);
+       start = (char *)align_down (start, SGEN_TO_SPACE_GRANULE_BITS);
+       end = (char *)align_up (end, SGEN_TO_SPACE_GRANULE_BITS);
 
        for (;start < end; start += SGEN_TO_SPACE_GRANULE_IN_BYTES)
                mark_bit (space_bitmap, start);
@@ -244,7 +244,7 @@ alloc_for_promotion_slow_path (int age, size_t objsize)
        size_t allocated_size;
        size_t aligned_objsize = (size_t)align_up (objsize, SGEN_TO_SPACE_GRANULE_BITS);
 
-       p = sgen_fragment_allocator_serial_range_alloc (
+       p = (char *)sgen_fragment_allocator_serial_range_alloc (
                &collector_allocator,
                MAX (aligned_objsize, AGE_ALLOC_BUFFER_DESIRED_SIZE),
                MAX (aligned_objsize, AGE_ALLOC_BUFFER_MIN_SIZE),
@@ -336,8 +336,8 @@ prepare_to_space (char *to_space_bitmap, size_t space_bitmap_size)
        previous = &collector_allocator.alloc_head;
 
        for (frag = *previous; frag; frag = *previous) {
-               char *start = align_up (frag->fragment_next, SGEN_TO_SPACE_GRANULE_BITS);
-               char *end = align_down (frag->fragment_end, SGEN_TO_SPACE_GRANULE_BITS);
+               char *start = (char *)align_up (frag->fragment_next, SGEN_TO_SPACE_GRANULE_BITS);
+               char *end = (char *)align_down (frag->fragment_end, SGEN_TO_SPACE_GRANULE_BITS);
 
                /* Fragment is too small to be usable. */
                if ((end - start) < SGEN_MAX_NURSERY_WASTE) {
@@ -378,12 +378,12 @@ static void
 init_nursery (SgenFragmentAllocator *allocator, char *start, char *end)
 {
        int alloc_quote = (int)((end - start) * alloc_ratio);
-       promotion_barrier = align_down (start + alloc_quote, 3);
+       promotion_barrier = (char *)align_down (start + alloc_quote, 3);
        sgen_fragment_allocator_add (allocator, start, promotion_barrier);
        sgen_fragment_allocator_add (&collector_allocator, promotion_barrier, end);
 
        region_age_size = (end - start) >> SGEN_TO_SPACE_GRANULE_BITS;
-       region_age = g_malloc0 (region_age_size);
+       region_age = (char *)g_malloc0 (region_age_size);
 }
 
 static gboolean

diff --git a/mono/sgen/sgen-thread-pool.c b/mono/sgen/sgen-thread-pool.c
index 629b19a415159e6cf4b56982b271aa18cc0e3b7a..e9706943f847803dc38b88b633b6464aefe85c75 100644 (file)
--- a/mono/sgen/sgen-thread-pool.c
+++ b/mono/sgen/sgen-thread-pool.c
@@ -23,7 +23,7 @@
 #include "mono/sgen/sgen-gc.h"
 #include "mono/sgen/sgen-thread-pool.h"
 #include "mono/sgen/sgen-pointer-queue.h"
-#include "mono/utils/mono-mutex.h"
+#include "mono/utils/mono-os-mutex.h"
 #ifndef SGEN_WITHOUT_MONO
 #include "mono/utils/mono-threads.h"
 #endif
@@ -52,7 +52,7 @@ static SgenThreadPoolJob*
 get_job_and_set_in_progress (void)
 {
        for (size_t i = 0; i < job_queue.next_slot; ++i) {
-               SgenThreadPoolJob *job = job_queue.data [i];
+               SgenThreadPoolJob *job = (SgenThreadPoolJob *)job_queue.data [i];
                if (job->state == STATE_WAITING) {
                        job->state = STATE_IN_PROGRESS;
                        return job;
@@ -98,7 +98,7 @@ thread_func (void *thread_data)
 {
        thread_init_func (thread_data);
 
-       mono_mutex_lock (&lock);
+       mono_os_mutex_lock (&lock);
        for (;;) {
                /*
                 * It's important that we check the continue idle flag with the lock held.
@@ -115,16 +115,16 @@ thread_func (void *thread_data)
                         * not being signalled, so we have to run this in a loop until we
                         * really have work to do.
                         */
-                       mono_cond_wait (&work_cond, &lock);
+                       mono_os_cond_wait (&work_cond, &lock);
                        continue;
                }
 
-               mono_mutex_unlock (&lock);
+               mono_os_mutex_unlock (&lock);
 
                if (job) {
                        job->func (thread_data, job);
 
-                       mono_mutex_lock (&lock);
+                       mono_os_mutex_lock (&lock);
 
                        SGEN_ASSERT (0, job->state == STATE_IN_PROGRESS, "The job should still be in progress.");
                        job->state = STATE_DONE;
@@ -133,7 +133,7 @@ thread_func (void *thread_data)
                         * Only the main GC thread will ever wait on the done condition, so we don't
                         * have to broadcast.
                         */
-                       mono_cond_signal (&done_cond);
+                       mono_os_cond_signal (&done_cond);
                } else {
                        SGEN_ASSERT (0, do_idle, "Why did we unlock if we still have to wait for idle?");
                        SGEN_ASSERT (0, idle_job_func, "Why do we have idle work when there's no idle job function?");
@@ -142,10 +142,10 @@ thread_func (void *thread_data)
                                do_idle = continue_idle_job ();
                        } while (do_idle && !job_queue.next_slot);
 
-                       mono_mutex_lock (&lock);
+                       mono_os_mutex_lock (&lock);
 
                        if (!do_idle)
-                               mono_cond_signal (&done_cond);
+                               mono_os_cond_signal (&done_cond);
                }
        }
 
@@ -157,9 +157,9 @@ sgen_thread_pool_init (int num_threads, SgenThreadPoolThreadInitFunc init_func,
 {
        SGEN_ASSERT (0, num_threads == 1, "We only support 1 thread pool thread for now.");
 
-       mono_mutex_init (&lock);
-       mono_cond_init (&work_cond, 0);
-       mono_cond_init (&done_cond, 0);
+       mono_os_mutex_init (&lock);
+       mono_os_cond_init (&work_cond);
+       mono_os_cond_init (&done_cond);
 
        thread_init_func = init_func;
        idle_job_func = idle_func;
@@ -171,7 +171,7 @@ sgen_thread_pool_init (int num_threads, SgenThreadPoolThreadInitFunc init_func,
 SgenThreadPoolJob*
 sgen_thread_pool_job_alloc (const char *name, SgenThreadPoolJobFunc func, size_t size)
 {
-       SgenThreadPoolJob *job = sgen_alloc_internal_dynamic (size, INTERNAL_MEM_THREAD_POOL_JOB, TRUE);
+       SgenThreadPoolJob *job = (SgenThreadPoolJob *)sgen_alloc_internal_dynamic (size, INTERNAL_MEM_THREAD_POOL_JOB, TRUE);
        job->name = name;
        job->size = size;
        job->state = STATE_WAITING;
@@ -188,16 +188,16 @@ sgen_thread_pool_job_free (SgenThreadPoolJob *job)
 void
 sgen_thread_pool_job_enqueue (SgenThreadPoolJob *job)
 {
-       mono_mutex_lock (&lock);
+       mono_os_mutex_lock (&lock);
 
        sgen_pointer_queue_add (&job_queue, job);
        /*
         * FIXME: We could check whether there is a job in progress.  If there is, there's
         * no need to signal the condition, at least as long as we have only one thread.
         */
-       mono_cond_signal (&work_cond);
+       mono_os_cond_signal (&work_cond);
 
-       mono_mutex_unlock (&lock);
+       mono_os_mutex_unlock (&lock);
 }
 
 void
@@ -205,12 +205,12 @@ sgen_thread_pool_job_wait (SgenThreadPoolJob *job)
 {
        SGEN_ASSERT (0, job, "Where's the job?");
 
-       mono_mutex_lock (&lock);
+       mono_os_mutex_lock (&lock);
 
        while (find_job_in_queue (job) >= 0)
-               mono_cond_wait (&done_cond, &lock);
+               mono_os_cond_wait (&done_cond, &lock);
 
-       mono_mutex_unlock (&lock);
+       mono_os_mutex_unlock (&lock);
 }
 
 void
@@ -218,12 +218,12 @@ sgen_thread_pool_idle_signal (void)
 {
        SGEN_ASSERT (0, idle_job_func, "Why are we signaling idle without an idle function?");
 
-       mono_mutex_lock (&lock);
+       mono_os_mutex_lock (&lock);
 
        if (continue_idle_job_func ())
-               mono_cond_signal (&work_cond);
+               mono_os_cond_signal (&work_cond);
 
-       mono_mutex_unlock (&lock);
+       mono_os_mutex_unlock (&lock);
 }
 
 void
@@ -231,23 +231,23 @@ sgen_thread_pool_idle_wait (void)
 {
        SGEN_ASSERT (0, idle_job_func, "Why are we waiting for idle without an idle function?");
 
-       mono_mutex_lock (&lock);
+       mono_os_mutex_lock (&lock);
 
        while (continue_idle_job_func ())
-               mono_cond_wait (&done_cond, &lock);
+               mono_os_cond_wait (&done_cond, &lock);
 
-       mono_mutex_unlock (&lock);
+       mono_os_mutex_unlock (&lock);
 }
 
 void
 sgen_thread_pool_wait_for_all_jobs (void)
 {
-       mono_mutex_lock (&lock);
+       mono_os_mutex_lock (&lock);
 
        while (!sgen_pointer_queue_is_empty (&job_queue))
-               mono_cond_wait (&done_cond, &lock);
+               mono_os_cond_wait (&done_cond, &lock);
 
-       mono_mutex_unlock (&lock);
+       mono_os_mutex_unlock (&lock);
 }
 
 gboolean

diff --git a/mono/sgen/sgen-workers.c b/mono/sgen/sgen-workers.c
index 40d0ed103595b9a75ba1a338599267e5a80e44d5..8f1af1331299b951daef97af52ceeb1c4d137bb7 100644 (file)
--- a/mono/sgen/sgen-workers.c
+++ b/mono/sgen/sgen-workers.c
@@ -191,7 +191,7 @@ init_private_gray_queue (WorkerData *data)
 static void
 thread_pool_init_func (void *data_untyped)
 {
-       WorkerData *data = data_untyped;
+       WorkerData *data = (WorkerData *)data_untyped;
        SgenMajorCollector *major = sgen_get_major_collector ();
 
        sgen_client_thread_register_worker ();
@@ -211,7 +211,7 @@ continue_idle_func (void)
 static void
 marker_idle_func (void *data_untyped)
 {
-       WorkerData *data = data_untyped;
+       WorkerData *data = (WorkerData *)data_untyped;
 
        SGEN_ASSERT (0, continue_idle_func (), "Why are we called when we're not supposed to work?");
        SGEN_ASSERT (0, sgen_concurrent_collection_in_progress (), "The worker should only mark in concurrent collections.");
@@ -258,7 +258,7 @@ void
 sgen_workers_init (int num_workers)
 {
        int i;
-       void **workers_data_ptrs = alloca(num_workers * sizeof(void *));
+       void **workers_data_ptrs = (void **)alloca(num_workers * sizeof(void *));
 
        if (!sgen_get_major_collector ()->is_concurrent) {
                sgen_thread_pool_init (num_workers, thread_pool_init_func, NULL, NULL, NULL);
@@ -269,7 +269,7 @@ sgen_workers_init (int num_workers)
 
        workers_num = num_workers;
 
-       workers_data = sgen_alloc_internal_dynamic (sizeof (WorkerData) * num_workers, INTERNAL_MEM_WORKER_DATA, TRUE);
+       workers_data = (WorkerData *)sgen_alloc_internal_dynamic (sizeof (WorkerData) * num_workers, INTERNAL_MEM_WORKER_DATA, TRUE);
        memset (workers_data, 0, sizeof (WorkerData) * num_workers);
 
        init_distribute_gray_queue ();

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 03cf5a7e9bff706fd86a6d46db1c4b2b69d692e1..f784c41bfdcb5254988f24156497a91607202c97 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = assemblyresolve gc-descriptors
 
-check-local: assemblyresolve/test/asm.dll testjit test-generic-sharing test-type-load test-cattr-type-load test-reflection-load-with-context test_platform test-process-exit test-messages test-unhandled-exception-2 test-appdomain-unload rm-empty-logs
+check-local: assemblyresolve/test/asm.dll testjit test-generic-sharing test-type-load test-cattr-type-load test-reflection-load-with-context test_platform test-process-exit test-messages test-env-options test-unhandled-exception-2 test-appdomain-unload rm-empty-logs
 check-full: test-sgen check-local
 check-parallel: compile-tests check-full
 
@@ -188,6 +188,7 @@ BASE_TEST_CS_SRC=           \
        delegate10.cs           \
        delegate11.cs           \
        delegate12.cs           \
+       delegate13.cs           \
        remoting1.cs            \
        remoting2.cs            \
        remoting3.cs            \
@@ -754,6 +755,9 @@ test-messages: w32message.exe
 endif
 endif
 
+test-env-options:
+       MONO_ENV_OPTIONS="--version" $(RUNTIME) array-init.exe | grep -q Architecture:
+
 if AMD64
 test-sgen : sgen-tests
 else

diff --git a/mono/tests/delegate13.cs b/mono/tests/delegate13.cs
new file mode 100644 (file)
index 0000000..3a4cfd0
--- /dev/null
+++ b/mono/tests/delegate13.cs
@@ -0,0 +1,31 @@
+using System;
+
+public static class Program
+{
+       public static int Main ()
+       {
+               Action d1 = new Action (Method1);
+               Action d2 = new Action (Method2);
+               Action d12 = d1 + d2;
+               Action d21 = d2 + d1;
+
+               if (d1.Method.Name != "Method1")
+                       return 1;
+               if (d2.Method.Name != "Method2")
+                       return 2;
+               if (d12.Method.Name != "Method2")
+                       return 3;
+               if (d21.Method.Name != "Method1")
+                       return 4;
+
+               return 0;
+       }
+
+       public static void Method1 ()
+       {
+       }
+
+       public static void Method2 ()
+       {
+       }
+}
\ No newline at end of file

diff --git a/mono/tests/delegate7.cs b/mono/tests/delegate7.cs
index a89657a4ba28fdc6b22479091a4683150a152b51..dd3a2a3ea27a4cbebd7ccb25cf428109d8afd7ea 100644 (file)
--- a/mono/tests/delegate7.cs
+++ b/mono/tests/delegate7.cs
@@ -16,6 +16,10 @@ class Tests {
                v += 4;
                Console.WriteLine ("Test.F4");
        }
+       static void F8 () {
+               v += 8;
+               Console.WriteLine ("Test.F8");
+       }
 
        public static int Main () {
                return TestDriver.RunTests (typeof (Tests));
@@ -33,6 +37,7 @@ class Tests {
                SimpleDelegate d1 = new SimpleDelegate (F1);
                SimpleDelegate d2 = new SimpleDelegate (F2);
                SimpleDelegate d4 = new SimpleDelegate (F4);
+               SimpleDelegate d8 = new SimpleDelegate (F8);
 
                if (d1 - d1 != null)
                        return 1;
@@ -82,21 +87,21 @@ class Tests {
 
                if (d12 - d12 != null)
                        return 21;
-               if (!check_is_expected_v (d12 - d14, 2))
+               if (!check_is_expected_v (d12 - d14, 3))
                        return 22;
-               if (!check_is_expected_v (d12 - d24, 1))
+               if (!check_is_expected_v (d12 - d24, 3))
                        return 23;
 
-               if (!check_is_expected_v (d14 - d12, 4))
+               if (!check_is_expected_v (d14 - d12, 5))
                        return 24;
                if (d14 - d14 != null)
                        return 25;
-               if (!check_is_expected_v (d14 - d24, 1))
+               if (!check_is_expected_v (d14 - d24, 5))
                        return 26;
 
-               if (!check_is_expected_v (d24 - d12, 4))
+               if (!check_is_expected_v (d24 - d12, 6))
                        return 27;
-               if (!check_is_expected_v (d24 - d14, 2))
+               if (!check_is_expected_v (d24 - d14, 6))
                        return 28;
                if (d24 - d24 != null)
                        return 29;
@@ -112,7 +117,7 @@ class Tests {
 
                if (!check_is_expected_v (d124 - d12, 4))
                        return 34;
-               if (!check_is_expected_v (d124 - d14, 2))
+               if (!check_is_expected_v (d124 - d14, 7))
                        return 35;
                if (!check_is_expected_v (d124 - d24, 1))
                        return 36;
@@ -120,6 +125,35 @@ class Tests {
                if (d124 - d124 != null)
                        return 37;
 
+               SimpleDelegate d1248 = d1 + d2 + d4 + d8;
+
+               if (!check_is_expected_v (d1248 - (d1 + d2), 12))
+                       return 41;
+               if (!check_is_expected_v (d1248 - (d1 + d4), 15))
+                       return 42;
+               if (!check_is_expected_v (d1248 - (d1 + d8), 15))
+                       return 43;
+               if (!check_is_expected_v (d1248 - (d2 + d4), 9))
+                       return 44;
+               if (!check_is_expected_v (d1248 - (d2 + d8), 15))
+                       return 45;
+               if (!check_is_expected_v (d1248 - (d4 + d8), 3))
+                       return 46;
+
+               if (!check_is_expected_v (d1248 - (d1 + d2 + d4), 8))
+                       return 51;
+               if (!check_is_expected_v (d1248 - (d1 + d2 + d8), 15))
+                       return 52;
+               if (!check_is_expected_v (d1248 - (d1 + d4 + d8), 15))
+                       return 53;
+               if (!check_is_expected_v (d1248 - (d2 + d4 + d8), 1))
+                       return 54;
+               if (!check_is_expected_v (d1248 - (d2 + d4 + d8), 1))
+                       return 54;
+
+               if (d1248 - d1248 != null)
+                       return 55;
+
                return 0;
        }
 

diff --git a/mono/tests/libtest.c b/mono/tests/libtest.c
index 60983ef323e4f863a97cdd7857158d20407a337c..de80d9f693f06a8e96a032c2da3cbb9423792e19 100644 (file)
--- a/mono/tests/libtest.c
+++ b/mono/tests/libtest.c
@@ -99,7 +99,7 @@ static gunichar2* marshal_bstr_alloc(const gchar* str)
        int slen = strlen (str);
        gunichar2* temp;
        /* allocate len + 1 utf16 characters plus 4 byte integer for length*/
-       ret = g_malloc ((slen + 1) * sizeof(gunichar2) + sizeof(guint32));
+       ret = (gchar *)g_malloc ((slen + 1) * sizeof(gunichar2) + sizeof(guint32));
        if (ret == NULL)
                return NULL;
        temp = g_utf8_to_utf16 (str, -1, NULL, NULL, NULL);
@@ -129,7 +129,7 @@ test_lpwstr_marshal (unsigned short* chars, long length)
        int i = 0;
        unsigned short *res;
 
-       res = marshal_alloc (2 * (length + 1));
+       res = (unsigned short *)marshal_alloc (2 * (length + 1));
 
        // printf("test_lpwstr_marshal()\n");
        
@@ -152,7 +152,7 @@ test_lpwstr_marshal_out (unsigned short** chars)
        const char abc[] = "ABC";
        glong len = strlen(abc);
 
-       *chars = marshal_alloc (2 * (len + 1));
+       *chars = (unsigned short *)marshal_alloc (2 * (len + 1));
        
        while ( i < len ) {
                (*chars) [i] = abc[i];
@@ -515,7 +515,7 @@ mono_test_marshal_out_byref_array_out_size_param (int **out_arr, int *out_len)
        int i, len;
 
        len = 4;
-       arr = marshal_alloc (sizeof (gint32) * len);
+       arr = (gint32 *)marshal_alloc (sizeof (gint32) * len);
        for (i = 0; i < len; ++i)
                arr [i] = i;
        *out_arr = arr;
@@ -623,7 +623,7 @@ LIBTEST_API int STDCALL
 mono_test_marshal_out_struct (int a, simplestruct *ss, int b, OutVTypeDelegate func)
 {
        /* Check that the input pointer is ignored */
-       ss->d = (gpointer)0x12345678;
+       ss->d = (const char *)0x12345678;
 
        func (a, ss, b);
 
@@ -1018,7 +1018,7 @@ mono_test_marshal_delegate7 (SimpleDelegate7 delegate)
        simplestruct *ptr;
 
        /* Check that the input pointer is ignored */
-       ptr = (gpointer)0x12345678;
+       ptr = (simplestruct *)0x12345678;
 
        res = delegate (&ptr);
        if (res != 0)
@@ -1067,7 +1067,7 @@ typedef int (STDCALL *SimpleDelegate9) (return_int_fnt d);
 LIBTEST_API int STDCALL 
 mono_test_marshal_delegate9 (SimpleDelegate9 delegate, gpointer ftn)
 {
-       return delegate (ftn);
+       return delegate ((return_int_fnt)ftn);
 }
 
 static int STDCALL 
@@ -1172,7 +1172,7 @@ mono_test_marshal_stringbuilder_out (char **s)
        const char m[] = "This is my message.  Isn't it nice?";
        char *str;
 
-       str = marshal_alloc (strlen (m) + 1);
+       str = (char *)marshal_alloc (strlen (m) + 1);
        memcpy (str, m, strlen (m) + 1);
        
        *s = str;
@@ -1188,7 +1188,7 @@ mono_test_marshal_stringbuilder_out_unicode (gunichar2 **s)
        s2 = g_utf8_to_utf16 (m, -1, NULL, &len, NULL);
        
        len = (len * 2) + 2;
-       *s = marshal_alloc (len);
+       *s = (gunichar2 *)marshal_alloc (len);
        memcpy (*s, s2, len);
 
        g_free (s2);
@@ -1205,18 +1205,21 @@ mono_test_marshal_stringbuilder_ref (char **s)
        if (strcmp (*s, "ABC"))
                return 1;
 
-       str = marshal_alloc (strlen (m) + 1);
+       str = (char *)marshal_alloc (strlen (m) + 1);
        memcpy (str, m, strlen (m) + 1);
        
        *s = str;
        return 0;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wc++-compat"
 typedef struct {
 #ifndef __GNUC__
     char a;
 #endif
 } EmptyStruct;
+#pragma GCC diagnostic pop
 
 LIBTEST_API int STDCALL 
 mono_test_marshal_empty_string_array (char **array)
@@ -1334,7 +1337,7 @@ mono_test_byvalstr_gen (void)
 {
        ByValStrStruct *ret;
        
-       ret = malloc(sizeof(ByValStrStruct));
+       ret = (ByValStrStruct *)malloc (sizeof (ByValStrStruct));
        memset(ret, 'a', sizeof(ByValStrStruct)-1);
        ret->a[sizeof(ByValStrStruct)-1] = 0;
 
@@ -1490,7 +1493,7 @@ class_marshal_test4 (SimpleObj *obj1)
 LIBTEST_API void STDCALL
 class_marshal_test1 (SimpleObj **obj1)
 {
-       SimpleObj *res = malloc (sizeof (SimpleObj));
+       SimpleObj *res = (SimpleObj *)malloc (sizeof (SimpleObj));
 
        res->str = marshal_strdup ("ABC");
        res->i = 5;
@@ -1733,7 +1736,7 @@ mono_test_asany (void *ptr, int what)
                GError *error = NULL;
                char *s;
 
-               s = g_utf16_to_utf8 (ptr, -1, NULL, NULL, &error);
+               s = g_utf16_to_utf8 ((const gunichar2 *)ptr, -1, NULL, NULL, &error);
 
                if (!s)
                        return 1;
@@ -1765,7 +1768,7 @@ typedef struct
 LIBTEST_API int STDCALL 
 mono_test_marshal_asany_in (void* ptr)
 {
-       AsAnyStruct* asAny = ptr;
+       AsAnyStruct *asAny = (AsAnyStruct *)ptr;
        int res = asAny->i + asAny->j + asAny->k;
 
        return res;
@@ -1774,7 +1777,7 @@ mono_test_marshal_asany_in (void* ptr)
 LIBTEST_API int STDCALL 
 mono_test_marshal_asany_inout (void* ptr)
 {
-       AsAnyStruct* asAny = ptr;
+       AsAnyStruct *asAny = (AsAnyStruct *)ptr;
        int res = asAny->i + asAny->j + asAny->k;
 
        marshal_free (asAny->s);
@@ -1790,7 +1793,7 @@ mono_test_marshal_asany_inout (void* ptr)
 LIBTEST_API int STDCALL 
 mono_test_marshal_asany_out (void* ptr)
 {
-       AsAnyStruct* asAny = ptr;
+       AsAnyStruct *asAny = (AsAnyStruct *)ptr;
        int res = asAny->i + asAny->j + asAny->k;
 
        asAny->i = 10;
@@ -1976,7 +1979,7 @@ mono_test_marshal_pass_return_custom_in_delegate (PassReturnPtrDelegate del)
        buf [0] = 0;
        buf [1] = 10;
 
-       ptr = del (&buf);
+       ptr = (guint32 *)del (&buf);
 
        res = ptr [1];
 
@@ -3586,22 +3589,22 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
        int ret = 0;
 
        gpointer (*mono_method_get_unmanaged_thunk)(gpointer)
-               = lookup_mono_symbol ("mono_method_get_unmanaged_thunk");
+               = (gpointer (*)(gpointer))lookup_mono_symbol ("mono_method_get_unmanaged_thunk");
 
        gpointer (*mono_string_new_wrapper)(const char *)
-               = lookup_mono_symbol ("mono_string_new_wrapper");
+               = (gpointer (*)(const char *))lookup_mono_symbol ("mono_string_new_wrapper");
 
-       char* (*mono_string_to_utf8)(gpointer)
-               = lookup_mono_symbol ("mono_string_to_utf8");
+       char *(*mono_string_to_utf8)(gpointer)
+               = (char *(*)(gpointer))lookup_mono_symbol ("mono_string_to_utf8");
 
        gpointer (*mono_object_unbox)(gpointer)
-               = lookup_mono_symbol ("mono_object_unbox");
+               = (gpointer (*)(gpointer))lookup_mono_symbol ("mono_object_unbox");
 
        gpointer (*mono_threads_enter_gc_unsafe_region) (gpointer)
-               = lookup_mono_symbol ("mono_threads_enter_gc_unsafe_region");
+               = (gpointer (*)(gpointer))lookup_mono_symbol ("mono_threads_enter_gc_unsafe_region");
 
        void (*mono_threads_exit_gc_unsafe_region) (gpointer, gpointer)
-               = lookup_mono_symbol ("mono_threads_exit_gc_unsafe_region");
+               = (void (*)(gpointer, gpointer))lookup_mono_symbol ("mono_threads_exit_gc_unsafe_region");
 
        
 
@@ -3621,7 +3624,7 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                goto done;
        }
 
-       CreateObject = mono_method_get_unmanaged_thunk (create_object_method_handle);
+       CreateObject = (gpointer (STDCALL *)(gpointer *))mono_method_get_unmanaged_thunk (create_object_method_handle);
        if (!CreateObject) {
                ret = 3;
                goto done;
@@ -3632,14 +3635,14 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
 
        case 0: {
                /* thunks.cs:Test.Test0 */
-               void (STDCALL *F)(gpointer*) = test_method;
+               void (STDCALL *F)(gpointer *) = (void (STDCALL *)(gpointer *))test_method;
                F (&ex);
                break;
        }
 
        case 1: {
                /* thunks.cs:Test.Test1 */
-               int (STDCALL *F)(gpointer*) = test_method;
+               int (STDCALL *F)(gpointer *) = (int (STDCALL *)(gpointer *))test_method;
                if (F (&ex) != 42) {
                        ret = 4;
                        goto done;
@@ -3649,7 +3652,7 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
 
        case 2: {
                /* thunks.cs:Test.Test2 */
-               gpointer (STDCALL *F)(gpointer, gpointer*) = test_method;
+               gpointer (STDCALL *F)(gpointer, gpointer*) = (gpointer (STDCALL *)(gpointer, gpointer *))test_method;
                gpointer str = mono_string_new_wrapper ("foo");
                if (str != F (str, &ex)) {
                        ret = 4;
@@ -3664,7 +3667,7 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                gpointer obj;
                gpointer str;
 
-               F = test_method;
+               F = (gpointer (STDCALL *)(gpointer, gpointer, gpointer *))test_method;
                obj = CreateObject (&ex);
                str = mono_string_new_wrapper ("bar");
 
@@ -3681,7 +3684,7 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                gpointer obj;
                gpointer str;
 
-               F = test_method;
+               F = (int (STDCALL *)(gpointer, gpointer, int, gpointer *))test_method;
                obj = CreateObject (&ex);
                str = mono_string_new_wrapper ("bar");
 
@@ -3699,7 +3702,7 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                gpointer obj;
                gpointer str;
 
-               F = test_method;
+               F = (int (STDCALL *)(gpointer, gpointer, int, gpointer *))test_method;
                obj = CreateObject (&ex);
                str = mono_string_new_wrapper ("bar");
 
@@ -3720,7 +3723,7 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                gpointer str = mono_string_new_wrapper ("Test6");
                int res;
 
-               F = test_method;
+               F = (int (STDCALL *)(gpointer, guint8, gint16, gint32, gint64, float, double, gpointer, gpointer *))test_method;
                obj = CreateObject (&ex);
 
                res = F (obj, 254, 32700, -245378, 6789600, 3.1415, 3.1415, str, &ex);
@@ -3739,7 +3742,7 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
 
        case 7: {
                /* thunks.cs:Test.Test7 */
-               gint64 (STDCALL *F)(gpointer*) = test_method;
+               gint64 (STDCALL *F)(gpointer*) = (gint64 (STDCALL *)(gpointer *))test_method;
                if (F (&ex) != G_MAXINT64) {
                        ret = 4;
                        goto done;
@@ -3760,7 +3763,8 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                double a6;
                gpointer a7;
 
-               F = test_method;
+               F = (void (STDCALL *)(guint8 *, gint16 *, gint32 *, gint64 *, float *, double *,
+                       gpointer *, gpointer *))test_method;
 
                F (&a1, &a2, &a3, &a4, &a5, &a6, &a7, &ex);
                if (ex) {
@@ -3785,7 +3789,7 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
        case 9: {
                /* thunks.cs:Test.Test9 */
                void (STDCALL *F)(guint8*, gint16*, gint32*, gint64*, float*, double*,
-                                gpointer*, gpointer*);
+                       gpointer*, gpointer*);
 
                guint8 a1;
                gint16 a2;
@@ -3795,7 +3799,8 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                double a6;
                gpointer a7;
 
-               F = test_method;
+               F = (void (STDCALL *)(guint8 *, gint16 *, gint32 *, gint64 *, float *, double *,
+                       gpointer *, gpointer *))test_method;
 
                F (&a1, &a2, &a3, &a4, &a5, &a6, &a7, &ex);
                if (!ex) {
@@ -3818,7 +3823,7 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                        goto done;
                }
 
-               F = test_method;
+               F = (void (STDCALL *)(gpointer *, gpointer *))test_method;
 
                F (&obj1, &ex);
                if (ex) {
@@ -3853,7 +3858,7 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                        goto done;
                }
 
-               a1 = mono_object_unbox (obj);
+               a1 = (TestStruct *)mono_object_unbox (obj);
                if (!a1) {
                        ret = 6;
                        goto done;
@@ -3862,9 +3867,9 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                a1->A = 42;
                a1->B = 3.1415;
 
-               F = test_method;
+               F = (int (STDCALL *)(gpointer *, gpointer *))test_method;
 
-               res = F (obj, &ex);
+               res = F ((gpointer *)obj, &ex);
                if (ex) {
                        ret = 7;
                        goto done;
@@ -3902,13 +3907,13 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                        goto done;
                }
 
-               a1 = mono_object_unbox (obj);
+               a1 = (TestStruct *)mono_object_unbox (obj);
                if (!a1) {
                        ret = 6;
                        goto done;
                }
 
-               F = test_method;
+               F = (void (STDCALL *)(gpointer, gpointer *))test_method;
 
                F (obj, &ex);
                if (ex) {
@@ -3936,7 +3941,7 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                TestStruct *a1;
                gpointer obj;
 
-               F = test_method;
+               F = (gpointer (STDCALL *)(gpointer *))test_method;
 
                obj = F (&ex);
                if (ex) {
@@ -3949,7 +3954,7 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                        goto done;
                }
 
-               a1 = mono_object_unbox (obj);
+               a1 = (TestStruct *)mono_object_unbox (obj);
 
                if (a1->A != 42) {
                        ret = 5;
@@ -3982,7 +3987,7 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                        goto done;
                }
                
-               a1 = mono_object_unbox (obj);
+               a1 = (TestStruct *)mono_object_unbox (obj);
 
                if (!a1) {
                        ret = 6;
@@ -3992,7 +3997,7 @@ test_method_thunk (int test_id, gpointer test_method_handle, gpointer create_obj
                a1->A = 42;
                a1->B = 3.1415;
 
-               F = test_method;
+               F = (void (STDCALL *)(gpointer, gpointer *))test_method;
 
                F (obj, &ex);
                if (ex) {
@@ -5406,7 +5411,7 @@ static int call_managed_res;
 static void
 call_managed (gpointer arg)
 {
-       SimpleDelegate del = arg;
+       SimpleDelegate del = (SimpleDelegate)arg;
 
        call_managed_res = del (42);
 }
@@ -5420,7 +5425,7 @@ mono_test_marshal_thread_attach (SimpleDelegate del)
        int res;
        pthread_t t;
 
-       res = pthread_create (&t, NULL, (gpointer)call_managed, del);
+       res = pthread_create (&t, NULL, (gpointer (*)(gpointer))call_managed, del);
        g_assert (res == 0);
        pthread_join (t, NULL);
 
@@ -5466,7 +5471,7 @@ mono_test_marshal_lpwstr (gunichar2 *str)
 LIBTEST_API char* STDCALL
 mono_test_marshal_return_lpstr (void)
 {
-       char *res = marshal_alloc (4);
+       char *res = (char *)marshal_alloc (4);
        strcpy (res, "XYZ");
        return res;
 }
@@ -5475,7 +5480,7 @@ mono_test_marshal_return_lpstr (void)
 LIBTEST_API gunichar2* STDCALL
 mono_test_marshal_return_lpwstr (void)
 {
-       gunichar2 *res = marshal_alloc (8);
+       gunichar2 *res = (gunichar2 *)marshal_alloc (8);
        gunichar2* tmp = g_utf8_to_utf16 ("XYZ", -1, NULL, NULL, NULL);
 
        memcpy (res, tmp, 8);

diff --git a/mono/tests/sgen-bridge-major-fragmentation.cs b/mono/tests/sgen-bridge-major-fragmentation.cs
index 5fc72e67e77bb713e73fc04ff27e723f28ea1eeb..c954ade20b8d539a9e221d41fa0036361391fcd2 100644 (file)
--- a/mono/tests/sgen-bridge-major-fragmentation.cs
+++ b/mono/tests/sgen-bridge-major-fragmentation.cs
@@ -13,6 +13,9 @@ public class Bridge {
 }
 
 class Driver {
+       static void LogLine (string message) {
+               Console.WriteLine ("[" + DateTime.Now + "] " + message);
+       }
        //we fill 16Mb worth of stuff, eg, 256k objects
        const int major_fill = 1024 * 256;
 
@@ -24,7 +27,7 @@ class Driver {
                for (int i = 0; i < major_fill; ++i)
                        arr [i] = new NonBridge ();
                GC.Collect (1);
-               Console.WriteLine ("major fill done");
+               LogLine ("major fill done");
 
                //induce massive fragmentation
                for (int i = 0; i < major_fill; i += 4) {
@@ -33,7 +36,7 @@ class Driver {
                        arr [i + 3] = null;
                }
                GC.Collect (1);
-               Console.WriteLine ("fragmentation done");
+               LogLine ("fragmentation done");
 
                //since 50% is garbage, do 2 fill passes
                for (int j = 0; j < 2; ++j) {
@@ -44,7 +47,7 @@ class Driver {
                                        arr [i] = new Bridge ();
                        }
                }
-               Console.WriteLine ("done spewing bridges");
+               LogLine ("done spewing bridges");
                
                for (int i = 0; i < major_fill; ++i)
                        arr [i] = null;
@@ -55,10 +58,10 @@ class Driver {
        static void Main () {
                const int loops = 4;
                for (int i = 0; i < loops; ++i) {
-                       Console.WriteLine ("CrashLoop {0}/{1}", i + 1, loops);
+                       LogLine ("CrashLoop " + (i + 1) + "/" + loops);
                        CrashMainLoop ();
                }
-               Console.WriteLine ("done");
+               LogLine ("done");
                GC.Collect ();
                GC.WaitForPendingFinalizers ();
                GC.Collect ();

diff --git a/mono/tests/test-driver b/mono/tests/test-driver
index 41b2832d1c7dd5fbf9facb39b7c5e03e73469f7e..a10323bb177a938ff2c311ff9b69e6b4eb812361 100755 (executable)
--- a/mono/tests/test-driver
+++ b/mono/tests/test-driver
@@ -27,7 +27,7 @@ if ($test =~ /.*\|.*/) {
        $output = $test;
 
        #This is a silly workaround, but all tests that use extra parameters need a larger timeout.
-       $timeout_in_minutes = 9;
+       $timeout_in_minutes = 15;
 }
 $ENV{'TEST_DRIVER_TIMEOUT_SEC'} = $timeout_in_minutes * 60;
 

diff --git a/mono/unit-tests/test-conc-hashtable.c b/mono/unit-tests/test-conc-hashtable.c
index fec63391ed85d337ac078ed81ebcc71014c73bb0..c5303a1a6cd7b3060fae2b5be3aeeaa1815d952b 100644 (file)
--- a/mono/unit-tests/test-conc-hashtable.c
+++ b/mono/unit-tests/test-conc-hashtable.c
@@ -37,24 +37,24 @@ single_writer_single_reader (void)
        MonoConcurrentHashTable *h;
        int res = 0;
 
-       mono_mutex_init (&mutex);
+       mono_os_mutex_init (&mutex);
        h = mono_conc_hashtable_new (NULL, NULL);
 
-       mono_mutex_lock (&mutex);
+       mono_os_mutex_lock (&mutex);
        mono_conc_hashtable_insert (h, GUINT_TO_POINTER (10), GUINT_TO_POINTER (20));
-       mono_mutex_unlock (&mutex);
+       mono_os_mutex_unlock (&mutex);
 
-       mono_mutex_lock (&mutex);
+       mono_os_mutex_lock (&mutex);
        mono_conc_hashtable_insert (h, GUINT_TO_POINTER (30), GUINT_TO_POINTER (40));
-       mono_mutex_unlock (&mutex);
+       mono_os_mutex_unlock (&mutex);
 
-       mono_mutex_lock (&mutex);
+       mono_os_mutex_lock (&mutex);
        mono_conc_hashtable_insert (h, GUINT_TO_POINTER (50), GUINT_TO_POINTER (60));
-       mono_mutex_unlock (&mutex);
+       mono_os_mutex_unlock (&mutex);
 
-       mono_mutex_lock (&mutex);
+       mono_os_mutex_lock (&mutex);
        mono_conc_hashtable_insert (h, GUINT_TO_POINTER (2), GUINT_TO_POINTER (3));
-       mono_mutex_unlock (&mutex);
+       mono_os_mutex_unlock (&mutex);
 
        if (mono_conc_hashtable_lookup (h, GUINT_TO_POINTER (30)) != GUINT_TO_POINTER (40))
                res = 1;
@@ -66,7 +66,7 @@ single_writer_single_reader (void)
                res = 4;
 
        mono_conc_hashtable_destroy (h);
-       mono_mutex_destroy (&mutex);
+       mono_os_mutex_destroy (&mutex);
        if (res)
                printf ("SERIAL TEST FAILED %d\n", res);
        return res;
@@ -82,9 +82,9 @@ pw_sr_thread (void *arg)
        mono_thread_info_attach ((gpointer)&arg);
 
        for (i = 0; i < 1000; ++i) {
-               mono_mutex_lock (&global_mutex);
+               mono_os_mutex_lock (&global_mutex);
                mono_conc_hashtable_insert (hash, GINT_TO_POINTER (i + idx), GINT_TO_POINTER (i + 1));
-               mono_mutex_unlock (&global_mutex);
+               mono_os_mutex_unlock (&global_mutex);
        }
        return NULL;
 }
@@ -95,7 +95,7 @@ parallel_writer_single_reader (void)
        pthread_t a,b,c;
        int i, j, res = 0;
 
-       mono_mutex_init (&global_mutex);
+       mono_os_mutex_init (&global_mutex);
        hash = mono_conc_hashtable_new (NULL, NULL);
 
        pthread_create (&a, NULL, pw_sr_thread, GINT_TO_POINTER (1));
@@ -117,7 +117,7 @@ parallel_writer_single_reader (void)
 
 done:
        mono_conc_hashtable_destroy (hash);
-       mono_mutex_destroy (&global_mutex);
+       mono_os_mutex_destroy (&global_mutex);
        if (res)
                printf ("PAR_WRITER_SINGLE_READER TEST FAILED %d\n", res);
        return res;
@@ -149,7 +149,7 @@ single_writer_parallel_reader (void)
        int i, res = 0;
        ra = rb = rc = GINT_TO_POINTER (1);
 
-       mono_mutex_init (&global_mutex);
+       mono_os_mutex_init (&global_mutex);
        hash = mono_conc_hashtable_new (NULL, NULL);
 
        pthread_create (&a, NULL, pr_sw_thread, GINT_TO_POINTER (0));
@@ -157,17 +157,17 @@ single_writer_parallel_reader (void)
        pthread_create (&c, NULL, pr_sw_thread, GINT_TO_POINTER (2));
 
        for (i = 0; i < 100; ++i) {
-               mono_mutex_lock (&global_mutex);
+               mono_os_mutex_lock (&global_mutex);
                mono_conc_hashtable_insert (hash, GINT_TO_POINTER (i +   0 + 1), GINT_TO_POINTER ((i +   0) * 2 + 1));
-               mono_mutex_unlock (&global_mutex);
+               mono_os_mutex_unlock (&global_mutex);
 
-               mono_mutex_lock (&global_mutex);
+               mono_os_mutex_lock (&global_mutex);
                mono_conc_hashtable_insert (hash, GINT_TO_POINTER (i + 100 + 1), GINT_TO_POINTER ((i + 100) * 2 + 1));
-               mono_mutex_unlock (&global_mutex);
+               mono_os_mutex_unlock (&global_mutex);
 
-               mono_mutex_lock (&global_mutex);
+               mono_os_mutex_lock (&global_mutex);
                mono_conc_hashtable_insert (hash, GINT_TO_POINTER (i + 200 + 1), GINT_TO_POINTER ((i + 200) * 2 + 1));
-               mono_mutex_unlock (&global_mutex);
+               mono_os_mutex_unlock (&global_mutex);
        }
 
        pthread_join (a, &ra);
@@ -176,7 +176,7 @@ single_writer_parallel_reader (void)
        res = GPOINTER_TO_INT (ra) + GPOINTER_TO_INT (rb) + GPOINTER_TO_INT (rc);
 
        mono_conc_hashtable_destroy (hash);
-       mono_mutex_destroy (&global_mutex);
+       mono_os_mutex_destroy (&global_mutex);
        if (res)
                printf ("SINGLE_WRITER_PAR_READER TEST FAILED %d\n", res);
        return res;
@@ -213,9 +213,9 @@ pw_pr_w_add_thread (void *arg)
        mono_thread_info_attach ((gpointer)&arg);
 
        for (i = idx; i < idx + 1000; i++) {
-               mono_mutex_lock (&global_mutex);
+               mono_os_mutex_lock (&global_mutex);
                mono_conc_hashtable_insert (hash, GINT_TO_POINTER (i + 1), GINT_TO_POINTER (i + 1));
-               mono_mutex_unlock (&global_mutex);
+               mono_os_mutex_unlock (&global_mutex);
        }
        return NULL;
 }
@@ -228,9 +228,9 @@ pw_pr_w_del_thread (void *arg)
        mono_thread_info_attach ((gpointer)&arg);
 
        for (i = idx; i < idx + 1000; i++) {
-               mono_mutex_lock (&global_mutex);
+               mono_os_mutex_lock (&global_mutex);
                mono_conc_hashtable_remove (hash, GINT_TO_POINTER (i + 1));
-               mono_mutex_unlock (&global_mutex);
+               mono_os_mutex_unlock (&global_mutex);
        }
        return NULL;
 }
@@ -244,7 +244,7 @@ parallel_writer_parallel_reader (void)
 
        srand(time(NULL));
 
-       mono_mutex_init (&global_mutex);
+       mono_os_mutex_init (&global_mutex);
        hash = mono_conc_hashtable_new (NULL, NULL);
 
        for (i = 0; i < 2; i++) {
@@ -284,7 +284,7 @@ parallel_writer_parallel_reader (void)
                printf ("PAR_WRITER_PAR_READER TEST FAILED %d %d %d\n", GPOINTER_TO_INT (a), GPOINTER_TO_INT (b), GPOINTER_TO_INT (c));
 
        mono_conc_hashtable_destroy (hash);
-       mono_mutex_destroy (&global_mutex);
+       mono_os_mutex_destroy (&global_mutex);
 
        return res;
 }
@@ -328,14 +328,25 @@ benchmark_glib (void)
        g_hash_table_destroy (h);
 }
 
+static void
+thread_state_init (MonoThreadUnwindState *ctx)
+{
+}
+
+
 int
 main (void)
 {
        MonoThreadInfoCallbacks cb = { NULL };
+       MonoThreadInfoRuntimeCallbacks ticallbacks;
        int res = 0;
 
        CHECKED_MONO_INIT ();
        mono_threads_init (&cb, sizeof (MonoThreadInfo));
+       memset (&ticallbacks, 0, sizeof (ticallbacks));
+       ticallbacks.thread_state_init = thread_state_init;
+       mono_threads_runtime_init (&ticallbacks);
+
        mono_thread_info_attach ((gpointer)&cb);
 
        // benchmark_conc ();

diff --git a/mono/unit-tests/test-memfuncs.c b/mono/unit-tests/test-memfuncs.c
index a2b86bbd825a35c59a56ee68e8bc5726d8cc0a30..2fb1498f60995e14dde7add344b9f5722e030ec2 100644 (file)
--- a/mono/unit-tests/test-memfuncs.c
+++ b/mono/unit-tests/test-memfuncs.c
@@ -40,9 +40,9 @@
 int
 main (void)
 {
-       unsigned char *random_mem = malloc (POOL_SIZE);
-       unsigned char *reference = malloc (POOL_SIZE);
-       unsigned char *playground = malloc (POOL_SIZE);
+       unsigned char *random_mem = (unsigned char *)malloc (POOL_SIZE);
+       unsigned char *reference = (unsigned char *)malloc (POOL_SIZE);
+       unsigned char *playground = (unsigned char *)malloc (POOL_SIZE);
        long *long_random_mem;
        int i, offset, size, src_offset, dest_offset;
 

diff --git a/mono/unit-tests/test-mono-linked-list-set.c b/mono/unit-tests/test-mono-linked-list-set.c
index 7d5cac53085e4ff5f6148fb3a3095a0a5c4f81cd..a5e01ebe09ec6e5f913e1ad936c822596d39ecde 100644 (file)
--- a/mono/unit-tests/test-mono-linked-list-set.c
+++ b/mono/unit-tests/test-mono-linked-list-set.c
@@ -48,7 +48,7 @@ mono_hazard_pointer_clear_all (MonoThreadHazardPointers *hp, int retain)
 static void
 free_node (void *n)
 {
-       node_t *node = n;
+       node_t *node = (node_t *)n;
        assert (node->state == STATE_BUSY);
        node->state = STATE_OUT;
 }
@@ -56,7 +56,7 @@ free_node (void *n)
 static void*
 worker (void *arg)
 {
-       thread_data_t *thread_data = arg;
+       thread_data_t *thread_data = (thread_data_t *)arg;
        MonoThreadHazardPointers *hp;
        int skip = thread_data->skip;
        int i, j;

diff --git a/mono/unit-tests/test-sgen-qsort.c b/mono/unit-tests/test-sgen-qsort.c
index 40ca64cb01f1d64db54abc270b47d5c2f652aa07..951b1b7321bb04a0f35ef4d9408308265748ac41 100644 (file)
--- a/mono/unit-tests/test-sgen-qsort.c
+++ b/mono/unit-tests/test-sgen-qsort.c
@@ -100,7 +100,7 @@ compare_sorts2 (void *base, size_t nel)
        memcpy (b2, base, len);
 
        qsort (b1, nel, sizeof (teststruct_t*), compare_teststructs2);
-       qsort_test_struct (b2, nel);
+       qsort_test_struct ((teststruct_t **)b2, nel);
 
        assert (!memcmp (b1, b2, len));
 

diff --git a/mono/utils/Makefile.am b/mono/utils/Makefile.am
index d03a73a3e07f9ea8849d95ab8f4600f64e98248c..c608c582b555f2b6041d2f8afee13ba3dbe2201e 100644 (file)
--- a/mono/utils/Makefile.am
+++ b/mono/utils/Makefile.am
@@ -37,8 +37,9 @@ monoutils_sources = \
        mono-mmap.c             \
        mono-mmap.h             \
        mono-mmap-internals.h   \
-       mono-mutex.c            \
-       mono-mutex.h            \
+       mono-os-mutex.h         \
+       mono-coop-mutex.h               \
+       mono-once.h             \
        mono-lazy-init.h                \
        mono-networkinterfaces.c                \
        mono-networkinterfaces.h                \
@@ -53,8 +54,8 @@ monoutils_sources = \
        mono-uri.c              \
        mono-poll.c             \
        mono-path.c             \
-       mono-semaphore.c        \
-       mono-semaphore.h        \
+       mono-os-semaphore.h     \
+       mono-coop-semaphore.h           \
        mono-sigcontext.h       \
        mono-stdlib.c           \
        mono-property-hash.h    \

diff --git a/mono/utils/atomic.c b/mono/utils/atomic.c
index 9ab8746f299f98ca783767ec8545aea0bab17928..447af4e8995727ef2a353acbeb766b5110127109 100644 (file)
--- a/mono/utils/atomic.c
+++ b/mono/utils/atomic.c
@@ -12,7 +12,6 @@
 #include <glib.h>
 
 #include <mono/utils/atomic.h>
-#include <mono/utils/mono-mutex.h>
 
 #if defined (WAPI_NO_ATOMIC_ASM) || defined (BROKEN_64BIT_ATOMICS_INTRINSIC)
 

diff --git a/mono/utils/bsearch.c b/mono/utils/bsearch.c
index 47be44419ae42b1c98341dd2dc4c4c627dcb6156..399a5c609a9b7ec323b5e3afc7264d3e8a9511c0 100644 (file)
--- a/mono/utils/bsearch.c
+++ b/mono/utils/bsearch.c
@@ -42,7 +42,7 @@ mono_binary_search (
        size_t member_size,
        BinarySearchComparer comparer)
 {
-       const char *base = array;
+       const char *base = (const char *)array;
        size_t lim;
        int cmp;
        const void *p;

diff --git a/mono/utils/checked-build.c b/mono/utils/checked-build.c
index 1a07001dc04273ffbe7da00887feeb999954e20b..9690d9d030d76309fc92a8e3c50ae6b94513e4f0 100644 (file)
--- a/mono/utils/checked-build.c
+++ b/mono/utils/checked-build.c
@@ -16,6 +16,7 @@
 #include <mono/metadata/metadata-internals.h>
 #include <mono/metadata/image-internals.h>
 #include <mono/metadata/class-internals.h>
+#include <mono/metadata/reflection-internals.h>
 #include <glib.h>
 
 #define MAX_NATIVE_BT 6
@@ -237,9 +238,24 @@ assert_gc_neutral_mode (void)
 // * Code below assumes reference counts never underflow (ie: if we have a pointer to something, it won't be deallocated while we're looking at it)
 // Locking strategy is a little slapdash overall.
 
+// Reference audit support
 #define check_mempool_assert_message(...) \
        g_assertion_message("Mempool reference violation: " __VA_ARGS__)
 
+typedef struct
+{
+       MonoImage *image;
+       MonoImageSet *image_set;
+} MonoMemPoolOwner;
+
+static MonoMemPoolOwner mono_mempool_no_owner = {NULL,NULL};
+
+static gboolean
+check_mempool_owner_eq (MonoMemPoolOwner a, MonoMemPoolOwner b)
+{
+       return a.image == b.image && a.image_set == b.image_set;
+}
+
 // Say image X "references" image Y if X either contains Y in its modules field, or X’s "references" field contains an
 // assembly whose image is Y.
 // Say image X transitively references image Y if there is any chain of images-referencing-images which leads from X to Y.
@@ -283,6 +299,18 @@ check_image_may_reference_image(MonoImage *from, MonoImage *to)
        if (to == mono_defaults.corlib)
                return TRUE;
 
+       // Non-dynamic images may NEVER reference dynamic images
+       if (to->dynamic && !from->dynamic)
+               return FALSE;
+
+       // FIXME: We currently give a dynamic images a pass on the reference rules.
+       // Dynamic images may ALWAYS reference non-dynamic images.
+       // We allow this because the dynamic image code is known "messy", and in theory it is already
+       // protected because dynamic images can only reference classes their assembly has retained.
+       // However, long term, we should make this rigorous.
+       if (from->dynamic && !to->dynamic)
+               return TRUE;
+
        gboolean success = FALSE;
 
        // Images to inspect on this pass, images to inspect on the next pass
@@ -351,7 +379,7 @@ check_image_set_may_reference_image (MonoImageSet *from, MonoImage *to)
        mono_image_set_lock (from);
        for (idx = 0; !success && idx < from->nimages; idx++)
        {
-               if (!check_image_may_reference_image (from->images[idx], to))
+               if (check_image_may_reference_image (from->images[idx], to))
                        success = TRUE;
        }
        mono_image_set_unlock (from);
@@ -414,16 +442,51 @@ check_image_may_reference_image_set (MonoImage *from, MonoImageSet *to)
 }
 
 // Small helper-- get a descriptive string for a MonoMemPoolOwner
+// Callers are obligated to free buffer with g_free after use
 static const char *
 check_mempool_owner_name (MonoMemPoolOwner owner)
 {
+       GString *result = g_string_new (NULL);
        if (owner.image)
-               return owner.image->name;
-       if (owner.image_set) // TODO: Construct a string containing all included images
-               return "(Imageset)";
-       return "(Non-image memory)";
+       {
+               if (owner.image->dynamic)
+                       g_string_append (result, "(Dynamic)");
+               g_string_append (result, owner.image->name);
+       }
+       else if (owner.image_set)
+       {
+               char *temp = mono_image_set_description (owner.image_set);
+               g_string_append (result, "(Image set)");
+               g_string_append (result, temp);
+               g_free (temp);
+       }
+       else
+       {
+               g_string_append (result, "(Non-image memory)");
+       }
+       return g_string_free (result, FALSE);
+}
+
+// Helper -- surf various image-locating functions looking for the owner of this pointer
+static MonoMemPoolOwner
+mono_find_mempool_owner (void *ptr)
+{
+       MonoMemPoolOwner owner = mono_mempool_no_owner;
+
+       owner.image = mono_find_image_owner (ptr);
+       if (!check_mempool_owner_eq (owner, mono_mempool_no_owner))
+               return owner;
+
+       owner.image_set = mono_find_image_set_owner (ptr);
+       if (!check_mempool_owner_eq (owner, mono_mempool_no_owner))
+               return owner;
+
+       owner.image = mono_find_dynamic_image_owner (ptr);
+
+       return owner;
 }
 
+// Actually perform reference audit
 static void
 check_mempool_may_reference_mempool (void *from_ptr, void *to_ptr, gboolean require_local)
 {
@@ -436,44 +499,44 @@ check_mempool_may_reference_mempool (void *from_ptr, void *to_ptr, gboolean requ
        if (require_local)
        {
                if (!check_mempool_owner_eq (from,to))
-                       check_mempool_assert_message ("Pointer in image %s should have been internal, but instead pointed to image %s", check_mempool_owner_name(from), check_mempool_owner_name(to));
+                       check_mempool_assert_message ("Pointer in image %s should have been internal, but instead pointed to image %s", check_mempool_owner_name (from), check_mempool_owner_name (to));
        }
 
        // Writing into unknown mempool
        else if (check_mempool_owner_eq (from, mono_mempool_no_owner))
        {
-               check_mempool_assert_message ("Non-image memory attempting to write pointer to image %s", check_mempool_owner_name(to));
+               check_mempool_assert_message ("Non-image memory attempting to write pointer to image %s", check_mempool_owner_name (to));
        }
 
        // Reading from unknown mempool
        else if (check_mempool_owner_eq (to, mono_mempool_no_owner))
        {
-               check_mempool_assert_message ("Attempting to write pointer from image %s to non-image memory", check_mempool_owner_name(from));
+               check_mempool_assert_message ("Attempting to write pointer from image %s to non-image memory", check_mempool_owner_name (from));
        }
 
        // Split out the four cases described above:
        else if (from.image && to.image)
        {
                if (!check_image_may_reference_image (from.image, to.image))
-                       check_mempool_assert_message ("Image %s tried to point to image %s, but does not retain a reference", check_mempool_owner_name(from), check_mempool_owner_name(to));
+                       check_mempool_assert_message ("Image %s tried to point to image %s, but does not retain a reference", check_mempool_owner_name (from), check_mempool_owner_name (to));
        }
 
        else if (from.image && to.image_set)
        {
                if (!check_image_may_reference_image_set (from.image, to.image_set))
-                       check_mempool_assert_message ("Image %s tried to point to image set, but does not retain a reference", check_mempool_owner_name(from));
+                       check_mempool_assert_message ("Image %s tried to point to image set %s, but does not retain a reference", check_mempool_owner_name (from), check_mempool_owner_name (to));
        }
 
        else if (from.image_set && to.image_set)
        {
                if (!check_image_set_may_reference_image_set (from.image_set, to.image_set))
-                       check_mempool_assert_message ("Image set tried to point to image set, but does not retain a reference");
+                       check_mempool_assert_message ("Image set %s tried to point to image set %s, but does not retain a reference", check_mempool_owner_name (from), check_mempool_owner_name (to));
        }
 
        else if (from.image_set && to.image)
        {
                if (!check_image_set_may_reference_image (from.image_set, to.image))
-                       check_mempool_assert_message ("Image set tried to point to image %s, but does not retain a reference", check_mempool_owner_name(to));
+                       check_mempool_assert_message ("Image set %s tried to point to image %s, but does not retain a reference", check_mempool_owner_name (from), check_mempool_owner_name (to));
        }
 
        else

diff --git a/mono/utils/checked-build.h b/mono/utils/checked-build.h
index 17524bdd1b8362c64a2704ba60aba5204b3750c9..8fac45b018fa0a00687ef1c11ba331b92d6b6c0f 100644 (file)
--- a/mono/utils/checked-build.h
+++ b/mono/utils/checked-build.h
@@ -20,6 +20,8 @@
 
 #ifdef CHECKED_BUILD
 
+#define g_assert_checked g_assert
+
 /*
 GC runtime modes rules:
 
@@ -88,6 +90,12 @@ Functions that can be called from both coop or preept modes.
     (ptr) = (val);    \
 } while (0);
 
+// Use when writing a pointer from one image or imageset to another (atomic version).
+#define CHECKED_METADATA_WRITE_PTR_ATOMIC(ptr, val) do {    \
+    check_metadata_store (&(ptr), (val));    \
+    mono_atomic_store_release (&(ptr), (val));    \
+} while (0);
+
 /*
 This can be called by embedders
 */
@@ -116,6 +124,8 @@ void check_metadata_store_local(void *from, void *to);
 
 #else
 
+#define g_assert_checked(...)
+
 #define MONO_REQ_GC_SAFE_MODE
 #define MONO_REQ_GC_UNSAFE_MODE
 #define MONO_REQ_GC_NEUTRAL_MODE
@@ -127,6 +137,7 @@ void check_metadata_store_local(void *from, void *to);
 
 #define CHECKED_METADATA_WRITE_PTR(ptr, val) do { (ptr) = (val); } while (0)
 #define CHECKED_METADATA_WRITE_PTR_LOCAL(ptr, val) do { (ptr) = (val); } while (0)
+#define CHECKED_METADATA_WRITE_PTR_ATOMIC(ptr, val) do { mono_atomic_store_release (&(ptr), (val)); } while (0)
 
 #endif /* CHECKED_BUILD */
 

diff --git a/mono/utils/gc_wrapper.h b/mono/utils/gc_wrapper.h
index 11620b3a4254562fd97b205616e09edc6bdc8ccb..a90d27c064f4d60458a09512fc5cdf32ef8a9b82 100644 (file)
--- a/mono/utils/gc_wrapper.h
+++ b/mono/utils/gc_wrapper.h
@@ -37,6 +37,7 @@
 #       endif
 #      endif
 
+#      define GC_INSIDE_DLL
 #      include <gc.h>
 #      include <gc_typed.h>
 #      include <gc_mark.h>

diff --git a/mono/utils/hazard-pointer.c b/mono/utils/hazard-pointer.c
index 0d7d37ac736c04065cf200e8be8a0ae10ab9a925..606387c073ef9e93a815366808aee01bbe3d0cd6 100644 (file)
--- a/mono/utils/hazard-pointer.c
+++ b/mono/utils/hazard-pointer.c
@@ -14,7 +14,7 @@
 #include <mono/utils/monobitset.h>
 #include <mono/utils/lock-free-array-queue.h>
 #include <mono/utils/atomic.h>
-#include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-os-mutex.h>
 #ifdef SGEN_WITHOUT_MONO
 #include <mono/sgen/sgen-gc.h>
 #include <mono/sgen/sgen-client.h>
@@ -71,7 +71,7 @@ mono_thread_small_id_alloc (void)
 {
        int i, id = -1;
 
-       mono_mutex_lock (&small_id_mutex);
+       mono_os_mutex_lock (&small_id_mutex);
 
        if (!small_id_table)
                small_id_table = mono_bitset_new (1, 0);
@@ -133,7 +133,7 @@ mono_thread_small_id_alloc (void)
                mono_memory_write_barrier ();
        }
 
-       mono_mutex_unlock (&small_id_mutex);
+       mono_os_mutex_unlock (&small_id_mutex);
 
        return id;
 }
@@ -142,13 +142,13 @@ void
 mono_thread_small_id_free (int id)
 {
        /* MonoBitSet operations are not atomic. */
-       mono_mutex_lock (&small_id_mutex);
+       mono_os_mutex_lock (&small_id_mutex);
 
        g_assert (id >= 0 && id < small_id_table->size);
        g_assert (mono_bitset_test_fast (small_id_table, id));
        mono_bitset_clear_fast (small_id_table, id);
 
-       mono_mutex_unlock (&small_id_mutex);
+       mono_os_mutex_unlock (&small_id_mutex);
 }
 
 static gboolean
@@ -353,7 +353,7 @@ mono_thread_smr_init (void)
 {
        int i;
 
-       mono_mutex_init_recursive(&small_id_mutex);
+       mono_os_mutex_init_recursive(&small_id_mutex);
        mono_counters_register ("Hazardous pointers", MONO_COUNTER_JIT | MONO_COUNTER_INT, &hazardous_pointer_count);
 
        for (i = 0; i < HAZARD_TABLE_OVERFLOW; ++i) {

diff --git a/mono/utils/memfuncs.c b/mono/utils/memfuncs.c
index c2a39d22b84287af5dbdab56066025cfaf13eb3e..f657b5532ee76999e868360a7dbc69f3e5fe4b0b 100644 (file)
--- a/mono/utils/memfuncs.c
+++ b/mono/utils/memfuncs.c
@@ -188,7 +188,7 @@ mono_gc_memmove_aligned (void *dest, const void *src, size_t size)
                        while (p > align_end)
                                *--p = *--s;
 
-                       word_start = align_up (start);
+                       word_start = (char *)align_up (start);
                        bytes_to_memmove = p - word_start;
                        p -= bytes_to_memmove;
                        s -= bytes_to_memmove;

diff --git a/mono/utils/mono-codeman.c b/mono/utils/mono-codeman.c
index 30416858d9f0b868ffba274c587a7791558164eb..16dc6f9f65810736b6349ae56d485a9109adcab7 100644 (file)
--- a/mono/utils/mono-codeman.c
+++ b/mono/utils/mono-codeman.c
@@ -26,7 +26,7 @@
 #include <nacl/nacl_dyncode.h>
 #include <mono/mini/mini.h>
 #endif
-#include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-os-mutex.h>
 
 
 static uintptr_t code_memory_used = 0;
@@ -243,14 +243,14 @@ codechunk_valloc (void *preferred, guint32 size)
        GSList *freelist;
 
        if (!valloc_freelists) {
-               mono_mutex_init_recursive (&valloc_mutex);
+               mono_os_mutex_init_recursive (&valloc_mutex);
                valloc_freelists = g_hash_table_new (NULL, NULL);
        }
 
        /*
         * Keep a small freelist of memory blocks to decrease pressure on the kernel memory subsystem to avoid #3321.
         */
-       mono_mutex_lock (&valloc_mutex);
+       mono_os_mutex_lock (&valloc_mutex);
        freelist = (GSList *) g_hash_table_lookup (valloc_freelists, GUINT_TO_POINTER (size));
        if (freelist) {
                ptr = freelist->data;
@@ -262,7 +262,7 @@ codechunk_valloc (void *preferred, guint32 size)
                if (!ptr && preferred)
                        ptr = mono_valloc (NULL, size, MONO_PROT_RWX | ARCH_MAP_FLAGS);
        }
-       mono_mutex_unlock (&valloc_mutex);
+       mono_os_mutex_unlock (&valloc_mutex);
        return ptr;
 }
 
@@ -271,7 +271,7 @@ codechunk_vfree (void *ptr, guint32 size)
 {
        GSList *freelist;
 
-       mono_mutex_lock (&valloc_mutex);
+       mono_os_mutex_lock (&valloc_mutex);
        freelist = (GSList *) g_hash_table_lookup (valloc_freelists, GUINT_TO_POINTER (size));
        if (!freelist || g_slist_length (freelist) < VALLOC_FREELIST_SIZE) {
                freelist = g_slist_prepend (freelist, ptr);
@@ -279,7 +279,7 @@ codechunk_vfree (void *ptr, guint32 size)
        } else {
                mono_vfree (ptr, size);
        }
-       mono_mutex_unlock (&valloc_mutex);
+       mono_os_mutex_unlock (&valloc_mutex);
 }              
 
 static void

diff --git a/mono/utils/mono-conc-hashtable.c b/mono/utils/mono-conc-hashtable.c
index 30521b2af9ef81e221add9051db5cbf3f46a299f..e0b2dcbbb0e36c49e649da110e62f8a6fd87d247 100644 (file)
--- a/mono/utils/mono-conc-hashtable.c
+++ b/mono/utils/mono-conc-hashtable.c
@@ -48,7 +48,7 @@ conc_table_new (int size)
 static void
 conc_table_free (gpointer ptr)
 {
-       conc_table *table = ptr;
+       conc_table *table = (conc_table *)ptr;
        g_free (table->kvs);
        g_free (table);
 }
@@ -164,7 +164,7 @@ mono_conc_hashtable_lookup (MonoConcurrentHashTable *hash_table, gpointer key)
        hp = mono_hazard_pointer_get ();
 
 retry:
-       table = get_hazardous_pointer ((gpointer volatile*)&hash_table->table, hp, 0);
+       table = (conc_table *)get_hazardous_pointer ((gpointer volatile*)&hash_table->table, hp, 0);
        table_mask = table->table_size - 1;
        kvs = table->kvs;
        i = hash & table_mask;

diff --git a/mono/utils/mono-conc-hashtable.h b/mono/utils/mono-conc-hashtable.h
index a1d20f1b04e7695dafff1b4825eb9a3609dfa887..a8eb927fb35e7161fc4ee2d46efa7c6166465a76 100644 (file)
--- a/mono/utils/mono-conc-hashtable.h
+++ b/mono/utils/mono-conc-hashtable.h
@@ -12,7 +12,7 @@
 
 #include <mono/utils/mono-publib.h>
 #include <mono/utils/mono-compiler.h>
-#include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-os-mutex.h>
 #include <glib.h>
 
 typedef struct _MonoConcurrentHashTable MonoConcurrentHashTable;

diff --git a/mono/utils/mono-coop-mutex.h b/mono/utils/mono-coop-mutex.h
new file mode 100644 (file)
index 0000000..0a81275
--- /dev/null
+++ b/mono/utils/mono-coop-mutex.h
@@ -0,0 +1,128 @@
+
+#ifndef __MONO_COOP_MUTEX_H__
+#define __MONO_COOP_MUTEX_H__
+
+#include <config.h>
+#include <glib.h>
+
+#include "mono-os-mutex.h"
+#include "mono-threads.h"
+
+G_BEGIN_DECLS
+
+/* We put the OS sync primitives in struct, so the compiler will warn us if
+ * we use mono_os_(mutex|cond|sem)_... on MonoCoop(Mutex|Cond|Sem) structures */
+
+typedef struct _MonoCoopMutex MonoCoopMutex;
+struct _MonoCoopMutex {
+       mono_mutex_t m;
+};
+
+typedef struct _MonoCoopCond MonoCoopCond;
+struct _MonoCoopCond {
+       mono_cond_t c;
+};
+
+static inline gint
+mono_coop_mutex_init (MonoCoopMutex *mutex)
+{
+       return mono_os_mutex_init (&mutex->m);
+}
+
+static inline gint
+mono_coop_mutex_init_recursive (MonoCoopMutex *mutex)
+{
+       return mono_os_mutex_init_recursive (&mutex->m);
+}
+
+static inline gint
+mono_coop_mutex_destroy (MonoCoopMutex *mutex)
+{
+       return mono_os_mutex_destroy (&mutex->m);
+}
+
+static inline gint
+mono_coop_mutex_lock (MonoCoopMutex *mutex)
+{
+       gint res;
+
+       /* Avoid thread state switch if lock is not contended */
+       if (mono_os_mutex_trylock (&mutex->m) == 0)
+               return 0;
+
+       MONO_PREPARE_BLOCKING;
+
+       res = mono_os_mutex_lock (&mutex->m);
+
+       MONO_FINISH_BLOCKING;
+
+       return res;
+}
+
+static inline gint
+mono_coop_mutex_trylock (MonoCoopMutex *mutex)
+{
+       return mono_os_mutex_trylock (&mutex->m);
+}
+
+static inline gint
+mono_coop_mutex_unlock (MonoCoopMutex *mutex)
+{
+       return mono_os_mutex_unlock (&mutex->m);
+}
+
+static inline gint
+mono_coop_cond_init (MonoCoopCond *cond)
+{
+       return mono_os_cond_init (&cond->c);
+}
+
+static inline gint
+mono_coop_cond_destroy (MonoCoopCond *cond)
+{
+       return mono_os_cond_destroy (&cond->c);
+}
+
+static inline gint
+mono_coop_cond_wait (MonoCoopCond *cond, MonoCoopMutex *mutex)
+{
+       gint res;
+
+       MONO_PREPARE_BLOCKING;
+
+       res = mono_os_cond_wait (&cond->c, &mutex->m);
+
+       MONO_FINISH_BLOCKING;
+
+       return res;
+}
+
+static inline gint
+mono_coop_cond_timedwait (MonoCoopCond *cond, MonoCoopMutex *mutex, guint32 timeout_ms)
+{
+       gint res;
+
+       MONO_PREPARE_BLOCKING;
+
+       res = mono_os_cond_timedwait (&cond->c, &mutex->m, timeout_ms);
+
+       MONO_FINISH_BLOCKING;
+
+       return res;
+}
+
+static inline gint
+mono_coop_cond_signal (MonoCoopCond *cond)
+{
+       return mono_os_cond_signal (&cond->c);
+}
+
+static inline gint
+mono_coop_cond_broadcast (MonoCoopCond *cond)
+{
+       return mono_os_cond_broadcast (&cond->c);
+}
+
+G_END_DECLS
+
+#endif /* __MONO_COOP_MUTEX_H__ */

diff --git a/mono/utils/mono-coop-semaphore.h b/mono/utils/mono-coop-semaphore.h
new file mode 100644 (file)
index 0000000..bcf45a2
--- /dev/null
+++ b/mono/utils/mono-coop-semaphore.h
@@ -0,0 +1,69 @@
+
+#ifndef __MONO_COOP_SEMAPHORE_H__
+#define __MONO_COOP_SEMAPHORE_H__
+
+#include <config.h>
+#include <glib.h>
+
+#include "mono-os-semaphore.h"
+#include "mono-threads.h"
+
+G_BEGIN_DECLS
+
+/* We put the OS sync primitives in struct, so the compiler will warn us if
+ * we use mono_os_(mutex|cond|sem)_... on MonoCoop(Mutex|Cond|Sem) structures */
+
+typedef struct _MonoCoopSem MonoCoopSem;
+struct _MonoCoopSem {
+       MonoSemType s;
+};
+
+static inline gint
+mono_coop_sem_init (MonoCoopSem *sem, int value)
+{
+       return mono_os_sem_init (&sem->s, value);
+}
+
+static inline gint
+mono_coop_sem_destroy (MonoCoopSem *sem)
+{
+       return mono_os_sem_destroy (&sem->s);
+}
+
+static inline gint
+mono_coop_sem_wait (MonoCoopSem *sem, MonoSemFlags flags)
+{
+       gint res;
+
+       MONO_PREPARE_BLOCKING;
+
+       res = mono_os_sem_wait (&sem->s, flags);
+
+       MONO_FINISH_BLOCKING;
+
+       return res;
+}
+
+static inline gint
+mono_coop_sem_timedwait (MonoCoopSem *sem, guint timeout_ms, MonoSemFlags flags)
+{
+       gint res;
+
+       MONO_PREPARE_BLOCKING;
+
+       res = mono_os_sem_timedwait (&sem->s, timeout_ms, flags);
+
+       MONO_FINISH_BLOCKING;
+
+       return res;
+}
+
+static inline gint
+mono_coop_sem_post (MonoCoopSem *sem)
+{
+       return mono_os_sem_post (&sem->s);
+}
+
+G_END_DECLS
+
+#endif /* __MONO_COOP_SEMAPHORE_H__ */

diff --git a/mono/utils/mono-counters.c b/mono/utils/mono-counters.c
index 2c7dd19eb9fdbe645bd24c523eff158f5fa05048..17170a40ed2bec07c33b774255203416740f5543 100644 (file)
--- a/mono/utils/mono-counters.c
+++ b/mono/utils/mono-counters.c
@@ -8,7 +8,7 @@
 #include "config.h"
 #include "mono-counters.h"
 #include "mono-proclib.h"
-#include "mono-mutex.h"
+#include "mono-os-mutex.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -138,7 +138,7 @@ mono_counters_init (void)
        if (initialized)
                return;
 
-       mono_mutex_init (&counters_mutex);
+       mono_os_mutex_init (&counters_mutex);
 
        initialize_system_counters ();
 
@@ -155,19 +155,19 @@ register_internal (const char *name, int type, void *addr, int size)
        if ((type & MONO_COUNTER_VARIANCE_MASK) == 0)
                type |= MONO_COUNTER_MONOTONIC;
 
-       mono_mutex_lock (&counters_mutex);
+       mono_os_mutex_lock (&counters_mutex);
 
        for (counter = counters; counter; counter = counter->next) {
                if (counter->addr == addr) {
                        g_warning ("you are registering twice the same counter address");
-                       mono_mutex_unlock (&counters_mutex);
+                       mono_os_mutex_unlock (&counters_mutex);
                        return;
                }
        }
 
        counter = (MonoCounter *) malloc (sizeof (MonoCounter));
        if (!counter) {
-               mono_mutex_unlock (&counters_mutex);
+               mono_os_mutex_unlock (&counters_mutex);
                return;
        }
        counter->name = g_strdup (name);
@@ -191,7 +191,7 @@ register_internal (const char *name, int type, void *addr, int size)
        for (register_callback = register_callbacks; register_callback; register_callback = register_callback->next)
                ((MonoCounterRegisterCallback)register_callback->data) (counter);
 
-       mono_mutex_unlock (&counters_mutex);
+       mono_os_mutex_unlock (&counters_mutex);
 }
 
 /**
@@ -291,9 +291,9 @@ mono_counters_on_register (MonoCounterRegisterCallback callback)
                return;
        }
 
-       mono_mutex_lock (&counters_mutex);
+       mono_os_mutex_lock (&counters_mutex);
        register_callbacks = g_slist_append (register_callbacks, (gpointer) callback);
-       mono_mutex_unlock (&counters_mutex);
+       mono_os_mutex_unlock (&counters_mutex);
 }
 
 typedef int (*IntFunc) (void);
@@ -437,16 +437,16 @@ mono_counters_foreach (CountersEnumCallback cb, gpointer user_data)
                return;
        }
 
-       mono_mutex_lock (&counters_mutex);
+       mono_os_mutex_lock (&counters_mutex);
 
        for (counter = counters; counter; counter = counter->next) {
                if (!cb (counter, user_data)) {
-                       mono_mutex_unlock (&counters_mutex);
+                       mono_os_mutex_unlock (&counters_mutex);
                        return;
                }
        }
 
-       mono_mutex_unlock (&counters_mutex);
+       mono_os_mutex_unlock (&counters_mutex);
 }
 
 #define COPY_COUNTER(type,functype) do {       \
@@ -600,10 +600,10 @@ mono_counters_dump (int section_mask, FILE *outfile)
        if (!initialized)
                return;
 
-       mono_mutex_lock (&counters_mutex);
+       mono_os_mutex_lock (&counters_mutex);
 
        if (!counters) {
-               mono_mutex_unlock (&counters_mutex);
+               mono_os_mutex_unlock (&counters_mutex);
                return;
        }
 
@@ -622,7 +622,7 @@ mono_counters_dump (int section_mask, FILE *outfile)
        }
 
        fflush (outfile);
-       mono_mutex_unlock (&counters_mutex);
+       mono_os_mutex_unlock (&counters_mutex);
 }
 
 /**
@@ -638,7 +638,7 @@ mono_counters_cleanup (void)
        if (!initialized)
                return;
 
-       mono_mutex_lock (&counters_mutex);
+       mono_os_mutex_lock (&counters_mutex);
 
        counter = counters;
        counters = NULL;
@@ -649,7 +649,7 @@ mono_counters_cleanup (void)
                free (tmp);
        }
 
-       mono_mutex_unlock (&counters_mutex);
+       mono_os_mutex_unlock (&counters_mutex);
 }
 
 static MonoResourceCallback limit_reached = NULL;

diff --git a/mono/utils/mono-linked-list-set.h b/mono/utils/mono-linked-list-set.h
index 8f609d0e44d4e618e927e6b253902cd29a86449e..0abcee98f15730a8d73b7a2f4dec99dc81409b06 100644 (file)
--- a/mono/utils/mono-linked-list-set.h
+++ b/mono/utils/mono-linked-list-set.h
@@ -71,7 +71,7 @@ Requires the world to be stoped
 
 #define MONO_LLS_FOREACH_FILTERED(list, element, filter_func, type) {\
        MonoLinkedListSetNode *__cur;   \
-       for (__cur = (list)->head; __cur; __cur = mono_lls_pointer_unmask (__cur->next)) \
+       for (__cur = (list)->head; __cur; __cur = (MonoLinkedListSetNode *)mono_lls_pointer_unmask (__cur->next)) \
                if (!mono_lls_pointer_get_mark (__cur->next)) { \
                        (element) = (type)__cur;                        \
                        if (!filter_func (element)) continue;

diff --git a/mono/utils/mono-mutex.c b/mono/utils/mono-mutex.c
deleted file mode 100644 (file)
index 51dee23..0000000
--- a/mono/utils/mono-mutex.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * mono-mutex.h: Portability wrappers around POSIX Mutexes
- *
- * Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright 2002 Ximian, Inc. (www.ximian.com)
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-#include <mono/utils/mono-memory-model.h>
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include "mono-mutex.h"
-
-#ifndef HOST_WIN32
-
-#if defined(__APPLE__)
-#define _DARWIN_C_SOURCE
-#include <pthread_spis.h>
-#include <dlfcn.h>
-#endif
-
-#ifndef HAVE_PTHREAD_MUTEX_TIMEDLOCK
-/* Android does not implement pthread_mutex_timedlock(), but does provide an
- * unusual declaration: http://code.google.com/p/android/issues/detail?id=7807
- */
-#ifdef PLATFORM_ANDROID
-#define CONST_NEEDED
-#else
-#define CONST_NEEDED const
-#endif
-
-int pthread_mutex_timedlock (pthread_mutex_t *mutex,
-                           CONST_NEEDED struct timespec *timeout);
-int
-pthread_mutex_timedlock (pthread_mutex_t *mutex, CONST_NEEDED struct timespec *timeout)
-{
-       struct timeval timenow;
-       struct timespec sleepytime;
-       int retcode;
-       
-       /* This is just to avoid a completely busy wait */
-       sleepytime.tv_sec = 0;
-       sleepytime.tv_nsec = 10000000;  /* 10ms */
-       
-       while ((retcode = pthread_mutex_trylock (mutex)) == EBUSY) {
-               gettimeofday (&timenow, NULL);
-               
-               if (timenow.tv_sec >= timeout->tv_sec &&
-                   (timenow.tv_usec * 1000) >= timeout->tv_nsec) {
-                       return ETIMEDOUT;
-               }
-               
-               nanosleep (&sleepytime, NULL);
-       }
-       
-       return retcode;
-}
-#endif /* HAVE_PTHREAD_MUTEX_TIMEDLOCK */
-
-
-int
-mono_once (mono_once_t *once, void (*once_init) (void))
-{
-       int thr_ret;
-       
-       if (!once->complete) {
-               pthread_cleanup_push ((void(*)(void *))pthread_mutex_unlock,
-                                     (void *)&once->mutex);
-               thr_ret = pthread_mutex_lock (&once->mutex);
-               g_assert (thr_ret == 0);
-               
-               if (!once->complete) {
-                       once_init ();
-                       once->complete = TRUE;
-               }
-               thr_ret = pthread_mutex_unlock (&once->mutex);
-               g_assert (thr_ret == 0);
-               
-               pthread_cleanup_pop (0);
-       }
-       
-       return 0;
-}
-
-#endif
-
-/*
-Returns a recursive mutex that is safe under suspension.
-
-A suspension safe mutex means one that can handle this scenario:
-
-mutex M
-
-thread 1:
-1)lock M
-2)suspend thread 2
-3)unlock M
-4)lock M
-
-thread 2:
-5)lock M
-
-Say (1) happens before (5) and (5) happens before (2).
-This means that thread 2 was suspended by the kernel because
-it's waiting on mutext M.
-
-Thread 1 then proceed to suspend thread 2 and unlock/lock the
-mutex.
-
-If the kernel implements mutexes with FIFO wait lists, this means
-that thread 1 will be blocked waiting for thread 2 acquire the lock.
-Since thread 2 is suspended, we have a deadlock.
-
-A suspend safe mutex is an unfair lock but will schedule any runable
-thread that is waiting for a the lock.
-
-This problem was witnessed on OSX in mono/tests/thread-exit.cs.
-
-*/
-int
-mono_mutex_init_suspend_safe (mono_mutex_t *mutex)
-{
-#if defined(__APPLE__)
-       int res;
-       pthread_mutexattr_t attr;
-       static gboolean inited;
-       static int (*setpolicy_np) (pthread_mutexattr_t *, int);
-
-       if (!inited) {
-               setpolicy_np = (int (*) (pthread_mutexattr_t *, int)) dlsym (RTLD_NEXT, "pthread_mutexattr_setpolicy_np");
-               mono_atomic_store_release (&inited, TRUE);
-       }
-
-       pthread_mutexattr_init (&attr);
-       pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
-       if (setpolicy_np)
-               setpolicy_np (&attr, _PTHREAD_MUTEX_POLICY_FIRSTFIT);
-       res = pthread_mutex_init (mutex, &attr);
-       pthread_mutexattr_destroy (&attr);
-
-       return res;
-#else
-       return mono_mutex_init (mutex);
-#endif
-}
-
-#ifndef HOST_WIN32
-int
-mono_cond_timedwait_ms (mono_cond_t *cond, mono_mutex_t *mutex, int timeout_ms)
-{
-       struct timeval tv;
-       struct timespec ts;
-       gint64 usecs;
-       int res;
-
-       /* ms = 10^-3, us = 10^-6, ns = 10^-9 */
-
-       gettimeofday (&tv, NULL);
-       tv.tv_sec += timeout_ms / 1000;
-       usecs = tv.tv_usec + ((timeout_ms % 1000) * 1000);
-       if (usecs >= 1000000) {
-               usecs -= 1000000;
-               tv.tv_sec ++;
-       }
-       ts.tv_sec = tv.tv_sec;
-       ts.tv_nsec = usecs * 1000;
-
-       res = pthread_cond_timedwait (cond, mutex, &ts);
-       g_assert (res != EINVAL);
-       return res;
-}
-
-#endif

diff --git a/mono/utils/mono-mutex.h b/mono/utils/mono-mutex.h
deleted file mode 100644 (file)
index 78a4f14..0000000
--- a/mono/utils/mono-mutex.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * mono-mutex.h: Portability wrappers around POSIX Mutexes
- *
- * Authors: Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright 2002 Ximian, Inc. (www.ximian.com)
- */
-
-#ifndef __MONO_MUTEX_H__
-#define __MONO_MUTEX_H__
-
-#include <config.h>
-
-#include <glib.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-#include <time.h>
-
-#ifdef HOST_WIN32
-#include <winsock2.h>
-#include <windows.h>
-
-/* Vanilla MinGW is missing some defs, loan them from MinGW-w64. */
-#if defined __MINGW32__ && !defined __MINGW64_VERSION_MAJOR
-
-#if (_WIN32_WINNT >= 0x0600)
-/* Fixme: Opaque structs */
-typedef PVOID RTL_CONDITION_VARIABLE;
-typedef PVOID RTL_SRWLOCK;
-
-#ifndef _RTL_RUN_ONCE_DEF
-#define _RTL_RUN_ONCE_DEF 1
-typedef PVOID RTL_RUN_ONCE, *PRTL_RUN_ONCE;
-typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *);
-#define RTL_RUN_ONCE_INIT 0
-#define RTL_RUN_ONCE_CHECK_ONLY 1UL
-#define RTL_RUN_ONCE_ASYNC 2UL
-#define RTL_RUN_ONCE_INIT_FAILED 4UL
-#define RTL_RUN_ONCE_CTX_RESERVED_BITS 2
-#endif
-#define RTL_SRWLOCK_INIT 0
-#define RTL_CONDITION_VARIABLE_INIT 0
-#define RTL_CONDITION_VARIABLE_LOCKMODE_SHARED 1
-
-#define CONDITION_VARIABLE_INIT RTL_CONDITION_VARIABLE_INIT
-#define CONDITION_VARIABLE_LOCKMODE_SHARED RTL_CONDITION_VARIABLE_LOCKMODE_SHARED
-#define SRWLOCK_INIT RTL_SRWLOCK_INIT
-#endif
-
-#if (_WIN32_WINNT >= 0x0600)
-/*Condition Variables http://msdn.microsoft.com/en-us/library/ms682052%28VS.85%29.aspx*/
-typedef RTL_CONDITION_VARIABLE CONDITION_VARIABLE, *PCONDITION_VARIABLE;
-typedef RTL_SRWLOCK SRWLOCK, *PSRWLOCK;
-
-WINBASEAPI VOID WINAPI InitializeConditionVariable(PCONDITION_VARIABLE ConditionVariable);
-WINBASEAPI WINBOOL WINAPI SleepConditionVariableCS(PCONDITION_VARIABLE ConditionVariable, PCRITICAL_SECTION CriticalSection, DWORD dwMilliseconds);
-WINBASEAPI WINBOOL WINAPI SleepConditionVariableSRW(PCONDITION_VARIABLE ConditionVariable, PSRWLOCK SRWLock, DWORD dwMilliseconds, ULONG Flags);
-WINBASEAPI VOID WINAPI WakeAllConditionVariable(PCONDITION_VARIABLE ConditionVariable);
-WINBASEAPI VOID WINAPI WakeConditionVariable(PCONDITION_VARIABLE ConditionVariable);
-
-/*Slim Reader/Writer (SRW) Locks http://msdn.microsoft.com/en-us/library/aa904937%28VS.85%29.aspx*/
-WINBASEAPI VOID WINAPI AcquireSRWLockExclusive(PSRWLOCK SRWLock);
-WINBASEAPI VOID WINAPI AcquireSRWLockShared(PSRWLOCK SRWLock);
-WINBASEAPI VOID WINAPI InitializeSRWLock(PSRWLOCK SRWLock);
-WINBASEAPI VOID WINAPI ReleaseSRWLockExclusive(PSRWLOCK SRWLock);
-WINBASEAPI VOID WINAPI ReleaseSRWLockShared(PSRWLOCK SRWLock);
-
-WINBASEAPI BOOLEAN TryAcquireSRWLockExclusive(PSRWLOCK SRWLock);
-WINBASEAPI BOOLEAN TryAcquireSRWLockShared(PSRWLOCK SRWLock);
-
-/*One-Time Initialization http://msdn.microsoft.com/en-us/library/aa363808(VS.85).aspx*/
-#define INIT_ONCE_ASYNC 0x00000002UL
-#define INIT_ONCE_INIT_FAILED 0x00000004UL
-
-typedef PRTL_RUN_ONCE PINIT_ONCE;
-typedef PRTL_RUN_ONCE LPINIT_ONCE;
-typedef WINBOOL CALLBACK (*PINIT_ONCE_FN) (PINIT_ONCE InitOnce, PVOID Parameter, PVOID *Context);
-
-WINBASEAPI WINBOOL WINAPI InitOnceBeginInitialize(LPINIT_ONCE lpInitOnce, DWORD dwFlags, PBOOL fPending, LPVOID *lpContext);
-WINBASEAPI WINBOOL WINAPI InitOnceComplete(LPINIT_ONCE lpInitOnce, DWORD dwFlags, LPVOID lpContext);
-WINBASEAPI WINBOOL WINAPI InitOnceExecuteOnce(PINIT_ONCE InitOnce, PINIT_ONCE_FN InitFn, PVOID Parameter, LPVOID *Context);
-#endif
-
-#endif /* defined __MINGW32__ && !defined __MINGW64_VERSION_MAJOR */
-#endif /* HOST_WIN32 */
-
-G_BEGIN_DECLS
-
-#ifndef HOST_WIN32
-
-typedef struct {
-       pthread_mutex_t mutex;
-       gboolean complete;
-} mono_once_t;
-
-#define MONO_ONCE_INIT { PTHREAD_MUTEX_INITIALIZER, FALSE }
-
-int mono_once (mono_once_t *once, void (*once_init) (void));
-
-typedef pthread_mutex_t mono_mutex_t;
-typedef pthread_cond_t mono_cond_t;
-
-#define mono_mutex_init(mutex) pthread_mutex_init (mutex, NULL)
-#define mono_mutex_lock(mutex) pthread_mutex_lock (mutex)
-#define mono_mutex_trylock(mutex) pthread_mutex_trylock (mutex)
-#define mono_mutex_timedlock(mutex,timeout) pthread_mutex_timedlock (mutex, timeout)
-#define mono_mutex_unlock(mutex) pthread_mutex_unlock (mutex)
-#define mono_mutex_destroy(mutex) pthread_mutex_destroy (mutex)
-
-#define mono_cond_init(cond,attr) pthread_cond_init (cond,attr)
-#define mono_cond_wait(cond,mutex) pthread_cond_wait (cond, mutex)
-#define mono_cond_timedwait(cond,mutex,timeout) pthread_cond_timedwait (cond, mutex, timeout)
-#define mono_cond_signal(cond) pthread_cond_signal (cond)
-#define mono_cond_broadcast(cond) pthread_cond_broadcast (cond)
-#define mono_cond_destroy(cond) pthread_cond_destroy (cond)
-
-/*
- * This should be used instead of mono_cond_timedwait, since that function is not implemented on windows.
- */
-int mono_cond_timedwait_ms (mono_cond_t *cond, mono_mutex_t *mutex, int timeout_ms);
-
-/* This is a function so it can be passed to pthread_cleanup_push -
- * that is a macro and giving it a macro as a parameter breaks.
- */
-G_GNUC_UNUSED
-static inline int mono_mutex_unlock_in_cleanup (mono_mutex_t *mutex)
-{
-       return(mono_mutex_unlock (mutex));
-}
-
-/* Returns zero on success. */
-static inline int
-mono_mutex_init_recursive (mono_mutex_t *mutex)
-{
-       int res;
-       pthread_mutexattr_t attr;
-
-       pthread_mutexattr_init (&attr);
-       pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
-       res = pthread_mutex_init (mutex, &attr);
-       pthread_mutexattr_destroy (&attr);
-
-       return res;
-}
-
-#else
-
-typedef CRITICAL_SECTION mono_mutex_t;
-typedef CONDITION_VARIABLE mono_cond_t;
-
-#define mono_mutex_init(mutex) (InitializeCriticalSection((mutex)), 0)
-#define mono_mutex_init_recursive(mutex) (InitializeCriticalSection((mutex)), 0)
-#define mono_mutex_lock(mutex) EnterCriticalSection((mutex))
-#define mono_mutex_trylock(mutex) (!TryEnterCriticalSection((mutex)))
-#define mono_mutex_unlock(mutex)  LeaveCriticalSection((mutex))
-#define mono_mutex_destroy(mutex) DeleteCriticalSection((mutex))
-
-static inline int
-mono_cond_init (mono_cond_t *cond, int attr)
-{
-       InitializeConditionVariable (cond);
-       return 0;
-}
-
-static inline int
-mono_cond_wait (mono_cond_t *cond, mono_mutex_t *mutex)
-{
-       return SleepConditionVariableCS (cond, mutex, INFINITE) ? 0 : 1;
-}
-
-static inline int
-mono_cond_timedwait (mono_cond_t *cond, mono_mutex_t *mutex, struct timespec *timeout)
-{
-       // FIXME:
-       g_assert_not_reached ();
-       return 0;
-}
-
-static inline int
-mono_cond_signal (mono_cond_t *cond)
-{
-       WakeConditionVariable (cond);
-       return 0;
-}
-
-static inline int
-mono_cond_broadcast (mono_cond_t *cond)
-{
-       WakeAllConditionVariable (cond);
-       return 0;
-}
-
-static inline int
-mono_cond_destroy (mono_cond_t *cond)
-{
-       return 0;
-}
-
-static inline int
-mono_cond_timedwait_ms (mono_cond_t *cond, mono_mutex_t *mutex, int timeout_ms)
-{
-       return SleepConditionVariableCS (cond, mutex, timeout_ms) ? 0 : 1;
-}
-
-#endif
-
-int mono_mutex_init_suspend_safe (mono_mutex_t *mutex);
-
-G_END_DECLS
-
-#endif /* __MONO_MUTEX_H__ */

diff --git a/mono/utils/mono-once.h b/mono/utils/mono-once.h
new file mode 100644 (file)
index 0000000..0021ac3
--- /dev/null
+++ b/mono/utils/mono-once.h
@@ -0,0 +1,17 @@
+
+#ifndef __MONO_ONCE_H__
+#define __MONO_ONCE_H__
+
+#include "mono-lazy-init.h"
+
+typedef mono_lazy_init_t mono_once_t;
+
+#define MONO_ONCE_INIT MONO_LAZY_INIT_STATUS_NOT_INITIALIZED
+
+static inline void
+mono_once (mono_once_t *once, void (*once_init) (void))
+{
+       mono_lazy_initialize (once, once_init);
+}
+
+#endif /* __MONO_ONCE_H__ */

diff --git a/mono/utils/mono-os-mutex.h b/mono/utils/mono-os-mutex.h
new file mode 100644 (file)
index 0000000..5366405
--- /dev/null
+++ b/mono/utils/mono-os-mutex.h
@@ -0,0 +1,301 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * mono-os-mutex.h: Portability wrappers around POSIX Mutexes
+ *
+ * Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright 2002 Ximian, Inc. (www.ximian.com)
+ */
+
+#ifndef __MONO_OS_MUTEX_H__
+#define __MONO_OS_MUTEX_H__
+
+#include <config.h>
+#include <glib.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#if !defined(HOST_WIN32)
+#include <pthread.h>
+#include <errno.h>
+#else
+#include <winsock2.h>
+#include <windows.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+G_BEGIN_DECLS
+
+#if !defined(HOST_WIN32)
+
+typedef pthread_mutex_t mono_mutex_t;
+typedef pthread_cond_t mono_cond_t;
+
+static inline int
+mono_os_mutex_init (mono_mutex_t *mutex)
+{
+       return pthread_mutex_init (mutex, NULL);
+}
+
+static inline int
+mono_os_mutex_init_recursive (mono_mutex_t *mutex)
+{
+       int res;
+       pthread_mutexattr_t attr;
+
+       pthread_mutexattr_init (&attr);
+       pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
+       res = pthread_mutex_init (mutex, &attr);
+       pthread_mutexattr_destroy (&attr);
+
+       return res;
+}
+
+static inline int
+mono_os_mutex_destroy (mono_mutex_t *mutex)
+{
+       return pthread_mutex_destroy (mutex);
+}
+
+static inline int
+mono_os_mutex_lock (mono_mutex_t *mutex)
+{
+       int res;
+
+       res = pthread_mutex_lock (mutex);
+       g_assert (res != EINVAL);
+
+       return res;
+}
+
+static inline int
+mono_os_mutex_trylock (mono_mutex_t *mutex)
+{
+       return pthread_mutex_trylock (mutex);
+}
+
+static inline int
+mono_os_mutex_unlock (mono_mutex_t *mutex)
+{
+       return pthread_mutex_unlock (mutex);
+}
+
+static inline int
+mono_os_cond_init (mono_cond_t *cond)
+{
+       return pthread_cond_init (cond, NULL);
+}
+
+static inline int
+mono_os_cond_destroy (mono_cond_t *cond)
+{
+       return pthread_cond_destroy (cond);
+}
+
+static inline int
+mono_os_cond_wait (mono_cond_t *cond, mono_mutex_t *mutex)
+{
+       int res;
+
+       res = pthread_cond_wait (cond, mutex);
+       g_assert (res != EINVAL);
+
+       return res;
+}
+
+static inline int
+mono_os_cond_timedwait (mono_cond_t *cond, mono_mutex_t *mutex, guint32 timeout_ms)
+{
+       struct timeval tv;
+       struct timespec ts;
+       gint64 usecs;
+       int res;
+
+       if (timeout_ms == (guint32) 0xFFFFFFFF)
+               return mono_os_cond_wait (cond, mutex);
+
+       /* ms = 10^-3, us = 10^-6, ns = 10^-9 */
+
+       gettimeofday (&tv, NULL);
+       tv.tv_sec += timeout_ms / 1000;
+       usecs = tv.tv_usec + ((timeout_ms % 1000) * 1000);
+       if (usecs >= 1000000) {
+               usecs -= 1000000;
+               tv.tv_sec ++;
+       }
+       ts.tv_sec = tv.tv_sec;
+       ts.tv_nsec = usecs * 1000;
+
+       res = pthread_cond_timedwait (cond, mutex, &ts);
+       g_assert (res != EINVAL);
+
+       return res;
+}
+
+static inline int
+mono_os_cond_signal (mono_cond_t *cond)
+{
+       return pthread_cond_signal (cond);
+}
+
+static inline int
+mono_os_cond_broadcast (mono_cond_t *cond)
+{
+       return pthread_cond_broadcast (cond);
+}
+
+#else
+
+/* Vanilla MinGW is missing some defs, load them from MinGW-w64. */
+#if defined __MINGW32__ && !defined __MINGW64_VERSION_MAJOR && (_WIN32_WINNT >= 0x0600)
+
+/* Fixme: Opaque structs */
+typedef PVOID RTL_CONDITION_VARIABLE;
+typedef PVOID RTL_SRWLOCK;
+
+#ifndef _RTL_RUN_ONCE_DEF
+#define _RTL_RUN_ONCE_DEF 1
+typedef PVOID RTL_RUN_ONCE, *PRTL_RUN_ONCE;
+typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *);
+#define RTL_RUN_ONCE_INIT 0
+#define RTL_RUN_ONCE_CHECK_ONLY 1UL
+#define RTL_RUN_ONCE_ASYNC 2UL
+#define RTL_RUN_ONCE_INIT_FAILED 4UL
+#define RTL_RUN_ONCE_CTX_RESERVED_BITS 2
+#endif /* _RTL_RUN_ONCE_DEF */
+#define RTL_SRWLOCK_INIT 0
+#define RTL_CONDITION_VARIABLE_INIT 0
+#define RTL_CONDITION_VARIABLE_LOCKMODE_SHARED 1
+
+#define CONDITION_VARIABLE_INIT RTL_CONDITION_VARIABLE_INIT
+#define CONDITION_VARIABLE_LOCKMODE_SHARED RTL_CONDITION_VARIABLE_LOCKMODE_SHARED
+#define SRWLOCK_INIT RTL_SRWLOCK_INIT
+
+/*Condition Variables http://msdn.microsoft.com/en-us/library/ms682052%28VS.85%29.aspx*/
+typedef RTL_CONDITION_VARIABLE CONDITION_VARIABLE, *PCONDITION_VARIABLE;
+typedef RTL_SRWLOCK SRWLOCK, *PSRWLOCK;
+
+WINBASEAPI VOID WINAPI InitializeConditionVariable(PCONDITION_VARIABLE ConditionVariable);
+WINBASEAPI WINBOOL WINAPI SleepConditionVariableCS(PCONDITION_VARIABLE ConditionVariable, PCRITICAL_SECTION CriticalSection, DWORD dwMilliseconds);
+WINBASEAPI WINBOOL WINAPI SleepConditionVariableSRW(PCONDITION_VARIABLE ConditionVariable, PSRWLOCK SRWLock, DWORD dwMilliseconds, ULONG Flags);
+WINBASEAPI VOID WINAPI WakeAllConditionVariable(PCONDITION_VARIABLE ConditionVariable);
+WINBASEAPI VOID WINAPI WakeConditionVariable(PCONDITION_VARIABLE ConditionVariable);
+
+/*Slim Reader/Writer (SRW) Locks http://msdn.microsoft.com/en-us/library/aa904937%28VS.85%29.aspx*/
+WINBASEAPI VOID WINAPI AcquireSRWLockExclusive(PSRWLOCK SRWLock);
+WINBASEAPI VOID WINAPI AcquireSRWLockShared(PSRWLOCK SRWLock);
+WINBASEAPI VOID WINAPI InitializeSRWLock(PSRWLOCK SRWLock);
+WINBASEAPI VOID WINAPI ReleaseSRWLockExclusive(PSRWLOCK SRWLock);
+WINBASEAPI VOID WINAPI ReleaseSRWLockShared(PSRWLOCK SRWLock);
+
+WINBASEAPI BOOLEAN TryAcquireSRWLockExclusive(PSRWLOCK SRWLock);
+WINBASEAPI BOOLEAN TryAcquireSRWLockShared(PSRWLOCK SRWLock);
+
+/*One-Time Initialization http://msdn.microsoft.com/en-us/library/aa363808(VS.85).aspx*/
+#define INIT_ONCE_ASYNC 0x00000002UL
+#define INIT_ONCE_INIT_FAILED 0x00000004UL
+
+typedef PRTL_RUN_ONCE PINIT_ONCE;
+typedef PRTL_RUN_ONCE LPINIT_ONCE;
+typedef WINBOOL CALLBACK (*PINIT_ONCE_FN) (PINIT_ONCE InitOnce, PVOID Parameter, PVOID *Context);
+
+WINBASEAPI WINBOOL WINAPI InitOnceBeginInitialize(LPINIT_ONCE lpInitOnce, DWORD dwFlags, PBOOL fPending, LPVOID *lpContext);
+WINBASEAPI WINBOOL WINAPI InitOnceComplete(LPINIT_ONCE lpInitOnce, DWORD dwFlags, LPVOID lpContext);
+WINBASEAPI WINBOOL WINAPI InitOnceExecuteOnce(PINIT_ONCE InitOnce, PINIT_ONCE_FN InitFn, PVOID Parameter, LPVOID *Context);
+
+#endif /* defined __MINGW32__ && !defined __MINGW64_VERSION_MAJOR && (_WIN32_WINNT >= 0x0600) */
+
+typedef CRITICAL_SECTION mono_mutex_t;
+typedef CONDITION_VARIABLE mono_cond_t;
+
+static inline int
+mono_os_mutex_init (mono_mutex_t *mutex)
+{
+       InitializeCriticalSection (mutex);
+       return 0;
+}
+
+static inline int
+mono_os_mutex_init_recursive (mono_mutex_t *mutex)
+{
+       InitializeCriticalSection (mutex);
+       return 0;
+}
+
+static inline int
+mono_os_mutex_destroy (mono_mutex_t *mutex)
+{
+       DeleteCriticalSection (mutex);
+       return 0;
+}
+
+static inline int
+mono_os_mutex_lock (mono_mutex_t *mutex)
+{
+       EnterCriticalSection (mutex);
+       return 0;
+}
+
+static inline int
+mono_os_mutex_trylock (mono_mutex_t *mutex)
+{
+       return TryEnterCriticalSection (mutex) != 0 ? 0 : 1;
+}
+
+static inline int
+mono_os_mutex_unlock (mono_mutex_t *mutex)
+{
+       LeaveCriticalSection (mutex);
+       return 0;
+}
+
+static inline int
+mono_os_cond_init (mono_cond_t *cond)
+{
+       InitializeConditionVariable (cond);
+       return 0;
+}
+
+static inline int
+mono_os_cond_destroy (mono_cond_t *cond)
+{
+       /* Beauty of win32 API: do not destroy it */
+       return 0;
+}
+
+static inline int
+mono_os_cond_wait (mono_cond_t *cond, mono_mutex_t *mutex)
+{
+       return SleepConditionVariableCS (cond, mutex, INFINITE) ? 0 : 1;
+}
+
+static inline int
+mono_os_cond_timedwait (mono_cond_t *cond, mono_mutex_t *mutex, guint32 timeout_ms)
+{
+       return SleepConditionVariableCS (cond, mutex, timeout_ms) ? 0 : 1;
+}
+
+static inline int
+mono_os_cond_signal (mono_cond_t *cond)
+{
+       WakeConditionVariable (cond);
+       return 0;
+}
+
+static inline int
+mono_os_cond_broadcast (mono_cond_t *cond)
+{
+       WakeAllConditionVariable (cond);
+       return 0;
+}
+
+#endif
+
+G_END_DECLS
+
+#endif /* __MONO_OS_MUTEX_H__ */

diff --git a/mono/utils/mono-os-semaphore.h b/mono/utils/mono-os-semaphore.h
new file mode 100644 (file)
index 0000000..7ab1b9d
--- /dev/null
+++ b/mono/utils/mono-os-semaphore.h
@@ -0,0 +1,277 @@
+/*
+ * mono-os-semaphore.h:  Definitions for generic semaphore usage
+ *
+ * Author:
+ *     Geoff Norton  <gnorton@novell.com>
+ *
+ * (C) 2009 Novell, Inc.
+ */
+
+#ifndef _MONO_SEMAPHORE_H_
+#define _MONO_SEMAPHORE_H_
+
+#include <config.h>
+#include <glib.h>
+
+#include <errno.h>
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#if defined(USE_MACH_SEMA)
+#include <mach/mach_init.h>
+#include <mach/task.h>
+#include <mach/semaphore.h>
+#elif !defined(HOST_WIN32) && defined(HAVE_SEMAPHORE_H)
+#include <semaphore.h>
+#else
+#include <winsock2.h>
+#include <windows.h>
+#endif
+
+#define MONO_HAS_SEMAPHORES 1
+
+#ifndef NSEC_PER_SEC
+#define NSEC_PER_SEC (1000 * 1000 * 1000)
+#endif
+
+G_BEGIN_DECLS
+
+typedef enum {
+       MONO_SEM_FLAGS_NONE      = 0,
+       MONO_SEM_FLAGS_ALERTABLE = 1 << 0,
+} MonoSemFlags;
+
+#if defined(USE_MACH_SEMA)
+
+typedef semaphore_t MonoSemType;
+
+static inline int
+mono_os_sem_init (MonoSemType *sem, int value)
+{
+       return semaphore_create (current_task (), sem, SYNC_POLICY_FIFO, value) != KERN_SUCCESS ? -1 : 0;
+}
+
+static inline int
+mono_os_sem_destroy (MonoSemType *sem)
+{
+       return semaphore_destroy (current_task (), *sem) != KERN_SUCCESS ? -1 : 0;
+}
+
+static inline int
+mono_os_sem_wait (MonoSemType *sem, MonoSemFlags flags)
+{
+       int res;
+
+retry:
+       res = semaphore_wait (*sem);
+       g_assert (res != KERN_INVALID_ARGUMENT);
+
+       if (res == KERN_ABORTED && !(flags & MONO_SEM_FLAGS_ALERTABLE))
+               goto retry;
+
+       return res != KERN_SUCCESS ? -1 : 0;
+}
+
+static inline int
+mono_os_sem_timedwait (MonoSemType *sem, guint32 timeout_ms, MonoSemFlags flags)
+{
+       mach_timespec_t ts, copy;
+       struct timeval start, current;
+       int res = 0;
+
+       if (timeout_ms == (guint32) 0xFFFFFFFF)
+               return mono_os_sem_wait (sem, flags);
+
+       ts.tv_sec = timeout_ms / 1000;
+       ts.tv_nsec = (timeout_ms % 1000) * 1000000;
+       while (ts.tv_nsec >= NSEC_PER_SEC) {
+               ts.tv_nsec -= NSEC_PER_SEC;
+               ts.tv_sec++;
+       }
+
+       copy = ts;
+       gettimeofday (&start, NULL);
+
+retry:
+       res = semaphore_timedwait (*sem, ts);
+       g_assert (res != KERN_INVALID_ARGUMENT);
+
+       if (res == KERN_ABORTED && !(flags & MONO_SEM_FLAGS_ALERTABLE)) {
+               ts = copy;
+
+               gettimeofday (&current, NULL);
+               ts.tv_sec -= (current.tv_sec - start.tv_sec);
+               ts.tv_nsec -= (current.tv_usec - start.tv_usec) * 1000;
+               if (ts.tv_nsec < 0) {
+                       if (ts.tv_sec <= 0) {
+                               ts.tv_nsec = 0;
+                       } else {
+                               ts.tv_sec--;
+                               ts.tv_nsec += NSEC_PER_SEC;
+                       }
+               }
+               if (ts.tv_sec < 0) {
+                       ts.tv_sec = 0;
+                       ts.tv_nsec = 0;
+               }
+
+               goto retry;
+       }
+
+       return res != KERN_SUCCESS ? -1 : 0;
+}
+
+static inline int
+mono_os_sem_post (MonoSemType *sem)
+{
+       int res;
+
+       res = semaphore_signal (*sem);
+       g_assert (res != KERN_INVALID_ARGUMENT);
+
+       return res != KERN_SUCCESS ? -1 : 0;
+}
+
+#elif !defined(HOST_WIN32) && defined(HAVE_SEMAPHORE_H)
+
+typedef sem_t MonoSemType;
+
+static inline int
+mono_os_sem_init (MonoSemType *sem, int value)
+{
+       return sem_init (sem, 0, value);
+}
+
+static inline int
+mono_os_sem_destroy (MonoSemType *sem)
+{
+       return sem_destroy (sem);
+}
+
+static inline int
+mono_os_sem_wait (MonoSemType *sem, MonoSemFlags flags)
+{
+       int res;
+
+retry:
+       res = sem_wait (sem);
+       if (res == -1)
+               g_assert (errno != EINVAL);
+
+       if (res == -1 && errno == EINTR && !(flags & MONO_SEM_FLAGS_ALERTABLE))
+               goto retry;
+
+       return res != 0 ? -1 : 0;
+}
+
+static inline int
+mono_os_sem_timedwait (MonoSemType *sem, guint32 timeout_ms, MonoSemFlags flags)
+{
+       struct timespec ts, copy;
+       struct timeval t;
+       int res = 0;
+
+       if (timeout_ms == 0) {
+               res = sem_trywait (sem) != 0 ? -1 : 0;
+               if (res == -1)
+                       g_assert (errno != EINVAL);
+
+               return res != 0 ? -1 : 0;
+       }
+
+       if (timeout_ms == (guint32) 0xFFFFFFFF)
+               return mono_os_sem_wait (sem, flags);
+
+       gettimeofday (&t, NULL);
+       ts.tv_sec = timeout_ms / 1000 + t.tv_sec;
+       ts.tv_nsec = (timeout_ms % 1000) * 1000000 + t.tv_usec * 1000;
+       while (ts.tv_nsec >= NSEC_PER_SEC) {
+               ts.tv_nsec -= NSEC_PER_SEC;
+               ts.tv_sec++;
+       }
+
+       copy = ts;
+
+retry:
+#if defined(__native_client__) && defined(USE_NEWLIB)
+       res = sem_trywait (sem);
+#else
+       res = sem_timedwait (sem, &ts);
+#endif
+       if (res == -1)
+               g_assert (errno != EINVAL);
+
+       if (res == -1 && errno == EINTR && !(flags & MONO_SEM_FLAGS_ALERTABLE)) {
+               ts = copy;
+               goto retry;
+       }
+
+       return res != 0 ? -1 : 0;
+}
+
+static inline int
+mono_os_sem_post (MonoSemType *sem)
+{
+       int res;
+
+       res = sem_post (sem);
+       if (res == -1)
+               g_assert (errno != EINVAL);
+
+       return res;
+}
+
+#else
+
+typedef HANDLE MonoSemType;
+
+static inline int
+mono_os_sem_init (MonoSemType *sem, int value)
+{
+       *sem = CreateSemaphore (NULL, value, 0x7FFFFFFF, NULL);
+       return *sem == NULL ? -1 : 0;
+}
+
+static inline int
+mono_os_sem_destroy (MonoSemType *sem)
+{
+       return !CloseHandle (*sem) ? -1 : 0;
+}
+
+static inline int
+mono_os_sem_timedwait (MonoSemType *sem, guint32 timeout_ms, MonoSemFlags flags)
+{
+       gboolean res;
+
+retry:
+       res = WaitForSingleObjectEx (*sem, timeout_ms, flags & MONO_SEM_FLAGS_ALERTABLE);
+
+       if (res == WAIT_IO_COMPLETION && !(flags & MONO_SEM_FLAGS_ALERTABLE))
+               goto retry;
+
+       return res != WAIT_OBJECT_0 ? -1 : 0;
+}
+
+static inline int
+mono_os_sem_wait (MonoSemType *sem, MonoSemFlags flags)
+{
+       return mono_os_sem_timedwait (sem, INFINITE, flags);
+}
+
+static inline int
+mono_os_sem_post (MonoSemType *sem)
+{
+       return !ReleaseSemaphore (*sem, 1, NULL) ? -1 : 0;
+}
+
+#endif
+
+G_END_DECLS
+
+#endif /* _MONO_SEMAPHORE_H_ */

diff --git a/mono/utils/mono-proclib.c b/mono/utils/mono-proclib.c
index 7766729c65552e301e146a025fe8382c80f6bd9a..c4e20e4ed42400bad8e38c6ddb3a8ff100d13b87 100644 (file)
--- a/mono/utils/mono-proclib.c
+++ b/mono/utils/mono-proclib.c
@@ -161,7 +161,7 @@ mono_process_list (int *size)
                                count = 16;
                        else
                                count *= 2;
-                       buf = g_realloc (buf, count * sizeof (void*));
+                       buf = (void **)g_realloc (buf, count * sizeof (void*));
                }
                buf [i++] = GINT_TO_POINTER (pid);
        }

diff --git a/mono/utils/mono-semaphore.c b/mono/utils/mono-semaphore.c
deleted file mode 100644 (file)
index 6c857fe..0000000
--- a/mono/utils/mono-semaphore.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * mono-semaphore.c: mono-semaphore functions
- *
- * Author:
- *     Gonzalo Paniagua Javier  <gonzalo@novell.com>
- *
- * (C) 2010 Novell, Inc.
- */
-
-#include <config.h>
-#include <errno.h>
-#include "utils/mono-semaphore.h"
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#if (defined (HAVE_SEMAPHORE_H) || defined (USE_MACH_SEMA)) && !defined(HOST_WIN32)
-/* sem_* or semaphore_* functions in use */
-#  ifdef USE_MACH_SEMA
-#    define TIMESPEC mach_timespec_t
-#    define WAIT_BLOCK(a,b) semaphore_timedwait (*(a), *(b))
-#  elif defined(__native_client__) && defined(USE_NEWLIB)
-#    define TIMESPEC struct timespec
-#    define WAIT_BLOCK(a, b) sem_trywait(a)
-#  else
-#    define TIMESPEC struct timespec
-#    define WAIT_BLOCK(a,b) sem_timedwait (a, b)
-#  endif
-
-#ifndef NSEC_PER_SEC
-#define NSEC_PER_SEC 1000000000
-#endif
-
-int
-mono_sem_timedwait (MonoSemType *sem, guint32 timeout_ms, gboolean alertable)
-{
-       TIMESPEC ts, copy;
-       struct timeval t;
-       int res = 0;
-
-#ifndef USE_MACH_SEMA
-       if (timeout_ms == 0)
-               return sem_trywait (sem);
-#endif
-       if (timeout_ms == (guint32) 0xFFFFFFFF)
-               return mono_sem_wait (sem, alertable);
-
-#ifdef USE_MACH_SEMA
-       memset (&t, 0, sizeof (t));
-#else
-       gettimeofday (&t, NULL);
-#endif
-       ts.tv_sec = timeout_ms / 1000 + t.tv_sec;
-       ts.tv_nsec = (timeout_ms % 1000) * 1000000 + t.tv_usec * 1000;
-       while (ts.tv_nsec >= NSEC_PER_SEC) {
-               ts.tv_nsec -= NSEC_PER_SEC;
-               ts.tv_sec++;
-       }
-
-       copy = ts;
-#ifdef USE_MACH_SEMA
-       gettimeofday (&t, NULL);
-       while ((res = WAIT_BLOCK (sem, &ts)) == KERN_ABORTED)
-#else
-       while ((res = WAIT_BLOCK (sem, &ts)) == -1 && errno == EINTR)
-#endif
-       {
-#ifdef USE_MACH_SEMA
-               struct timeval current;
-#endif
-               if (alertable)
-                       return -1;
-               ts = copy;
-#ifdef USE_MACH_SEMA
-               gettimeofday (&current, NULL);
-               ts.tv_sec -= (current.tv_sec - t.tv_sec);
-               ts.tv_nsec -= (current.tv_usec - t.tv_usec) * 1000;
-               if (ts.tv_nsec < 0) {
-                       if (ts.tv_sec <= 0) {
-                               ts.tv_nsec = 0;
-                       } else {
-                               ts.tv_sec--;
-                               ts.tv_nsec += NSEC_PER_SEC;
-                       }
-               }
-               if (ts.tv_sec < 0) {
-                       ts.tv_sec = 0;
-                       ts.tv_nsec = 0;
-               }
-#endif
-       }
-
-       /* OSX might return > 0 for error */
-       if (res != 0)
-               res = -1;
-       return res;
-}
-
-int
-mono_sem_wait (MonoSemType *sem, gboolean alertable)
-{
-       int res;
-#ifndef USE_MACH_SEMA
-       while ((res = sem_wait (sem)) == -1 && errno == EINTR)
-#else
-       while ((res = semaphore_wait (*sem)) == KERN_ABORTED)
-#endif
-       {
-               if (alertable)
-                       return -1;
-       }
-       /* OSX might return > 0 for error */
-       if (res != 0)
-               res = -1;
-       return res;
-}
-
-int
-mono_sem_post (MonoSemType *sem)
-{
-       int res;
-#ifndef USE_MACH_SEMA
-       while ((res = sem_post (sem)) == -1 && errno == EINTR);
-#else
-       res = semaphore_signal (*sem);
-       /* OSX might return > 0 for error */
-       if (res != KERN_SUCCESS)
-               res = -1;
-#endif
-       return res;
-}
-
-#else
-/* Windows or io-layer functions in use */
-int
-mono_sem_wait (MonoSemType *sem, gboolean alertable)
-{
-       return mono_sem_timedwait (sem, INFINITE, alertable);
-}
-
-int
-mono_sem_timedwait (MonoSemType *sem, guint32 timeout_ms, gboolean alertable)
-{
-       gboolean res;
-
-       while ((res = WaitForSingleObjectEx (*sem, timeout_ms, alertable)) == WAIT_IO_COMPLETION) {
-               if (alertable) {
-                       errno = EINTR;
-                       return -1;
-               }
-       }
-       switch (res) {
-       case WAIT_OBJECT_0:
-               return 0;    
-       // WAIT_TIMEOUT and WAIT_FAILED
-       default:
-               return -1;
-       }
-}
-
-int
-mono_sem_post (MonoSemType *sem)
-{
-       if (!ReleaseSemaphore (*sem, 1, NULL))
-               return -1;
-       return 0;
-}
-#endif
-

diff --git a/mono/utils/mono-semaphore.h b/mono/utils/mono-semaphore.h
deleted file mode 100644 (file)
index b4e9f26..0000000
--- a/mono/utils/mono-semaphore.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * mono-semaphore.h:  Definitions for generic semaphore usage
- *
- * Author:
- *     Geoff Norton  <gnorton@novell.com>
- *
- * (C) 2009 Novell, Inc.
- */
-
-#ifndef _MONO_SEMAPHORE_H_
-#define _MONO_SEMAPHORE_H_
-
-#include <config.h>
-#include <glib.h>
-#include <time.h>
-#if defined(HAVE_SEMAPHORE_H) && !defined(HOST_WIN32)
-#include <semaphore.h>
-#endif
-#include <mono/io-layer/io-layer.h>
-#include <mono/utils/mono-publib.h>
-
-#if (defined (HAVE_SEMAPHORE_H) || defined (USE_MACH_SEMA)) && !defined(HOST_WIN32)
-#  define MONO_HAS_SEMAPHORES
-
-#  if defined (USE_MACH_SEMA)
-#    include <mach/mach_init.h>
-#    include <mach/task.h>
-#    include <mach/semaphore.h>
-typedef semaphore_t MonoSemType;
-#    define MONO_SEM_INIT(addr,value) semaphore_create (current_task (), (addr), SYNC_POLICY_FIFO, (value))
-#    define MONO_SEM_DESTROY(sem) semaphore_destroy (current_task (), *(sem))
-#  else
-typedef sem_t MonoSemType;
-#    define MONO_SEM_INIT(addr,value) sem_init ((addr), 0, (value))
-#    define MONO_SEM_DESTROY(sem) sem_destroy ((sem))
-#  endif
-#else
-#  define MONO_HAS_SEMAPHORES
-typedef HANDLE MonoSemType;
-#    define MONO_SEM_INIT(addr,initial) do {*(addr) = CreateSemaphore ( NULL,(initial),0x7FFFFFFF,NULL);} while(0)
-#    define MONO_SEM_DESTROY(sem) do { CloseHandle (*(sem)); (*(sem))=0; } while(0)
-#endif
-
-#define MONO_SEM_WAIT(sem) MONO_SEM_WAIT_ALERTABLE(sem, FALSE)
-#define MONO_SEM_WAIT_ALERTABLE(sem,alertable) mono_sem_wait ((sem), alertable)
-#define MONO_SEM_POST(sem) mono_sem_post ((sem))
-#define MONO_SEM_TIMEDWAIT(sem, timeout_ms) MONO_SEM_TIMEDWAIT_ALERTABLE(sem, timeout_ms, FALSE)
-#define MONO_SEM_TIMEDWAIT_ALERTABLE(sem, timeout_ms, alertable) mono_sem_timedwait ((sem), (timeout_ms), alertable) 
-
-#define MONO_SEM_WAIT_UNITERRUPTIBLE(sem) do { \
-       while (MONO_SEM_WAIT ((sem)) != 0) {    \
-               /*if (EINTR != errno) ABORT("sem_wait failed"); */      \
-       }       \
-} while (0)
-
-G_BEGIN_DECLS
-
-MONO_API int mono_sem_wait (MonoSemType *sem, gboolean alertable);
-MONO_API int mono_sem_timedwait (MonoSemType *sem, guint32 timeout_ms, gboolean alertable);
-MONO_API int mono_sem_post (MonoSemType *sem);
-
-G_END_DECLS
-#endif /* _MONO_SEMAPHORE_H_ */

diff --git a/mono/utils/mono-threads-coop.c b/mono/utils/mono-threads-coop.c
index edfb11d6c028b7aea1737d98cfa8d0c13173af19..dcf1a786e40b458bd0a67de0cd9a5175b5cf7699 100644 (file)
--- a/mono/utils/mono-threads-coop.c
+++ b/mono/utils/mono-threads-coop.c
@@ -15,7 +15,6 @@
 #endif
 
 #include <mono/utils/mono-compiler.h>
-#include <mono/utils/mono-semaphore.h>
 #include <mono/utils/mono-threads.h>
 #include <mono/utils/mono-tls.h>
 #include <mono/utils/hazard-pointer.h>
@@ -158,7 +157,7 @@ mono_threads_finish_blocking (void *cookie, void* stackdata)
        if (!mono_threads_is_coop_enabled ())
                return;
 
-       info = cookie;
+       info = (MonoThreadInfo *)cookie;
        if (!info)
                return;
 
@@ -228,7 +227,7 @@ mono_threads_reset_blocking_end (void *cookie, void* stackdata)
        if (!mono_threads_is_coop_enabled ())
                return;
 
-       info = cookie;
+       info = (MonoThreadInfo *)cookie;
        if (!info)
                return;
 
@@ -236,49 +235,6 @@ mono_threads_reset_blocking_end (void *cookie, void* stackdata)
        mono_threads_prepare_blocking (stackdata);
 }
 
-void*
-mono_threads_try_prepare_blocking (void* stackdata)
-{
-       MonoThreadInfo *info;
-
-       if (!mono_threads_is_coop_enabled ())
-               return NULL;
-
-       ++coop_try_blocking_count;
-
-       info = mono_thread_info_current_unchecked ();
-       /* If the thread is not attached, it doesn't make sense prepare for suspend. */
-       if (!info || !mono_thread_info_is_live (info) || mono_thread_info_current_state (info) == STATE_BLOCKING) {
-               THREADS_SUSPEND_DEBUG ("PREPARE-TRY-BLOCKING failed %p\n", mono_thread_info_get_tid (info));
-               return NULL;
-       }
-
-       copy_stack_data (info, stackdata);
-
-retry:
-       ++coop_save_count;
-       mono_threads_get_runtime_callbacks ()->thread_state_init (&info->thread_saved_state [SELF_SUSPEND_STATE_INDEX]);
-
-       switch (mono_threads_transition_do_blocking (info)) {
-       case DoBlockingContinue:
-               break;
-       case DoBlockingPollAndRetry:
-               mono_threads_state_poll ();
-               goto retry;
-       }
-
-       return info;
-}
-
-void
-mono_threads_finish_try_blocking (void* cookie, void* stackdata)
-{
-       if (!mono_threads_is_coop_enabled ())
-               return;
-
-       mono_threads_finish_blocking (cookie, stackdata);
-}
-
 void
 mono_threads_init_coop (void)
 {

diff --git a/mono/utils/mono-threads-coop.h b/mono/utils/mono-threads-coop.h
index fa928672400754d15963d1f61fcfbcd588e159d5..4e24389489a65aa9f8891e0edafa4965376b99ac 100644 (file)
--- a/mono/utils/mono-threads-coop.h
+++ b/mono/utils/mono-threads-coop.h
@@ -42,9 +42,6 @@ void mono_threads_finish_blocking (void* cookie, void* stackdata);
 void* mono_threads_reset_blocking_start (void* stackdata);
 void mono_threads_reset_blocking_end (void* cookie, void* stackdata);
 
-void* mono_threads_try_prepare_blocking (void* stackdata);
-void mono_threads_finish_try_blocking (void* cookie, void* stackdata);
-
 static inline void
 mono_threads_safepoint (void)
 {
@@ -53,30 +50,21 @@ mono_threads_safepoint (void)
 }
 
 #define MONO_PREPARE_BLOCKING  \
-{      \
-       void *__dummy;  \
-       void *__blocking_cookie = mono_threads_prepare_blocking (&__dummy);
+       do {    \
+               void *__dummy;  \
+               void *__blocking_cookie = mono_threads_prepare_blocking (&__dummy)
 
 #define MONO_FINISH_BLOCKING \
-       mono_threads_finish_blocking (__blocking_cookie, &__dummy);     \
-}
+               mono_threads_finish_blocking (__blocking_cookie, &__dummy);     \
+       } while (0)
 
 #define MONO_PREPARE_RESET_BLOCKING    \
-{      \
-       void *__dummy;  \
-       void *__reset_cookie = mono_threads_reset_blocking_start (&__dummy);
+       do {    \
+               void *__dummy;  \
+               void *__reset_cookie = mono_threads_reset_blocking_start (&__dummy)
 
 #define MONO_FINISH_RESET_BLOCKING \
-       mono_threads_reset_blocking_end (__reset_cookie, &__dummy);     \
-}
-
-#define MONO_TRY_BLOCKING      \
-{      \
-       void *__dummy;  \
-       void *__try_block_cookie = mono_threads_try_prepare_blocking (&__dummy);
-
-#define MONO_FINISH_TRY_BLOCKING \
-       mono_threads_finish_try_blocking (__try_block_cookie, &__dummy);        \
-}
+               mono_threads_reset_blocking_end (__reset_cookie, &__dummy);     \
+       } while (0)
 
 #endif

diff --git a/mono/utils/mono-threads-mach.c b/mono/utils/mono-threads-mach.c
index d48e30a2b37f5e0b13f56fd6f1674c75ff51b033..6f2ddfa78af52357be210b50a2a43c3a73526b52 100644 (file)
--- a/mono/utils/mono-threads-mach.c
+++ b/mono/utils/mono-threads-mach.c
@@ -21,7 +21,6 @@
 
 #include <mono/utils/mach-support.h>
 #include <mono/utils/mono-compiler.h>
-#include <mono/utils/mono-semaphore.h>
 #include <mono/utils/mono-threads.h>
 #include <mono/utils/hazard-pointer.h>
 

diff --git a/mono/utils/mono-threads-posix-signals.c b/mono/utils/mono-threads-posix-signals.c
index ade08008827ad746753bbaa654bb7d5a47654ae5..155f830a0fa15bcda4b9e803617f938c6c513889 100644 (file)
--- a/mono/utils/mono-threads-posix-signals.c
+++ b/mono/utils/mono-threads-posix-signals.c
@@ -17,7 +17,6 @@
 #include <errno.h>
 #include <signal.h>
 
-#include "mono-semaphore.h"
 #include "mono-threads-posix-signals.h"
 
 #if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -65,7 +64,7 @@ signal_add_handler (int signo, gpointer handler, int flags)
        struct sigaction previous_sa;
        int ret;
 
-       sa.sa_sigaction = handler;
+       sa.sa_sigaction = (void (*)(int, siginfo_t *, void *))handler;
        sigfillset (&sa.sa_mask);
 
        sa.sa_flags = SA_SIGINFO | flags;
@@ -217,7 +216,8 @@ suspend_signal_handler (int _dummy, siginfo_t *info, void *context)
 #if MONO_ARCH_HAS_MONO_CONTEXT
                MonoContext tmp = current->thread_saved_state [ASYNC_SUSPEND_STATE_INDEX].ctx;
                mono_threads_get_runtime_callbacks ()->setup_async_callback (&tmp, current->async_target, current->user_data);
-               current->async_target = current->user_data = NULL;
+               current->user_data = NULL;
+               current->async_target = NULL;
                mono_monoctx_to_sigctx (&tmp, context);
 #else
                g_error ("The new interruption machinery requires a working mono-context");

diff --git a/mono/utils/mono-threads-posix.c b/mono/utils/mono-threads-posix.c
index b9ede7e25de311bb0874f0d3dad6994e30f67eab..54f183e58f03659937730f70797d3de5b411c0db 100644 (file)
--- a/mono/utils/mono-threads-posix.c
+++ b/mono/utils/mono-threads-posix.c
@@ -16,6 +16,7 @@
 
 #include <mono/utils/mono-threads.h>
 #include <mono/utils/mono-threads-posix-signals.h>
+#include <mono/utils/mono-coop-semaphore.h>
 #include <mono/metadata/gc-internals.h>
 
 #include <errno.h>
@@ -40,7 +41,7 @@ typedef struct {
        void *(*start_routine)(void*);
        void *arg;
        int flags;
-       MonoSemType registered;
+       MonoCoopSem registered;
        HANDLE handle;
 } StartInfo;
 
@@ -59,35 +60,34 @@ inner_start_thread (void *arg)
        /* Register the thread with the io-layer */
        handle = wapi_create_thread_handle ();
        if (!handle) {
-               res = MONO_SEM_POST (&(start_info->registered));
+               res = mono_coop_sem_post (&(start_info->registered));
                g_assert (!res);
                return NULL;
        }
        start_info->handle = handle;
 
        info = mono_thread_info_attach (&result);
-       MONO_PREPARE_BLOCKING;
 
        info->runtime_thread = TRUE;
        info->handle = handle;
 
        if (flags & CREATE_SUSPENDED) {
                info->create_suspended = TRUE;
-               MONO_SEM_INIT (&info->create_suspended_sem, 0);
+               mono_coop_sem_init (&info->create_suspended_sem, 0);
        }
 
        /* start_info is not valid after this */
-       res = MONO_SEM_POST (&(start_info->registered));
+       res = mono_coop_sem_post (&(start_info->registered));
        g_assert (!res);
        start_info = NULL;
 
        if (flags & CREATE_SUSPENDED) {
-               while (MONO_SEM_WAIT (&info->create_suspended_sem) != 0 &&
-                          errno == EINTR);
-               MONO_SEM_DESTROY (&info->create_suspended_sem);
+               res = mono_coop_sem_wait (&info->create_suspended_sem, MONO_SEM_FLAGS_NONE);
+               g_assert (res != -1);
+
+               mono_coop_sem_destroy (&info->create_suspended_sem);
        }
 
-       MONO_FINISH_BLOCKING;
        /* Run the actual main function of the thread */
        result = start_func (t_arg);
 
@@ -131,23 +131,20 @@ mono_threads_core_create_thread (LPTHREAD_START_ROUTINE start_routine, gpointer
        start_info.start_routine = (void *(*)(void *)) start_routine;
        start_info.arg = arg;
        start_info.flags = creation_flags;
-       MONO_SEM_INIT (&(start_info.registered), 0);
+       mono_coop_sem_init (&(start_info.registered), 0);
 
        /* Actually start the thread */
        res = mono_gc_pthread_create (&thread, &attr, inner_start_thread, &start_info);
        if (res) {
-               MONO_SEM_DESTROY (&(start_info.registered));
+               mono_coop_sem_destroy (&(start_info.registered));
                return NULL;
        }
 
-       MONO_TRY_BLOCKING;
        /* Wait until the thread register itself in various places */
-       while (MONO_SEM_WAIT (&(start_info.registered)) != 0) {
-               /*if (EINTR != errno) ABORT("sem_wait failed"); */
-       }
-       MONO_FINISH_TRY_BLOCKING;
+       res = mono_coop_sem_wait (&start_info.registered, MONO_SEM_FLAGS_NONE);
+       g_assert (res != -1);
 
-       MONO_SEM_DESTROY (&(start_info.registered));
+       mono_coop_sem_destroy (&(start_info.registered));
 
        if (out_tid)
                *out_tid = thread;
@@ -163,7 +160,7 @@ mono_threads_core_create_thread (LPTHREAD_START_ROUTINE start_routine, gpointer
 void
 mono_threads_core_resume_created (MonoThreadInfo *info, MonoNativeThreadId tid)
 {
-       MONO_SEM_POST (&info->create_suspended_sem);
+       mono_coop_sem_post (&info->create_suspended_sem);
 }
 
 gboolean

diff --git a/mono/utils/mono-threads-windows.c b/mono/utils/mono-threads-windows.c
index 5f62b198075f8c7c836b8122d2ea4b3a46af3365..86275a53833ab5028b682df6386b79015b419ec2 100644 (file)
--- a/mono/utils/mono-threads-windows.c
+++ b/mono/utils/mono-threads-windows.c
@@ -139,7 +139,7 @@ mono_threads_platform_free (MonoThreadInfo *info)
 typedef struct {
        LPTHREAD_START_ROUTINE start_routine;
        void *arg;
-       MonoSemType registered;
+       MonoCoopSem registered;
        gboolean suspend;
        HANDLE suspend_event;
 } ThreadStartInfo;
@@ -160,7 +160,7 @@ inner_start_thread (LPVOID arg)
        info->runtime_thread = TRUE;
        info->create_suspended = suspend;
 
-       post_result = MONO_SEM_POST (&(start_info->registered));
+       post_result = mono_coop_sem_post (&(start_info->registered));
        g_assert (!post_result);
 
        if (suspend) {
@@ -181,11 +181,12 @@ mono_threads_core_create_thread (LPTHREAD_START_ROUTINE start_routine, gpointer
        ThreadStartInfo *start_info;
        HANDLE result;
        DWORD thread_id;
+       int res;
 
        start_info = g_malloc0 (sizeof (ThreadStartInfo));
        if (!start_info)
                return NULL;
-       MONO_SEM_INIT (&(start_info->registered), 0);
+       mono_coop_sem_init (&(start_info->registered), 0);
        start_info->arg = arg;
        start_info->start_routine = start_routine;
        start_info->suspend = creation_flags & CREATE_SUSPENDED;
@@ -198,9 +199,9 @@ mono_threads_core_create_thread (LPTHREAD_START_ROUTINE start_routine, gpointer
 
        result = CreateThread (NULL, stack_size, inner_start_thread, start_info, creation_flags, &thread_id);
        if (result) {
-               while (MONO_SEM_WAIT (&(start_info->registered)) != 0) {
-                       /*if (EINTR != errno) ABORT("sem_wait failed"); */
-               }
+               res = mono_coop_sem_wait (&(start_info->registered), MONO_SEM_FLAGS_NONE);
+               g_assert (res != -1);
+
                if (start_info->suspend) {
                        g_assert (SuspendThread (result) != (DWORD)-1);
                        SetEvent (start_info->suspend_event);
@@ -210,7 +211,7 @@ mono_threads_core_create_thread (LPTHREAD_START_ROUTINE start_routine, gpointer
        }
        if (out_tid)
                *out_tid = thread_id;
-       MONO_SEM_DESTROY (&(start_info->registered));
+       mono_coop_sem_destroy (&(start_info->registered));
        g_free (start_info);
        return result;
 }

diff --git a/mono/utils/mono-threads.c b/mono/utils/mono-threads.c
index abad3b64aaacaf2ce6acbd8b46fab97791266354..9a41de7c7164341b455b9cb1258c06b917840531 100644 (file)
--- a/mono/utils/mono-threads.c
+++ b/mono/utils/mono-threads.c
@@ -16,7 +16,7 @@
 #endif
 
 #include <mono/utils/mono-compiler.h>
-#include <mono/utils/mono-semaphore.h>
+#include <mono/utils/mono-os-semaphore.h>
 #include <mono/utils/mono-threads.h>
 #include <mono/utils/mono-tls.h>
 #include <mono/utils/hazard-pointer.h>
@@ -25,7 +25,8 @@
 #include <mono/utils/atomic.h>
 #include <mono/utils/mono-time.h>
 #include <mono/utils/mono-lazy-init.h>
-
+#include <mono/utils/mono-coop-mutex.h>
+#include <mono/utils/mono-coop-semaphore.h>
 
 #include <errno.h>
 
@@ -45,7 +46,7 @@ The GC has to acquire this lock before starting a STW to make sure
 a runtime suspend won't make it wronly see a thread in a safepoint
 when it is in fact not.
 */
-static MonoSemType global_suspend_semaphore;
+static MonoCoopSem global_suspend_semaphore;
 
 static size_t thread_info_size;
 static MonoThreadInfoCallbacks threads_callbacks;
@@ -77,7 +78,7 @@ mono_threads_notify_initiator_of_abort (MonoThreadInfo* info)
 {
        THREADS_SUSPEND_DEBUG ("[INITIATOR-NOTIFY-ABORT] %p\n", mono_thread_info_get_tid (info));
        InterlockedIncrement (&abort_posts);
-       MONO_SEM_POST (&suspend_semaphore);
+       mono_os_sem_post (&suspend_semaphore);
 }
 
 void
@@ -85,7 +86,7 @@ mono_threads_notify_initiator_of_suspend (MonoThreadInfo* info)
 {
        THREADS_SUSPEND_DEBUG ("[INITIATOR-NOTIFY-SUSPEND] %p\n", mono_thread_info_get_tid (info));
        InterlockedIncrement (&suspend_posts);
-       MONO_SEM_POST (&suspend_semaphore);
+       mono_os_sem_post (&suspend_semaphore);
 }
 
 void
@@ -93,7 +94,7 @@ mono_threads_notify_initiator_of_resume (MonoThreadInfo* info)
 {
        THREADS_SUSPEND_DEBUG ("[INITIATOR-NOTIFY-RESUME] %p\n", mono_thread_info_get_tid (info));
        InterlockedIncrement (&resume_posts);
-       MONO_SEM_POST (&suspend_semaphore);
+       mono_os_sem_post (&suspend_semaphore);
 }
 
 static gboolean
@@ -132,21 +133,23 @@ static void
 resume_self_suspended (MonoThreadInfo* info)
 {
        THREADS_SUSPEND_DEBUG ("**BEGIN self-resume %p\n", mono_thread_info_get_tid (info));
-       MONO_SEM_POST (&info->resume_semaphore);
+       mono_os_sem_post (&info->resume_semaphore);
 }
 
 void
 mono_thread_info_wait_for_resume (MonoThreadInfo* info)
 {
+       int res;
        THREADS_SUSPEND_DEBUG ("**WAIT self-resume %p\n", mono_thread_info_get_tid (info));
-       MONO_SEM_WAIT_UNITERRUPTIBLE (&info->resume_semaphore);
+       res = mono_os_sem_wait (&info->resume_semaphore, MONO_SEM_FLAGS_NONE);
+       g_assert (res != -1);
 }
 
 static void
 resume_blocking_suspended (MonoThreadInfo* info)
 {
        THREADS_SUSPEND_DEBUG ("**BEGIN blocking-resume %p\n", mono_thread_info_get_tid (info));
-       MONO_SEM_POST (&info->resume_semaphore);
+       mono_os_sem_post (&info->resume_semaphore);
 }
 
 void
@@ -225,7 +228,7 @@ mono_threads_wait_pending_operations (void)
                for (i = 0; i < pending_suspends; ++i) {
                        THREADS_SUSPEND_DEBUG ("[INITIATOR-WAIT-WAITING]\n");
                        InterlockedIncrement (&waits_done);
-                       if (!MONO_SEM_TIMEDWAIT (&suspend_semaphore, SLEEP_DURATION_BEFORE_ABORT))
+                       if (!mono_os_sem_timedwait (&suspend_semaphore, SLEEP_DURATION_BEFORE_ABORT, MONO_SEM_FLAGS_NONE))
                                continue;
                        mono_stopwatch_stop (&suspension_time);
 
@@ -308,7 +311,7 @@ free_thread_info (gpointer mem)
 {
        MonoThreadInfo *info = (MonoThreadInfo *) mem;
 
-       MONO_SEM_DESTROY (&info->resume_semaphore);
+       mono_os_sem_destroy (&info->resume_semaphore);
        mono_threads_platform_free (info);
 
        g_free (info);
@@ -336,7 +339,7 @@ register_thread (MonoThreadInfo *info, gpointer baseptr)
        mono_thread_info_set_tid (info, mono_native_thread_id_get ());
        info->small_id = small_id;
 
-       MONO_SEM_INIT (&info->resume_semaphore, 0);
+       mono_os_sem_init (&info->resume_semaphore, 0);
 
        /*set TLS early so SMR works */
        mono_native_tls_set_value (thread_info_key, info);
@@ -631,8 +634,8 @@ mono_threads_init (MonoThreadInfoCallbacks *callbacks, size_t info_size)
 
        unified_suspend_enabled = g_getenv ("MONO_ENABLE_UNIFIED_SUSPEND") != NULL || mono_threads_is_coop_enabled ();
 
-       MONO_SEM_INIT (&global_suspend_semaphore, 1);
-       MONO_SEM_INIT (&suspend_semaphore, 0);
+       mono_coop_sem_init (&global_suspend_semaphore, 1);
+       mono_os_sem_init (&suspend_semaphore, 0);
 
        mono_lls_init (&thread_list, NULL);
        mono_thread_smr_init ();
@@ -661,45 +664,6 @@ mono_threads_get_runtime_callbacks (void)
        return &runtime_callbacks;
 }
 
-/*
-The return value is only valid until a matching mono_thread_info_resume is called
-*/
-static MonoThreadInfo*
-mono_thread_info_suspend_sync (MonoNativeThreadId tid, gboolean interrupt_kernel, const char **error_condition)
-{
-       MonoThreadHazardPointers *hp = mono_hazard_pointer_get ();      
-       MonoThreadInfo *info = mono_thread_info_lookup (tid); /*info on HP1*/
-       if (!info) {
-               *error_condition = "Thread not found";
-               return NULL;
-       }
-
-       switch (mono_threads_transition_request_async_suspension (info)) {
-       case AsyncSuspendAlreadySuspended:
-               mono_hazard_pointer_clear (hp, 1); //XXX this is questionable we got to clean the suspend/resume nonsense of critical sections
-               return info;
-       case AsyncSuspendWait:
-               mono_threads_add_to_pending_operation_set (info);
-               break;
-       case AsyncSuspendInitSuspend:
-               if (!begin_async_suspend (info, interrupt_kernel)) {
-                       mono_hazard_pointer_clear (hp, 1);
-                       *error_condition = "Could not suspend thread";
-                       return NULL;
-               }
-       }
-
-       //Wait for the pending suspend to finish
-       mono_threads_wait_pending_operations ();
-
-       if (!check_async_suspend (info)) {
-               mono_hazard_pointer_clear (hp, 1);
-               *error_condition = "Post suspend failed";
-               return NULL;
-       }
-       return info;
-}
-
 /*
 Signal that the current thread wants to be suspended.
 This function can be called without holding the suspend lock held.
@@ -884,14 +848,48 @@ mono_thread_info_in_critical_location (MonoThreadInfo *info)
        return is_thread_in_critical_region (info);
 }
 
+/*
+The return value is only valid until a matching mono_thread_info_resume is called
+*/
+static MonoThreadInfo*
+suspend_sync (MonoNativeThreadId tid, gboolean interrupt_kernel)
+{
+       MonoThreadHazardPointers *hp = mono_hazard_pointer_get ();
+       MonoThreadInfo *info = mono_thread_info_lookup (tid); /*info on HP1*/
+       if (!info)
+               return NULL;
+
+       switch (mono_threads_transition_request_async_suspension (info)) {
+       case AsyncSuspendAlreadySuspended:
+               mono_hazard_pointer_clear (hp, 1); //XXX this is questionable we got to clean the suspend/resume nonsense of critical sections
+               return info;
+       case AsyncSuspendWait:
+               mono_threads_add_to_pending_operation_set (info);
+               break;
+       case AsyncSuspendInitSuspend:
+               if (!begin_async_suspend (info, interrupt_kernel)) {
+                       mono_hazard_pointer_clear (hp, 1);
+                       return NULL;
+               }
+       }
+
+       //Wait for the pending suspend to finish
+       mono_threads_wait_pending_operations ();
+
+       if (!check_async_suspend (info)) {
+               mono_hazard_pointer_clear (hp, 1);
+               return NULL;
+       }
+       return info;
+}
+
 static MonoThreadInfo*
 suspend_sync_nolock (MonoNativeThreadId id, gboolean interrupt_kernel)
 {
        MonoThreadInfo *info = NULL;
        int sleep_duration = 0;
        for (;;) {
-               const char *suspend_error = "Unknown error";
-               if (!(info = mono_thread_info_suspend_sync (id, interrupt_kernel, &suspend_error))) {
+               if (!(info = suspend_sync (id, interrupt_kernel))) {
                        mono_hazard_pointer_clear (mono_hazard_pointer_get (), 1);
                        return NULL;
                }
@@ -909,16 +907,11 @@ suspend_sync_nolock (MonoNativeThreadId id, gboolean interrupt_kernel)
                /* Wait for the pending resume to finish */
                mono_threads_wait_pending_operations ();
 
-               if (!sleep_duration) {
-#ifdef HOST_WIN32
-                       SwitchToThread ();
-#else
-                       sched_yield ();
-#endif
-               }
-               else {
-                       g_usleep (sleep_duration);
-               }
+               if (sleep_duration == 0)
+                       mono_thread_info_yield ();
+               else
+                       mono_thread_info_usleep (sleep_duration);
+
                sleep_duration += 10;
        }
        return info;
@@ -961,38 +954,6 @@ done:
        mono_thread_info_suspend_unlock ();
 }
 
-/*
-WARNING:
-If we are trying to suspend a target that is on a critical region
-and running a syscall we risk looping forever if @interrupt_kernel is FALSE.
-So, be VERY carefull in calling this with @interrupt_kernel == FALSE.
-
-Info is not put on a hazard pointer as a suspended thread cannot exit and be freed.
-
-This function MUST be matched with mono_thread_info_finish_suspend or mono_thread_info_finish_suspend_and_resume
-*/
-MonoThreadInfo*
-mono_thread_info_safe_suspend_sync (MonoNativeThreadId id, gboolean interrupt_kernel)
-{
-       MonoThreadInfo *info = NULL;
-
-       THREADS_SUSPEND_DEBUG ("SUSPENDING tid %p\n", (void*)id);
-       /*FIXME: unify this with self-suspend*/
-       g_assert (id != mono_native_thread_id_get ());
-
-       mono_thread_info_suspend_lock ();
-       mono_threads_begin_global_suspend ();
-
-       info = suspend_sync_nolock (id, interrupt_kernel);
-
-       /* XXX this clears HP 1, so we restated it again */
-       // mono_atomic_store_release (&mono_thread_info_current ()->inside_critical_region, TRUE);
-       mono_threads_end_global_suspend ();
-       mono_thread_info_suspend_unlock ();
-
-       return info;
-}
-
 /**
 Inject an assynchronous call into the target thread. The target thread must be suspended and
 only a single async call can be setup for a given suspend cycle.
@@ -1020,15 +981,14 @@ STW to make sure no unsafe pending suspend is in progress.
 void
 mono_thread_info_suspend_lock (void)
 {
-       MONO_TRY_BLOCKING;
-       MONO_SEM_WAIT_UNITERRUPTIBLE (&global_suspend_semaphore);
-       MONO_FINISH_TRY_BLOCKING;
+       int res = mono_coop_sem_wait (&global_suspend_semaphore, MONO_SEM_FLAGS_NONE);
+       g_assert (res != -1);
 }
 
 void
 mono_thread_info_suspend_unlock (void)
 {
-       MONO_SEM_POST (&global_suspend_semaphore);
+       mono_coop_sem_post (&global_suspend_semaphore);
 }
 
 /*
@@ -1143,22 +1103,22 @@ mono_thread_info_yield (void)
        return mono_threads_core_yield ();
 }
 static mono_lazy_init_t sleep_init = MONO_LAZY_INIT_STATUS_NOT_INITIALIZED;
-static mono_mutex_t sleep_mutex;
-static mono_cond_t sleep_cond;
+static MonoCoopMutex sleep_mutex;
+static MonoCoopCond sleep_cond;
 
 static void
 sleep_initialize (void)
 {
-       mono_mutex_init (&sleep_mutex);
-       mono_cond_init (&sleep_cond, NULL);
+       mono_coop_mutex_init (&sleep_mutex);
+       mono_coop_cond_init (&sleep_cond);
 }
 
 static void
 sleep_interrupt (gpointer data)
 {
-       mono_mutex_lock (&sleep_mutex);
-       mono_cond_broadcast (&sleep_cond);
-       mono_mutex_unlock (&sleep_mutex);
+       mono_coop_mutex_lock (&sleep_mutex);
+       mono_coop_cond_broadcast (&sleep_cond);
+       mono_coop_mutex_unlock (&sleep_mutex);
 }
 
 static inline guint32
@@ -1182,28 +1142,28 @@ sleep_interruptable (guint32 ms, gboolean *alerted)
 
        mono_lazy_initialize (&sleep_init, sleep_initialize);
 
-       mono_mutex_lock (&sleep_mutex);
+       mono_coop_mutex_lock (&sleep_mutex);
 
        for (now = mono_msec_ticks (); ms == INFINITE || now - start < ms; now = mono_msec_ticks ()) {
                mono_thread_info_install_interrupt (sleep_interrupt, NULL, alerted);
                if (*alerted) {
-                       mono_mutex_unlock (&sleep_mutex);
+                       mono_coop_mutex_unlock (&sleep_mutex);
                        return WAIT_IO_COMPLETION;
                }
 
                if (ms < INFINITE)
-                       mono_cond_timedwait_ms (&sleep_cond, &sleep_mutex, end - now);
+                       mono_coop_cond_timedwait (&sleep_cond, &sleep_mutex, end - now);
                else
-                       mono_cond_wait (&sleep_cond, &sleep_mutex);
+                       mono_coop_cond_wait (&sleep_cond, &sleep_mutex);
 
                mono_thread_info_uninstall_interrupt (alerted);
                if (*alerted) {
-                       mono_mutex_unlock (&sleep_mutex);
+                       mono_coop_mutex_unlock (&sleep_mutex);
                        return WAIT_IO_COMPLETION;
                }
        }
 
-       mono_mutex_unlock (&sleep_mutex);
+       mono_coop_mutex_unlock (&sleep_mutex);
 
        return 0;
 }
@@ -1226,6 +1186,8 @@ mono_thread_info_sleep (guint32 ms, gboolean *alerted)
        if (alerted)
                return sleep_interruptable (ms, alerted);
 
+       MONO_PREPARE_BLOCKING;
+
        if (ms == INFINITE) {
                do {
 #ifdef HOST_WIN32
@@ -1269,6 +1231,17 @@ mono_thread_info_sleep (guint32 ms, gboolean *alerted)
 #endif /* __linux__ */
        }
 
+       MONO_FINISH_BLOCKING;
+
+       return 0;
+}
+
+gint
+mono_thread_info_usleep (guint64 us)
+{
+       MONO_PREPARE_BLOCKING;
+       g_usleep (us);
+       MONO_FINISH_BLOCKING;
        return 0;
 }
 
@@ -1374,7 +1347,7 @@ mono_thread_info_install_interrupt (void (*callback) (gpointer data), gpointer d
        token->callback = callback;
        token->data = data;
 
-       previous_token = InterlockedCompareExchangePointer ((gpointer*) &info->interrupt_token, token, NULL);
+       previous_token = (MonoThreadInfoInterruptToken *)InterlockedCompareExchangePointer ((gpointer*) &info->interrupt_token, token, NULL);
 
        if (previous_token) {
                if (previous_token != INTERRUPT_STATE)
@@ -1401,7 +1374,7 @@ mono_thread_info_uninstall_interrupt (gboolean *interrupted)
        info = mono_thread_info_current ();
        g_assert (info);
 
-       previous_token = InterlockedExchangePointer ((gpointer*) &info->interrupt_token, NULL);
+       previous_token = (MonoThreadInfoInterruptToken *)InterlockedExchangePointer ((gpointer*) &info->interrupt_token, NULL);
 
        /* only the installer can uninstall the token */
        g_assert (previous_token);
@@ -1510,7 +1483,7 @@ mono_thread_info_clear_self_interrupt ()
        info = mono_thread_info_current ();
        g_assert (info);
 
-       previous_token = InterlockedCompareExchangePointer ((gpointer*) &info->interrupt_token, NULL, INTERRUPT_STATE);
+       previous_token = (MonoThreadInfoInterruptToken *)InterlockedCompareExchangePointer ((gpointer*) &info->interrupt_token, NULL, INTERRUPT_STATE);
        g_assert (previous_token == NULL || previous_token == INTERRUPT_STATE);
 
        THREADS_INTERRUPT_DEBUG ("interrupt clear self tid %p previous_token %p\n", mono_thread_info_get_tid (info), previous_token);

diff --git a/mono/utils/mono-threads.h b/mono/utils/mono-threads.h
index 8a7782fad12d6bc69c507a992f9e909f06d9ac33..5fe411dbe1ae05f60bfcd355b1b436204d57ae5a 100644 (file)
--- a/mono/utils/mono-threads.h
+++ b/mono/utils/mono-threads.h
@@ -10,13 +10,15 @@
 #ifndef __MONO_THREADS_H__
 #define __MONO_THREADS_H__
 
-#include <mono/utils/mono-semaphore.h>
+#include <mono/utils/mono-os-semaphore.h>
 #include <mono/utils/mono-stack-unwinding.h>
 #include <mono/utils/mono-linked-list-set.h>
-#include <mono/utils/mono-mutex.h>
 #include <mono/utils/mono-tls.h>
 #include <mono/utils/mono-threads-coop.h>
 #include <mono/utils/mono-threads-api.h>
+#include <mono/utils/mono-coop-semaphore.h>
+
+#include <mono/io-layer/io-layer.h>
 
 #include <glib.h>
 #include <config.h>
@@ -226,7 +228,7 @@ typedef struct {
        gboolean create_suspended;
 
        /* Semaphore used to implement CREATE_SUSPENDED */
-       MonoSemType create_suspended_sem;
+       MonoCoopSem create_suspended_sem;
 
        /*
         * Values of TLS variables for this thread.
@@ -356,9 +358,6 @@ mono_thread_info_list_head (void);
 THREAD_INFO_TYPE*
 mono_thread_info_lookup (MonoNativeThreadId id);
 
-THREAD_INFO_TYPE*
-mono_thread_info_safe_suspend_sync (MonoNativeThreadId tid, gboolean interrupt_kernel);
-
 gboolean
 mono_thread_info_resume (MonoNativeThreadId tid);
 
@@ -407,6 +406,9 @@ mono_thread_info_yield (void);
 gint
 mono_thread_info_sleep (guint32 ms, gboolean *alerted);
 
+gint
+mono_thread_info_usleep (guint64 us);
+
 gpointer
 mono_thread_info_tls_get (THREAD_INFO_TYPE *info, MonoTlsKey key);
 

diff --git a/mono/utils/networking-posix.c b/mono/utils/networking-posix.c
index ad4a623eda77cd5faaaa7c25ed8fe0bc668e6234..58ab1378a90ab147b5794d7e8752e545cbf46053 100644 (file)
--- a/mono/utils/networking-posix.c
+++ b/mono/utils/networking-posix.c
@@ -182,7 +182,7 @@ mono_get_local_interfaces (int family, int *interface_count)
 
        memset (&ifc, 0, sizeof (ifc));
        ifc.ifc_len = IFCONF_BUFF_SIZE;
-       ifc.ifc_buf = g_malloc (IFCONF_BUFF_SIZE); /* We can't have such huge buffers on the stack. */
+       ifc.ifc_buf = (char *)g_malloc (IFCONF_BUFF_SIZE); /* We can't have such huge buffers on the stack. */
        if (ioctl (fd, SIOCGIFCONF, &ifc) < 0)
                goto done;
 
@@ -219,7 +219,8 @@ mono_get_local_interfaces (int family, int *interface_count)
                ++if_count;
        }
 
-       result_ptr = result = g_malloc (if_count * mono_address_size_for_family (family));
+       result = (char *)g_malloc (if_count * mono_address_size_for_family (family));
+       result_ptr = (char *)result;
        FOREACH_IFR (ifr, ifc) {
                if (ifr->ifr_name [0] == '\0')
                        continue;

diff --git a/msvc/.gitignore b/msvc/.gitignore
index 13fa9cfd9ef4a5bf862dab11a461941741707644..486f7866be2d0b45c247cbe011dae9bbe459afc0 100644 (file)
--- a/msvc/.gitignore
+++ b/msvc/.gitignore
@@ -6,4 +6,5 @@
 /*.opensdf
 /ipch/
 /Win32/
-/x64/
\ No newline at end of file
+/x64/
+/include/
\ No newline at end of file

diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj
index ff512f903d0084cbea627d8b0b9bf7f39bd87d29..5daad9472621c95d4b94c98809d6f0ab2a74ff50 100644 (file)
--- a/msvc/libmonoutils.vcxproj
+++ b/msvc/libmonoutils.vcxproj
@@ -45,7 +45,6 @@
     <ClCompile Include="..\mono\utils\mono-math.c" />\r
     <ClCompile Include="..\mono\utils\mono-md5.c" />\r
     <ClCompile Include="..\mono\utils\mono-mmap.c" />\r
-    <ClCompile Include="..\mono\utils\mono-mutex.c" />\r
     <ClCompile Include="..\mono\utils\mono-networkinterfaces.c" />\r
     <ClCompile Include="..\mono\utils\mono-rand.c" />\r
     <ClCompile Include="..\mono\utils\mono-threads-state-machine.c" />\r
@@ -58,7 +57,6 @@
     <ClCompile Include="..\mono\utils\mono-proclib.c" />\r
     <ClCompile Include="..\mono\utils\mono-property-hash.c" />\r
     <ClCompile Include="..\mono\utils\mono-publib.c" />\r
-    <ClCompile Include="..\mono\utils\mono-semaphore.c" />\r
     <ClCompile Include="..\mono\utils\mono-sha1.c" />\r
     <ClCompile Include="..\mono\utils\mono-stdlib.c" />\r
     <ClCompile Include="..\mono\utils\mono-threads-mach.c" />\r
@@ -104,6 +102,8 @@
     <ClInclude Include="..\mono\utils\mono-complex.h" />\r
     <ClInclude Include="..\mono\utils\mono-conc-hashtable.h" />\r
     <ClInclude Include="..\mono\utils\mono-context.h" />\r
+    <ClInclude Include="..\mono\utils\mono-coop-mutex.h" />\r
+    <ClInclude Include="..\mono\utils\mono-coop-semaphore.h" />\r
     <ClInclude Include="..\mono\utils\mono-counters.h" />\r
     <ClInclude Include="..\mono\utils\mono-digest.h" />\r
     <ClInclude Include="..\mono\utils\mono-dl-fallback.h" />\r
@@ -120,15 +120,16 @@
     <ClInclude Include="..\mono\utils\mono-membar.h" />\r
     <ClInclude Include="..\mono\utils\mono-memory-model.h" />\r
     <ClInclude Include="..\mono\utils\mono-mmap.h" />\r
-    <ClInclude Include="..\mono\utils\mono-mutex.h" />\r
     <ClInclude Include="..\mono\utils\mono-networkinterfaces.h" />\r
+    <ClInclude Include="..\mono\utils\mono-once.h" />\r
+    <ClInclude Include="..\mono\utils\mono-os-mutex.h" />\r
+    <ClInclude Include="..\mono\utils\mono-os-semaphore.h" />\r
     <ClInclude Include="..\mono\utils\mono-path.h" />\r
     <ClInclude Include="..\mono\utils\mono-poll.h" />\r
     <ClInclude Include="..\mono\utils\mono-proclib.h" />\r
     <ClInclude Include="..\mono\utils\mono-property-hash.h" />\r
     <ClInclude Include="..\mono\utils\mono-publib.h" />\r
     <ClInclude Include="..\mono\utils\mono-rand.h" />\r
-    <ClInclude Include="..\mono\utils\mono-semaphore.h" />\r
     <ClInclude Include="..\mono\utils\mono-sigcontext.h" />\r
     <ClInclude Include="..\mono\utils\mono-stack-unwinding.h" />\r
     <ClInclude Include="..\mono\utils\mono-stdlib.h" />\r

diff --git a/msvc/mono.def b/msvc/mono.def
index df0b1c9856294276979bb2df8b5e57bccafb51ca..615886ddf32aa4117566c9f825dddb2169723044 100644 (file)
--- a/msvc/mono.def
+++ b/msvc/mono.def
@@ -759,9 +759,6 @@ mono_security_core_clr_require_elevated_permissions
 mono_security_core_clr_set_options
 mono_security_enable_core_clr
 mono_security_set_core_clr_platform_callback
-mono_sem_post
-mono_sem_timedwait
-mono_sem_wait
 mono_set_assemblies_path
 mono_set_break_policy
 mono_set_config_dir

diff --git a/msvc/monosgen.def b/msvc/monosgen.def
index f0dae232db09ec427176e52270a2014104e3ca24..66fea4dae387430ad2ff31fa8ffc70259f883226 100644 (file)
--- a/msvc/monosgen.def
+++ b/msvc/monosgen.def
@@ -761,9 +761,6 @@ mono_security_core_clr_require_elevated_permissions
 mono_security_core_clr_set_options
 mono_security_enable_core_clr
 mono_security_set_core_clr_platform_callback
-mono_sem_post
-mono_sem_timedwait
-mono_sem_wait
 mono_set_assemblies_path
 mono_set_break_policy
 mono_set_config_dir

diff --git a/msvc/scripts/.gitignore b/msvc/scripts/.gitignore
new file mode 100644 (file)
index 0000000..ddab2ab
--- /dev/null
+++ b/msvc/scripts/.gitignore
@@ -0,0 +1 @@
+*.mdb
\ No newline at end of file

diff --git a/msvc/scripts/README b/msvc/scripts/README
index eae93d57b545a59c24c7617daddec6045ffc04c2..e73eab7fc0b09ee6bd5479406d0427f15a0af8f2 100644 (file)
--- a/msvc/scripts/README
+++ b/msvc/scripts/README
@@ -54,10 +54,10 @@ necessary to build the Mono class libraries.
           On Mac:
                cd msvc/scripts/
                make genproj.exe
-               mono genproj.
+               mono genproj.exe
                
        One output of genproj is the solutions for the successive profiles, 
-       from net_2_0.sln to from net_4.5.sln 
+       like net_4_x.sln.
 
        The command
                ./genproj.exe -h 

diff --git a/msvc/scripts/net_4_x.sln b/msvc/scripts/net_4_x.sln
index 035004a84d4400ea72231302c9375a75b21ea53b..732e14aa11a1344e8800140db5b92cfee0937c83 100644 (file)
--- a/msvc/scripts/net_4_x.sln
+++ b/msvc/scripts/net_4_x.sln
@@ -27,6 +27,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Core-net_4_x", "..\.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Core-plaincore-net_4_x", "..\..\mcs\class/System.Core\System.Core-plaincore-net_4_x.csproj", "{1EC0EBC0-0B35-454C-89AE-3F8F0FDD9705}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression-net_4_x", "..\..\mcs\class/System.IO.Compression\System.IO.Compression-net_4_x.csproj", "{6187D26C-54C8-4298-829E-A99B0E6036B1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.FileSystem-net_4_x", "..\..\mcs\class/System.IO.Compression.FileSystem\System.IO.Compression.FileSystem-net_4_x.csproj", "{9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing-net_4_x", "..\..\mcs\class/System.Drawing\System.Drawing-net_4_x.csproj", "{584A5E46-2958-4CB2-8DF9-188B420D0BB0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Transactions-net_4_x", "..\..\mcs\class/System.Transactions\System.Transactions-net_4_x.csproj", "{3821C69F-220D-4231-992C-0FE05311A005}"
@@ -267,14 +271,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Data
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Composition-net_4_x", "..\..\mcs\class/System.ComponentModel.Composition.4.5\System.ComponentModel.Composition-net_4_x.csproj", "{9091B5ED-8AFF-4B93-801A-9A33E0895A2B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression-net_4_x", "..\..\mcs\class/System.IO.Compression\System.IO.Compression-net_4_x.csproj", "{6187D26C-54C8-4298-829E-A99B0E6036B1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.FileSystem-net_4_x", "..\..\mcs\class/System.IO.Compression.FileSystem\System.IO.Compression.FileSystem-net_4_x.csproj", "{9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Windows-net_4_x", "..\..\mcs\class/System.Windows\System.Windows-net_4_x.csproj", "{3F6EB6D4-602E-43C2-A3E1-4AD98E8C86EE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.Serialization-net_4_x", "..\..\mcs\class/System.Xml.Serialization\System.Xml.Serialization-net_4_x.csproj", "{2210873E-99FC-48A2-A261-D650BAE33A1C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Security.Providers.DotNet-net_4_x", "..\..\mcs\class/Mono.Security.Providers.DotNet\Mono.Security.Providers.DotNet-net_4_x.csproj", "{391EDD2B-85AC-4FCA-B607-AAD6C51E6799}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Security.Providers.OldTls-net_4_x", "..\..\mcs\class/Mono.Security.Providers.OldTls\Mono.Security.Providers.OldTls-net_4_x.csproj", "{E485E885-59B1-4081-BC66-56AAAFD8771A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Security.Providers.NewSystemSource-net_4_x", "..\..\mcs\class/Mono.Security.Providers.NewSystemSource\Mono.Security.Providers.NewSystemSource-net_4_x.csproj", "{0BB4541F-9B1A-4CBC-BEB1-00B31B37F74E}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.DirectoryServices.Protocols-net_4_x", "..\..\mcs\class/System.DirectoryServices.Protocols\System.DirectoryServices.Protocols-net_4_x.csproj", "{EF08F249-31A1-4E62-8391-ECBA5227B686}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualC-net_4_x", "..\..\mcs\class/Microsoft.VisualC\Microsoft.VisualC-net_4_x.csproj", "{ACA2694D-9F07-4AE2-9171-9AB5DD1A8C18}"
@@ -341,6 +347,14 @@ Global
                {1EC0EBC0-0B35-454C-89AE-3F8F0FDD9705}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {1EC0EBC0-0B35-454C-89AE-3F8F0FDD9705}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {1EC0EBC0-0B35-454C-89AE-3F8F0FDD9705}.Release|Any CPU.Build.0 = Release|Any CPU
+               {6187D26C-54C8-4298-829E-A99B0E6036B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {6187D26C-54C8-4298-829E-A99B0E6036B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {6187D26C-54C8-4298-829E-A99B0E6036B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {6187D26C-54C8-4298-829E-A99B0E6036B1}.Release|Any CPU.Build.0 = Release|Any CPU
+               {9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}.Release|Any CPU.Build.0 = Release|Any CPU
                {584A5E46-2958-4CB2-8DF9-188B420D0BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {584A5E46-2958-4CB2-8DF9-188B420D0BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {584A5E46-2958-4CB2-8DF9-188B420D0BB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -821,14 +835,6 @@ Global
                {9091B5ED-8AFF-4B93-801A-9A33E0895A2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {9091B5ED-8AFF-4B93-801A-9A33E0895A2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {9091B5ED-8AFF-4B93-801A-9A33E0895A2B}.Release|Any CPU.Build.0 = Release|Any CPU
-               {6187D26C-54C8-4298-829E-A99B0E6036B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {6187D26C-54C8-4298-829E-A99B0E6036B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {6187D26C-54C8-4298-829E-A99B0E6036B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {6187D26C-54C8-4298-829E-A99B0E6036B1}.Release|Any CPU.Build.0 = Release|Any CPU
-               {9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}.Release|Any CPU.Build.0 = Release|Any CPU
                {3F6EB6D4-602E-43C2-A3E1-4AD98E8C86EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {3F6EB6D4-602E-43C2-A3E1-4AD98E8C86EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {3F6EB6D4-602E-43C2-A3E1-4AD98E8C86EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -837,6 +843,18 @@ Global
                {2210873E-99FC-48A2-A261-D650BAE33A1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {2210873E-99FC-48A2-A261-D650BAE33A1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {2210873E-99FC-48A2-A261-D650BAE33A1C}.Release|Any CPU.Build.0 = Release|Any CPU
+               {391EDD2B-85AC-4FCA-B607-AAD6C51E6799}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {391EDD2B-85AC-4FCA-B607-AAD6C51E6799}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {391EDD2B-85AC-4FCA-B607-AAD6C51E6799}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {391EDD2B-85AC-4FCA-B607-AAD6C51E6799}.Release|Any CPU.Build.0 = Release|Any CPU
+               {E485E885-59B1-4081-BC66-56AAAFD8771A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {E485E885-59B1-4081-BC66-56AAAFD8771A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {E485E885-59B1-4081-BC66-56AAAFD8771A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {E485E885-59B1-4081-BC66-56AAAFD8771A}.Release|Any CPU.Build.0 = Release|Any CPU
+               {0BB4541F-9B1A-4CBC-BEB1-00B31B37F74E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {0BB4541F-9B1A-4CBC-BEB1-00B31B37F74E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {0BB4541F-9B1A-4CBC-BEB1-00B31B37F74E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {0BB4541F-9B1A-4CBC-BEB1-00B31B37F74E}.Release|Any CPU.Build.0 = Release|Any CPU
                {EF08F249-31A1-4E62-8391-ECBA5227B686}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {EF08F249-31A1-4E62-8391-ECBA5227B686}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {EF08F249-31A1-4E62-8391-ECBA5227B686}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/msvc/scripts/order.xml b/msvc/scripts/order.xml
index 587a99b1c467f9a4d976a9092c811da2d222f102..bf815da41c7f8ceeace7fd9dc8e47869d19c1627 100644 (file)
--- a/msvc/scripts/order.xml
+++ b/msvc/scripts/order.xml
@@ -2,7 +2,7 @@
 <root>
     <project dir="mcs" library="basic-basic">
       <boot></boot>
-      <flags>/codepage:65001 -d:STATIC,NO_SYMBOL_WRITER,NO_AUTHENTICODE -d:NET_4_0 -d:NET_4_5 -d:MONO -d:BOOTSTRAP_BASIC -nowarn:1699 -d:DISABLE_CAS_USE -lib:./../class/lib/basic -optimize /noconfig -r:System -r:System.Core -r:System.Xml</flags>
+      <flags>/codepage:65001 -d:STATIC,NO_SYMBOL_WRITER,NO_AUTHENTICODE -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_PROCESS_START -d:NET_4_0 -d:NET_4_5 -d:MONO -d:BOOTSTRAP_BASIC -nowarn:1699 -d:DISABLE_CAS_USE -lib:./../class/lib/basic -optimize /noconfig -r:System -r:System.Core -r:System.Xml</flags>
       <output>basic.exe</output>
       <built_sources></built_sources>
       <library_output>./../class/lib/basic/basic.exe</library_output>
@@ -12,7 +12,7 @@
     </project>
     <project dir="class/corlib" library="corlib-basic">
       <boot>true</boot>
-      <flags>/codepage:65001 -unsafe -nostdlib -nowarn:612,618,1635 -d:INSIDE_CORLIB,MONO_CULTURE_DATA -d:LIBC -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY -d:NET_4_0 -d:NET_4_5 -d:MONO -d:BOOTSTRAP_BASIC -nowarn:1699 -d:DISABLE_CAS_USE -lib:./../../class/lib/basic -optimize /noconfig -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY -resource:resources/charinfo.nlp -resource:resources/collation.core.bin -resource:resources/collation.tailoring.bin -resource:resources/collation.cjkCHS.bin -resource:resources/collation.cjkCHT.bin -resource:resources/collation.cjkJA.bin -resource:resources/collation.cjkKO.bin -resource:resources/collation.cjkKOlv2.bin --runtime:v4</flags>
+      <flags>/codepage:65001 -unsafe -nostdlib -nowarn:612,618,1635 -d:INSIDE_CORLIB,MONO_CULTURE_DATA -d:LIBC -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -d:NET_4_0 -d:NET_4_5 -d:MONO -d:BOOTSTRAP_BASIC -nowarn:1699 -d:DISABLE_CAS_USE -lib:./../../class/lib/basic -optimize /noconfig -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -resource:resources/charinfo.nlp -resource:resources/collation.core.bin -resource:resources/collation.tailoring.bin -resource:resources/collation.cjkCHS.bin -resource:resources/collation.cjkCHT.bin -resource:resources/collation.cjkJA.bin -resource:resources/collation.cjkKO.bin -resource:resources/collation.cjkKOlv2.bin --runtime:v4</flags>
       <output>mscorlib.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/basic/mscorlib.dll</library_output>
@@ -22,7 +22,7 @@
     </project>
     <project dir="class/System" library="System-basic">
       <boot>true</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:BOOTSTRAP_BASIC -nowarn:1699 -d:DISABLE_CAS_USE -lib:./../../class/lib/basic -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/basic/secxml/System.dll -r:System.Configuration.dll -d:CONFIGURATION_DEP -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:BOOTSTRAP_BASIC -nowarn:1699 -d:DISABLE_CAS_USE -lib:./../../class/lib/basic -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -d:MONO_FEATURE_PROCESS_START -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/basic/secxml/System.dll -d:MONO_SECURITY_ALIAS -d:MONO_X509_ALIAS -r:System.Configuration.dll -d:CONFIGURATION_DEP -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
       <output>System.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/basic/System.dll</library_output>
@@ -42,7 +42,7 @@
     </project>
     <project dir="class/System" library="System-basic">
       <boot>true</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:BOOTSTRAP_BASIC -nowarn:1699 -d:DISABLE_CAS_USE -lib:./../../class/lib/basic -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/basic/secxml/System.dll -r:System.Configuration.dll -d:CONFIGURATION_DEP -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:BOOTSTRAP_BASIC -nowarn:1699 -d:DISABLE_CAS_USE -lib:./../../class/lib/basic -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -d:MONO_FEATURE_PROCESS_START -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/basic/secxml/System.dll -d:MONO_SECURITY_ALIAS -d:MONO_X509_ALIAS -r:System.Configuration.dll -d:CONFIGURATION_DEP -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
       <output>System.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/basic/System.dll</library_output>
@@ -72,7 +72,7 @@
     </project>
     <project dir="class/corlib" library="corlib-build">
       <boot>true</boot>
-      <flags>/codepage:65001 -unsafe -nostdlib -nowarn:612,618,1635 -d:INSIDE_CORLIB,MONO_CULTURE_DATA -d:LIBC -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/build -optimize /noconfig -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY -resource:resources/charinfo.nlp -resource:resources/collation.core.bin -resource:resources/collation.tailoring.bin -resource:resources/collation.cjkCHS.bin -resource:resources/collation.cjkCHT.bin -resource:resources/collation.cjkJA.bin -resource:resources/collation.cjkKO.bin -resource:resources/collation.cjkKOlv2.bin --runtime:v4</flags>
+      <flags>/codepage:65001 -unsafe -nostdlib -nowarn:612,618,1635 -d:INSIDE_CORLIB,MONO_CULTURE_DATA -d:LIBC -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/build -optimize /noconfig -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -resource:resources/charinfo.nlp -resource:resources/collation.core.bin -resource:resources/collation.tailoring.bin -resource:resources/collation.cjkCHS.bin -resource:resources/collation.cjkCHT.bin -resource:resources/collation.cjkJA.bin -resource:resources/collation.cjkKO.bin -resource:resources/collation.cjkKOlv2.bin --runtime:v4</flags>
       <output>mscorlib.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/build/mscorlib.dll</library_output>
@@ -82,7 +82,7 @@
     </project>
     <project dir="class/System" library="System-build">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/build -r:mscorlib.dll -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/build/secxml/System.dll -r:System.Configuration.dll -d:CONFIGURATION_DEP -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/build -r:mscorlib.dll -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -d:MONO_FEATURE_PROCESS_START -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/build/secxml/System.dll -d:MONO_SECURITY_ALIAS -d:MONO_X509_ALIAS -r:System.Configuration.dll -d:CONFIGURATION_DEP -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
       <output>System.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/build/System.dll</library_output>
@@ -92,7 +92,7 @@
     </project>
     <project dir="class/System" library="System-bare-build">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/build -r:mscorlib.dll -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav</flags>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/build -r:mscorlib.dll -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -d:MONO_FEATURE_PROCESS_START -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav</flags>
       <output>System.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/build/bare/System.dll</library_output>
@@ -102,7 +102,7 @@
     </project>
     <project dir="class/System" library="System-secxml-build">
       <boot>false</boot>
-      <flags>/codepage:65001 -lib:./../../class/lib/build/bare -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/build -r:mscorlib.dll -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/build/bare/System.dll -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
+      <flags>/codepage:65001 -lib:./../../class/lib/build/bare -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/build -r:mscorlib.dll -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -d:MONO_FEATURE_PROCESS_START -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/build/bare/System.dll -d:MONO_SECURITY_ALIAS -d:MONO_X509_ALIAS -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
       <output>System.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/build/secxml/System.dll</library_output>
@@ -132,7 +132,7 @@
     </project>
     <project dir="class/System" library="System-build">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/build -r:mscorlib.dll -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/build/secxml/System.dll -r:System.Configuration.dll -d:CONFIGURATION_DEP -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/build -r:mscorlib.dll -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -d:MONO_FEATURE_PROCESS_START -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/build/secxml/System.dll -d:MONO_SECURITY_ALIAS -d:MONO_X509_ALIAS -r:System.Configuration.dll -d:CONFIGURATION_DEP -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
       <output>System.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/build/System.dll</library_output>
@@ -142,7 +142,7 @@
     </project>
     <project dir="class/System" library="System-bare-build">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/build -r:mscorlib.dll -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav</flags>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/build -r:mscorlib.dll -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -d:MONO_FEATURE_PROCESS_START -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav</flags>
       <output>System.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/build/bare/System.dll</library_output>
@@ -152,7 +152,7 @@
     </project>
     <project dir="class/System" library="System-secxml-build">
       <boot>false</boot>
-      <flags>/codepage:65001 -lib:./../../class/lib/build/bare -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/build -r:mscorlib.dll -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/build/bare/System.dll -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
+      <flags>/codepage:65001 -lib:./../../class/lib/build/bare -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/build -r:mscorlib.dll -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -d:MONO_FEATURE_PROCESS_START -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/build/bare/System.dll -d:MONO_SECURITY_ALIAS -d:MONO_X509_ALIAS -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
       <output>System.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/build/secxml/System.dll</library_output>
@@ -202,7 +202,7 @@
     </project>
     <project dir="mcs" library="mcs-build">
       <boot></boot>
-      <flags>/codepage:65001 -lib:./../class/lib/build -debug -d:STATIC,NO_SYMBOL_WRITER,NO_AUTHENTICODE -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../class/lib/build -r:mscorlib.dll -optimize /noconfig -r:System -r:System.Core -r:System.Xml</flags>
+      <flags>/codepage:65001 -lib:./../class/lib/build -debug -d:STATIC,NO_SYMBOL_WRITER,NO_AUTHENTICODE -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_PROCESS_START -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../class/lib/build -r:mscorlib.dll -optimize /noconfig -r:System -r:System.Core -r:System.Xml</flags>
       <output>mcs.exe</output>
       <built_sources></built_sources>
       <library_output>mcs.exe</library_output>
@@ -232,7 +232,7 @@
     </project>
     <project dir="mcs" library="mcs-net_4_x">
       <boot></boot>
-      <flags>/codepage:65001 -lib:./../class/lib/build -debug -d:STATIC,NO_SYMBOL_WRITER,NO_AUTHENTICODE -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -r:System -r:System.Core -r:System.Xml</flags>
+      <flags>/codepage:65001 -lib:./../class/lib/build -debug -d:STATIC,NO_SYMBOL_WRITER,NO_AUTHENTICODE -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_PROCESS_START -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -r:System -r:System.Core -r:System.Xml</flags>
       <output>mcs.exe</output>
       <built_sources></built_sources>
       <library_output>mcs.exe</library_output>
@@ -242,7 +242,7 @@
     </project>
     <project dir="class/corlib" library="corlib-net_4_x">
       <boot>true</boot>
-      <flags>/codepage:65001 -unsafe -nostdlib -nowarn:612,618,1635 -d:INSIDE_CORLIB,MONO_CULTURE_DATA -d:LIBC -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -debug -optimize /noconfig -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY -resource:resources/charinfo.nlp -resource:resources/collation.core.bin -resource:resources/collation.tailoring.bin -resource:resources/collation.cjkCHS.bin -resource:resources/collation.cjkCHT.bin -resource:resources/collation.cjkJA.bin -resource:resources/collation.cjkKO.bin -resource:resources/collation.cjkKOlv2.bin --runtime:v4</flags>
+      <flags>/codepage:65001 -unsafe -nostdlib -nowarn:612,618,1635 -d:INSIDE_CORLIB,MONO_CULTURE_DATA -d:LIBC -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -debug -optimize /noconfig -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -resource:resources/charinfo.nlp -resource:resources/collation.core.bin -resource:resources/collation.tailoring.bin -resource:resources/collation.cjkCHS.bin -resource:resources/collation.cjkCHT.bin -resource:resources/collation.cjkJA.bin -resource:resources/collation.cjkKO.bin -resource:resources/collation.cjkKOlv2.bin --runtime:v4</flags>
       <output>mscorlib.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/net_4_x/mscorlib.dll</library_output>
@@ -252,7 +252,7 @@
     </project>
     <project dir="class/corlib" library="corlib-tests-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -unsafe -nostdlib -nowarn:612,618,1635 -d:INSIDE_CORLIB,MONO_CULTURE_DATA -d:LIBC -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -debug -optimize -r:./../../class/lib/net_4_x/mscorlib.dll -debug -nowarn:168,219,618,672 -unsafe -r:Mono.Posix.dll -r:System.Core.dll -define:MONO_DATACONVERTER_STATIC_METHODS -resource:Test/resources/Resources.resources</flags>
+      <flags>/codepage:65001 -unsafe -nostdlib -nowarn:612,618,1635 -d:INSIDE_CORLIB,MONO_CULTURE_DATA -d:LIBC -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -debug -optimize -r:./../../class/lib/net_4_x/mscorlib.dll -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -debug -nowarn:168,219,618,672 -unsafe -r:Mono.Posix.dll -r:System.Core.dll -define:MONO_DATACONVERTER_STATIC_METHODS -resource:Test/resources/Resources.resources</flags>
       <output>corlib_test_net_4_x.dll</output>
       <built_sources></built_sources>
       <library_output>corlib_test_net_4_x.dll</library_output>
@@ -262,7 +262,7 @@
     </project>
     <project dir="class/System" library="System-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/net_4_x/secxml/System.dll -r:System.Configuration.dll -d:CONFIGURATION_DEP -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -d:MONO_FEATURE_PROCESS_START -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/net_4_x/secxml/System.dll -d:MONO_SECURITY_ALIAS -d:MONO_X509_ALIAS -r:System.Configuration.dll -d:CONFIGURATION_DEP -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
       <output>System.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/net_4_x/System.dll</library_output>
@@ -272,7 +272,7 @@
     </project>
     <project dir="class/System" library="System-tests-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -lib:./../../class/lib/net_4_x/bare -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/secxml/System.dll -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -r:System.Xml.dll -r:System.Core.dll -nowarn:618,672,219,67,169,612 -resource:Test/System/test-uri-props.txt,test-uri-props.txt -resource:Test/System/test-uri-props-manual.txt,test-uri-props-manual.txt -resource:Test/System/test-uri-relative-props.txt,test-uri-relative-props.txt -r:System.Configuration</flags>
+      <flags>/codepage:65001 -lib:./../../class/lib/net_4_x/bare -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/secxml/System.dll -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -r:System.Xml.dll -r:System.Core.dll -nowarn:618,672,219,67,169,612 -resource:Test/System/test-uri-props.txt,test-uri-props.txt -resource:Test/System/test-uri-props-manual.txt,test-uri-props-manual.txt -resource:Test/System/test-uri-relative-props.txt,test-uri-relative-props.txt -d:MONO_FEATURE_PROCESS_START -r:System.Configuration -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME</flags>
       <output>System_test_net_4_x.dll</output>
       <built_sources></built_sources>
       <library_output>System_test_net_4_x.dll</library_output>
@@ -282,7 +282,7 @@
     </project>
     <project dir="class/System" library="System-bare-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav</flags>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -d:MONO_FEATURE_PROCESS_START -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav</flags>
       <output>System.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/net_4_x/bare/System.dll</library_output>
@@ -292,7 +292,7 @@
     </project>
     <project dir="class/System" library="System-tests-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -lib:./../../class/lib/net_4_x/bare -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/secxml/System.dll -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -r:System.Xml.dll -r:System.Core.dll -nowarn:618,672,219,67,169,612 -resource:Test/System/test-uri-props.txt,test-uri-props.txt -resource:Test/System/test-uri-props-manual.txt,test-uri-props-manual.txt -resource:Test/System/test-uri-relative-props.txt,test-uri-relative-props.txt -r:System.Configuration</flags>
+      <flags>/codepage:65001 -lib:./../../class/lib/net_4_x/bare -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/secxml/System.dll -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -r:System.Xml.dll -r:System.Core.dll -nowarn:618,672,219,67,169,612 -resource:Test/System/test-uri-props.txt,test-uri-props.txt -resource:Test/System/test-uri-props-manual.txt,test-uri-props-manual.txt -resource:Test/System/test-uri-relative-props.txt,test-uri-relative-props.txt -d:MONO_FEATURE_PROCESS_START -r:System.Configuration -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME</flags>
       <output>System_test_net_4_x.dll</output>
       <built_sources></built_sources>
       <library_output>System_test_net_4_x.dll</library_output>
@@ -302,7 +302,7 @@
     </project>
     <project dir="class/System" library="System-secxml-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -lib:./../../class/lib/net_4_x/bare -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/net_4_x/bare/System.dll -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
+      <flags>/codepage:65001 -lib:./../../class/lib/net_4_x/bare -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -nowarn:618 -d:CONFIGURATION_2_0 -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX -d:MONO_FEATURE_PROCESS_START -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME -unsafe -resource:resources/Asterisk.wav -resource:resources/Beep.wav -resource:resources/Exclamation.wav -resource:resources/Hand.wav -resource:resources/Question.wav -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=./../../class/lib/net_4_x/bare/System.dll -d:MONO_SECURITY_ALIAS -d:MONO_X509_ALIAS -r:System.Xml -r:MonoSecurity=Mono.Security</flags>
       <output>System.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/net_4_x/secxml/System.dll</library_output>
@@ -312,7 +312,7 @@
     </project>
     <project dir="class/System" library="System-tests-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -lib:./../../class/lib/net_4_x/bare -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/secxml/System.dll -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -r:System.Xml.dll -r:System.Core.dll -nowarn:618,672,219,67,169,612 -resource:Test/System/test-uri-props.txt,test-uri-props.txt -resource:Test/System/test-uri-props-manual.txt,test-uri-props-manual.txt -resource:Test/System/test-uri-relative-props.txt,test-uri-relative-props.txt -r:System.Configuration</flags>
+      <flags>/codepage:65001 -lib:./../../class/lib/net_4_x/bare -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/secxml/System.dll -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -r:System.Xml.dll -r:System.Core.dll -nowarn:618,672,219,67,169,612 -resource:Test/System/test-uri-props.txt,test-uri-props.txt -resource:Test/System/test-uri-props-manual.txt,test-uri-props-manual.txt -resource:Test/System/test-uri-relative-props.txt,test-uri-relative-props.txt -d:MONO_FEATURE_PROCESS_START -r:System.Configuration -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME</flags>
       <output>System_test_net_4_x.dll</output>
       <built_sources></built_sources>
       <library_output>System_test_net_4_x.dll</library_output>
@@ -500,6 +500,46 @@
       <profile>net_4_x</profile>
       <response>resgen.exe.sources</response>
     </project>
+    <project dir="class/System.IO.Compression" library="System.IO.Compression-net_4_x">
+      <boot>false</boot>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig /unsafe -r:System -r:System.Core</flags>
+      <output>System.IO.Compression.dll</output>
+      <built_sources></built_sources>
+      <library_output>./../../class/lib/net_4_x/System.IO.Compression.dll</library_output>
+      <fx_version>4.5</fx_version>
+      <profile>net_4_x</profile>
+      <response>System.IO.Compression.dll.sources</response>
+    </project>
+    <project dir="class/System.IO.Compression" library="System.IO.Compression-tests-net_4_x">
+      <boot>false</boot>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/System.IO.Compression.dll /r:System /r:System.Core</flags>
+      <output>System.IO.Compression_test_net_4_x.dll</output>
+      <built_sources></built_sources>
+      <library_output>System.IO.Compression_test_net_4_x.dll</library_output>
+      <fx_version>4.5</fx_version>
+      <profile>net_4_x</profile>
+      <response>./../../build/deps/System.IO.Compression_test_net_4_x.dll.response</response>
+    </project>
+    <project dir="class/System.IO.Compression.FileSystem" library="System.IO.Compression.FileSystem-net_4_x">
+      <boot>false</boot>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -r:System -r:System.IO.Compression</flags>
+      <output>System.IO.Compression.FileSystem.dll</output>
+      <built_sources></built_sources>
+      <library_output>./../../class/lib/net_4_x/System.IO.Compression.FileSystem.dll</library_output>
+      <fx_version>4.5</fx_version>
+      <profile>net_4_x</profile>
+      <response>System.IO.Compression.FileSystem.dll.sources</response>
+    </project>
+    <project dir="class/System.IO.Compression.FileSystem" library="System.IO.Compression.FileSystem-tests-net_4_x">
+      <boot>false</boot>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/System.IO.Compression.FileSystem.dll /r:System /r:System.Core /r:System.IO.Compression.dll</flags>
+      <output>System.IO.Compression.FileSystem_test_net_4_x.dll</output>
+      <built_sources></built_sources>
+      <library_output>System.IO.Compression.FileSystem_test_net_4_x.dll</library_output>
+      <fx_version>4.5</fx_version>
+      <profile>net_4_x</profile>
+      <response>./../../build/deps/System.IO.Compression.FileSystem_test_net_4_x.dll.response</response>
+    </project>
     <project dir="class/System.Drawing" library="System.Drawing-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig /unsafe /r:mscorlib.dll -resource:Assembly/Mono.ico,Mono.ico -resource:Assembly/Information.ico,Information.ico -resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico -resource:Assembly/Question.ico,Question.ico -resource:Assembly/Shield.ico,Shield.ico -r:System</flags>
@@ -822,7 +862,7 @@
     </project>
     <project dir="class/System.Web.Services" library="System.Web.Services-tests-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -lib:./../../class/lib/net_4_x/plainweb -lib:./../../class/lib/net_4_x/plaindesign -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/System.Web.Services.dll -nowarn:168,169,219,414,612,649 -d:MONO_BROKEN_CONFIGURATION_DLL -resource:System.Web.Services.Description/wsdl-1.1.xsd,wsdl-1.1.xsd -resource:System.Web.Services.Description/wsdl-1.1-soap.xsd,wsdl-1.1-soap.xsd -resource:System.Web.Services.Description/web-reference.xsd,web-reference.xsd -r:System -r:System.EnterpriseServices -r:System.Xml -r:System.Data -r:System.Web -r:System.Design -r:System.DirectoryServices -r:System.Configuration -nowarn:618</flags>
+      <flags>/codepage:65001 -lib:./../../class/lib/net_4_x/plainweb -lib:./../../class/lib/net_4_x/plaindesign -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/System.Web.Services.dll -nowarn:168,169,219,414,612,649 -d:MONO_BROKEN_CONFIGURATION_DLL -resource:System.Web.Services.Description/wsdl-1.1.xsd,wsdl-1.1.xsd -resource:System.Web.Services.Description/wsdl-1.1-soap.xsd,wsdl-1.1-soap.xsd -resource:System.Web.Services.Description/web-reference.xsd,web-reference.xsd -r:System -r:System.EnterpriseServices -r:System.Xml -r:System.Data -r:System.Web -r:System.Design -r:System.DirectoryServices -r:System.Configuration -nowarn:618 -d:MONO_FEATURE_THREAD_ABORT -d:MONO_FEATURE_THREAD_SUSPEND_RESUME</flags>
       <output>System.Web.Services_test_net_4_x.dll</output>
       <built_sources></built_sources>
       <library_output>System.Web.Services_test_net_4_x.dll</library_output>
@@ -1282,7 +1322,7 @@
     </project>
     <project dir="class/System.Web.Extensions" library="System.Web.Extensions-tests-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/System.Web.Extensions.dll -unsafe -define:NET_3_5 -define:SYSTEM_WEB_EXTENSIONS -r:mscorlib.dll -r:System.Web.ApplicationServices.dll /resource:../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.debug.js /resource:../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.js /resource:../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.debug.js /resource:../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.js /resource:../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.debug.js /resource:../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.js -r:System -r:System.Core -r:System.Drawing -r:System.Data -r:System.Data.Linq -r:System.Xml -r:System.Web -r:System.Web.Services -r:System.Configuration -r:System.EnterpriseServices -r:System.ServiceModel -doc:System.Web.Extensions_test_net_4_x.xml -nowarn:219,169,1591 /resource:Test/resources/Web.mono.config /resource:Test/resources/profile.config.4.x /resource:Test/resources/ListViewSort.aspx /resource:Test/resources/ListViewTest.aspx /resource:Test/resources/ListViewTotalRowCount_Bug535701_1.aspx /resource:Test/resources/ListViewTotalRowCount_Bug535701_2.aspx /resource:Test/resources/ListViewTotalRowCount_Bug604053.aspx /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithDerivedMaster.aspx /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMasterInvalidPlaceHolder.aspx /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.master /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyDerived.master -r:SystemWebTestShim.dll -define:SYSTEM_WEB_EXTENSIONS</flags>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/System.Web.Extensions.dll -unsafe -define:NET_3_5 -define:SYSTEM_WEB_EXTENSIONS -r:mscorlib.dll -r:System.Web.ApplicationServices.dll /resource:../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.debug.js /resource:../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.js /resource:../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.debug.js /resource:../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.js /resource:../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.debug.js /resource:../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.js -r:System -r:System.Core -r:System.Drawing -r:System.Data -r:System.Data.Linq -r:System.Xml -r:System.Web -r:System.Web.Services -r:System.Configuration -r:System.EnterpriseServices -r:System.ServiceModel -doc:System.Web.Extensions_test_net_4_x.xml -nowarn:219,169,1591 /resource:Test/resources/Web.mono.config /resource:Test/resources/profile.config.4.x /resource:Test/resources/ListViewSort.aspx /resource:Test/resources/ListViewTest.aspx /resource:Test/resources/ListViewTotalRowCount_Bug535701_1.aspx /resource:Test/resources/ListViewTotalRowCount_Bug535701_2.aspx /resource:Test/resources/ListViewTotalRowCount_Bug604053.aspx /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithDerivedMaster.aspx /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMasterInvalidPlaceHolder.aspx /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/MyDerived.master /resource:../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.master -r:SystemWebTestShim.dll -define:SYSTEM_WEB_EXTENSIONS</flags>
       <output>System.Web.Extensions_test_net_4_x.dll</output>
       <built_sources></built_sources>
       <library_output>System.Web.Extensions_test_net_4_x.dll</library_output>
@@ -1322,7 +1362,7 @@
     </project>
     <project dir="class/Mono.CSharp" library="Mono.CSharp-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -r:System.Core -r:System.Xml -r:System</flags>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -d:MONO_FEATURE_THREAD_ABORT -r:System.Core -r:System.Xml -r:System</flags>
       <output>Mono.CSharp.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/net_4_x/Mono.CSharp.dll</library_output>
@@ -2292,7 +2332,7 @@
     </project>
     <project dir="class/System.Threading.Tasks.Dataflow" library="System.Threading.Tasks.Dataflow-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -r:System.Core -r:System -r:mscorlib.dll</flags>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -r:System.Core -r:System -r:mscorlib.dll -d:CONCURRENT_COLLECTIONS</flags>
       <output>System.Threading.Tasks.Dataflow.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/net_4_x/System.Threading.Tasks.Dataflow.dll</library_output>
@@ -2320,65 +2360,55 @@
       <profile>net_4_x</profile>
       <response>System.ComponentModel.Composition.dll.sources</response>
     </project>
-    <project dir="class/System.IO.Compression" library="System.IO.Compression-net_4_x">
-      <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig /unsafe -r:System -r:System.Core</flags>
-      <output>System.IO.Compression.dll</output>
-      <built_sources></built_sources>
-      <library_output>./../../class/lib/net_4_x/System.IO.Compression.dll</library_output>
-      <fx_version>4.5</fx_version>
-      <profile>net_4_x</profile>
-      <response>System.IO.Compression.dll.sources</response>
-    </project>
-    <project dir="class/System.IO.Compression" library="System.IO.Compression-tests-net_4_x">
+    <project dir="class/System.Windows" library="System.Windows-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/System.IO.Compression.dll /r:System /r:System.Core</flags>
-      <output>System.IO.Compression_test_net_4_x.dll</output>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig -r:System</flags>
+      <output>System.Windows.dll</output>
       <built_sources></built_sources>
-      <library_output>System.IO.Compression_test_net_4_x.dll</library_output>
+      <library_output>./../../class/lib/net_4_x/System.Windows.dll</library_output>
       <fx_version>4.5</fx_version>
       <profile>net_4_x</profile>
-      <response>./../../build/deps/System.IO.Compression_test_net_4_x.dll.response</response>
+      <response>System.Windows.dll.sources</response>
     </project>
-    <project dir="class/System.IO.Compression.FileSystem" library="System.IO.Compression.FileSystem-net_4_x">
+    <project dir="class/System.Xml.Serialization" library="System.Xml.Serialization-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -r:System -r:System.IO.Compression</flags>
-      <output>System.IO.Compression.FileSystem.dll</output>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig -r:System.Xml -r:System.ServiceModel</flags>
+      <output>System.Xml.Serialization.dll</output>
       <built_sources></built_sources>
-      <library_output>./../../class/lib/net_4_x/System.IO.Compression.FileSystem.dll</library_output>
+      <library_output>./../../class/lib/net_4_x/System.Xml.Serialization.dll</library_output>
       <fx_version>4.5</fx_version>
       <profile>net_4_x</profile>
-      <response>System.IO.Compression.FileSystem.dll.sources</response>
+      <response>System.Xml.Serialization.dll.sources</response>
     </project>
-    <project dir="class/System.IO.Compression.FileSystem" library="System.IO.Compression.FileSystem-tests-net_4_x">
+    <project dir="class/Mono.Security.Providers.DotNet" library="Mono.Security.Providers.DotNet-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/System.IO.Compression.FileSystem.dll /r:System /r:System.Core /r:System.IO.Compression.dll</flags>
-      <output>System.IO.Compression.FileSystem_test_net_4_x.dll</output>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -unsafe -nowarn:1030 -keyfile:../mono.pub -delaysign -r:System -r:Mono.Security</flags>
+      <output>Mono.Security.Providers.DotNet.dll</output>
       <built_sources></built_sources>
-      <library_output>System.IO.Compression.FileSystem_test_net_4_x.dll</library_output>
+      <library_output>./../../class/lib/net_4_x/Mono.Security.Providers.DotNet.dll</library_output>
       <fx_version>4.5</fx_version>
       <profile>net_4_x</profile>
-      <response>./../../build/deps/System.IO.Compression.FileSystem_test_net_4_x.dll.response</response>
+      <response>Mono.Security.Providers.DotNet.dll.sources</response>
     </project>
-    <project dir="class/System.Windows" library="System.Windows-net_4_x">
+    <project dir="class/Mono.Security.Providers.OldTls" library="Mono.Security.Providers.OldTls-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig -r:System</flags>
-      <output>System.Windows.dll</output>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -unsafe -nowarn:1030 -keyfile:../mono.pub -delaysign -d:SECURITY_DEP -r:System -r:Mono.Security</flags>
+      <output>Mono.Security.Providers.OldTls.dll</output>
       <built_sources></built_sources>
-      <library_output>./../../class/lib/net_4_x/System.Windows.dll</library_output>
+      <library_output>./../../class/lib/net_4_x/Mono.Security.Providers.OldTls.dll</library_output>
       <fx_version>4.5</fx_version>
       <profile>net_4_x</profile>
-      <response>System.Windows.dll.sources</response>
+      <response>Mono.Security.Providers.OldTls.dll.sources</response>
     </project>
-    <project dir="class/System.Xml.Serialization" library="System.Xml.Serialization-net_4_x">
+    <project dir="class/Mono.Security.Providers.NewSystemSource" library="Mono.Security.Providers.NewSystemSource-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig -r:System.Xml -r:System.ServiceModel</flags>
-      <output>System.Xml.Serialization.dll</output>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig -d:SECURITY_DEP -d:MONO_SECURITY_ALIAS -r:MonoSecurity=Mono.Security -unsafe -nowarn:1030 -keyfile:../mono.pub -delaysign -d:MONO -d:FEATURE_PAL -d:MONO_FEATURE_NEW_TLS -d:MONO_FEATURE_NEW_SYSTEM_SOURCE -d:DISABLE_CAS_USE -r:System</flags>
+      <output>Mono.Security.Providers.NewSystemSource.dll</output>
       <built_sources></built_sources>
-      <library_output>./../../class/lib/net_4_x/System.Xml.Serialization.dll</library_output>
+      <library_output>./../../class/lib/net_4_x/Mono.Security.Providers.NewSystemSource.dll</library_output>
       <fx_version>4.5</fx_version>
       <profile>net_4_x</profile>
-      <response>System.Xml.Serialization.dll.sources</response>
+      <response>Mono.Security.Providers.NewSystemSource.dll.sources</response>
     </project>
     <project dir="class/System.DirectoryServices.Protocols" library="System.DirectoryServices.Protocols-net_4_x">
       <boot>false</boot>
@@ -2440,7 +2470,7 @@
       <profile>net_4_x</profile>
       <response>./../../build/deps/monodoc_test_net_4_x.dll.response</response>
     </project>
-    <project dir="class/Facades/System.Collections.Concurrent" library="Facades_System.Collections.Concurrent-net_4_x">
+    <project dir="class/Facades/System.Collections.Concurrent" library="System.Collections.Concurrent-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Collections.Concurrent.dll</output>
@@ -2450,7 +2480,7 @@
       <profile>net_4_x</profile>
       <response>System.Collections.Concurrent.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Collections" library="Facades_System.Collections-net_4_x">
+    <project dir="class/Facades/System.Collections" library="System.Collections-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System -r:System.Core</flags>
       <output>System.Collections.dll</output>
@@ -2460,7 +2490,7 @@
       <profile>net_4_x</profile>
       <response>System.Collections.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.ComponentModel.Annotations" library="Facades_System.ComponentModel.Annotations-net_4_x">
+    <project dir="class/Facades/System.ComponentModel.Annotations" library="System.ComponentModel.Annotations-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.ComponentModel.DataAnnotations</flags>
       <output>System.ComponentModel.Annotations.dll</output>
@@ -2470,7 +2500,7 @@
       <profile>net_4_x</profile>
       <response>System.ComponentModel.Annotations.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.ComponentModel.EventBasedAsync" library="Facades_System.ComponentModel.EventBasedAsync-net_4_x">
+    <project dir="class/Facades/System.ComponentModel.EventBasedAsync" library="System.ComponentModel.EventBasedAsync-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.ComponentModel.EventBasedAsync.dll</output>
@@ -2480,7 +2510,7 @@
       <profile>net_4_x</profile>
       <response>System.ComponentModel.EventBasedAsync.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.ComponentModel" library="Facades_System.ComponentModel-net_4_x">
+    <project dir="class/Facades/System.ComponentModel" library="System.ComponentModel-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.ComponentModel.dll</output>
@@ -2490,7 +2520,7 @@
       <profile>net_4_x</profile>
       <response>System.ComponentModel.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Diagnostics.Contracts" library="Facades_System.Diagnostics.Contracts-net_4_x">
+    <project dir="class/Facades/System.Diagnostics.Contracts" library="System.Diagnostics.Contracts-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Diagnostics.Contracts.dll</output>
@@ -2500,7 +2530,7 @@
       <profile>net_4_x</profile>
       <response>System.Diagnostics.Contracts.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Diagnostics.Debug" library="Facades_System.Diagnostics.Debug-net_4_x">
+    <project dir="class/Facades/System.Diagnostics.Debug" library="System.Diagnostics.Debug-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Diagnostics.Debug.dll</output>
@@ -2510,7 +2540,7 @@
       <profile>net_4_x</profile>
       <response>System.Diagnostics.Debug.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Diagnostics.Tracing" library="Facades_System.Diagnostics.Tracing-net_4_x">
+    <project dir="class/Facades/System.Diagnostics.Tracing" library="System.Diagnostics.Tracing-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Diagnostics.Tracing.dll</output>
@@ -2520,7 +2550,7 @@
       <profile>net_4_x</profile>
       <response>System.Diagnostics.Tracing.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Diagnostics.Tools" library="Facades_System.Diagnostics.Tools-net_4_x">
+    <project dir="class/Facades/System.Diagnostics.Tools" library="System.Diagnostics.Tools-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Diagnostics.Tools.dll</output>
@@ -2530,7 +2560,7 @@
       <profile>net_4_x</profile>
       <response>System.Diagnostics.Tools.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Dynamic.Runtime" library="Facades_System.Dynamic.Runtime-net_4_x">
+    <project dir="class/Facades/System.Dynamic.Runtime" library="System.Dynamic.Runtime-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.Core -r:System</flags>
       <output>System.Dynamic.Runtime.dll</output>
@@ -2540,7 +2570,7 @@
       <profile>net_4_x</profile>
       <response>System.Dynamic.Runtime.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Globalization" library="Facades_System.Globalization-net_4_x">
+    <project dir="class/Facades/System.Globalization" library="System.Globalization-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Globalization.dll</output>
@@ -2550,7 +2580,7 @@
       <profile>net_4_x</profile>
       <response>System.Globalization.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.IO" library="Facades_System.IO-net_4_x">
+    <project dir="class/Facades/System.IO" library="System.IO-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.IO.dll</output>
@@ -2560,7 +2590,7 @@
       <profile>net_4_x</profile>
       <response>System.IO.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Linq.Expressions" library="Facades_System.Linq.Expressions-net_4_x">
+    <project dir="class/Facades/System.Linq.Expressions" library="System.Linq.Expressions-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.Core</flags>
       <output>System.Linq.Expressions.dll</output>
@@ -2570,7 +2600,7 @@
       <profile>net_4_x</profile>
       <response>System.Linq.Expressions.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Linq.Parallel" library="Facades_System.Linq.Parallel-net_4_x">
+    <project dir="class/Facades/System.Linq.Parallel" library="System.Linq.Parallel-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.Core</flags>
       <output>System.Linq.Parallel.dll</output>
@@ -2580,7 +2610,7 @@
       <profile>net_4_x</profile>
       <response>System.Linq.Parallel.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Linq.Queryable" library="Facades_System.Linq.Queryable-net_4_x">
+    <project dir="class/Facades/System.Linq.Queryable" library="System.Linq.Queryable-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.Core</flags>
       <output>System.Linq.Queryable.dll</output>
@@ -2590,7 +2620,7 @@
       <profile>net_4_x</profile>
       <response>System.Linq.Queryable.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Linq" library="Facades_System.Linq-net_4_x">
+    <project dir="class/Facades/System.Linq" library="System.Linq-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.Core</flags>
       <output>System.Linq.dll</output>
@@ -2600,7 +2630,7 @@
       <profile>net_4_x</profile>
       <response>System.Linq.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.NetworkInformation" library="Facades_System.Net.NetworkInformation-net_4_x">
+    <project dir="class/Facades/System.Net.NetworkInformation" library="System.Net.NetworkInformation-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Net.NetworkInformation.dll</output>
@@ -2610,7 +2640,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.NetworkInformation.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.Primitives" library="Facades_System.Net.Primitives-net_4_x">
+    <project dir="class/Facades/System.Net.Primitives" library="System.Net.Primitives-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Net.Primitives.dll</output>
@@ -2620,7 +2650,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.Primitives.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.Requests" library="Facades_System.Net.Requests-net_4_x">
+    <project dir="class/Facades/System.Net.Requests" library="System.Net.Requests-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Net.Requests.dll</output>
@@ -2630,7 +2660,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.Requests.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.ObjectModel" library="Facades_System.ObjectModel-net_4_x">
+    <project dir="class/Facades/System.ObjectModel" library="System.ObjectModel-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.ObjectModel.dll</output>
@@ -2640,7 +2670,7 @@
       <profile>net_4_x</profile>
       <response>System.ObjectModel.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Reflection.Extensions" library="Facades_System.Reflection.Extensions-net_4_x">
+    <project dir="class/Facades/System.Reflection.Extensions" library="System.Reflection.Extensions-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Reflection.Extensions.dll</output>
@@ -2650,7 +2680,7 @@
       <profile>net_4_x</profile>
       <response>System.Reflection.Extensions.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Reflection.Primitives" library="Facades_System.Reflection.Primitives-net_4_x">
+    <project dir="class/Facades/System.Reflection.Primitives" library="System.Reflection.Primitives-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Reflection.Primitives.dll</output>
@@ -2660,7 +2690,7 @@
       <profile>net_4_x</profile>
       <response>System.Reflection.Primitives.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Reflection" library="Facades_System.Reflection-net_4_x">
+    <project dir="class/Facades/System.Reflection" library="System.Reflection-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Reflection.dll</output>
@@ -2670,7 +2700,7 @@
       <profile>net_4_x</profile>
       <response>System.Reflection.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Resources.ResourceManager" library="Facades_System.Resources.ResourceManager-net_4_x">
+    <project dir="class/Facades/System.Resources.ResourceManager" library="System.Resources.ResourceManager-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Resources.ResourceManager.dll</output>
@@ -2680,7 +2710,7 @@
       <profile>net_4_x</profile>
       <response>System.Resources.ResourceManager.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Runtime.Extensions" library="Facades_System.Runtime.Extensions-net_4_x">
+    <project dir="class/Facades/System.Runtime.Extensions" library="System.Runtime.Extensions-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Runtime.Extensions.dll</output>
@@ -2690,7 +2720,7 @@
       <profile>net_4_x</profile>
       <response>System.Runtime.Extensions.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Runtime.InteropServices" library="Facades_System.Runtime.InteropServices-net_4_x">
+    <project dir="class/Facades/System.Runtime.InteropServices" library="System.Runtime.InteropServices-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System -r:System.Core</flags>
       <output>System.Runtime.InteropServices.dll</output>
@@ -2700,7 +2730,7 @@
       <profile>net_4_x</profile>
       <response>System.Runtime.InteropServices.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Runtime.InteropServices.WindowsRuntime" library="Facades_System.Runtime.InteropServices.WindowsRuntime-net_4_x">
+    <project dir="class/Facades/System.Runtime.InteropServices.WindowsRuntime" library="System.Runtime.InteropServices.WindowsRuntime-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Runtime.InteropServices.WindowsRuntime.dll</output>
@@ -2710,7 +2740,7 @@
       <profile>net_4_x</profile>
       <response>System.Runtime.InteropServices.WindowsRuntime.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Runtime.Numerics" library="Facades_System.Runtime.Numerics-net_4_x">
+    <project dir="class/Facades/System.Runtime.Numerics" library="System.Runtime.Numerics-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.Numerics</flags>
       <output>System.Runtime.Numerics.dll</output>
@@ -2720,7 +2750,7 @@
       <profile>net_4_x</profile>
       <response>System.Runtime.Numerics.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Runtime.Serialization.Json" library="Facades_System.Runtime.Serialization.Json-net_4_x">
+    <project dir="class/Facades/System.Runtime.Serialization.Json" library="System.Runtime.Serialization.Json-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.Runtime.Serialization</flags>
       <output>System.Runtime.Serialization.Json.dll</output>
@@ -2730,7 +2760,7 @@
       <profile>net_4_x</profile>
       <response>System.Runtime.Serialization.Json.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Runtime.Serialization.Primitives" library="Facades_System.Runtime.Serialization.Primitives-net_4_x">
+    <project dir="class/Facades/System.Runtime.Serialization.Primitives" library="System.Runtime.Serialization.Primitives-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.Runtime.Serialization</flags>
       <output>System.Runtime.Serialization.Primitives.dll</output>
@@ -2740,7 +2770,7 @@
       <profile>net_4_x</profile>
       <response>System.Runtime.Serialization.Primitives.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Runtime.Serialization.Xml" library="Facades_System.Runtime.Serialization.Xml-net_4_x">
+    <project dir="class/Facades/System.Runtime.Serialization.Xml" library="System.Runtime.Serialization.Xml-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.Runtime.Serialization -r:System.Xml</flags>
       <output>System.Runtime.Serialization.Xml.dll</output>
@@ -2750,7 +2780,7 @@
       <profile>net_4_x</profile>
       <response>System.Runtime.Serialization.Xml.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Runtime" library="Facades_System.Runtime-net_4_x">
+    <project dir="class/Facades/System.Runtime" library="System.Runtime-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System -r:System.ComponentModel.Composition -r:System.Core</flags>
       <output>System.Runtime.dll</output>
@@ -2760,7 +2790,7 @@
       <profile>net_4_x</profile>
       <response>System.Runtime.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Principal" library="Facades_System.Security.Principal-net_4_x">
+    <project dir="class/Facades/System.Security.Principal" library="System.Security.Principal-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Security.Principal.dll</output>
@@ -2770,7 +2800,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Principal.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.ServiceModel.Http" library="Facades_System.ServiceModel.Http-net_4_x">
+    <project dir="class/Facades/System.ServiceModel.Http" library="System.ServiceModel.Http-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.ServiceModel</flags>
       <output>System.ServiceModel.Http.dll</output>
@@ -2780,7 +2810,7 @@
       <profile>net_4_x</profile>
       <response>System.ServiceModel.Http.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.ServiceModel.Primitives" library="Facades_System.ServiceModel.Primitives-net_4_x">
+    <project dir="class/Facades/System.ServiceModel.Primitives" library="System.ServiceModel.Primitives-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.ServiceModel -r:System.Xml</flags>
       <output>System.ServiceModel.Primitives.dll</output>
@@ -2790,7 +2820,7 @@
       <profile>net_4_x</profile>
       <response>System.ServiceModel.Primitives.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.ServiceModel.Security" library="Facades_System.ServiceModel.Security-net_4_x">
+    <project dir="class/Facades/System.ServiceModel.Security" library="System.ServiceModel.Security-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.ServiceModel</flags>
       <output>System.ServiceModel.Security.dll</output>
@@ -2800,7 +2830,7 @@
       <profile>net_4_x</profile>
       <response>System.ServiceModel.Security.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Text.Encoding.Extensions" library="Facades_System.Text.Encoding.Extensions-net_4_x">
+    <project dir="class/Facades/System.Text.Encoding.Extensions" library="System.Text.Encoding.Extensions-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Text.Encoding.Extensions.dll</output>
@@ -2810,7 +2840,7 @@
       <profile>net_4_x</profile>
       <response>System.Text.Encoding.Extensions.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Text.Encoding" library="Facades_System.Text.Encoding-net_4_x">
+    <project dir="class/Facades/System.Text.Encoding" library="System.Text.Encoding-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Text.Encoding.dll</output>
@@ -2820,7 +2850,7 @@
       <profile>net_4_x</profile>
       <response>System.Text.Encoding.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Text.RegularExpressions" library="Facades_System.Text.RegularExpressions-net_4_x">
+    <project dir="class/Facades/System.Text.RegularExpressions" library="System.Text.RegularExpressions-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Text.RegularExpressions.dll</output>
@@ -2830,7 +2860,7 @@
       <profile>net_4_x</profile>
       <response>System.Text.RegularExpressions.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Threading.Tasks.Parallel" library="Facades_System.Threading.Tasks.Parallel-net_4_x">
+    <project dir="class/Facades/System.Threading.Tasks.Parallel" library="System.Threading.Tasks.Parallel-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Threading.Tasks.Parallel.dll</output>
@@ -2840,7 +2870,7 @@
       <profile>net_4_x</profile>
       <response>System.Threading.Tasks.Parallel.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Threading.Tasks" library="Facades_System.Threading.Tasks-net_4_x">
+    <project dir="class/Facades/System.Threading.Tasks" library="System.Threading.Tasks-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.Core</flags>
       <output>System.Threading.Tasks.dll</output>
@@ -2850,7 +2880,7 @@
       <profile>net_4_x</profile>
       <response>System.Threading.Tasks.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Threading.Timer" library="Facades_System.Threading.Timer-net_4_x">
+    <project dir="class/Facades/System.Threading.Timer" library="System.Threading.Timer-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System -r:System.Core</flags>
       <output>System.Threading.Timer.dll</output>
@@ -2860,7 +2890,7 @@
       <profile>net_4_x</profile>
       <response>System.Threading.Timer.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Threading" library="Facades_System.Threading-net_4_x">
+    <project dir="class/Facades/System.Threading" library="System.Threading-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System -r:System.Core</flags>
       <output>System.Threading.dll</output>
@@ -2870,7 +2900,7 @@
       <profile>net_4_x</profile>
       <response>System.Threading.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Xml.ReaderWriter" library="Facades_System.Xml.ReaderWriter-net_4_x">
+    <project dir="class/Facades/System.Xml.ReaderWriter" library="System.Xml.ReaderWriter-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.Xml</flags>
       <output>System.Xml.ReaderWriter.dll</output>
@@ -2880,7 +2910,7 @@
       <profile>net_4_x</profile>
       <response>System.Xml.ReaderWriter.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Xml.XDocument" library="Facades_System.Xml.XDocument-net_4_x">
+    <project dir="class/Facades/System.Xml.XDocument" library="System.Xml.XDocument-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.Xml.Linq -r:System.Xml</flags>
       <output>System.Xml.XDocument.dll</output>
@@ -2890,7 +2920,7 @@
       <profile>net_4_x</profile>
       <response>System.Xml.XDocument.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Xml.XmlSerializer" library="Facades_System.Xml.XmlSerializer-net_4_x">
+    <project dir="class/Facades/System.Xml.XmlSerializer" library="System.Xml.XmlSerializer-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.Xml</flags>
       <output>System.Xml.XmlSerializer.dll</output>
@@ -2900,7 +2930,7 @@
       <profile>net_4_x</profile>
       <response>System.Xml.XmlSerializer.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Runtime.Handles" library="Facades_System.Runtime.Handles-net_4_x">
+    <project dir="class/Facades/System.Runtime.Handles" library="System.Runtime.Handles-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System -r:System.Core</flags>
       <output>System.Runtime.Handles.dll</output>
@@ -2910,7 +2940,7 @@
       <profile>net_4_x</profile>
       <response>System.Runtime.Handles.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.ServiceModel.Duplex" library="Facades_System.ServiceModel.Duplex-net_4_x">
+    <project dir="class/Facades/System.ServiceModel.Duplex" library="System.ServiceModel.Duplex-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.ServiceModel</flags>
       <output>System.ServiceModel.Duplex.dll</output>
@@ -2920,7 +2950,7 @@
       <profile>net_4_x</profile>
       <response>System.ServiceModel.Duplex.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.ServiceModel.NetTcp" library="Facades_System.ServiceModel.NetTcp-net_4_x">
+    <project dir="class/Facades/System.ServiceModel.NetTcp" library="System.ServiceModel.NetTcp-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System.ServiceModel</flags>
       <output>System.ServiceModel.NetTcp.dll</output>
@@ -2930,7 +2960,7 @@
       <profile>net_4_x</profile>
       <response>System.ServiceModel.NetTcp.dll.sources</response>
     </project>
-    <project dir="class/Facades/Microsoft.Win32.Primitives" library="Facades_Microsoft.Win32.Primitives-net_4_x">
+    <project dir="class/Facades/Microsoft.Win32.Primitives" library="Microsoft.Win32.Primitives-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>Microsoft.Win32.Primitives.dll</output>
@@ -2940,7 +2970,7 @@
       <profile>net_4_x</profile>
       <response>Microsoft.Win32.Primitives.dll.sources</response>
     </project>
-    <project dir="class/Facades/Microsoft.Win32.Registry" library="Facades_Microsoft.Win32.Registry-net_4_x">
+    <project dir="class/Facades/Microsoft.Win32.Registry" library="Microsoft.Win32.Registry-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>Microsoft.Win32.Registry.dll</output>
@@ -2950,7 +2980,7 @@
       <profile>net_4_x</profile>
       <response>Microsoft.Win32.Registry.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.AppContext" library="Facades_System.AppContext-net_4_x">
+    <project dir="class/Facades/System.AppContext" library="System.AppContext-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.AppContext.dll</output>
@@ -2960,7 +2990,7 @@
       <profile>net_4_x</profile>
       <response>System.AppContext.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Collections.NonGeneric" library="Facades_System.Collections.NonGeneric-net_4_x">
+    <project dir="class/Facades/System.Collections.NonGeneric" library="System.Collections.NonGeneric-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Collections.NonGeneric.dll</output>
@@ -2970,7 +3000,7 @@
       <profile>net_4_x</profile>
       <response>System.Collections.NonGeneric.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Collections.Specialized" library="Facades_System.Collections.Specialized-net_4_x">
+    <project dir="class/Facades/System.Collections.Specialized" library="System.Collections.Specialized-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Collections.Specialized.dll</output>
@@ -2980,7 +3010,7 @@
       <profile>net_4_x</profile>
       <response>System.Collections.Specialized.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.ComponentModel.Primitives" library="Facades_System.ComponentModel.Primitives-net_4_x">
+    <project dir="class/Facades/System.ComponentModel.Primitives" library="System.ComponentModel.Primitives-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.ComponentModel.Primitives.dll</output>
@@ -2990,7 +3020,7 @@
       <profile>net_4_x</profile>
       <response>System.ComponentModel.Primitives.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.ComponentModel.TypeConverter" library="Facades_System.ComponentModel.TypeConverter-net_4_x">
+    <project dir="class/Facades/System.ComponentModel.TypeConverter" library="System.ComponentModel.TypeConverter-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.ComponentModel.TypeConverter.dll</output>
@@ -3000,7 +3030,7 @@
       <profile>net_4_x</profile>
       <response>System.ComponentModel.TypeConverter.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Console" library="Facades_System.Console-net_4_x">
+    <project dir="class/Facades/System.Console" library="System.Console-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Console.dll</output>
@@ -3010,7 +3040,7 @@
       <profile>net_4_x</profile>
       <response>System.Console.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Data.Common" library="Facades_System.Data.Common-net_4_x">
+    <project dir="class/Facades/System.Data.Common" library="System.Data.Common-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.Data.dll -r:System</flags>
       <output>System.Data.Common.dll</output>
@@ -3020,7 +3050,7 @@
       <profile>net_4_x</profile>
       <response>System.Data.Common.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Data.SqlClient" library="Facades_System.Data.SqlClient-net_4_x">
+    <project dir="class/Facades/System.Data.SqlClient" library="System.Data.SqlClient-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.Data.dll /r:System.Xml.dll -r:System</flags>
       <output>System.Data.SqlClient.dll</output>
@@ -3030,7 +3060,7 @@
       <profile>net_4_x</profile>
       <response>System.Data.SqlClient.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Diagnostics.FileVersionInfo" library="Facades_System.Diagnostics.FileVersionInfo-net_4_x">
+    <project dir="class/Facades/System.Diagnostics.FileVersionInfo" library="System.Diagnostics.FileVersionInfo-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Diagnostics.FileVersionInfo.dll</output>
@@ -3040,7 +3070,7 @@
       <profile>net_4_x</profile>
       <response>System.Diagnostics.FileVersionInfo.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Diagnostics.Process" library="Facades_System.Diagnostics.Process-net_4_x">
+    <project dir="class/Facades/System.Diagnostics.Process" library="System.Diagnostics.Process-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Diagnostics.Process.dll</output>
@@ -3050,7 +3080,7 @@
       <profile>net_4_x</profile>
       <response>System.Diagnostics.Process.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Diagnostics.TextWriterTraceListener" library="Facades_System.Diagnostics.TextWriterTraceListener-net_4_x">
+    <project dir="class/Facades/System.Diagnostics.TextWriterTraceListener" library="System.Diagnostics.TextWriterTraceListener-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Diagnostics.TextWriterTraceListener.dll</output>
@@ -3060,7 +3090,7 @@
       <profile>net_4_x</profile>
       <response>System.Diagnostics.TextWriterTraceListener.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Diagnostics.TraceEvent" library="Facades_System.Diagnostics.TraceEvent-net_4_x">
+    <project dir="class/Facades/System.Diagnostics.TraceEvent" library="System.Diagnostics.TraceEvent-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Diagnostics.TraceEvent.dll</output>
@@ -3070,7 +3100,7 @@
       <profile>net_4_x</profile>
       <response>System.Diagnostics.TraceEvent.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Diagnostics.TraceSource" library="Facades_System.Diagnostics.TraceSource-net_4_x">
+    <project dir="class/Facades/System.Diagnostics.TraceSource" library="System.Diagnostics.TraceSource-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Diagnostics.TraceSource.dll</output>
@@ -3080,7 +3110,7 @@
       <profile>net_4_x</profile>
       <response>System.Diagnostics.TraceSource.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Globalization.Calendars" library="Facades_System.Globalization.Calendars-net_4_x">
+    <project dir="class/Facades/System.Globalization.Calendars" library="System.Globalization.Calendars-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Globalization.Calendars.dll</output>
@@ -3090,17 +3120,7 @@
       <profile>net_4_x</profile>
       <response>System.Globalization.Calendars.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.IO.Compression" library="Facades_System.IO.Compression-net_4_x">
-      <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.IO.Compression.dll -r:System</flags>
-      <output>System.IO.Compression.dll</output>
-      <built_sources></built_sources>
-      <library_output>./../../../class/lib/net_4_x/Facades/System.IO.Compression.dll</library_output>
-      <fx_version>4.5</fx_version>
-      <profile>net_4_x</profile>
-      <response>System.IO.Compression.dll.sources</response>
-    </project>
-    <project dir="class/Facades/System.IO.Compression.ZipFile" library="Facades_System.IO.Compression.ZipFile-net_4_x">
+    <project dir="class/Facades/System.IO.Compression.ZipFile" library="System.IO.Compression.ZipFile-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.IO.Compression.FileSystem.dll -r:System</flags>
       <output>System.IO.Compression.ZipFile.dll</output>
@@ -3110,7 +3130,7 @@
       <profile>net_4_x</profile>
       <response>System.IO.Compression.ZipFile.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.IO.FileSystem" library="Facades_System.IO.FileSystem-net_4_x">
+    <project dir="class/Facades/System.IO.FileSystem" library="System.IO.FileSystem-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.IO.FileSystem.dll</output>
@@ -3120,7 +3140,7 @@
       <profile>net_4_x</profile>
       <response>System.IO.FileSystem.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.IO.FileSystem.DriveInfo" library="Facades_System.IO.FileSystem.DriveInfo-net_4_x">
+    <project dir="class/Facades/System.IO.FileSystem.DriveInfo" library="System.IO.FileSystem.DriveInfo-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.IO.FileSystem.DriveInfo.dll</output>
@@ -3130,7 +3150,7 @@
       <profile>net_4_x</profile>
       <response>System.IO.FileSystem.DriveInfo.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.IO.FileSystem.Primitives" library="Facades_System.IO.FileSystem.Primitives-net_4_x">
+    <project dir="class/Facades/System.IO.FileSystem.Primitives" library="System.IO.FileSystem.Primitives-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.IO.FileSystem.Primitives.dll</output>
@@ -3140,7 +3160,7 @@
       <profile>net_4_x</profile>
       <response>System.IO.FileSystem.Primitives.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.IO.IsolatedStorage" library="Facades_System.IO.IsolatedStorage-net_4_x">
+    <project dir="class/Facades/System.IO.IsolatedStorage" library="System.IO.IsolatedStorage-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.IO.IsolatedStorage.dll</output>
@@ -3150,7 +3170,7 @@
       <profile>net_4_x</profile>
       <response>System.IO.IsolatedStorage.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.IO.MemoryMappedFiles" library="Facades_System.IO.MemoryMappedFiles-net_4_x">
+    <project dir="class/Facades/System.IO.MemoryMappedFiles" library="System.IO.MemoryMappedFiles-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.Core.dll -r:System</flags>
       <output>System.IO.MemoryMappedFiles.dll</output>
@@ -3160,7 +3180,7 @@
       <profile>net_4_x</profile>
       <response>System.IO.MemoryMappedFiles.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.IO.UnmanagedMemoryStream" library="Facades_System.IO.UnmanagedMemoryStream-net_4_x">
+    <project dir="class/Facades/System.IO.UnmanagedMemoryStream" library="System.IO.UnmanagedMemoryStream-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.IO.UnmanagedMemoryStream.dll</output>
@@ -3170,7 +3190,7 @@
       <profile>net_4_x</profile>
       <response>System.IO.UnmanagedMemoryStream.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.AuthenticationManager" library="Facades_System.Net.AuthenticationManager-net_4_x">
+    <project dir="class/Facades/System.Net.AuthenticationManager" library="System.Net.AuthenticationManager-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Net.AuthenticationManager.dll</output>
@@ -3180,7 +3200,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.AuthenticationManager.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.Cache" library="Facades_System.Net.Cache-net_4_x">
+    <project dir="class/Facades/System.Net.Cache" library="System.Net.Cache-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Net.Cache.dll</output>
@@ -3190,7 +3210,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.Cache.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.HttpListener" library="Facades_System.Net.HttpListener-net_4_x">
+    <project dir="class/Facades/System.Net.HttpListener" library="System.Net.HttpListener-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.dll -r:System</flags>
       <output>System.Net.HttpListener.dll</output>
@@ -3200,7 +3220,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.HttpListener.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.Mail" library="Facades_System.Net.Mail-net_4_x">
+    <project dir="class/Facades/System.Net.Mail" library="System.Net.Mail-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.dll -r:System</flags>
       <output>System.Net.Mail.dll</output>
@@ -3210,7 +3230,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.Mail.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.NameResolution" library="Facades_System.Net.NameResolution-net_4_x">
+    <project dir="class/Facades/System.Net.NameResolution" library="System.Net.NameResolution-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Net.NameResolution.dll</output>
@@ -3220,7 +3240,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.NameResolution.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.Security" library="Facades_System.Net.Security-net_4_x">
+    <project dir="class/Facades/System.Net.Security" library="System.Net.Security-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.dll -r:System</flags>
       <output>System.Net.Security.dll</output>
@@ -3230,7 +3250,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.Security.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.ServicePoint" library="Facades_System.Net.ServicePoint-net_4_x">
+    <project dir="class/Facades/System.Net.ServicePoint" library="System.Net.ServicePoint-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Net.ServicePoint.dll</output>
@@ -3240,7 +3260,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.ServicePoint.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.Sockets" library="Facades_System.Net.Sockets-net_4_x">
+    <project dir="class/Facades/System.Net.Sockets" library="System.Net.Sockets-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.dll -r:System</flags>
       <output>System.Net.Sockets.dll</output>
@@ -3250,7 +3270,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.Sockets.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.Utilities" library="Facades_System.Net.Utilities-net_4_x">
+    <project dir="class/Facades/System.Net.Utilities" library="System.Net.Utilities-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Net.Utilities.dll</output>
@@ -3260,7 +3280,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.Utilities.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.WebHeaderCollection" library="Facades_System.Net.WebHeaderCollection-net_4_x">
+    <project dir="class/Facades/System.Net.WebHeaderCollection" library="System.Net.WebHeaderCollection-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Net.WebHeaderCollection.dll</output>
@@ -3270,7 +3290,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.WebHeaderCollection.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.WebSockets" library="Facades_System.Net.WebSockets-net_4_x">
+    <project dir="class/Facades/System.Net.WebSockets" library="System.Net.WebSockets-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Net.WebSockets.dll</output>
@@ -3280,7 +3300,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.WebSockets.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.WebSockets.Client" library="Facades_System.Net.WebSockets.Client-net_4_x">
+    <project dir="class/Facades/System.Net.WebSockets.Client" library="System.Net.WebSockets.Client-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Net.WebSockets.Client.dll</output>
@@ -3290,7 +3310,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.WebSockets.Client.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Resources.ReaderWriter" library="Facades_System.Resources.ReaderWriter-net_4_x">
+    <project dir="class/Facades/System.Resources.ReaderWriter" library="System.Resources.ReaderWriter-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Resources.ReaderWriter.dll</output>
@@ -3300,7 +3320,7 @@
       <profile>net_4_x</profile>
       <response>System.Resources.ReaderWriter.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Runtime.CompilerServices.VisualC" library="Facades_System.Runtime.CompilerServices.VisualC-net_4_x">
+    <project dir="class/Facades/System.Runtime.CompilerServices.VisualC" library="System.Runtime.CompilerServices.VisualC-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Runtime.CompilerServices.VisualC.dll</output>
@@ -3310,7 +3330,7 @@
       <profile>net_4_x</profile>
       <response>System.Runtime.CompilerServices.VisualC.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.AccessControl" library="Facades_System.Security.AccessControl-net_4_x">
+    <project dir="class/Facades/System.Security.AccessControl" library="System.Security.AccessControl-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Security.AccessControl.dll</output>
@@ -3320,7 +3340,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.AccessControl.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Claims" library="Facades_System.Security.Claims-net_4_x">
+    <project dir="class/Facades/System.Security.Claims" library="System.Security.Claims-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Security.Claims.dll</output>
@@ -3330,7 +3350,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Claims.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Cryptography.DeriveBytes" library="Facades_System.Security.Cryptography.DeriveBytes-net_4_x">
+    <project dir="class/Facades/System.Security.Cryptography.DeriveBytes" library="System.Security.Cryptography.DeriveBytes-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Security.Cryptography.DeriveBytes.dll</output>
@@ -3340,7 +3360,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Cryptography.DeriveBytes.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Cryptography.Encoding" library="Facades_System.Security.Cryptography.Encoding-net_4_x">
+    <project dir="class/Facades/System.Security.Cryptography.Encoding" library="System.Security.Cryptography.Encoding-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Security.Cryptography.Encoding.dll</output>
@@ -3350,7 +3370,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Cryptography.Encoding.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Cryptography.Encryption" library="Facades_System.Security.Cryptography.Encryption-net_4_x">
+    <project dir="class/Facades/System.Security.Cryptography.Encryption" library="System.Security.Cryptography.Encryption-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Security.Cryptography.Encryption.dll</output>
@@ -3360,7 +3380,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Cryptography.Encryption.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Cryptography.Encryption.Aes" library="Facades_System.Security.Cryptography.Encryption.Aes-net_4_x">
+    <project dir="class/Facades/System.Security.Cryptography.Encryption.Aes" library="System.Security.Cryptography.Encryption.Aes-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Security.Cryptography.Encryption.Aes.dll</output>
@@ -3370,7 +3390,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Cryptography.Encryption.Aes.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman" library="Facades_System.Security.Cryptography.Encryption.ECDiffieHellman-net_4_x">
+    <project dir="class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman" library="System.Security.Cryptography.Encryption.ECDiffieHellman-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.Core.dll -r:System</flags>
       <output>System.Security.Cryptography.Encryption.ECDiffieHellman.dll</output>
@@ -3380,7 +3400,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Cryptography.Encryption.ECDiffieHellman.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Cryptography.Encryption.ECDsa" library="Facades_System.Security.Cryptography.Encryption.ECDsa-net_4_x">
+    <project dir="class/Facades/System.Security.Cryptography.Encryption.ECDsa" library="System.Security.Cryptography.Encryption.ECDsa-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.Core.dll -r:System</flags>
       <output>System.Security.Cryptography.Encryption.ECDsa.dll</output>
@@ -3390,7 +3410,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Cryptography.Encryption.ECDsa.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Cryptography.Hashing" library="Facades_System.Security.Cryptography.Hashing-net_4_x">
+    <project dir="class/Facades/System.Security.Cryptography.Hashing" library="System.Security.Cryptography.Hashing-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Security.Cryptography.Hashing.dll</output>
@@ -3400,7 +3420,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Cryptography.Hashing.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Cryptography.Hashing.Algorithms" library="Facades_System.Security.Cryptography.Hashing.Algorithms-net_4_x">
+    <project dir="class/Facades/System.Security.Cryptography.Hashing.Algorithms" library="System.Security.Cryptography.Hashing.Algorithms-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Security.Cryptography.Hashing.Algorithms.dll</output>
@@ -3410,7 +3430,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Cryptography.Hashing.Algorithms.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Cryptography.RSA" library="Facades_System.Security.Cryptography.RSA-net_4_x">
+    <project dir="class/Facades/System.Security.Cryptography.RSA" library="System.Security.Cryptography.RSA-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Security.Cryptography.RSA.dll</output>
@@ -3420,7 +3440,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Cryptography.RSA.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Cryptography.RandomNumberGenerator" library="Facades_System.Security.Cryptography.RandomNumberGenerator-net_4_x">
+    <project dir="class/Facades/System.Security.Cryptography.RandomNumberGenerator" library="System.Security.Cryptography.RandomNumberGenerator-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Security.Cryptography.RandomNumberGenerator.dll</output>
@@ -3430,7 +3450,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Cryptography.RandomNumberGenerator.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Cryptography.X509Certificates" library="Facades_System.Security.Cryptography.X509Certificates-net_4_x">
+    <project dir="class/Facades/System.Security.Cryptography.X509Certificates" library="System.Security.Cryptography.X509Certificates-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Security.Cryptography.X509Certificates.dll</output>
@@ -3440,7 +3460,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Cryptography.X509Certificates.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Principal.Windows" library="Facades_System.Security.Principal.Windows-net_4_x">
+    <project dir="class/Facades/System.Security.Principal.Windows" library="System.Security.Principal.Windows-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Security.Principal.Windows.dll</output>
@@ -3450,7 +3470,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Principal.Windows.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Threading.Thread" library="Facades_System.Threading.Thread-net_4_x">
+    <project dir="class/Facades/System.Threading.Thread" library="System.Threading.Thread-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Threading.Thread.dll</output>
@@ -3460,7 +3480,7 @@
       <profile>net_4_x</profile>
       <response>System.Threading.Thread.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Threading.ThreadPool" library="Facades_System.Threading.ThreadPool-net_4_x">
+    <project dir="class/Facades/System.Threading.ThreadPool" library="System.Threading.ThreadPool-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Threading.ThreadPool.dll</output>
@@ -3470,7 +3490,7 @@
       <profile>net_4_x</profile>
       <response>System.Threading.ThreadPool.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Xml.XPath" library="Facades_System.Xml.XPath-net_4_x">
+    <project dir="class/Facades/System.Xml.XPath" library="System.Xml.XPath-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.Xml.dll -r:System</flags>
       <output>System.Xml.XPath.dll</output>
@@ -3480,7 +3500,7 @@
       <profile>net_4_x</profile>
       <response>System.Xml.XPath.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Xml.XmlDocument" library="Facades_System.Xml.XmlDocument-net_4_x">
+    <project dir="class/Facades/System.Xml.XmlDocument" library="System.Xml.XmlDocument-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.Xml.dll -r:System</flags>
       <output>System.Xml.XmlDocument.dll</output>
@@ -3490,7 +3510,7 @@
       <profile>net_4_x</profile>
       <response>System.Xml.XmlDocument.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Xml.Xsl.Primitives" library="Facades_System.Xml.Xsl.Primitives-net_4_x">
+    <project dir="class/Facades/System.Xml.Xsl.Primitives" library="System.Xml.Xsl.Primitives-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.Xml.dll -r:System</flags>
       <output>System.Xml.Xsl.Primitives.dll</output>
@@ -3500,7 +3520,7 @@
       <profile>net_4_x</profile>
       <response>System.Xml.Xsl.Primitives.dll.sources</response>
     </project>
-    <project dir="class/Facades/Microsoft.Win32.Registry.AccessControl" library="Facades_Microsoft.Win32.Registry.AccessControl-net_4_x">
+    <project dir="class/Facades/Microsoft.Win32.Registry.AccessControl" library="Microsoft.Win32.Registry.AccessControl-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>Microsoft.Win32.Registry.AccessControl.dll</output>
@@ -3510,7 +3530,7 @@
       <profile>net_4_x</profile>
       <response>Microsoft.Win32.Registry.AccessControl.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Diagnostics.StackTrace" library="Facades_System.Diagnostics.StackTrace-net_4_x">
+    <project dir="class/Facades/System.Diagnostics.StackTrace" library="System.Diagnostics.StackTrace-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Diagnostics.StackTrace.dll</output>
@@ -3520,7 +3540,7 @@
       <profile>net_4_x</profile>
       <response>System.Diagnostics.StackTrace.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Globalization.Extensions" library="Facades_System.Globalization.Extensions-net_4_x">
+    <project dir="class/Facades/System.Globalization.Extensions" library="System.Globalization.Extensions-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Globalization.Extensions.dll</output>
@@ -3530,7 +3550,7 @@
       <profile>net_4_x</profile>
       <response>System.Globalization.Extensions.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.IO.FileSystem.AccessControl" library="Facades_System.IO.FileSystem.AccessControl-net_4_x">
+    <project dir="class/Facades/System.IO.FileSystem.AccessControl" library="System.IO.FileSystem.AccessControl-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.IO.FileSystem.AccessControl.dll</output>
@@ -3540,7 +3560,7 @@
       <profile>net_4_x</profile>
       <response>System.IO.FileSystem.AccessControl.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Private.CoreLib.InteropServices" library="Facades_System.Private.CoreLib.InteropServices-net_4_x">
+    <project dir="class/Facades/System.Private.CoreLib.InteropServices" library="System.Private.CoreLib.InteropServices-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Private.CoreLib.InteropServices.dll</output>
@@ -3550,7 +3570,7 @@
       <profile>net_4_x</profile>
       <response>System.Private.CoreLib.InteropServices.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Private.CoreLib.Threading" library="Facades_System.Private.CoreLib.Threading-net_4_x">
+    <project dir="class/Facades/System.Private.CoreLib.Threading" library="System.Private.CoreLib.Threading-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Private.CoreLib.Threading.dll</output>
@@ -3560,7 +3580,7 @@
       <profile>net_4_x</profile>
       <response>System.Private.CoreLib.Threading.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Reflection.TypeExtensions" library="Facades_System.Reflection.TypeExtensions-net_4_x">
+    <project dir="class/Facades/System.Reflection.TypeExtensions" library="System.Reflection.TypeExtensions-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Reflection.TypeExtensions.dll</output>
@@ -3570,7 +3590,7 @@
       <profile>net_4_x</profile>
       <response>System.Reflection.TypeExtensions.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.SecureString" library="Facades_System.Security.SecureString-net_4_x">
+    <project dir="class/Facades/System.Security.SecureString" library="System.Security.SecureString-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Security.SecureString.dll</output>
@@ -3580,7 +3600,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.SecureString.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Threading.AccessControl" library="Facades_System.Threading.AccessControl-net_4_x">
+    <project dir="class/Facades/System.Threading.AccessControl" library="System.Threading.AccessControl-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Threading.AccessControl.dll</output>
@@ -3590,7 +3610,7 @@
       <profile>net_4_x</profile>
       <response>System.Threading.AccessControl.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Threading.Overlapped" library="Facades_System.Threading.Overlapped-net_4_x">
+    <project dir="class/Facades/System.Threading.Overlapped" library="System.Threading.Overlapped-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Threading.Overlapped.dll</output>
@@ -3600,7 +3620,7 @@
       <profile>net_4_x</profile>
       <response>System.Threading.Overlapped.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Xml.XPath.XDocument" library="Facades_System.Xml.XPath.XDocument-net_4_x">
+    <project dir="class/Facades/System.Xml.XPath.XDocument" library="System.Xml.XPath.XDocument-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.Xml.Linq.dll -r:System</flags>
       <output>System.Xml.XPath.XDocument.dll</output>
@@ -3610,7 +3630,7 @@
       <profile>net_4_x</profile>
       <response>System.Xml.XPath.XDocument.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Reflection.Emit.ILGeneration" library="Facades_System.Reflection.Emit.ILGeneration-net_4_x">
+    <project dir="class/Facades/System.Reflection.Emit.ILGeneration" library="System.Reflection.Emit.ILGeneration-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Reflection.Emit.ILGeneration.dll</output>
@@ -3620,7 +3640,7 @@
       <profile>net_4_x</profile>
       <response>System.Reflection.Emit.ILGeneration.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Reflection.Emit.Lightweight" library="Facades_System.Reflection.Emit.Lightweight-net_4_x">
+    <project dir="class/Facades/System.Reflection.Emit.Lightweight" library="System.Reflection.Emit.Lightweight-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Reflection.Emit.Lightweight.dll</output>
@@ -3630,7 +3650,7 @@
       <profile>net_4_x</profile>
       <response>System.Reflection.Emit.Lightweight.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Reflection.Emit" library="Facades_System.Reflection.Emit-net_4_x">
+    <project dir="class/Facades/System.Reflection.Emit" library="System.Reflection.Emit-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib</flags>
       <output>System.Reflection.Emit.dll</output>
@@ -3640,7 +3660,7 @@
       <profile>net_4_x</profile>
       <response>System.Reflection.Emit.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Diagnostics.PerformanceCounter" library="Facades_System.Diagnostics.PerformanceCounter-net_4_x">
+    <project dir="class/Facades/System.Diagnostics.PerformanceCounter" library="System.Diagnostics.PerformanceCounter-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.Diagnostics.PerformanceCounter.dll</output>
@@ -3650,7 +3670,7 @@
       <profile>net_4_x</profile>
       <response>System.Diagnostics.PerformanceCounter.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.IO.FileSystem.Watcher" library="Facades_System.IO.FileSystem.Watcher-net_4_x">
+    <project dir="class/Facades/System.IO.FileSystem.Watcher" library="System.IO.FileSystem.Watcher-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib -r:System</flags>
       <output>System.IO.FileSystem.Watcher.dll</output>
@@ -3660,7 +3680,7 @@
       <profile>net_4_x</profile>
       <response>System.IO.FileSystem.Watcher.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.IO.Pipes" library="Facades_System.IO.Pipes-net_4_x">
+    <project dir="class/Facades/System.IO.Pipes" library="System.IO.Pipes-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.Core.dll -r:System</flags>
       <output>System.IO.Pipes.dll</output>
@@ -3670,7 +3690,7 @@
       <profile>net_4_x</profile>
       <response>System.IO.Pipes.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Security.Cryptography.ProtectedData" library="Facades_System.Security.Cryptography.ProtectedData-net_4_x">
+    <project dir="class/Facades/System.Security.Cryptography.ProtectedData" library="System.Security.Cryptography.ProtectedData-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.Security.dll -r:System</flags>
       <output>System.Security.Cryptography.ProtectedData.dll</output>
@@ -3680,7 +3700,7 @@
       <profile>net_4_x</profile>
       <response>System.Security.Cryptography.ProtectedData.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.ServiceProcess.ServiceController" library="Facades_System.ServiceProcess.ServiceController-net_4_x">
+    <project dir="class/Facades/System.ServiceProcess.ServiceController" library="System.ServiceProcess.ServiceController-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.ServiceProcess.dll -r:System</flags>
       <output>System.ServiceProcess.ServiceController.dll</output>
@@ -3690,7 +3710,7 @@
       <profile>net_4_x</profile>
       <response>System.ServiceProcess.ServiceController.dll.sources</response>
     </project>
-    <project dir="class/Facades/System.Net.Http.WebRequestHandler" library="Facades_System.Net.Http.WebRequestHandler-net_4_x">
+    <project dir="class/Facades/System.Net.Http.WebRequestHandler" library="System.Net.Http.WebRequestHandler-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../../class/lib/net_4_x -r:mscorlib.dll -optimize /noconfig /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 /r:mscorlib /r:System.Net.Http.WebRequest.dll /r:System.Net.Http.dll -r:System</flags>
       <output>System.Net.Http.WebRequestHandler.dll</output>
@@ -4240,6 +4260,16 @@
       <profile>net_4_x</profile>
       <response>mono-symbolicate.exe.sources</response>
     </project>
+    <project dir="tools/linker-analyzer" library="linkeranalyzer-net_4_x">
+      <boot></boot>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/net_4_x -r:mscorlib.dll -debug -optimize /noconfig</flags>
+      <output>linkeranalyzer.exe</output>
+      <built_sources></built_sources>
+      <library_output>./../../class/lib/net_4_x/linkeranalyzer.exe</library_output>
+      <fx_version>4.5</fx_version>
+      <profile>net_4_x</profile>
+      <response>linkeranalyzer.exe.sources</response>
+    </project>
     <project dir="class/Microsoft.Build.Framework" library="Microsoft.Build.Framework-xbuild_12">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:./../../class/lib/xbuild_12 -r:mscorlib.dll -debug -d:XBUILD_12 -d:MONO -d:DISABLE_CAS_USE -lib:./../../class/lib/net_4_x -optimize /noconfig /r:mscorlib.dll /r:System.dll -r:System</flags>

diff --git a/msvc/winsetup.bat b/msvc/winsetup.bat
index f67a854569327dcbd8fb0d344ea2ed97de89c1f3..336778204f2a5dc3507a880bef2062e5bd669801 100755 (executable)
--- a/msvc/winsetup.bat
+++ b/msvc/winsetup.bat
@@ -4,6 +4,7 @@ if exist config.h if not exist cygconfig.h copy config.h cygconfig.h
 if exist eglib\config.h if not exist eglib\cygconfig.h copy eglib\config.h eglib\cygconfig.h
 copy winconfig.h config.h
 copy eglib\winconfig.h eglib\config.h
+powershell -Command "(Get-Content config.h) -replace '#MONO_VERSION#', (Select-String -path configure.ac -pattern 'AC_INIT\(mono, \[(.*)\]').Matches[0].Groups[1].Value | Set-Content config.h"
 goto end
 :error
 echo fatal error: the VSDepenancies directory was not found in the "mono" directory

diff --git a/support/map.h b/support/map.h
index 34cdb68ab4da8bab5ff81cddbf5c53e4e976b712..9f89fcde93b94c6326a863c767ea2ff2b4b877c7 100644 (file)
--- a/support/map.h
+++ b/support/map.h
@@ -2018,8 +2018,9 @@ struct Mono_Unix_UnixSignal_SignalInfo {
        int   count;
        int   read_fd;
        int   write_fd;
-       int   have_handler;
        int   pipecnt;
+       int   pipelock;
+       int   have_handler;
        void* handler;
 };
 
@@ -2049,6 +2050,7 @@ int Mono_Posix_Stdlib_clearerr (void* stream);
 void* Mono_Posix_Stdlib_CreateFilePosition (void);
 int Mono_Posix_Stdlib_DumpFilePosition (char* buf, void* handle, int len);
 int Mono_Posix_Stdlib_EOF (void);
+const char* Mono_Unix_VersionString (void);
 int Mono_Posix_Stdlib_EXIT_FAILURE (void);
 int Mono_Posix_Stdlib_EXIT_SUCCESS (void);
 int Mono_Posix_Stdlib_fgetpos (void* stream, void* pos);

diff --git a/support/signal.c b/support/signal.c
index 6adf5463878ef2693b8d3ecc101ea5809b88cb28..993e2e216618b3c0aa0a9773707f48eef836873d 100644 (file)
--- a/support/signal.c
+++ b/support/signal.c
@@ -107,23 +107,28 @@ int Mono_Posix_FromRealTimeSignum (int offset, int *r)
 
 #ifndef HOST_WIN32
 
+// Atomicity rules: Fields of signal_info read or written by the signal handler
+// (see UnixSignal.cs) should be read and written using atomic functions.
+// (For simplicity, we're protecting some things we don't strictly need to.)
+
+// Because we are in MonoPosixHelper, we are banned from linking mono.
+// We can still use atomic.h because that's all inline functions--
+// unless WAPI_NO_ATOMIC_ASM is defined, in which case atomic.h calls linked functions.
 #ifndef WAPI_NO_ATOMIC_ASM
        #define mph_int_get(p)     InterlockedExchangeAdd ((p), 0)
        #define mph_int_inc(p)     InterlockedIncrement ((p))
        #define mph_int_dec_test(p)     (InterlockedDecrement ((p)) == 0)
-       #define mph_int_set(p,o,n) InterlockedExchange ((p), (n))
+       #define mph_int_set(p,n) InterlockedExchange ((p), (n))
+       // Pointer, original, new
+       #define mph_int_test_and_set(p,o,n) (o == InterlockedCompareExchange ((p), (n), (o)))
 #elif GLIB_CHECK_VERSION(2,4,0)
        #define mph_int_get(p) g_atomic_int_get ((p))
        #define mph_int_inc(p) do {g_atomic_int_inc ((p));} while (0)
        #define mph_int_dec_test(p) g_atomic_int_dec_and_test ((p))
-       #define mph_int_set(p,o,n) do {                                 \
-               while (!g_atomic_int_compare_and_exchange ((p), (o), (n))) {} \
-       } while (0)
+       #define mph_int_set(p,n) g_atomic_int_set ((p),(n))
+       #define mph_int_test_and_set(p,o,n) g_atomic_int_compare_and_exchange ((p), (o), (n))
 #else
-       #define mph_int_get(p) (*(p))
-       #define mph_int_inc(p) do { (*(p))++; } while (0)
-       #define mph_int_dec_test(p) (--(*(p)) == 0)
-       #define mph_int_set(p,o,n) do { *(p) = n; } while (0)
+       #error "GLIB 2.4 required because building without ASM atomics"
 #endif
 
 #if HAVE_PSIGNAL
@@ -166,6 +171,90 @@ keep_trying (int r)
        return r == -1 && errno == EINTR;
 }
 
+// This tiny ad-hoc read/write lock is needed because of the very specific
+// synchronization needed between default_handler and teardown_pipes:
+// - Many default_handlers can be running at once
+// - The signals_mutex already ensures only one teardown_pipes runs at once
+// - If teardown_pipes starts while a default_handler is ongoing, it must block
+// - If default_handler starts while a teardown_pipes is ongoing, it must *not* block
+// Locks are implemented as ints.
+
+// The lock is split into a teardown bit and a handler count (sign bit unused).
+// There is a teardown running or waiting to run if the teardown bit is set.
+// There is a handler running if the handler count is nonzero.
+#define PIPELOCK_TEARDOWN_BIT (  (int)0x40000000 )
+#define PIPELOCK_COUNT_MASK   (~((int)0xC0000000))
+#define PIPELOCK_GET_COUNT(x)      ((x) & PIPELOCK_COUNT_MASK)
+#define PIPELOCK_INCR_COUNT(x, by) (((x) & PIPELOCK_TEARDOWN_BIT) | (PIPELOCK_GET_COUNT (PIPELOCK_GET_COUNT (x) + (by))))
+
+static inline void
+acquire_pipelock_teardown (int *lock)
+{
+       int lockvalue_draining;
+       // First mark that a teardown is occurring, so handlers will stop entering the lock.
+       while (1) {
+               int lockvalue = mph_int_get (lock);
+               lockvalue_draining = lockvalue | PIPELOCK_TEARDOWN_BIT;
+               if (mph_int_test_and_set (lock, lockvalue, lockvalue_draining))
+                       break;
+       }
+       // Now wait for all handlers to complete.
+       while (1) {
+               if (0 == PIPELOCK_GET_COUNT (lockvalue_draining))
+                       break; // We now hold the lock.
+               // Handler is still running, spin until it completes.
+               sched_yield (); // We can call this because !defined(HOST_WIN32)
+               lockvalue_draining = mph_int_get (lock);
+       }
+}
+
+static inline void
+release_pipelock_teardown (int *lock)
+{
+       while (1) {
+               int lockvalue = mph_int_get (lock);
+               int lockvalue_new = lockvalue & ~PIPELOCK_TEARDOWN_BIT;
+               // Technically this can't fail, because we hold both the pipelock and the mutex, but
+               if (mph_int_test_and_set (lock, lockvalue, lockvalue_new))
+                       return;
+       }
+}
+
+// Return 1 for success
+static inline int
+acquire_pipelock_handler (int *lock)
+{
+       while (1) {
+               int lockvalue = mph_int_get (lock);
+               if (lockvalue & PIPELOCK_TEARDOWN_BIT) // Final lock is being torn down
+                       return 0;
+               int lockvalue_new = PIPELOCK_INCR_COUNT (lockvalue, 1);
+               if (mph_int_test_and_set (lock, lockvalue, lockvalue_new))
+                       return 1;
+       }
+}
+
+static inline void
+release_pipelock_handler (int *lock)
+{
+       while (1) {
+               int lockvalue = mph_int_get (lock);
+               int lockvalue_new = PIPELOCK_INCR_COUNT (lockvalue, -1);
+               if (mph_int_test_and_set (lock, lockvalue, lockvalue_new))
+                       return;
+       }
+}
+
+// This handler is registered once for each UnixSignal object. A pipe is maintained
+// for each one; Wait users read at one end of this pipe, and default_handler sends
+// a write on the pipe for each signal received while the Wait is ongoing.
+//
+// Notice a fairly unlikely race condition exists here: Because we synchronize with
+// pipe teardown, but not install/uninstall (in other words, we are only trying to
+// protect against writing on a closed pipe) it is technically possible a full
+// uninstall and then an install could complete after signum is checked but before
+// the remaining instructions execute. In this unlikely case count could be
+// incremented or a byte written on the wrong signal handler.
 static void
 default_handler (int signum)
 {
@@ -175,30 +264,36 @@ default_handler (int signum)
                signal_info* h = &signals [i];
                if (mph_int_get (&h->signum) != signum)
                        continue;
+
                mph_int_inc (&h->count);
+
+               if (!acquire_pipelock_handler (&h->pipelock))
+                       continue; // Teardown is occurring on this object, no one to send to.
+
                fd = mph_int_get (&h->write_fd);
-               if (fd > 0) {
+               if (fd > 0) { // If any listener exists to write to
                        int j,pipecounter;
-                       char c = signum;
-                       pipecounter = mph_int_get (&h->pipecnt);
+                       char c = signum; // (Value is meaningless)
+                       pipecounter = mph_int_get (&h->pipecnt); // Write one byte per pipe listener
                        for (j = 0; j < pipecounter; ++j) {
                                int r;
                                do { r = write (fd, &c, 1); } while (keep_trying (r));
-                               fsync (fd); /* force */
                        }
                }
+               release_pipelock_handler (&h->pipelock);
        }
 }
 
 static pthread_mutex_t signals_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+// A UnixSignal object is being constructed
 void*
 Mono_Unix_UnixSignal_install (int sig)
 {
 #if defined(HAVE_SIGNAL)
        int i;
-       signal_info* h = NULL; 
-       int have_handler = 0;
+       signal_info* h = NULL;        // signals[] slot to install to
+       int have_handler = 0;         // Candidates for signal_info handler fields
        void* handler = NULL;
 
        if (acquire_mutex (&signals_mutex) == -1)
@@ -212,13 +307,16 @@ Mono_Unix_UnixSignal_install (int sig)
                if (sinfo.sa_handler != SIG_DFL || (void*)sinfo.sa_sigaction != (void*)SIG_DFL) {
                        pthread_mutex_unlock (&signals_mutex);
                        errno = EADDRINUSE;
-                       return NULL;
+                       return NULL; // This is an rt signal with an existing handler. Bail out.
                }
        }
 #endif /*defined (SIGRTMIN) && defined (SIGRTMAX)*/
 
+       // Scan through signals list looking for (1) an unused spot (2) a usable value for handler
        for (i = 0; i < NUM_SIGNALS; ++i) {
-               if (h == NULL && signals [i].signum == 0) {
+               int just_installed = 0;
+               // We're still looking for a signal_info spot, and this one is available:
+               if (h == NULL && mph_int_get (&signals [i].signum) == 0) {
                        h = &signals [i];
                        h->handler = signal (sig, default_handler);
                        if (h->handler == SIG_ERR) {
@@ -227,27 +325,32 @@ Mono_Unix_UnixSignal_install (int sig)
                                break;
                        }
                        else {
-                               h->have_handler = 1;
+                               just_installed = 1;
                        }
                }
-               if (!have_handler && signals [i].signum == sig &&
+               // Check if this slot has a "usable" (not installed by this file) handler-to-restore-later:
+               // (On the first signal to be installed, signals [i] will be == h when this happens.)
+               if (!have_handler && (just_installed || mph_int_get (&signals [i].signum) == sig) &&
                                signals [i].handler != default_handler) {
                        have_handler = 1;
                        handler = signals [i].handler;
                }
-               if (h && have_handler)
+               if (h && have_handler) // We have everything we need
                        break;
        }
 
-       if (h && have_handler) {
+       if (h) {
+               // If we reached here without have_handler, this means that default_handler
+               // was set as the signal handler before the first UnixSignal object was installed.
+               g_assert (have_handler);
+
+               // Overwrite the tenative handler we set a moment ago with a known-usable one
+               h->handler = handler;
                h->have_handler = 1;
-               h->handler      = handler;
-       }
 
-       if (h) {
-               mph_int_set (&h->count, h->count, 0);
-               mph_int_set (&h->signum, h->signum, sig);
-               mph_int_set (&h->pipecnt, h->pipecnt, 0);
+               mph_int_set (&h->count, 0);
+               mph_int_set (&h->pipecnt, 0);
+               mph_int_set (&h->signum, sig);
        }
 
        release_mutex (&signals_mutex);
@@ -265,16 +368,17 @@ count_handlers (int signum)
        int i;
        int count = 0;
        for (i = 0; i < NUM_SIGNALS; ++i) {
-               if (signals [i].signum == signum)
+               if (mph_int_get (&signals [i].signum) == signum)
                        ++count;
        }
        return count;
 }
 
+// A UnixSignal object is being Disposed
 int
 Mono_Unix_UnixSignal_uninstall (void* info)
 {
-#if defined(HAVE_SIGNAL)       
+#if defined(HAVE_SIGNAL)
        signal_info* h;
        int r = -1;
 
@@ -287,14 +391,15 @@ Mono_Unix_UnixSignal_uninstall (void* info)
                errno = EINVAL;
        else {
                /* last UnixSignal -- we can unregister */
-               if (h->have_handler && count_handlers (h->signum) == 1) {
-                       mph_sighandler_t p = signal (h->signum, h->handler);
+               int signum = mph_int_get (&h->signum);
+               if (h->have_handler && count_handlers (signum) == 1) {
+                       mph_sighandler_t p = signal (signum, h->handler);
                        if (p != SIG_ERR)
                                r = 0;
                        h->handler      = NULL;
                        h->have_handler = 0;
                }
-               h->signum = 0;
+               mph_int_set (&h->signum, 0);
        }
 
        release_mutex (&signals_mutex);
@@ -306,6 +411,7 @@ Mono_Unix_UnixSignal_uninstall (void* info)
 #endif
 }
 
+// Set up a signal_info to begin waiting for signal
 static int
 setup_pipes (signal_info** signals, int count, struct pollfd *fd_structs, int *currfd)
 {
@@ -317,21 +423,22 @@ setup_pipes (signal_info** signals, int count, struct pollfd *fd_structs, int *c
 
                h = signals [i];
 
-               if (mph_int_get (&h->pipecnt) == 0) {
+               if (mph_int_get (&h->pipecnt) == 0) { // First listener for this signal_info
                        if ((r = pipe (filedes)) != 0) {
                                break;
                        }
-                       h->read_fd  = filedes [0];
-                       h->write_fd = filedes [1];
+                       mph_int_set (&h->read_fd,  filedes [0]);
+                       mph_int_set (&h->write_fd, filedes [1]);
                }
                mph_int_inc (&h->pipecnt);
-               fd_structs[*currfd].fd = h->read_fd;
+               fd_structs[*currfd].fd = mph_int_get (&h->read_fd);
                fd_structs[*currfd].events = POLLIN;
-               ++(*currfd);
+               ++(*currfd); // count is verified less than NUM_SIGNALS by caller
        }
        return r;
 }
 
+// Cleanup a signal_info after waiting for signal
 static void
 teardown_pipes (signal_info** signals, int count)
 {
@@ -339,21 +446,28 @@ teardown_pipes (signal_info** signals, int count)
        for (i = 0; i < count; ++i) {
                signal_info* h = signals [i];
 
-               if (mph_int_dec_test (&h->pipecnt)) {
-                       if (h->read_fd != 0)
-                               close (h->read_fd);
-                       if (h->write_fd != 0)
-                               close (h->write_fd);
-                       h->read_fd  = 0;
-                       h->write_fd = 0;
+               if (mph_int_dec_test (&h->pipecnt)) { // Final listener for this signal_info
+                       acquire_pipelock_teardown (&h->pipelock);
+                       int read_fd = mph_int_get (&h->read_fd);
+                       int write_fd = mph_int_get (&h->write_fd);
+                       if (read_fd != 0)
+                               close (read_fd);
+                       if (write_fd != 0)
+                               close (write_fd);
+                       mph_int_set (&h->read_fd, 0);
+                       mph_int_set (&h->write_fd, 0);
+                       release_pipelock_teardown (&h->pipelock);
                }
        }
 }
 
+// Given pipes set up, wait for a byte to arrive on one of them
 static int
 wait_for_any (signal_info** signals, int count, int *currfd, struct pollfd* fd_structs, int timeout, Mono_Posix_RuntimeIsShuttingDown shutting_down)
 {
        int r, idx;
+       // Poll until one of this signal_info's pipes is ready to read.
+       // Once a second, stop to check if the VM is shutting down.
        do {
                struct timeval tv;
                struct timeval *ptv = NULL;
@@ -368,7 +482,7 @@ wait_for_any (signal_info** signals, int count, int *currfd, struct pollfd* fd_s
        idx = -1;
        if (r == 0)
                idx = timeout;
-       else if (r > 0) {
+       else if (r > 0) { // The pipe[s] are ready to read.
                int i;
                for (i = 0; i < count; ++i) {
                        signal_info* h = signals [i];
@@ -376,7 +490,7 @@ wait_for_any (signal_info** signals, int count, int *currfd, struct pollfd* fd_s
                                int r;
                                char c;
                                do {
-                                       r = read (h->read_fd, &c, 1);
+                                       r = read (mph_int_get (&h->read_fd), &c, 1);
                                } while (keep_trying (r) && !shutting_down ());
                                if (idx == -1)
                                        idx = i;

diff --git a/support/stdlib.c b/support/stdlib.c
index 56df107016f6d1c4affdf29d4d81ecf3ab27e4a7..523ae92482899dca3582cb5103d2e085506530d6 100644 (file)
--- a/support/stdlib.c
+++ b/support/stdlib.c
@@ -14,6 +14,13 @@
 
 G_BEGIN_DECLS
 
+// See Stdlib.cs
+const char *
+Mono_Unix_VersionString ()
+{
+       return "MonoProject-2015-12-1";
+}
+
 gint32
 Mono_Posix_Stdlib_EXIT_FAILURE (void)
 {

diff --git a/winconfig.h b/winconfig.h
index 71555cecf19cb644d73abd4909edb5fdf349616d..1a9a35eb18ae5136db406fb8c8770e462c39d4e3 100644 (file)
--- a/winconfig.h
+++ b/winconfig.h
@@ -7,11 +7,11 @@
 
 /* The architecture this is running on */
 #if defined(_M_IA64)
-#define ARCHITECTURE "ia64"
+#define MONO_ARCHITECTURE "ia64"
 #elif defined(_M_AMD64)
-#define ARCHITECTURE "amd64"
+#define MONO_ARCHITECTURE "amd64"
 #elif defined(_M_IX86)
-#define ARCHITECTURE "x86"
+#define MONO_ARCHITECTURE "x86"
 #else
 #error Unknown architecture
 #endif
@@ -67,9 +67,6 @@
 /* Disable reflection emit support */
 /* #undef DISABLE_REFLECTION_EMIT */
 
-/* Disable inter-process shared handles */
-/* #undef DISABLE_SHARED_HANDLES */
-
 /* Disable advanced SSA JIT optimizations */
 /* #undef DISABLE_SSA */
 
@@ -645,5 +642,5 @@
 /* #undef USE_MONO_MUTEX */
 
 /* Version number of package */
-#define VERSION "4.1.0"
+#define VERSION "#MONO_VERSION#"
 #endif