Compare commits

..
Author SHA1 Message Date
Zoltan Varga 45d0ba1bc0 [runtime] Fix the leaking of mach ports introduced by 98bbf8512a. Fixes #22068. 2014-08-15 10:19:13 -04:00
Alexander Köplinger 69104ca6c7 [System] Use xamarin.com instead of mono-project.com for DNS tests
The latter is now hosted on a different IP behind a CDN and the IP may change depending on location.
Using xamarin.com instead fixes the tests for now.
2014-08-14 20:24:29 -04:00
Rodrigo Kumpera 62a857ec77 Revert "[mcs] Use closed delegate over static generated methods from anonymous methods"
This reverts commit 7edcd42a15.

Conflicts:
	mcs/tests/ver-il-net_4_5.xml
2014-08-12 19:40:17 -04:00
Zoltan Varga 2e5f57cc6c Revert "[mcs] Use closed delegate over static generated methods from anonymous methods"
This reverts commit 7edcd42a15.

Revert this as it causes blocker https://bugzilla.xamarin.com/show_bug.cgi?id=21651.
2014-08-12 19:23:41 -04:00
Marek Safar 992e9ff54b [System.Net.Http] Handle quoted filename value. Fixes #21960 2014-08-12 10:35:52 +02:00
Zoltan Varga 1a2c7216c1 [runtime] Fix Process.PrivateMemorySize64 etc. on ios. Fixes #21882. 2014-08-07 15:51:34 +02:00
Zoltan Varga 7348882b0b [jit] Fix enum->int casts in gsharedvt code. Fixes #21893. 2014-08-07 15:48:28 +02:00
Zoltan Varga 9ffca33e57 [jit] Avoid making generic calls from gsharedvt methods normally, go through the rgctx infrastructure instead. Fixes #21677. 2014-07-31 22:16:56 +02:00
Marek Safar 3b5a8e7214 [mcs] Update codegen for boolean loads. Fixes #21685 2014-07-31 18:41:09 +02:00
Alexis Christoforides 44ae3e4969 Bump Mono version -> 3.8.0 2014-07-30 14:50:28 -04:00
1175 changed files with 86069 additions and 19003 deletions

No files matched your search

+1 -1
View File
@@ -1,7 +1,7 @@
Mono is a software platform designed to allow developers to easily create cross platform applications.
Mono is an open source implementation of Microsoft's .NET Framework based on the ECMA standards for C# and the Common Language Runtime.
[![Build Status](http://jenkins.mono-project.com/job/test-mono-mainline/badge/icon/)](http://jenkins.mono-project.com/job/test-mono-mainline/)
[![Build Status](http://monojenkins.cloudapp.net/job/Mono/badge/icon)](http://monojenkins.cloudapp.net/job/Mono/)
1. [Installation](#compilation-and-installation)
2. [Using Mono](#using-mono)
+1
View File
@@ -123,6 +123,7 @@ if test x$has_ext_mod = xtrue; then
popd
else
cat mono/mini/Makefile.am.in > mono/mini/Makefile.am
cat mono/metadata/Makefile.am.in > mono/metadata/Makefile.am
fi
+17 -22
View File
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
#AC_PREREQ([2.62])
AC_INIT(mono, [3.10.1],
AC_INIT(mono, [3.8.0],
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
AC_CONFIG_SRCDIR([README.md])
@@ -142,17 +142,6 @@ case "$host" in
with_sigaltstack=no
use_sigposix=yes
;;
*-*-kfreebsd*-gnu)
host_win32=no
CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP -DTHREAD_LOCAL_ALLOC -pthread"
libmono_cflags="-D_REENTRANT -DTHREAD_LOCAL_ALLOC -pthread"
libmono_ldflags="-lpthread -pthread"
libdl="-ldl"
libgc_threads=pthreads
need_link_unlink=yes
with_sigaltstack=no
use_sigposix=yes
;;
*-*-*freebsd*)
host_win32=no
if test "x$PTHREAD_CFLAGS" = "x"; then
@@ -368,7 +357,6 @@ fi
AC_SUBST(extra_runtime_ldflags)
AM_CONDITIONAL(HOST_WIN32, test x$host_win32 = xyes)
AM_CONDITIONAL(TARGET_WIN32, test x$target_win32 = xyes)
AM_CONDITIONAL(PLATFORM_GNU, echo x$target_os | grep -q -- -gnu)
AM_CONDITIONAL(PLATFORM_LINUX, echo x$target_os | grep -q linux)
AM_CONDITIONAL(PLATFORM_DARWIN, test x$platform_darwin = xyes)
AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes)
@@ -2507,7 +2495,7 @@ SQLITE3="libsqlite3.so.0"
X11="libX11.so"
GDKX11="libgdk-x11-2.0.so.0"
GTKX11="libgtk-x11-2.0.so.0"
XINERAMA="libXinerama.so.1"
XINERAMA="libXinerama.so"
sizeof_register="SIZEOF_VOID_P"
@@ -2577,7 +2565,7 @@ case "$host" in
sgen_supported=true
AOT_SUPPORTED="yes"
;;
openbsd*|freebsd*|kfreebsd-gnu*)
openbsd*|freebsd*)
sgen_supported=true
;;
esac
@@ -2599,7 +2587,7 @@ case "$host" in
sgen_supported=true
AOT_SUPPORTED="yes"
;;
openbsd*|freebsd*|kfreebsd-gnu*)
openbsd*|freebsd*)
sgen_supported=true
;;
mingw*)
@@ -2973,11 +2961,6 @@ case "$host" in
LIBC="libc.so.12"
INTL="libintl.so.0"
;;
*-*-kfreebsd*-gnu)
LIBC="libc.so.0.1"
INTL="libc.so.0.1"
X11="libX11.so.6"
;;
*-*-*freebsd*)
LIBC="libc.so"
INTL="libintl.so"
@@ -3004,9 +2987,21 @@ case "$host" in
done
if test "x$X11" = "xlibX11.so"; then
AC_MSG_WARN([Could not find libX11.so. Do you have X.org or XFree86 installed? Assuming libX11.so.6...]);
AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? Assuming libX11.so.6...]);
X11=libX11.so.6
fi
AC_MSG_CHECKING(for the soname of libXinerama.so)
for i in $x_libraries $dlsearch_path; do
for r in 1 2 3; do
if test -f $i/libXinerama.so.$r; then
XINERAMA=libXinerama.so.$r
AC_MSG_RESULT($XINERAMA)
fi
done
done
if test "x$XINERAMA" = "xlibXinerama.so"; then
AC_MSG_WARN([Could not find Xinerama development libs. Support for multiple monitors might not work...]);
fi
;;
esac
-6
View File
@@ -273,9 +273,3 @@
#define g_utf8_get_char_validated monoeg_utf8_get_char_validated
#define g_utf8_prev_char monoeg_utf8_prev_char
#define g_utf8_to_ucs4 monoeg_utf8_to_ucs4
#define g_log_default_handler monoeg_log_default_handler
#define g_log_set_default_handler monoeg_log_set_default_handler
#define g_set_print_handler monoeg_set_print_handler
#define g_set_printerr_handler monoeg_set_printerr_handler
-8
View File
@@ -57,14 +57,6 @@ typedef struct {
Slot *slot;
} Iter;
size_t
mono_eg_hashtable_get_memory_size (GHashTable *hashtable)
{
return sizeof (GHashTable) +
hashtable->in_use * sizeof (Slot) +
hashtable->table_size * sizeof (Slot*);
}
static const guint prime_tbl[] = {
11, 19, 37, 73, 109, 163, 251, 367, 557, 823, 1237,
1861, 2777, 4177, 6247, 9371, 14057, 21089, 31627,
+2 -8
View File
@@ -467,8 +467,6 @@ guint g_spaced_primes_closest (guint x);
#define g_hash_table_insert(h,k,v) g_hash_table_insert_replace ((h),(k),(v),FALSE)
#define g_hash_table_replace(h,k,v) g_hash_table_insert_replace ((h),(k),(v),TRUE)
size_t mono_eg_hashtable_get_memory_size (GHashTable *hashtable);
gboolean g_direct_equal (gconstpointer v1, gconstpointer v2);
guint g_direct_hash (gconstpointer v1);
gboolean g_int_equal (gconstpointer v1, gconstpointer v2);
@@ -605,14 +603,10 @@ void g_assertion_message (const gchar *format, ...) G_GNUC_NORETURN
#define g_message(...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, __VA_ARGS__)
#define g_debug(...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, __VA_ARGS__)
#endif /* ndef HAVE_C99_SUPPORT */
#define g_log_set_handler(a,b,c,d)
typedef void (*GLogFunc) (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data);
typedef void (*GPrintFunc) (const gchar *string);
#define G_GNUC_INTERNAL
void g_log_default_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer unused_data);
GLogFunc g_log_set_default_handler (GLogFunc log_func, gpointer user_data);
GPrintFunc g_set_print_handler (GPrintFunc func);
GPrintFunc g_set_printerr_handler (GPrintFunc func);
/*
* Conversions
*/
+92 -165
View File
@@ -35,47 +35,85 @@
/* The current fatal levels, error is always fatal */
static GLogLevelFlags fatal = G_LOG_LEVEL_ERROR;
static GLogFunc default_log_func;
static gpointer default_log_func_user_data;
static GPrintFunc stdout_handler, stderr_handler;
static void default_stdout_handler (const gchar *string);
static void default_stderr_handler (const gchar *string);
#if PLATFORM_ANDROID
#include <android/log.h>
static android_LogPriority
to_android_priority (GLogLevelFlags log_level)
{
switch (log_level & G_LOG_LEVEL_MASK)
{
case G_LOG_LEVEL_ERROR: return ANDROID_LOG_FATAL;
case G_LOG_LEVEL_CRITICAL: return ANDROID_LOG_ERROR;
case G_LOG_LEVEL_WARNING: return ANDROID_LOG_WARN;
case G_LOG_LEVEL_MESSAGE: return ANDROID_LOG_INFO;
case G_LOG_LEVEL_INFO: return ANDROID_LOG_DEBUG;
case G_LOG_LEVEL_DEBUG: return ANDROID_LOG_VERBOSE;
}
return ANDROID_LOG_UNKNOWN;
}
static void
out_vfprintf (FILE *ignore, const gchar *format, va_list args)
{
/* TODO: provide a proper app name */
__android_log_vprint (ANDROID_LOG_ERROR, "mono", format, args);
}
#elif MONOTOUCH && defined(__arm__)
#include <asl.h>
static int
to_asl_priority (GLogLevelFlags log_level)
{
switch (log_level & G_LOG_LEVEL_MASK)
{
case G_LOG_LEVEL_ERROR: return ASL_LEVEL_CRIT;
case G_LOG_LEVEL_CRITICAL: return ASL_LEVEL_ERR;
case G_LOG_LEVEL_WARNING: return ASL_LEVEL_WARNING;
case G_LOG_LEVEL_MESSAGE: return ASL_LEVEL_NOTICE;
case G_LOG_LEVEL_INFO: return ASL_LEVEL_INFO;
case G_LOG_LEVEL_DEBUG: return ASL_LEVEL_DEBUG;
}
return ASL_LEVEL_ERR;
}
static void
out_vfprintf (FILE *ignore, const gchar *format, va_list args)
{
asl_vlog (NULL, NULL, ASL_LEVEL_WARNING, format, args);
}
#else
static void
out_vfprintf (FILE *file, const gchar *format, va_list args)
{
vfprintf (file, format, args);
}
#endif
void
g_print (const gchar *format, ...)
{
char *msg;
va_list args;
va_start (args, format);
if (vasprintf (&msg, format, args) < 0)
return;
out_vfprintf (stdout, format, args);
va_end (args);
if (!stdout_handler)
stdout_handler = default_stdout_handler;
stdout_handler (msg);
free (msg);
}
void
g_printerr (const gchar *format, ...)
{
char *msg;
va_list args;
va_start (args, format);
if (vasprintf (&msg, format, args) < 0)
return;
out_vfprintf (stderr, format, args);
va_end (args);
if (!stderr_handler)
stderr_handler = default_stderr_handler;
stderr_handler (msg);
free (msg);
}
GLogLevelFlags
@@ -102,16 +140,42 @@ g_log_set_fatal_mask (const gchar *log_domain, GLogLevelFlags fatal_mask)
void
g_logv (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, va_list args)
{
#if PLATFORM_ANDROID
__android_log_vprint (to_android_priority (log_level), log_domain, format, args);
#elif MONOTOUCH && defined(__arm__)
asl_vlog (NULL, NULL, to_asl_priority (log_level), format, args);
#else
char *msg;
if (!default_log_func)
default_log_func = g_log_default_handler;
if (vasprintf (&msg, format, args) < 0)
return;
default_log_func (log_domain, log_level, msg, default_log_func_user_data);
#ifdef G_OS_WIN32
printf ("%s%s%s\n",
log_domain != NULL ? log_domain : "",
log_domain != NULL ? ": " : "",
msg);
#else
#if MONOTOUCH
FILE *target = stderr;
#else
FILE *target = stdout;
#endif
fprintf (target, "%s%s%s\n",
log_domain != NULL ? log_domain : "",
log_domain != NULL ? ": " : "",
msg);
#endif
free (msg);
if (log_level & fatal){
fflush (stdout);
fflush (stderr);
}
#endif
if (log_level & fatal){
abort ();
}
}
void
@@ -132,143 +196,6 @@ g_assertion_message (const gchar *format, ...)
va_start (args, format);
g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
va_end (args);
}
#if PLATFORM_ANDROID
#include <android/log.h>
static android_LogPriority
to_android_priority (GLogLevelFlags log_level)
{
switch (log_level & G_LOG_LEVEL_MASK)
{
case G_LOG_LEVEL_ERROR: return ANDROID_LOG_FATAL;
case G_LOG_LEVEL_CRITICAL: return ANDROID_LOG_ERROR;
case G_LOG_LEVEL_WARNING: return ANDROID_LOG_WARN;
case G_LOG_LEVEL_MESSAGE: return ANDROID_LOG_INFO;
case G_LOG_LEVEL_INFO: return ANDROID_LOG_DEBUG;
case G_LOG_LEVEL_DEBUG: return ANDROID_LOG_VERBOSE;
}
return ANDROID_LOG_UNKNOWN;
}
void
g_log_default_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer unused_data)
{
__android_log_write (to_android_priority (log_level), log_domain, message);
if (log_level & fatal)
abort ();
}
static void
default_stdout_handler (const gchar *message)
{
/* TODO: provide a proper app name */
__android_log_write (ANDROID_LOG_ERROR, "mono", message);
}
static void
default_stderr_handler (const gchar *message)
{
/* TODO: provide a proper app name */
__android_log_write (ANDROID_LOG_ERROR, "mono", message);
}
#elif MONOTOUCH
#include <asl.h>
static int
to_asl_priority (GLogLevelFlags log_level)
{
switch (log_level & G_LOG_LEVEL_MASK)
{
case G_LOG_LEVEL_ERROR: return ASL_LEVEL_CRIT;
case G_LOG_LEVEL_CRITICAL: return ASL_LEVEL_ERR;
case G_LOG_LEVEL_WARNING: return ASL_LEVEL_WARNING;
case G_LOG_LEVEL_MESSAGE: return ASL_LEVEL_NOTICE;
case G_LOG_LEVEL_INFO: return ASL_LEVEL_INFO;
case G_LOG_LEVEL_DEBUG: return ASL_LEVEL_DEBUG;
}
return ASL_LEVEL_ERR;
}
void
g_log_default_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer unused_data)
{
asl_log (NULL, NULL, to_asl_priority (log_level), "%s", message);
if (log_level & fatal)
abort ();
}
static void
default_stdout_handler (const gchar *message)
{
asl_log (NULL, NULL, ASL_LEVEL_WARNING, "%s", message);
}
static void
default_stderr_handler (const gchar *message)
{
asl_log (NULL, NULL, ASL_LEVEL_WARNING, "%s", message);
}
#else
void
g_log_default_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer unused_data)
{
FILE *target = stdout;
fprintf (target, "%s%s%s\n",
log_domain != NULL ? log_domain : "",
log_domain != NULL ? ": " : "",
message);
if (log_level & fatal) {
fflush (stdout);
fflush (stderr);
abort ();
}
}
static void
default_stdout_handler (const gchar *string)
{
fprintf (stdout, "%s", string);
}
static void
default_stderr_handler (const gchar *string)
{
fprintf (stderr, "%s", string);
}
#endif
GLogFunc
g_log_set_default_handler (GLogFunc log_func, gpointer user_data)
{
GLogFunc old = default_log_func;
default_log_func = log_func;
default_log_func_user_data = user_data;
return old;
}
GPrintFunc
g_set_print_handler (GPrintFunc func)
{
GPrintFunc old = stdout_handler;
stdout_handler = func;
return old;
}
GPrintFunc
g_set_printerr_handler (GPrintFunc func)
{
GPrintFunc old = stderr_handler;
stderr_handler = func;
return old;
abort ();
}
+1 -1
+1 -1
-11
View File
@@ -114,17 +114,6 @@ case "$THREADS" in
AC_DEFINE(THREAD_LOCAL_ALLOC)
THREADDLLIBS="-lpthread -lrt"
;;
*-*-kfreebsd*-gnu)
AC_DEFINE(GC_FREEBSD_THREADS)
INCLUDES="$INCLUDES -pthread"
THREADDLLIBS=-pthread
AC_DEFINE(_REENTRANT)
if test "${enable_parallel_mark}" = yes; then
AC_DEFINE(PARALLEL_MARK)
fi
AC_DEFINE(THREAD_LOCAL_ALLOC)
AC_DEFINE(USE_COMPILER_TLS)
;;
*-*-freebsd*)
AC_DEFINE(GC_FREEBSD_THREADS)
if test "x$PTHREAD_CFLAGS" != "x"; then
+2 -2
View File
@@ -26,7 +26,7 @@
* None of this is safe with dlclose and incremental collection.
* But then not much of anything is safe in the presence of dlclose.
*/
#if (defined(__linux__) || defined(__GLIBC__) || defined(__native_client__)) && !defined(_GNU_SOURCE)
#if (defined(__linux__) || defined(__native_client__)) && !defined(_GNU_SOURCE)
/* Can't test LINUX, since this must be define before other includes */
# define _GNU_SOURCE
#endif
@@ -394,7 +394,7 @@ GC_bool GC_register_main_static_data()
/* For glibc 2.2.4+. Unfortunately, it doesn't work for older */
/* versions. Thanks to Jakub Jelinek for most of the code. */
# if (defined(LINUX) || defined (__GLIBC__) || defined(NACL)) /* Are others OK here, too? */ \
# if (defined(LINUX) || defined(NACL)) /* Are others OK here, too? */ \
&& (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
+1 -1
View File
@@ -497,7 +497,7 @@ GC_API GC_PTR GC_malloc_atomic_ignore_off_page GC_PROTO((size_t lb));
# define GC_RETURN_ADDR (GC_word)__return_address
#endif
#if defined(__linux__) || defined(__GLIBC__)
#ifdef __linux__
# include <features.h>
# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
&& !defined(__ia64__)
+8 -22
View File
@@ -55,7 +55,7 @@
# endif
/* And one for FreeBSD: */
# if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(FREEBSD)
# if defined(__FreeBSD__) && !defined(FREEBSD)
# define FREEBSD
# endif
@@ -1371,15 +1371,8 @@
# ifndef GC_FREEBSD_THREADS
# define MPROTECT_VDB
# endif
# ifdef __GLIBC__
# define SIG_SUSPEND (32+6)
# define SIG_THR_RESTART (32+5)
extern int _end[];
# define DATAEND (_end)
# else
# define SIG_SUSPEND SIGTSTP
# define SIG_THR_RESTART SIGCONT
# endif
# define SIG_SUSPEND SIGTSTP
# define SIG_THR_RESTART SIGCONT
# define FREEBSD_STACKBOTTOM
# ifdef __ELF__
# define DYNAMIC_LOADING
@@ -2139,15 +2132,8 @@
# ifndef GC_FREEBSD_THREADS
# define MPROTECT_VDB
# endif
# ifdef __GLIBC__
# define SIG_SUSPEND (32+6)
# define SIG_THR_RESTART (32+5)
extern int _end[];
# define DATAEND (_end)
# else
# define SIG_SUSPEND SIGUSR1
# define SIG_THR_RESTART SIGUSR2
# endif
# define SIG_SUSPEND SIGTSTP
# define SIG_THR_RESTART SIGCONT
# define NEED_FIND_LIMIT
# define FREEBSD_STACKBOTTOM
# ifdef __ELF__
@@ -2244,7 +2230,7 @@
# define SUNOS5SIGS
# endif
# if defined(FREEBSD) && ((__FreeBSD__ >= 4) || (__FreeBSD_kernel__ >= 4))
# if defined(FREEBSD) && (__FreeBSD__ >= 4)
# define SUNOS5SIGS
# endif
@@ -2307,7 +2293,7 @@
# define CACHE_LINE_SIZE 32 /* Wild guess */
# endif
# if defined(LINUX) || defined(__GLIBC__)
# ifdef LINUX
# define REGISTER_LIBRARIES_EARLY
/* We sometimes use dl_iterate_phdr, which may acquire an internal */
/* lock. This isn't safe after the world has stopped. So we must */
@@ -2388,7 +2374,7 @@
#if defined(SPARC)
# define CAN_SAVE_CALL_ARGS
#endif
#if (defined(I386) || defined(X86_64)) && (defined(LINUX) || defined(__GLIBC__))
#if (defined(I386) || defined(X86_64)) && defined(LINUX)
/* SAVE_CALL_CHAIN is supported if the code is compiled to save */
/* frame pointers by default, i.e. no -fomit-frame-pointer flag. */
# define CAN_SAVE_CALL_ARGS
-11
View File
@@ -1216,17 +1216,6 @@ is used.
Performs a check to make sure that no references are left to an
unloaded AppDomain.
.TP
\fBclear-at-tlab-creation\fR
Clears the nursery incrementally when the thread local allocation
buffers (TLAB) are created. The default setting clears the whole
nursery at GC time.
.TP
\fBdebug-clear-at-tlab-creation\fR
Clears the nursery incrementally when the thread local allocation
buffers (TLAB) are created, but at GC time fills it with the byte
`0xff`, which should result in a crash more quickly if
`clear-at-tlab-creation` doesn't work properly.
.TP
\fBclear-at-gc\fR
This clears the nursery at GC time instead of doing it when the thread
local allocation buffer (TLAB) is created. The default is to clear
+1 -1
View File
@@ -82,7 +82,7 @@ all-local $(STD_TARGETS:=-local):
@:
dir-check:
@if [ "$(NO_DIR_CHECK)" = "" -a "$(PROFILE)" != "basic" ]; then $(MAKE) -C ../runtime; fi
@if [ "$(NO_DIR_CHECK)" = "" -a "$(PROFILE)" != "basic" ]; then make -C ../runtime; fi
# fun specialty targets
-3
View File
@@ -17,6 +17,3 @@ FRAMEWORK_VERSION = 4.0
XBUILD_VERSION = 4.0
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
# Ignore tests on net_4_0 as the 4.0 IL code is never used for running (just for metadata), so it doesn't make sense to execute tests there
NO_TEST = yes
@@ -0,0 +1,70 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{75D99998-A9C1-4B89-AD47-DA830E461DED}</ProjectGuid>
<ProjectTypeGuids>{F6B19D50-1E2E-4e87-ADFB-10393B439DE0};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>Accessibility</AssemblyName>
<JDKName>1.6</JDKName>
<GHProjectType>1</GHProjectType>
<Version>2.0</Version>
<UseVSHostingProcess>false</UseVSHostingProcess>
<AdditionalClassPath>
</AdditionalClassPath>
<RootNamespace>Accessibility</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug_Java20\</OutputPath>
<DefineConstants>TRACE;DEBUG;JAVA;NET_1_1;NET_2_0;TARGET_JVM</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<BaseAddress>285212672</BaseAddress>
<SkipValidation>false</SkipValidation>
<KeepIntermediate>false</KeepIntermediate>
<TargetPlatform>0</TargetPlatform>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release_Java20\</OutputPath>
<DefineConstants>TRACE;JAVA;NET_1_1;NET_2_0;TARGET_JVM</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<BaseAddress>285212672</BaseAddress>
<SkipValidation>false</SkipValidation>
<KeepIntermediate>false</KeepIntermediate>
<TargetPlatform>0</TargetPlatform>
</PropertyGroup>
<ItemGroup>
<Compile Include="Accessibility\IAccessible.cs" />
<Compile Include="Accessibility\IAccessibleHandler.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\build\common\Consts.cs.in">
<Link>Consts.cs.in</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets" />
<Import Project="$(VMW_HOME)\bin\Mainsoft.Common.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ProjectExtensions>
<VisualStudio>
<UserProperties REFS-JarPath-system="" REFS-RefInfo-system="repository:vmw:framework:2.0" REFS-JarPath-system-data="" REFS-RefInfo-system-data="repository:vmw:framework:2.0" REFS-JarPath-system-xml="" REFS-RefInfo-system-xml="repository:vmw:framework:2.0" REFS-JarPath-rt="" REFS-RefInfo-rt="repository:jre:sun:1.6.0" />
</VisualStudio>
</ProjectExtensions>
</Project>
@@ -55,8 +55,10 @@ using System.Runtime.InteropServices;
[assembly: Guid ("1ea4dbf0-3c3b-11cf-810c-00aa00389b71")]
[assembly: AllowPartiallyTrustedCallers]
#if !TARGET_JVM
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile ("../msfinal.pub")]
#endif
[assembly: ImportedFromTypeLib ("Accessibility")]
+32
View File
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<NoConfig>true</NoConfig>
<CodePage>65001</CodePage>
<NoWarn>414</NoWarn>
<UseVSHostingProcess>false</UseVSHostingProcess>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<Reference Include="I18N">
<HintPath>..\lib\net_2_0\I18N.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="big5.table"/>
<EmbeddedResource Include="gb2312.table"/>
<EmbeddedResource Include="jis.table"/>
<EmbeddedResource Include="ks.table"/>
<EmbeddedResource Include="gb18030.table"/>
</ItemGroup>
<Import Project="$(MSBuildProjectDirectory)\..\..\..\build\msbuild\Mono.Common.targets"/>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="BeforeBuild" DependsOnTargets="SetupProject">
</Target>
</Project>
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<NoConfig>true</NoConfig>
<CodePage>65001</CodePage>
<NoWarn>414</NoWarn>
<UseVSHostingProcess>false</UseVSHostingProcess>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
</PropertyGroup>
<Import Project="$(MSBuildProjectDirectory)\..\..\..\build\msbuild\Mono.Common.targets"/>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="BeforeBuild" DependsOnTargets="SetupProject">
</Target>
</Project>
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<NoConfig>true</NoConfig>
<CodePage>65001</CodePage>
<NoWarn>414</NoWarn>
<UseVSHostingProcess>false</UseVSHostingProcess>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<Reference Include="I18N">
<HintPath>..\lib\net_2_0\I18N.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildProjectDirectory)\..\..\..\build\msbuild\Mono.Common.targets"/>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="BeforeBuild" DependsOnTargets="SetupProject">
</Target>
</Project>
+25
View File
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<NoConfig>true</NoConfig>
<CodePage>65001</CodePage>
<NoWarn>414</NoWarn>
<UseVSHostingProcess>false</UseVSHostingProcess>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<Reference Include="I18N">
<HintPath>..\lib\net_2_0\I18N.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildProjectDirectory)\..\..\..\build\msbuild\Mono.Common.targets"/>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="BeforeBuild" DependsOnTargets="SetupProject">
</Target>
</Project>
+25
View File
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<NoConfig>true</NoConfig>
<CodePage>65001</CodePage>
<NoWarn>414</NoWarn>
<UseVSHostingProcess>false</UseVSHostingProcess>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<Reference Include="I18N">
<HintPath>..\lib\net_2_0\I18N.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildProjectDirectory)\..\..\..\build\msbuild\Mono.Common.targets"/>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="BeforeBuild" DependsOnTargets="SetupProject">
</Target>
</Project>
+25
View File
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<NoConfig>true</NoConfig>
<CodePage>65001</CodePage>
<NoWarn>414</NoWarn>
<UseVSHostingProcess>false</UseVSHostingProcess>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<Reference Include="I18N">
<HintPath>..\lib\net_2_0\I18N.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildProjectDirectory)\..\..\..\build\msbuild\Mono.Common.targets"/>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="BeforeBuild" DependsOnTargets="SetupProject">
</Target>
</Project>
+9
View File
@@ -16,6 +16,15 @@ build_SUBDIRS := \
Mono.Posix \
System.Core
net_1_1_java_SUBDIRS = \
System.Xml \
System.Data \
System.Drawing \
Novell.Directory.Ldap \
System.DirectoryServices \
System.Runtime.Serialization.Formatters.Soap \
System.Runtime.Remoting
net_2_0_dirs := \
corlib \
System \
+1 -1
View File
@@ -100,7 +100,7 @@ TEST_DISTFILES = \
EXTRA_DISTFILES = \
README System.Windows.Forms.dll.resources \
$(RESX_RESOURCES:.resources=.resx) $(CUR_RESOURCES) $(PREBUILT) \
$(RESX_RESOURCES:.resources=.resx) $(CUR_RESOURCES) $(PREBUILT) build-csproj build-csproj2k5 \
$(IMAGES_RESOURCES) \
$(TEST_DISTFILES)
File diff suppressed because it is too large. Load diff
+35
View File
@@ -0,0 +1,35 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C# Express 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SWF", "SWF.csproj", "{5E6430B2-6B9F-4E76-802E-20207EF80391}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testbed", "..\testbed\testbed.csproj", "{75D9EBE5-A54C-4FFF-B536-066577092A78}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug 2.0|Any CPU = Debug 2.0|Any CPU
Debug|Any CPU = Debug|Any CPU
Release 2.0|Any CPU = Release 2.0|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Debug 2.0|Any CPU.ActiveCfg = Debug 2.0|Any CPU
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Debug 2.0|Any CPU.Build.0 = Debug 2.0|Any CPU
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Release 2.0|Any CPU.ActiveCfg = Release 2.0|Any CPU
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Release 2.0|Any CPU.Build.0 = Release 2.0|Any CPU
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Release|Any CPU.Build.0 = Release|Any CPU
{75D9EBE5-A54C-4FFF-B536-066577092A78}.Debug 2.0|Any CPU.ActiveCfg = Debug|Any CPU
{75D9EBE5-A54C-4FFF-B536-066577092A78}.Debug 2.0|Any CPU.Build.0 = Debug|Any CPU
{75D9EBE5-A54C-4FFF-B536-066577092A78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{75D9EBE5-A54C-4FFF-B536-066577092A78}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75D9EBE5-A54C-4FFF-B536-066577092A78}.Release 2.0|Any CPU.ActiveCfg = Release|Any CPU
{75D9EBE5-A54C-4FFF-B536-066577092A78}.Release 2.0|Any CPU.Build.0 = Release|Any CPU
{75D9EBE5-A54C-4FFF-B536-066577092A78}.Release|Any CPU.ActiveCfg = Release|Any CPU
{75D9EBE5-A54C-4FFF-B536-066577092A78}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -0,0 +1,402 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5E6430B2-6B9F-4E76-802E-20207EF80391}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>System.Windows.Forms_test</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
<RootNamespace>
</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>.\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1,NET_2_0,__MonoCS__,DEBUG</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<OutputType>Library</OutputType>
<AssemblyName>System.Windows.Forms_test_net_2_0</AssemblyName>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug 2.0|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_2_0 __MonoCS__ DEBUG</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<OutputType>Library</OutputType>
<AssemblyName>System.Windows.Forms_test</AssemblyName>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1 ONLY_1_1 __MonoCS__</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
<OutputType>Library</OutputType>
<AssemblyName>System.Windows.Forms_test</AssemblyName>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release 2.0|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_2_0 __MonoCS__</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
<OutputType>Library</OutputType>
<AssemblyName>System.Windows.Forms_test</AssemblyName>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<OutputPath>.\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1,NET_2_0,__MonoCS__,DEBUG</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<AssemblyName>System.Windows.Forms_test_net_2_0</AssemblyName>
<OutputType>Library</OutputType>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\winforms-unittests\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Accessibility">
<Name>Accessibility</Name>
</Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Drawing">
<Name>System.Drawing</Name>
</Reference>
<Reference Include="System.Windows.Forms">
<Name>System.Windows.Forms</Name>
</Reference>
<Reference Include="System.Xml">
<Name>System.Xml</Name>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Test\System.Windows.Forms\ApplicationTest.cs" />
<Compile Include="Test\System.Windows.Forms\AutoCompleteStringCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ApplicationContextTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingsCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingContextTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingManagerBaseTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingMemberInfoTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingNavigatorTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingSourceTest.cs" />
<Compile Include="Test\System.Windows.Forms\ButtonBaseTest.cs" />
<Compile Include="Test\System.Windows.Forms\ButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\CheckBoxEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\CheckBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\CheckedListBoxEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\CheckedListBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\ColumnClickEventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ColumnHeaderTest.cs" />
<Compile Include="Test\System.Windows.Forms\ColumnStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\ComboBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\Common.cs" />
<Compile Include="Test\System.Windows.Forms\CommonDialogsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ContainerControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\ContextMenuTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlBindingsCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlBindingsConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlHandleTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlLogger.cs" />
<Compile Include="Test\System.Windows.Forms\ControlLogger2.cs" />
<Compile Include="Test\System.Windows.Forms\ControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlPaintTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlPropertyEventsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\CursorTest.cs" />
<Compile Include="Test\System.Windows.Forms\CurrencyManagerTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataBindingTests.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridColumnStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridTableStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridTextBoxColumnTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridTextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewAdvancedBorderStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewBandTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewButtonCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCellCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCellStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCheckBoxCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewClipboardHeaderTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewClipboardTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewColumnCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewColumnHeaderTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewColumnTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewComboBoxCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCommon.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewDataBindingTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewElementTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewLinkCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewImageCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewRowCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewRowHeaderTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewRowTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewTextBoxCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewTextBoxColumnTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataObjectTest.cs" />
<Compile Include="Test\System.Windows.Forms\DateTimePickerTest.cs" />
<Compile Include="Test\System.Windows.Forms\DefaultLayoutTest.cs" />
<Compile Include="Test\System.Windows.Forms\DragEventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ErrorProviderTest.cs" />
<Compile Include="Test\System.Windows.Forms\FlowPanelTests.cs" />
<Compile Include="Test\System.Windows.Forms\FocusTest.cs" />
<Compile Include="Test\System.Windows.Forms\FolderBrowserDialogTest.cs" />
<Compile Include="Test\System.Windows.Forms\FormEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\FormHandleTest.cs" />
<Compile Include="Test\System.Windows.Forms\FormTest.cs" />
<Compile Include="Test\System.Windows.Forms\EventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\EventLogger.cs" />
<Compile Include="Test\System.Windows.Forms\GridColumnStylesCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\GridTableStylesCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\GroupBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\HelpProviderTest.cs" />
<Compile Include="Test\System.Windows.Forms\HScrollPropertiesTest.cs" />
<Compile Include="Test\System.Windows.Forms\ImageKeyConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\ImageListStreamerTest.cs" />
<Compile Include="Test\System.Windows.Forms\ImageListTest.cs" />
<Compile Include="Test\System.Windows.Forms\InputLanguageTest.cs" />
<Compile Include="Test\System.Windows.Forms\KeyEventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\KeysConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\LabelTest.cs" />
<Compile Include="Test\System.Windows.Forms\LinkAreaTest.cs" />
<Compile Include="Test\System.Windows.Forms\LinkConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\LinkLabelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListBindingHelperTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListBoxEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewCollectionsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewGroupTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewGroupCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\MaskedTextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\MdiFormHandleTest.cs" />
<Compile Include="Test\System.Windows.Forms\MdiFormTest.cs" />
<Compile Include="Test\System.Windows.Forms\MessageTest.cs" />
<Compile Include="Test\System.Windows.Forms\MenuStripTest.cs" />
<Compile Include="Test\System.Windows.Forms\MenuTest.cs" />
<Compile Include="Test\System.Windows.Forms\MenuItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\MonthCalendarTest.cs" />
<Compile Include="Test\System.Windows.Forms\NotifyIconTest.cs" />
<Compile Include="Test\System.Windows.Forms\NumericUpDownTest.cs" />
<Compile Include="Test\System.Windows.Forms\PaddingTest.cs" />
<Compile Include="Test\System.Windows.Forms\PaddingConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\PaintEventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\PanelTest.cs" />
<Compile Include="Test\System.Windows.Forms\PictureBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\PrintDialogTest.cs" />
<Compile Include="Test\System.Windows.Forms\ProgressBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\PropertyGridTest.cs" />
<Compile Include="Test\System.Windows.Forms\PropertyManagerTest.cs" />
<Compile Include="Test\System.Windows.Forms\RadioButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\RowStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\RichTextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\SaveFileDialogTest.cs" />
<Compile Include="Test\System.Windows.Forms\ScrollableControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\ScrollBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\SelectionRangeTest.cs" />
<Compile Include="Test\System.Windows.Forms\SendKeysTest.cs" />
<Compile Include="Test\System.Windows.Forms\SplitterTest.cs" />
<Compile Include="Test\System.Windows.Forms\SplitContainerTests.cs" />
<Compile Include="Test\System.Windows.Forms\StatusBarPanelTest.cs" />
<Compile Include="Test\System.Windows.Forms\StatusBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\StatusStripTest.cs" />
<Compile Include="Test\System.Windows.Forms\SystemInformationTest.cs" />
<Compile Include="Test\System.Windows.Forms\TabControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\TableLayoutTest.cs" />
<Compile Include="Test\System.Windows.Forms\TestHelper.cs" />
<Compile Include="Test\System.Windows.Forms\TestImageIndexConverter.cs" />
<Compile Include="Test\System.Windows.Forms\TextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\TimerTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolBarButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripComboBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripContainerTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripContentPanelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripControlHostTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripDropDownTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripItemCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripLabelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripManagerTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripMenuItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripOverflowButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripOverflowTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripPanelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripProgressBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripSeparatorTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripStatusLabelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripTextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolTipTest.cs" />
<Compile Include="Test\System.Windows.Forms\TrackBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeNodeCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeNodeTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewHitTestInfoTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewImageKeyConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewImageIndexConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewEventsTest.cs" />
<Compile Include="Test\System.Windows.Forms\UpDownTest.cs" />
<Compile Include="Test\System.Windows.Forms\UserControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\VScrollPropertiesTest.cs" />
<Compile Include="Test\System.Windows.Forms.Layout\TableLayoutSettingsTypeConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms.Layout\ArrangedElementCollectionTest.cs" />
<Compile Include="Test\System.Resources\CompatTest.cs" />
<Compile Include="Test\System.Resources\CultureTest.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeTest.cs" />
<Compile Include="Test\System.Resources\ResXFileRefTest.cs" />
<Compile Include="Test\System.Resources\ResXResourceReaderTest.cs" />
<Compile Include="Test\System.Resources\WriterTest.cs" />
<Compile Include="..\..\build\common\Consts.cs">
<Link>Consts.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="Test\System.Windows.Forms\ChangeLog" />
</ItemGroup>
<ItemGroup>
<None Include="Test\System.Resources\ChangeLog" />
</ItemGroup>
<ItemGroup>
<None Include="Test\System.Windows.Forms.Layout\ChangeLog" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
<ProjectGuid>{5E6430B2-6B9F-4E76-802E-20207EF80391}</ProjectGuid>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
</Project>
File diff suppressed because it is too large. Load diff
+35
View File
@@ -0,0 +1,35 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SWF2k5", "SWF2k5.csproj", "{5E6430B2-6B9F-4E76-802E-20207EF80391}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.WebBrowser2K5", "..\Mono.WebBrowser\Mono.WebBrowser2K5.csproj", "{5E6C996A-007F-40CE-B244-006EFCFB77D2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug 1.1|Any CPU = Debug 1.1|Any CPU
Release|Any CPU = Release|Any CPU
Release 1.1|Any CPU = Release 1.1|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Debug 1.1|Any CPU.ActiveCfg = Debug 1.1|Any CPU
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Debug 1.1|Any CPU.Build.0 = Debug 1.1|Any CPU
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Release|Any CPU.Build.0 = Release|Any CPU
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Release 1.1|Any CPU.ActiveCfg = Release 1.1|Any CPU
{5E6430B2-6B9F-4E76-802E-20207EF80391}.Release 1.1|Any CPU.Build.0 = Release 1.1|Any CPU
{5E6C996A-007F-40CE-B244-006EFCFB77D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E6C996A-007F-40CE-B244-006EFCFB77D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E6C996A-007F-40CE-B244-006EFCFB77D2}.Debug 1.1|Any CPU.ActiveCfg = Debug 1.1|Any CPU
{5E6C996A-007F-40CE-B244-006EFCFB77D2}.Debug 1.1|Any CPU.Build.0 = Debug 1.1|Any CPU
{5E6C996A-007F-40CE-B244-006EFCFB77D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E6C996A-007F-40CE-B244-006EFCFB77D2}.Release|Any CPU.Build.0 = Release|Any CPU
{5E6C996A-007F-40CE-B244-006EFCFB77D2}.Release 1.1|Any CPU.ActiveCfg = Release 1.1|Any CPU
{5E6C996A-007F-40CE-B244-006EFCFB77D2}.Release 1.1|Any CPU.Build.0 = Release 1.1|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Default.targets"/>
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<NoConfig>true</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodePage>65001</CodePage>
<NoWarn>618,612,809</NoWarn>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<Reference Include="System"/>
<Reference Include="System.Xml"/>
<Reference Include="System.Drawing"/>
<Reference Include="Accessibility"/>
<Reference Include="System.Data"/>
<Reference Include="System.Configuration"/>
<Reference Include="Mono.Posix">
<HintPath>..\lib\net_2_0\Mono.Posix.dll</HintPath>
</Reference>
<Reference Include="Mono.WebBrowser">
<HintPath>..\lib\net_2_0\Mono.WebBrowser.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="BeforeBuild" DependsOnTargets="SetupProject">
</Target>
</Project>
+217
View File
@@ -0,0 +1,217 @@
#!/bin/bash
#
# I got tired of editing the SWF.csproj
# This script will generate it from our System.Windows.Forms.dll.sources
#
#
tr=tr
OutFile=SWF.csproj
Source=System.Windows.Forms.dll.sources
Resource=System.Windows.Forms.dll.resources
SWFhead()
{
cat << EOT
<VisualStudioProject>
<CSHARP
ProjectType = "Local"
ProductVersion = "7.10.3077"
SchemaVersion = "2.0"
ProjectGuid = "{5E6430B2-6B9F-4E76-802E-20207EF80391}"
>
<Build>
<Settings
ApplicationIcon = ""
AssemblyKeyContainerName = ""
AssemblyName = "System.Windows.Forms"
AssemblyOriginatorKeyFile = ""
DefaultClientScript = "JScript"
DefaultHTMLPageLayout = "Grid"
DefaultTargetSchema = "IE50"
DelaySign = "false"
OutputType = "Library"
PreBuildEvent = ""
PostBuildEvent = ""
RootNamespace = ""
RunPostBuildEvent = "OnBuildSuccess"
StartupObject = ""
>
<Config
Name = "Debug"
AllowUnsafeBlocks = "true"
BaseAddress = "285212672"
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
DefineConstants = "NET_1_1 ONLY_1_1"
DocumentationFile = ""
DebugSymbols = "true"
FileAlignment = "4096"
IncrementalBuild = "false"
NoStdLib = "false"
NoWarn = ""
Optimize = "false"
OutputPath = "bin\Debug\"
RegisterForComInterop = "false"
RemoveIntegerChecks = "false"
TreatWarningsAsErrors = "false"
WarningLevel = "1"
/>
<Config
Name = "Debug 2.0"
AllowUnsafeBlocks = "true"
BaseAddress = "285212672"
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
DefineConstants = "NET_2_0"
DocumentationFile = ""
DebugSymbols = "true"
FileAlignment = "4096"
IncrementalBuild = "false"
NoStdLib = "false"
NoWarn = ""
Optimize = "false"
OutputPath = "bin\Debug\"
RegisterForComInterop = "false"
RemoveIntegerChecks = "false"
TreatWarningsAsErrors = "false"
WarningLevel = "1"
/>
<Config
Name = "Release"
AllowUnsafeBlocks = "true"
BaseAddress = "285212672"
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
DefineConstants = "NET_1_1 ONLY_1_1"
DocumentationFile = ""
DebugSymbols = "false"
FileAlignment = "4096"
IncrementalBuild = "false"
NoStdLib = "false"
NoWarn = ""
Optimize = "false"
OutputPath = "bin\Release\"
RegisterForComInterop = "false"
RemoveIntegerChecks = "false"
TreatWarningsAsErrors = "false"
WarningLevel = "1"
/>
<Config
Name = "Release 2.0"
AllowUnsafeBlocks = "true"
BaseAddress = "285212672"
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
DefineConstants = "NET_2_0"
DocumentationFile = ""
DebugSymbols = "false"
FileAlignment = "4096"
IncrementalBuild = "false"
NoStdLib = "false"
NoWarn = ""
Optimize = "false"
OutputPath = "bin\Release\"
RegisterForComInterop = "false"
RemoveIntegerChecks = "false"
TreatWarningsAsErrors = "false"
WarningLevel = "1"
/>
</Settings>
<References>
<Reference
Name = "Accessibility"
AssemblyName = "Accessibility"
HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\Accessibility.dll"
/>
<Reference
Name = "System"
AssemblyName = "System"
HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
/>
<Reference
Name = "System.Data"
AssemblyName = "System.Data"
HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
/>
<Reference
Name = "System.Drawing"
AssemblyName = "System.Drawing"
HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
/>
<Reference
Name = "System.Data"
AssemblyName = "System.Data"
HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
/>
<Reference
Name = "System.XML"
AssemblyName = "System.XML"
HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
/>
</References>
</Build>
<Files>
<Include>
EOT
}
SWFfilelist()
{
cat $Source | while read SRC; do
# Don't do AssemblyInfo, it's got signing requests and such that we don't want
if [ "x$SRC" != "xAssembly/AssemblyInfo.cs" ] ; then
SRC=`echo $SRC | $tr '/' '\\\\'`
cat << EOT
<File
RelPath = "$SRC"
SubType = "Code"
BuildAction = "Compile"
/>
EOT
fi
done
}
SWFresourcelist()
{
cat $Resource | while read SRC; do
SRC=`echo $SRC | $tr '/' '\\\\'`
SRC=`echo $SRC | sed 's/-resource://' | awk -F , '{print " RelPath = \"" $1 "\"\n CustomToolNameSpace = \"" $2 "\""}' | fgrep -v \"\"`
cat << EOT
<File
$SRC
BuildAction = "EmbeddedResource"
/>
EOT
done
}
SWFtail()
{
cat << EOT
<File
RelPath = "Consts.cs"
Link = "common/Consts.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "MonoTODOAttribute.cs"
Link = "common/MonoTODOAttribute.cs"
SubType = "Code"
BuildAction = "Compile"
/>
</Include>
</Files>
</CSHARP>
</VisualStudioProject>
EOT
}
SWFhead > $OutFile
SWFfilelist >> $OutFile
SWFresourcelist >> $OutFile
SWFtail >> $OutFile
+247
View File
@@ -0,0 +1,247 @@
#!/bin/bash
#
# This script will generate SWF.cs.target from our System.Windows.Forms.dll.sources
#
#
exec > SWF2k5.csproj
Source=System.Windows.Forms.dll.sources
Resource=System.Windows.Forms.dll.resources
SWFhead()
{
cat <<EOF
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5E6430B2-6B9F-4E76-802E-20207EF80391}</ProjectGuid>
<Configuration Condition=" '\$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '\$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>System.Windows.Forms</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
<RootNamespace>
</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
</PropertyGroup>
<PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1 NET_2_0 MWF_ON_MSRUNTIME</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>612,618,3021</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<OutputType>Library</OutputType>
<AssemblyName>System.Windows.Forms</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1 NET_2_0 MWF_ON_MSRUNTIME</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>612,618,3021</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
<OutputType>Library</OutputType>
<AssemblyName>System.Windows.Forms</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Debug 1.1|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1 ONLY_1_1 MWF_ON_MSRUNTIME</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>612,618,3021</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<OutputType>Library</OutputType>
<AssemblyName>System.Windows.Forms</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Release 1.1|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1 ONLY_1_1 MWF_ON_MSRUNTIME</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>612,618,3021</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
<OutputType>Library</OutputType>
<AssemblyName>System.Windows.Forms</AssemblyName>
</PropertyGroup>
<ItemGroup>
<Reference Include="Accessibility">
<Name>Accessibility</Name>
</Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
<Reference Include="System.configuration" />
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Drawing">
<Name>System.Drawing</Name>
</Reference>
<Reference Include="System.Xml">
<Name>System.Xml</Name>
</Reference>
<Reference Include="Mono.WebBrowser2K5">
<Name>Mono.WebBrowser2K5</Name>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mono.WebBrowser\Mono.WebBrowser2K5.csproj">
<Project>{5E6C996A-007F-40CE-B244-006EFCFB77D2}</Project>
<Name>Mono.WebBrowser2K5</Name>
</ProjectReference>
</ItemGroup>
EOF
}
SWFtail()
{
cat <<EOF
<ItemGroup>
<None Include="System.Windows.Forms\ChangeLog" />
</ItemGroup>
<ItemGroup>
<None Include="ChangeLog" />
</ItemGroup>
<Import Project="\$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
EOF
}
SWFfilelist()
{
echo " <ItemGroup>"
cat $Source | while read SRC; do
# Don't do AssemblyInfo, it's got signing requests and such that we don't want
if [ "x$SRC" != "xAssembly/AssemblyInfo.cs" ] ; then
SRC=`echo $SRC | sed 's/..\/..\/build\///'`
SRC=`echo $SRC | tr '/' '\\\\'`
cat <<EOF
<Compile Include="$SRC" />
EOF
fi
done
echo " </ItemGroup>"
}
SWFresourcelist()
{
echo " <ItemGroup>"
cat $Resource | while read SRC; do
CUSTOMTOOLNAMESPACE=""
# strip out that -resource:
SRC=`echo $SRC | sed 's/-resource://'`
CUSTOMTOOLNAMESPACE=`echo $SRC | awk -F, '{print $2}'`
INCLUDE=`echo $SRC | awk -F, '{print $1}'`
if test -f $INCLUDE.prebuilt; then
INCLUDE=$INCLUDE.prebuilt
fi
# strip off the path from the name of the resource and the .prebuilt if there is one
LOGICALNAME=`echo $INCLUDE | sed 's/resources\///;s/.prebuilt//'`
# convert all /'s to \\'s
INCLUDE=`echo $INCLUDE | sed 's/\//\\\\/'`
echo " <EmbeddedResource Include=\"$INCLUDE\">"
if test "x$CUSTOMTOOLNAMESPACE" != "x"; then
echo " <LogicalName>$CUSTOMTOOLNAMESPACE</LogicalName>"
else
echo " <LogicalName>$LOGICALNAME</LogicalName>"
fi
echo " </EmbeddedResource>"
done
echo " </ItemGroup>"
}
SWFhead
SWFfilelist
SWFresourcelist
SWFtail
+267
View File
@@ -0,0 +1,267 @@
#!/bin/bash
#
# This script will generate SWF2K5-tests.cs.target from our System.Windows.Forms.dll.sources
#
#
exec > SWF2k5-tests.csproj
Source=System.Windows.Forms_test.dll.sources
Resource=System.Windows.Forms.dll.resources
SWFhead()
{
cat <<EOF
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5E6430B2-6B9F-4E76-802E-20207EF80391}</ProjectGuid>
<Configuration Condition=" '\$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '\$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>System.Windows.Forms_test</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
<RootNamespace>
</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
</PropertyGroup>
<PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1 ONLY_1_1 __MonoCS__ DEBUG</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Debug 2.0|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_2_0 __MonoCS__ DEBUG</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1 ONLY_1_1 __MonoCS__</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Release 2.0|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_2_0 __MonoCS__</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'net_2_0|AnyCPU' ">
<OutputPath>.\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1 NET_2_0 __MonoCS__ DEBUG</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<AssemblyName>System.Windows.Forms_test_net_2_0</AssemblyName>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\winforms-unittests\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Accessibility">
<Name>Accessibility</Name>
</Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Drawing">
<Name>System.Drawing</Name>
</Reference>
<Reference Include="System.Windows.Forms">
<Name>System.Windows.Forms</Name>
</Reference>
<Reference Include="System.Xml">
<Name>System.Xml</Name>
</Reference>
</ItemGroup>
EOF
}
SWFtail()
{
cat <<EOF
<ItemGroup>
<None Include="Test\System.Windows.Forms\ChangeLog" />
</ItemGroup>
<ItemGroup>
<None Include="Test\System.Resources\ChangeLog" />
</ItemGroup>
<ItemGroup>
<None Include="Test\System.Windows.Forms.Layout\ChangeLog" />
</ItemGroup>
<Import Project="\$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
EOF
}
SWFfilelist()
{
echo " <ItemGroup>"
cat $Source | while read SRC; do
# Don't do AssemblyInfo, it's got signing requests and such that we don't want
if [ "x$SRC" != "xAssembly/AssemblyInfo.cs" ] ; then
SRC=`echo Test/$SRC`
SRC=`echo $SRC | sed 's/Test\/..\/..\/..\/build\///'`
SRC=`echo $SRC | tr '/' '\\\\'`
cat <<EOF
<Compile Include="$SRC" />
EOF
fi
done
echo " </ItemGroup>"
}
SWFresourcelist()
{
echo " <ItemGroup>"
cat $Resource | while read SRC; do
CUSTOMTOOLNAMESPACE=""
# strip out that -resource:
SRC=`echo $SRC | sed 's/-resource://'`
CUSTOMTOOLNAMESPACE=`echo $SRC | awk -F, '{print $2}'`
INCLUDE=`echo $SRC | awk -F, '{print $1}'`
if test -f $INCLUDE.prebuilt; then
INCLUDE=$INCLUDE.prebuilt
fi
# strip off the path from the name of the resource and the .prebuilt if there is one
LOGICALNAME=`echo $INCLUDE | sed 's/resources\///;s/.prebuilt//'`
# convert all /'s to \\'s
INCLUDE=`echo $INCLUDE | sed 's/\//\\\\/'`
echo " <EmbeddedResource Include=\"$INCLUDE\">"
echo " <LogicalName>$LOGICALNAME</LogicalName>"
if test "x$CUSTOMTOOLNAMESPACE" != "x"; then
echo " <CustomToolNameSpace>$CUSTOMTOOLNAMESPACE</CustomToolNameSpace>"
fi
echo " </EmbeddedResource>"
done
echo " </ItemGroup>"
}
SWFhead
SWFfilelist
#SWFresourcelist
SWFtail
@@ -78,38 +78,43 @@ namespace Microsoft.Build.BuildEngine {
if (propertyName != null)
element.SetAttribute ("PropertyName", propertyName);
}
[MonoTODO]
public bool Execute ()
{
bool result = false;
TaskEngine taskEngine;
LogTaskStarted ();
ITask task;
ITask task = null;
try {
task = InitializeTask ();
} catch (Exception e) {
LogError ("Error initializing task {0}: {1}", taskElement.LocalName, e.Message);
LogMessage (MessageImportance.Low, "Error initializing task {0}: {1}",
taskElement.LocalName, e.ToString ());
return false;
}
try {
taskEngine = new TaskEngine (parentTarget.Project, task, Type);
taskEngine.Prepare (GetParameters ());
var result = taskEngine.Execute ();
if (result)
taskEngine.PublishOutput (taskElement, taskEngine.ValueFromExecution);
try {
task = InitializeTask ();
} catch (Exception e) {
LogError ("Error initializing task {0}: {1}", taskElement.LocalName, e.Message);
LogMessage (MessageImportance.Low, "Error initializing task {0}: {1}",
taskElement.LocalName, e.ToString ());
return false;
}
try {
taskEngine = new TaskEngine (parentTarget.Project);
taskEngine.Prepare (task, this.taskElement, GetParameters (), this.Type);
result = taskEngine.Execute ();
if (result)
taskEngine.PublishOutput ();
} catch (Exception e) {
task_logger.LogError ("Error executing task {0}: {1}", taskElement.LocalName, e.Message);
task_logger.LogMessage (MessageImportance.Low,
"Error executing task {0}: {1}", taskElement.LocalName, e.ToString ());
result = false;
}
} finally {
LogTaskFinished (result);
return result;
} catch (Exception e) {
task_logger.LogError ("Error executing task {0}: {1}", taskElement.LocalName, e.Message);
task_logger.LogMessage (MessageImportance.Low,
"Error executing task {0}: {1}", taskElement.LocalName, e.ToString ());
return false;
}
return result;
}
@@ -135,21 +140,6 @@ namespace Microsoft.Build.BuildEngine {
return taskElement.GetAttribute (attributeName);
}
bool IBuildTask.ResolveOutputItems ()
{
var taskEngine = new TaskEngine (parentTarget.Project, null, Type);
taskEngine.PublishOutput (taskElement, l => {
var pv = GetParameterValue (l.Name);
Expression exp = new Expression ();
exp.Parse (pv, ParseOptions.AllowItemsMetadataAndSplit);
return exp.ConvertTo (parentTarget.Project, l.PropertyType);
});
return true;
}
public void SetParameterValue (string parameterName,
string parameterValue)
@@ -73,11 +73,6 @@ namespace Microsoft.Build.BuildEngine
foreach (XmlAttribute attrib in XmlElement.Attributes)
yield return attrib.Value;
}
public bool ResolveOutputItems ()
{
return true;
}
}
}
@@ -52,11 +52,7 @@ namespace Microsoft.Build.BuildEngine {
{
return GetAttributes ();
}
public bool ResolveOutputItems ()
{
return true;
}
}
}
@@ -38,7 +38,6 @@ namespace Microsoft.Build.BuildEngine {
}
bool Execute ();
bool ResolveOutputItems ();
IEnumerable<string> GetAttributes ();
}
@@ -36,6 +36,7 @@ using System.Xml;
using Microsoft.Build.Framework;
namespace Microsoft.Build.BuildEngine {
internal class TargetBatchingImpl : BatchingImplBase
{
string inputs;
@@ -57,6 +58,17 @@ namespace Microsoft.Build.BuildEngine {
{
executeOnErrors = false;
try {
string reason;
if (!BuildTargetNeeded (out reason)) {
LogTargetStarted (target);
LogTargetSkipped (target, reason);
LogTargetFinished (target, true);
return true;
}
if (!String.IsNullOrEmpty (reason))
target.Engine.LogMessage (MessageImportance.Low, reason);
Init ();
ParseTargetAttributes (target);
@@ -92,29 +104,24 @@ namespace Microsoft.Build.BuildEngine {
executeOnErrors = false;
LogTargetStarted (target);
if (bucket != null)
project.PushBatch (bucket, commonItemsByName);
try {
TaskExecutionMode taskExecutionMode;
string reason;
if (!BuildTargetNeeded (out reason)) {
LogTargetSkipped (target, reason);
taskExecutionMode = TaskExecutionMode.SkipAndSetOutput;
} else {
taskExecutionMode = TaskExecutionMode.Complete;
if (!String.IsNullOrEmpty (reason))
target.Engine.LogMessage (MessageImportance.Low, reason);
return true;
}
if (!String.IsNullOrEmpty (reason))
target.Engine.LogMessage (MessageImportance.Low, reason);
for (int i = 0; i < target.BuildTasks.Count; i ++) {
//FIXME: parsing attributes repeatedly
IBuildTask bt = target.BuildTasks [i];
TaskBatchingImpl batchingImpl = new TaskBatchingImpl (project);
bool task_result = batchingImpl.Build (bt, taskExecutionMode, out executeOnErrors);
bool task_result = batchingImpl.Build (bt, out executeOnErrors);
if (task_result)
continue;
@@ -131,7 +138,6 @@ namespace Microsoft.Build.BuildEngine {
} finally {
if (bucket != null)
project.PopBatch ();
LogTargetFinished (target, target_result);
}
@@ -40,7 +40,7 @@ namespace Microsoft.Build.BuildEngine {
{
}
public bool Build (IBuildTask buildTask, TaskExecutionMode taskExecutionMode, out bool executeOnErrors)
public bool Build (IBuildTask buildTask, out bool executeOnErrors)
{
executeOnErrors = false;
try {
@@ -49,11 +49,15 @@ namespace Microsoft.Build.BuildEngine {
// populate list of referenced items and metadata
ParseTaskAttributes (buildTask);
if (consumedMetadataReferences.Count == 0) {
return Execute (buildTask, taskExecutionMode);
// No batching required
if (ConditionParser.ParseAndEvaluate (buildTask.Condition, project))
return buildTask.Execute ();
else // skipped, it should be logged
return true;
}
BatchAndPrepareBuckets ();
return Run (buildTask, taskExecutionMode, out executeOnErrors);
return Run (buildTask, out executeOnErrors);
} finally {
consumedItemsByName = null;
consumedMetadataReferences = null;
@@ -64,7 +68,7 @@ namespace Microsoft.Build.BuildEngine {
}
}
bool Run (IBuildTask buildTask, TaskExecutionMode taskExecutionMode, out bool executeOnErrors)
bool Run (IBuildTask buildTask, out bool executeOnErrors)
{
executeOnErrors = false;
@@ -72,9 +76,11 @@ namespace Microsoft.Build.BuildEngine {
bool retval = true;
if (buckets.Count == 0) {
// batched mode, but no values in the corresponding items!
retval = Execute (buildTask, taskExecutionMode);
if (!retval && !buildTask.ContinueOnError)
executeOnErrors = true;
if (ConditionParser.ParseAndEvaluate (buildTask.Condition, project)) {
retval = buildTask.Execute ();
if (!retval && !buildTask.ContinueOnError)
executeOnErrors = true;
}
return retval;
}
@@ -83,10 +89,12 @@ namespace Microsoft.Build.BuildEngine {
foreach (Dictionary<string, BuildItemGroup> bucket in buckets) {
project.PushBatch (bucket, commonItemsByName);
try {
retval = Execute (buildTask, taskExecutionMode);
if (!retval && !buildTask.ContinueOnError) {
executeOnErrors = true;
break;
if (ConditionParser.ParseAndEvaluate (buildTask.Condition, project)) {
retval = buildTask.Execute ();
if (!retval && !buildTask.ContinueOnError) {
executeOnErrors = true;
break;
}
}
} finally {
project.PopBatch ();
@@ -96,22 +104,6 @@ namespace Microsoft.Build.BuildEngine {
return retval;
}
bool Execute (IBuildTask buildTask, TaskExecutionMode taskExecutionMode)
{
if (ConditionParser.ParseAndEvaluate (buildTask.Condition, project)) {
switch (taskExecutionMode) {
case TaskExecutionMode.Complete:
return buildTask.Execute ();
case TaskExecutionMode.SkipAndSetOutput:
return buildTask.ResolveOutputItems ();
default:
throw new NotImplementedException ();
}
}
return true;
}
// Parse task attributes to get list of referenced metadata and items
// to determine batching
@@ -38,9 +38,10 @@ using Microsoft.Build.Utilities;
namespace Microsoft.Build.BuildEngine {
internal class TaskEngine {
ITask task;
XmlElement taskElement;
Type taskType;
Project parentProject;
ITask task;
static Type requiredAttribute;
static Type outputAttribute;
@@ -51,11 +52,9 @@ namespace Microsoft.Build.BuildEngine {
outputAttribute = typeof (Microsoft.Build.Framework.OutputAttribute);
}
public TaskEngine (Project project, ITask task, Type taskType)
public TaskEngine (Project project)
{
parentProject = project;
this.task = task;
this.taskType = taskType;
}
// Rules (inferred) for property values incase of empty data
@@ -70,13 +69,17 @@ namespace Microsoft.Build.BuildEngine {
// string/
// ITaskItem[] empty/whitespace null No
public void Prepare (IDictionary <string, string> parameters)
public void Prepare (ITask task, XmlElement taskElement,
IDictionary <string, string> parameters, Type taskType)
{
Dictionary <string, object> values;
PropertyInfo currentProperty;
PropertyInfo[] properties;
object value;
this.task = task;
this.taskElement = taskElement;
this.taskType = taskType;
values = new Dictionary <string, object> (StringComparer.OrdinalIgnoreCase);
foreach (KeyValuePair <string, string> de in parameters) {
@@ -128,18 +131,20 @@ namespace Microsoft.Build.BuildEngine {
InitializeParameter (pi, val);
}
}
public bool Execute ()
{
return task.Execute ();
}
public void PublishOutput (XmlElement taskElement, Func<PropertyInfo, object> valueProvider)
public void PublishOutput ()
{
XmlElement xmlElement;
PropertyInfo propertyInfo;
string propertyName;
string taskParameter;
string itemName;
object o;
foreach (XmlNode xmlNode in taskElement.ChildNodes) {
if (!(xmlNode is XmlElement))
@@ -160,17 +165,16 @@ namespace Microsoft.Build.BuildEngine {
taskParameter = xmlElement.GetAttribute ("TaskParameter");
itemName = xmlElement.GetAttribute ("ItemName");
propertyName = xmlElement.GetAttribute ("PropertyName");
var propertyInfo = taskType.GetProperty (taskParameter, BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase);
if (propertyInfo == null)
throw new InvalidProjectFileException (String.Format ("The parameter '{0}' was not found for the '{1}' task.", taskParameter, taskElement.Name));
if (!propertyInfo.IsDefined (outputAttribute, false))
throw new InvalidProjectFileException ("This is not output property.");
var o = valueProvider (propertyInfo);
propertyInfo = taskType.GetProperty (taskParameter, BindingFlags.Public | BindingFlags.Instance |
BindingFlags.IgnoreCase);
if (propertyInfo == null)
throw new InvalidProjectFileException (String.Format (
"The parameter '{0}' was not found for the '{1}' task.", taskParameter, taskElement.Name));
if (!propertyInfo.IsDefined (outputAttribute, false))
throw new InvalidProjectFileException ("This is not output property.");
o = propertyInfo.GetValue (task, null);
if (itemName != String.Empty) {
PublishItemGroup (propertyInfo, o, itemName);
} else {
@@ -256,10 +260,5 @@ namespace Microsoft.Build.BuildEngine {
return true;
}
public object ValueFromExecution (PropertyInfo propertyInfo)
{
return propertyInfo.GetValue (task, null);
}
}
}
@@ -65,7 +65,6 @@ Microsoft.Build.BuildEngine/TargetCollection.cs
Microsoft.Build.BuildEngine/Target.cs
Microsoft.Build.BuildEngine/TaskDatabase.cs
Microsoft.Build.BuildEngine/TaskEngine.cs
Microsoft.Build.BuildEngine/TaskExecutionMode.cs
Microsoft.Build.BuildEngine/Token.cs
Microsoft.Build.BuildEngine/Toolset.cs
Microsoft.Build.BuildEngine/ToolsetCollection.cs
@@ -1402,8 +1402,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
}
[Test]
// Fails on wrench
[Category ("NotWorking")]
public void TestItemsWithWildcards ()
{
Engine engine = new Engine (Consts.BinPath);
@@ -1478,8 +1476,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
}
[Test]
// Fails on wrench
[Category ("NotWorking")]
public void TestReservedMetadata ()
{
Engine engine = new Engine (Consts.BinPath);
@@ -0,0 +1,66 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{1D0190A3-E345-45EC-9DCD-7B12BB6A7CC9}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Build.Framework.Test</RootNamespace>
<AssemblyName>Microsoft.Build.Framework.Test</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>.\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Test\Microsoft.Build.Framework\BuildErrorEventArgsTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\BuildEventArgsTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\BuildFinishedEventArgsTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\BuildMessageEventArgsTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\BuildStartedEventArgsTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\BuildWarningEventArgsTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\ExternalProjectFinishedEventArgsTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\ExternalProjectStartedEventArgsTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\LoggerExceptionTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\ProjectFinishedEventArgsTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\ProjectStartedEventArgsTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\TargetFinishedEventArgsTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\TargetStartedEventArgsTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\TaskCommandLineEventArgsTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\TaskFinishedEventArgsTest.cs" />
<Compile Include="Test\Microsoft.Build.Framework\TaskStartedEventArgsTest.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
@@ -0,0 +1,20 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.Framework.Test", "Microsoft.Build.Framework.Test.csproj", "{1D0190A3-E345-45EC-9DCD-7B12BB6A7CC9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1D0190A3-E345-45EC-9DCD-7B12BB6A7CC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D0190A3-E345-45EC-9DCD-7B12BB6A7CC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D0190A3-E345-45EC-9DCD-7B12BB6A7CC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1D0190A3-E345-45EC-9DCD-7B12BB6A7CC9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -83,11 +83,6 @@ namespace Microsoft.Build.Framework
get {
return message;
}
#if NET_4_0
protected set {
message = value;
}
#endif
}
public string SenderName {
@@ -26,12 +26,12 @@ namespace Microsoft.Build.Framework
{
}
public BuildEventContext (int nodeId, int projectInstanceId, int projectContextId, int targetId, int taskId)
: this (rnd.Next (), nodeId, projectInstanceId, projectContextId, targetId, taskId)
public BuildEventContext (int nodeId, int projectInstanceId, int targetId, int projectContextId, int taskId)
: this (rnd.Next (), nodeId, projectInstanceId, targetId, projectContextId, taskId)
{
}
public BuildEventContext (int submissionId, int nodeId, int projectInstanceId, int projectContextId, int targetId, int taskId)
public BuildEventContext (int submissionId, int nodeId, int projectInstanceId, int targetId, int projectContextId, int taskId)
{
SubmissionId = submissionId;
NodeId = nodeId;
@@ -56,9 +56,9 @@ namespace Microsoft.Build.Framework
public int TaskId { get; private set; }
// MSDN document says "true if the references are equal, false otherwise." but that doesn't make sense.
public override bool Equals (object obj)
public override bool Equals (object other)
{
var o = obj as BuildEventContext;
var o = other as BuildEventContext;
return (object) o != null &&
o.NodeId == NodeId &&
o.ProjectContextId == ProjectContextId &&
@@ -32,7 +32,7 @@ using System;
namespace Microsoft.Build.Framework
{
[Serializable]
public class LazyFormattedBuildEventArgs : BuildEventArgs {
public abstract class LazyFormattedBuildEventArgs : BuildEventArgs {
string message, format;
object[] args;
@@ -3,8 +3,8 @@ namespace Microsoft.Build.Framework
{
public enum RegisteredTaskObjectLifetime
{
Build,
AppDomain
AppDomain,
Build
}
}
#endif
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{01D4DF2C-F88B-43F1-B935-25CC0EE900C7}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Build.Tasks.Test</RootNamespace>
<AssemblyName>Microsoft.Build.Tasks.Test</AssemblyName>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>False</Optimize>
<OutputPath>./</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<OutputType>Library</OutputType>
<AssemblyName>Microsoft.Build.Tasks.Test</AssemblyName>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>True</Optimize>
<OutputPath>./bin/Release/</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<OutputType>Library</OutputType>
<AssemblyName>Microsoft.Build.Tasks.Test</AssemblyName>
<DebugSymbols>True</DebugSymbols>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<Compile Include="Test\Microsoft.Build.Tasks\ALTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\Consts.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\CreateItemTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\CreatePropertyTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\CscTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\ErrorTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\GetFrameworkPathTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\GetFrameworkSdkPathTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\MakeDirTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\ManagedCompilerTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\MessageTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\RemoveDirTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\TestEngine.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\WarningTest.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.Build.Engine" />
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Microsoft.Build.Tasks" />
<Reference Include="Microsoft.Build.Utilities" />
<Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
</Project>
@@ -0,0 +1,20 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C# Express 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.Tasks.Test", "Microsoft.Build.Tasks.Test.csproj", "{01D4DF2C-F88B-43F1-B935-25CC0EE900C7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{01D4DF2C-F88B-43F1-B935-25CC0EE900C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{01D4DF2C-F88B-43F1-B935-25CC0EE900C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{01D4DF2C-F88B-43F1-B935-25CC0EE900C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{01D4DF2C-F88B-43F1-B935-25CC0EE900C7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -41,7 +41,7 @@ using System.Collections.Specialized;
namespace Microsoft.Build.Tasks
{
public class CodeTaskFactory : ITaskFactory
public class CodeTaskFactory : ITaskFactory2
{
public CodeTaskFactory ()
{
@@ -51,12 +51,11 @@ namespace Microsoft.Build.Tasks
public void CleanupTask (ITask task)
{
}
public ITask CreateTask (IBuildEngine loggingHost)
public ITask CreateTask (IBuildEngine taskFactoryLoggingHost)
{
return CreateTask (loggingHost, null);
return CreateTask (taskFactoryLoggingHost, null);
}
ITask CreateTask (IBuildEngine taskFactoryLoggingHost, IDictionary<string, string> taskIdentityParameters)
public ITask CreateTask (IBuildEngine taskFactoryLoggingHost, IDictionary<string, string> taskIdentityParameters)
{
if (assembly == null)
return null;
@@ -67,11 +66,11 @@ namespace Microsoft.Build.Tasks
{
return parameter_group != null ? parameter_group.Values.ToArray () : new TaskPropertyInfo [0];
}
public bool Initialize (string taskName, IDictionary<string, TaskPropertyInfo> taskParameters, string taskElementContents, IBuildEngine taskFactoryLoggingHost)
public bool Initialize (string taskName, IDictionary<string, TaskPropertyInfo> parameterGroup, string taskBody, IBuildEngine taskFactoryLoggingHost)
{
return Initialize (taskName, null, taskParameters, taskElementContents, taskFactoryLoggingHost);
return Initialize (taskName, null, parameterGroup, taskBody, taskFactoryLoggingHost);
}
bool Initialize (string taskName, IDictionary<string, string> factoryIdentityParameters, IDictionary<string, TaskPropertyInfo> parameterGroup, string taskBody, IBuildEngine taskFactoryLoggingHost)
public bool Initialize (string taskName, IDictionary<string, string> factoryIdentityParameters, IDictionary<string, TaskPropertyInfo> parameterGroup, string taskBody, IBuildEngine taskFactoryLoggingHost)
{
task_name = taskName;
if (parameterGroup != null)
@@ -122,7 +122,7 @@ namespace Microsoft.Build.Tasks {
protected abstract string CreateManifestName (string fileName,
string linkFileName,
string rootNamespaceName,
string rootNamespace,
string dependentUponFileName,
Stream binaryStream);
@@ -26,7 +26,7 @@
///// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/////
#if !NET_4_0
#if NET_2_0
using System;
using Microsoft.Build.Framework;
@@ -25,6 +25,8 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#if NET_2_0
using System;
using System.IO;
using Microsoft.Build.Framework;
@@ -100,12 +102,12 @@ namespace Microsoft.Build.Tasks {
//
if (References != null)
foreach (ITaskItem item in References) {
string aliases = item.GetMetadata ("Aliases");
if (!string.IsNullOrEmpty (aliases)) {
AddAliasesReference (commandLine, aliases, item.ItemSpec);
} else {
string aliases = item.GetMetadata ("Aliases") ?? String.Empty;
aliases = aliases.Trim ();
if (aliases.Length > 0)
commandLine.AppendSwitchIfNotNull ("/reference:" + aliases + "=", item.ItemSpec);
else
commandLine.AppendSwitchIfNotNull ("/reference:", item.ItemSpec);
}
}
if (ResponseFiles != null)
@@ -123,21 +125,6 @@ namespace Microsoft.Build.Tasks {
commandLine.AppendSwitchIfNotNull ("/win32res:", Win32Resource);
}
static void AddAliasesReference (CommandLineBuilderExtension commandLine, string aliases, string reference)
{
foreach (var alias in aliases.Split (',')) {
var a = alias.Trim ();
if (a.Length == null)
continue;
var r = "/reference:";
if (!string.Equals (a, "global", StringComparison.OrdinalIgnoreCase))
r += a + "=";
commandLine.AppendSwitchIfNotNull (r, reference);
}
}
[MonoTODO]
protected override bool CallHostObjectToExecute ()
{
@@ -245,3 +232,4 @@ namespace Microsoft.Build.Tasks {
}
}
#endif
@@ -122,13 +122,13 @@ namespace Microsoft.Build.Tasks {
Log.LogMessage (MessageImportance.Normal, "Executing: " + command);
}
protected override void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
protected override void LogEventsFromTextOutput (string singleLine, MessageImportance importance)
{
#if NET_4_0
if (IgnoreStandardErrorWarningFormat ||
(!errorMatcher (singleLine) && !warningMatcher (singleLine)))
#endif
Log.LogMessage (messageImportance, singleLine);
Log.LogMessage (importance, singleLine);
}
#if NET_4_0
@@ -36,7 +36,7 @@ using Microsoft.Build.Utilities;
namespace Microsoft.Build.Tasks {
//FIXME: This should be in v3.5 only
public class FindAppConfigFile : TaskExtension {
public sealed class FindAppConfigFile : TaskExtension {
public FindAppConfigFile ()
{
@@ -222,6 +222,7 @@ namespace Microsoft.Build.Tasks
"It should have either 2 or 3 comma separated components.", moniker_literal);
}
[Required]
public string TargetFrameworkMoniker { get; set; }
public string RootPath { get; set; }
@@ -232,10 +233,10 @@ namespace Microsoft.Build.Tasks
public string TargetFrameworkMonikerDisplayName { get; set; }
[Output]
public string[] ReferenceAssemblyPaths { get; private set; }
public string[] ReferenceAssemblyPaths { get; set; }
[Output]
public string[] FullFrameworkReferenceAssemblyPaths { get; private set; }
public string[] FullFrameworkReferenceAssemblyPaths { get; set; }
static string DefaultFrameworksBasePath {
get {
@@ -53,6 +53,7 @@ namespace Microsoft.Build.Tasks {
bool findRelatedFiles;
bool findSatellites;
bool findSerializationAssemblies;
string[] installedAssemblyTables;
ITaskItem[] relatedFiles;
ITaskItem[] resolvedDependencyFiles;
ITaskItem[] resolvedFiles;
@@ -155,9 +156,6 @@ namespace Microsoft.Build.Tasks {
LogWithPrecedingNewLine (MessageImportance.Low, "Primary Reference {0}", item.ItemSpec);
ResolvedReference resolved_ref = ResolveReference (item, searchPaths, true);
if (resolved_ref == null)
resolved_ref = ResolveWithAlternateName (item, allowedAssemblyExtensions ?? default_assembly_extensions);
if (resolved_ref == null) {
Log.LogWarning ("Reference '{0}' not resolved", item.ItemSpec);
assembly_resolver.LogSearchLoggerMessages (MessageImportance.Normal);
@@ -184,19 +182,6 @@ namespace Microsoft.Build.Tasks {
}
}
ResolvedReference ResolveWithAlternateName (ITaskItem item, string[] extensions)
{
foreach (string extn in extensions) {
if (item.ItemSpec.EndsWith (extn)) {
ITaskItem altitem = new TaskItem (item.ItemSpec.Substring (0, item.ItemSpec.Length - extn.Length));
item.CopyMetadataTo (altitem);
return ResolveReference (altitem, searchPaths, true);
}
}
return null;
}
// Use @search_paths to resolve the reference
ResolvedReference ResolveReference (ITaskItem item, IEnumerable<string> search_paths, bool set_copy_local)
{
@@ -625,15 +610,12 @@ namespace Microsoft.Build.Tasks {
get { return findSerializationAssemblies; }
set { findSerializationAssemblies = value; }
}
public
#if NET_4_0
ITaskItem[]
#else
string[]
#endif
InstalledAssemblyTables { get; set; }
public string[] InstalledAssemblyTables {
get { return installedAssemblyTables; }
set { installedAssemblyTables = value; }
}
[Output]
public ITaskItem[] RelatedFiles {
get { return relatedFiles; }
@@ -1,5 +1,5 @@
//
// VCBuild.cs
// UpdateManifest.cs
//
// Author:
// Leszek Ciesielski <[email protected]>
@@ -26,7 +26,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if !NET_4_0
#if NET_2_0
using System;
using System.Collections.Specialized;
@@ -158,7 +158,7 @@ namespace Microsoft.Build.Tasks {
return true;
}
protected override void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
protected override void LogEventsFromTextOutput (string singleLine, MessageImportance importance)
{
singleLine = singleLine.Trim ();
if (singleLine.Length == 0)
@@ -173,7 +173,7 @@ namespace Microsoft.Build.Tasks {
Match match = ErrorRegex.Match (singleLine);
if (!match.Success) {
Log.LogMessage (messageImportance, singleLine);
Log.LogMessage (importance, singleLine);
return;
}
@@ -198,7 +198,7 @@ namespace Microsoft.Build.Tasks {
Log.LogError (null, code, null, filename, lineNumber, columnNumber, -1,
-1, text, null);
} else {
Log.LogMessage (messageImportance, singleLine);
Log.LogMessage (importance, singleLine);
}
}
@@ -433,24 +433,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
Assert.AreEqual (String.Empty, c2.ToString (), "A2");
}
[Test]
public void TestReferencesAlias ()
{
CscExtended csc = new CscExtended ();
CommandLineBuilderExtension c1 = new CommandLineBuilderExtension ();
CommandLineBuilderExtension c2 = new CommandLineBuilderExtension ();
TaskItem ti1 = new TaskItem ("A");
ti1.SetMetadata ("Aliases", "r1,global,r2");
csc.References = new ITaskItem[2] { ti1, new TaskItem ("B") };
csc.ARFC (c1);
csc.ACLC (c2);
Assert.AreEqual ("/reference:r1=A /reference:A /reference:r2=A /reference:B", c1.ToString (), "A1");
Assert.AreEqual (String.Empty, c2.ToString (), "A2");
}
[Test]
public void TestResponseFiles ()
{
@@ -227,52 +227,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
";
}
[Test]
public void TestSystemDll ()
{
var gacDir = GetGacDir ();
if (gacDir == null || !System.IO.Directory.Exists (gacDir))
Assert.Ignore ("GAC not found.");
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<ItemGroup>
<Reference Include='System.dll' />
</ItemGroup>
<PropertyGroup>
<SearchPaths>
{CandidateAssemblyFiles};
$(ReferencePath);
{HintPathFromItem};
{TargetFrameworkDirectory};
{AssemblyFolders};
{GAC};
{RawFileName};
$(OutputPath)
</SearchPaths>
</PropertyGroup>
<Target Name='A'>
<ResolveAssemblyReference
Assemblies='@(Reference)'
SearchPaths='$(SearchPaths)'
>
<Output TaskParameter='ResolvedFiles' ItemName='ResolvedFiles'/>
</ResolveAssemblyReference>
</Target>
</Project>
";
engine = new Engine (Consts.BinPath);
project = engine.CreateNewProject ();
project.LoadXml (documentString);
Assert.IsTrue (project.Build ("A"), "A1");
big = project.GetEvaluatedItemsByName ("ResolvedFiles");
Assert.AreEqual (1, big.Count, "A2");
Assert.IsTrue (big [0].Include.EndsWith (".dll"), "A3");
}
string GetGacDir ()
{
// copied from mcs/tools/gacutil/driver.cs
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{DC97F667-4341-4764-8F35-E1E0B2705A51}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Build.Utilities.Test</RootNamespace>
<AssemblyName>Microsoft.Build.Utilities.Test</AssemblyName>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>.\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Microsoft.Build.Utilities" />
<Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Test\Microsoft.Build.Utilities\CommandLineBuilderTest.cs" />
<Compile Include="Test\Microsoft.Build.Utilities\LoggerTest.cs" />
<Compile Include="Test\Microsoft.Build.Utilities\TaskItemTest.cs" />
<Compile Include="Test\Microsoft.Build.Utilities\TaskLoggingHelperTest.cs" />
<Compile Include="Test\Microsoft.Build.Utilities\ToolTaskTest.cs" />
</ItemGroup>
</Project>
@@ -0,0 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C# Express 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.Utilities.Test", "Microsoft.Build.Utilities.Test.csproj", "{DC97F667-4341-4764-8F35-E1E0B2705A51}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DC97F667-4341-4764-8F35-E1E0B2705A51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DC97F667-4341-4764-8F35-E1E0B2705A51}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DC97F667-4341-4764-8F35-E1E0B2705A51}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DC97F667-4341-4764-8F35-E1E0B2705A51}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -112,9 +112,9 @@ namespace Microsoft.Build.Utilities
}
[MonoTODO]
public bool IsVerbosityAtLeast (LoggerVerbosity checkVerbosity)
public bool IsVerbosityAtLeast (LoggerVerbosity verbosity)
{
return this.verbosity >= checkVerbosity;
return (this.verbosity >= verbosity) ? true : false;
}
}
}
@@ -127,31 +127,31 @@ namespace Microsoft.Build.Utilities
hasLoggedErrors = true;
}
public void LogErrorFromException (Exception exception)
public void LogErrorFromException (Exception e)
{
LogErrorFromException (exception, true);
LogErrorFromException (e, true);
}
public void LogErrorFromException (Exception exception,
public void LogErrorFromException (Exception e,
bool showStackTrace)
{
LogErrorFromException (exception, showStackTrace, true, String.Empty);
LogErrorFromException (e, showStackTrace, true, String.Empty);
}
[MonoTODO ("Arguments @showDetail and @file are not honored")]
public void LogErrorFromException (Exception exception,
public void LogErrorFromException (Exception e,
bool showStackTrace, bool showDetail, string file)
{
if (exception == null)
throw new ArgumentNullException ("exception");
if (e == null)
throw new ArgumentNullException ("e");
StringBuilder sb = new StringBuilder ();
sb.Append (exception.Message);
sb.Append (e.Message);
if (showStackTrace == true)
sb.Append (exception.StackTrace);
sb.Append (e.StackTrace);
BuildErrorEventArgs beea = new BuildErrorEventArgs (
null, null, buildEngine.ProjectFileOfTaskNode, 0, 0, 0, 0, sb.ToString (),
exception.HelpLink, exception.Source);
e.HelpLink, e.Source);
buildEngine.LogErrorEvent (beea);
hasLoggedErrors = true;
}
@@ -239,16 +239,16 @@ namespace Microsoft.Build.Utilities
messageResourceName), messageArgs);
}
public bool LogMessagesFromFile (string fileName)
public bool LogMessagesFromFile (string filename)
{
return LogMessagesFromFile (fileName, MessageImportance.Normal);
return LogMessagesFromFile (filename, MessageImportance.Normal);
}
public bool LogMessagesFromFile (string fileName,
public bool LogMessagesFromFile (string filename,
MessageImportance messageImportance)
{
try {
StreamReader sr = new StreamReader (fileName);
StreamReader sr = new StreamReader (filename);
LogMessage (messageImportance, sr.ReadToEnd (),
null);
sr.Close ();
@@ -276,14 +276,14 @@ namespace Microsoft.Build.Utilities
}
public bool LogMessageFromText (string lineOfText,
MessageImportance messageImportance)
MessageImportance importance)
{
if (lineOfText == null)
throw new ArgumentNullException ("lineOfText");
BuildMessageEventArgs bmea = new BuildMessageEventArgs (
lineOfText, helpKeywordPrefix,
null, messageImportance);
null, importance);
buildEngine.LogMessageEvent (bmea);
return true;
@@ -313,18 +313,18 @@ namespace Microsoft.Build.Utilities
buildEngine.LogWarningEvent (bwea);
}
public void LogWarningFromException (Exception exception)
public void LogWarningFromException (Exception e)
{
LogWarningFromException (exception, false);
LogWarningFromException (e, false);
}
public void LogWarningFromException (Exception exception,
public void LogWarningFromException (Exception e,
bool showStackTrace)
{
StringBuilder sb = new StringBuilder ();
sb.Append (exception.Message);
sb.Append (e.Message);
if (showStackTrace)
sb.Append (exception.StackTrace);
sb.Append (e.StackTrace);
LogWarning (null, null, null, null, 0, 0, 0, 0,
sb.ToString (), null);
}
@@ -233,10 +233,10 @@ namespace Microsoft.Build.Utilities
}
}
protected virtual void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
protected virtual void LogEventsFromTextOutput (string singleLine, MessageImportance importance)
{
if (singleLine.Length == 0) {
Log.LogMessage (singleLine, messageImportance);
Log.LogMessage (singleLine, importance);
return;
}
@@ -254,7 +254,7 @@ namespace Microsoft.Build.Utilities
var result = MSBuildErrorParser.TryParseLine (singleLine);
if (result == null) {
Log.LogMessage (messageImportance, singleLine);
Log.LogMessage (importance, singleLine);
return;
}
@@ -304,7 +304,7 @@ namespace Microsoft.Build.Utilities
return String.Format ("@{0}", responseFilePath);
}
protected ProcessStartInfo GetProcessStartInfo (string pathToTool, string commandLineCommands, string responseFileSwitch)
protected virtual ProcessStartInfo GetProcessStartInfo (string pathToTool, string commandLineCommands, string responseFileSwitch)
{
var pinfo = new ProcessStartInfo (pathToTool, String.Format ("{0} {1}", commandLineCommands, responseFileSwitch));
@@ -62,28 +62,14 @@ namespace Microsoft.Build.Construction
}
string @remove;
public string Remove { get { return @remove ?? String.Empty; } set { @remove = value; } }
#if NET_4_5
string keepDuplicates;
string keepMetadata;
string removeMetadata;
#if NET_4_5
public
#else
internal
public string KeepDuplicates { get { return keepDuplicates ?? String.Empty; } set { keepDuplicates = value; } }
string keepMetadata;
public string KeepMetadata { get { return keepMetadata ?? String.Empty; } set { keepMetadata = value; } }
string removeMetadata;
public string RemoveMetadata { get { return removeMetadata ?? String.Empty; } set { removeMetadata = value; } }
#endif
string KeepDuplicates { get { return keepDuplicates ?? String.Empty; } set { keepDuplicates = value; } }
#if NET_4_5
public
#else
internal
#endif
string KeepMetadata { get { return keepMetadata ?? String.Empty; } set { keepMetadata = value; } }
#if NET_4_5
public
#else
internal
#endif
string RemoveMetadata { get { return removeMetadata ?? String.Empty; } set { removeMetadata = value; } }
public ProjectMetadataElement AddMetadata (string name, string unevaluatedValue)
{
var metadata = ContainingProject.CreateMetadataElement (name, unevaluatedValue);
@@ -97,9 +83,11 @@ namespace Microsoft.Build.Construction
{
SaveAttribute (writer, "Include", Include);
SaveAttribute (writer, "Exclude", Exclude);
#if NET_4_5
SaveAttribute (writer, "KeepDuplicates", KeepDuplicates);
SaveAttribute (writer, "KeepMetadata", KeepMetadata);
SaveAttribute (writer, "RemoveMetadata", RemoveMetadata);
#endif
SaveAttribute (writer, "Remove", Remove);
base.SaveValue (writer);
}
@@ -113,6 +101,7 @@ namespace Microsoft.Build.Construction
case "Exclude":
Exclude = value;
break;
#if NET_4_5
case "KeepDuplicates":
KeepDuplicates = value;
break;
@@ -122,6 +111,7 @@ namespace Microsoft.Build.Construction
case "RemoveMetadata":
RemoveMetadata = value;
break;
#endif
case "Remove":
Remove = value;
break;
@@ -61,6 +61,7 @@ namespace Microsoft.Build.Execution
~BuildManager ()
{
// maybe processes created by out-of-process nodes should be signaled.
BuildNodeManager.Stop ();
}
readonly List<BuildSubmission> submissions = new List<BuildSubmission> ();
@@ -595,10 +595,6 @@ namespace Microsoft.Build.Internal
foreach (DictionaryEntry p in globalProperties)
globalPropertiesThatMakeSense [(string) p.Key] = (string) p.Value;
var projectToBuild = new ProjectInstance (ProjectRootElement.Create (XmlReader.Create (projectFileName)), globalPropertiesThatMakeSense, toolsVersion, Projects);
// Not very sure if ALL of these properties should be added, but some are certainly needed.
foreach (var p in this.project.Properties.Where (p => !globalProperties.Contains (p.Name)))
projectToBuild.SetProperty (p.Name, p.EvaluatedValue);
IDictionary<string,TargetResult> outs;
var ret = projectToBuild.Build (targetNames ?? new string [] {"Build"}, Projects.Loggers, out outs);
foreach (var p in outs)
@@ -15,7 +15,6 @@ Microsoft.Build.Execution/BuildSubmissionTest.cs
Microsoft.Build.Execution/ProjectInstanceTest.cs
Microsoft.Build.Execution/ProjectMetadataInstanceTest.cs
Microsoft.Build.Execution/ProjectTargetInstanceTest.cs
Microsoft.Build.Execution/ProjectTaskInstanceTest.cs
Microsoft.Build.Internal/CollectionFromEnumerableTest.cs
Microsoft.Build.Internal/ExpressionParserTest.cs
Microsoft.Build.Logging/ConsoleLoggerTest.cs
@@ -40,13 +40,15 @@ namespace MonoTests.Microsoft.Build.Evaluation
public class ProjectCollectionTest
{
[Test]
#if NET_4_0
// BXC #20961
[Category ("NotWorking")]
#endif
public void GlobalProperties ()
{
var g = ProjectCollection.GlobalProjectCollection;
Assert.AreEqual (0, g.GlobalProperties.Count, "#1");
#if NET_4_5
Assert.IsTrue (g.GlobalProperties.IsReadOnly, "#2");
#endif
}
[Test]
@@ -143,12 +143,12 @@ namespace MonoTests.Microsoft.Build.Evaluation
[Test]
public void BuildCSharpTargetGetFrameworkPaths ()
{
string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<Import Project='$(MSBuildToolsPath)\Microsoft.CSharp.targets' />
</Project>";
var xml = XmlReader.Create (new StringReader (project_xml));
var root = ProjectRootElement.Create (xml);
var proj = new Project (root);
var xml = XmlReader.Create (new StringReader (project_xml));
var root = ProjectRootElement.Create (xml);
var proj = new Project (root);
root.FullPath = "ProjectTest.BuildCSharpTargetGetFrameworkPaths.proj";
Assert.IsTrue (proj.Build ("GetFrameworkPaths", new ILogger [] {/*new ConsoleLogger ()*/}));
}
@@ -156,14 +156,14 @@ namespace MonoTests.Microsoft.Build.Evaluation
[Test]
public void ProperiesMustBeDistinct ()
{
string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<PropertyGroup>
<AssemblyName>Foo</AssemblyName>
<OutputPath>Test</OutputPath>
</PropertyGroup>
</Project>";
var xml = XmlReader.Create (new StringReader (project_xml));
var root = ProjectRootElement.Create (xml);
var xml = XmlReader.Create (new StringReader (project_xml));
var root = ProjectRootElement.Create (xml);
root.FullPath = "ProjectTest.BuildCSharpTargetBuild.proj";
var proj = new Project (root);
var list = new List<ProjectProperty> ();
@@ -173,16 +173,20 @@ namespace MonoTests.Microsoft.Build.Evaluation
}
[Test]
#if NET_4_0
// BXC #20961
[Category ("NotWorking")]
#endif
public void BuildCSharpTargetBuild ()
{
string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<PropertyGroup>
<AssemblyName>Foo</AssemblyName>
</PropertyGroup>
<Import Project='$(MSBuildToolsPath)\Microsoft.CSharp.targets' />
</Project>";
var xml = XmlReader.Create (new StringReader (project_xml));
var root = ProjectRootElement.Create (xml);
var xml = XmlReader.Create (new StringReader (project_xml));
var root = ProjectRootElement.Create (xml);
root.FullPath = "ProjectTest.BuildCSharpTargetBuild.proj";
var proj = new Project (root, null, "4.0");
Assert.IsFalse (proj.Build ("Build", new ILogger [] {/*new ConsoleLogger (LoggerVerbosity.Diagnostic)*/})); // missing mandatory properties
@@ -191,7 +195,7 @@ namespace MonoTests.Microsoft.Build.Evaluation
[Test]
public void EvaluateItemConditionThenIgnored ()
{
string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<PropertyGroup>
<P></P>
</PropertyGroup>
@@ -214,7 +218,7 @@ namespace MonoTests.Microsoft.Build.Evaluation
public void EvaluateSamePropertiesInOrder ()
{
// used in Microsoft.Common.targets
string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<PropertyGroup>
<BaseIntermediateOutputPath Condition=""'$(BaseIntermediateOutputPath)' == ''"">obj\</BaseIntermediateOutputPath>
</PropertyGroup>
@@ -254,44 +258,52 @@ namespace MonoTests.Microsoft.Build.Evaluation
}
[Test]
#if NET_4_0
// BXC #20961
[Category ("NotWorking")]
#endif
public void CreateProjectInstance ()
{
string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<PropertyGroup>
<AssemblyName>Foo</AssemblyName>
</PropertyGroup>
<Import Project='$(MSBuildToolsPath)\Microsoft.CSharp.targets' />
</Project>";
var xml = XmlReader.Create (new StringReader (project_xml));
var root = ProjectRootElement.Create (xml);
var xml = XmlReader.Create (new StringReader (project_xml));
var root = ProjectRootElement.Create (xml);
var proj = new Project (root, null, "4.0");
var inst = proj.CreateProjectInstance ();
Assert.AreEqual ("4.0", inst.ToolsVersion, "#1");
}
[Test]
#if NET_4_0
// BXC #20961
[Category ("NotWorking")]
#endif
public void LoadCaseInsensitive ()
{
string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<PropertyGroup>
<AssemblyName>Foo</AssemblyName>
</PropertyGroup>
<Import Project='$(MSBuildToolsPath)\Microsoft.CSharp.Targets' />
</Project>";
var xml = XmlReader.Create (new StringReader (project_xml));
var root = ProjectRootElement.Create (xml);
var xml = XmlReader.Create (new StringReader (project_xml));
var root = ProjectRootElement.Create (xml);
new Project (root, null, "4.0");
}
[Test]
public void SameNameTargets ()
{
string project_xml = @"<Project DefaultTargets='Foo' xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
string project_xml = @"<Project DefaultTargets='Foo' xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<Target Name='Foo'><Message Text='This should not be written' /></Target>
<Target Name='Foo'><Message Text='This will be written' /></Target>
</Project>";
var xml = XmlReader.Create (new StringReader (project_xml));
var root = ProjectRootElement.Create (xml);
var xml = XmlReader.Create (new StringReader (project_xml));
var root = ProjectRootElement.Create (xml);
var proj = new Project (root, null, "4.0");
var sw = new StringWriter ();
proj.Build (new ConsoleLogger (LoggerVerbosity.Diagnostic, sw.WriteLine, null, null));
@@ -326,3 +338,4 @@ namespace MonoTests.Microsoft.Build.Evaluation
}
}
}
@@ -310,34 +310,6 @@ namespace MonoTests.Microsoft.Build.Execution
Assert.AreEqual (";_AddCorlibReference", p.EvaluatedValue, "#2");
}
[Test]
public void ItemsAndPostEvaluationCondition ()
{
// target-assigned property X is not considered when evaluating condition for C.
string project_xml = @"<Project DefaultTargets='X;Y' xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<ItemGroup>
<A Include='foo.txt' />
<B Condition='False' Include='bar.txt' />
<C Condition=""'$(X)'=='True'"" Include='baz.txt' />
</ItemGroup>
<Target Name='X'>
<CreateProperty Value='True'>
<Output TaskParameter='Value' PropertyName='X' />
</CreateProperty>
</Target>
<Target Name='Y'>
<Error Condition=""'@(C)'==''"" Text='missing C. X is $(X)' />
</Target>
</Project>";
var xml = XmlReader.Create (new StringReader (project_xml));
var root = ProjectRootElement.Create (xml);
root.FullPath = "ProjectInstanceTest.ItemsAndPostEvaluationCondition.proj";
var proj = new ProjectInstance (root);
Assert.AreEqual (1, proj.Items.Count, "Count1");
Assert.IsFalse (proj.Build (), "Build");
Assert.AreEqual (1, proj.Items.Count, "Count2");
}
[Test]
[Category ("NotWorking")] // until we figure out why it fails on wrench.
public void ItemsInTargets ()
@@ -369,33 +341,6 @@ namespace MonoTests.Microsoft.Build.Execution
Assert.IsTrue (items.Any (), "items.Any");
Assert.IsTrue (!string.IsNullOrEmpty (items.First ().EvaluatedInclude), "item.EvaluatedInclude");
}
[Test]
[Category ("NotWorking")]
public void ConditionalCyclicDependence ()
{
string project_xml = @"<Project DefaultTargets='Build' xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<PropertyGroup>
<C>False</C>
</PropertyGroup>
<Target Name='Build' DependsOnTargets='ResolveReferences' />
<Target Name='Build2' DependsOnTargets='Bar' />
<Target Name='ResolveReferences' DependsOnTargets='Foo;Bar' />
<Target Name='Foo'>
<CreateProperty Value='True'>
<Output TaskParameter='Value' PropertyName='C' />
</CreateProperty>
</Target>
<Target Name='Bar' Condition='!($(C))' DependsOnTargets='ResolveReferences'>
</Target>
</Project>";
var xml = XmlReader.Create (new StringReader (project_xml));
var root = ProjectRootElement.Create (xml);
root.FullPath = "ProjectInstanceTest.ConditionalCyclicDependence.proj";
var proj = new ProjectInstance (root, null, "4.0", ProjectCollection.GlobalProjectCollection);
Assert.IsTrue (proj.Build (), "#1");
Assert.IsFalse (proj.Build ("Build2", new ILogger [0]), "#2");
}
}
namespace SubNamespace
@@ -1,84 +0,0 @@
//
// ProjectInstanceTest.cs
//
// Author:
// Atsushi Enomoto ([email protected])
//
// Copyright (C) 2013 Xamarin Inc. (http://www.xamarin.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.IO;
using System.Linq;
using System.Xml;
using Microsoft.Build.Construction;
using Microsoft.Build.Execution;
using NUnit.Framework;
using Microsoft.Build.Evaluation;
using Microsoft.Build.Utilities;
using Microsoft.Build.Framework;
using Microsoft.Build.Logging;
namespace MonoTests.Microsoft.Build.Execution
{
[TestFixture]
public class ProjectTaskInstanceTest
{
#if NET_4_5
[Test]
public void OutputPropertyExists ()
{
string project_xml = @"
<Project DefaultTargets='Build' xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
<PropertyGroup>
<C>False</C>
</PropertyGroup>
<Target Name='Build' DependsOnTargets='ResolveReferences' />
<Target Name='Build2' DependsOnTargets='Bar' />
<Target Name='ResolveReferences' DependsOnTargets='Foo;Bar' />
<Target Name='Foo'>
<CreateProperty Value='True'>
<Output TaskParameter='Value' PropertyName='C' />
</CreateProperty>
</Target>
<Target Name='Bar' Condition='!($(C))' DependsOnTargets='ResolveReferences'>
</Target>
</Project>";
var xml = XmlReader.Create (new StringReader(project_xml));
var root = ProjectRootElement.Create (xml);
var proj = new ProjectInstance (root);
Assert.AreEqual (5, proj.Targets.Count, "#1");
var foo = proj.Targets ["Foo"];
Assert.IsNotNull (foo, "#2");
Assert.AreEqual (1, foo.Tasks.Count, "#3");
var cp = foo.Tasks.First ();
Assert.AreEqual (1, cp.Outputs.Count, "#4");
var po = cp.Outputs.First () as ProjectTaskOutputPropertyInstance;
Assert.IsNotNull (po, "#5");
Assert.AreEqual ("C", po.PropertyName, "#5");
proj.Build ("Build", null);
Assert.AreEqual (string.Empty, foo.Outputs, "#6");
Assert.AreEqual ("True", proj.GetPropertyValue ("C"), "#7");
}
#endif
}
}
+18 -16
View File
@@ -3,14 +3,14 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{817CE046-07E8-409D-84BF-A6EA4F2879DE}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mono.CSharp</RootNamespace>
<AssemblyName>Mono.CSharp</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -54,10 +54,24 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.XML" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs">
<Link>MonoSymbolFile.cs</Link>
</Compile>
<Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs">
<Link>MonoSymbolTable.cs</Link>
</Compile>
<Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs">
<Link>MonoSymbolWriter.cs</Link>
</Compile>
<Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\SourceMethodBuilder.cs">
<Link>SourceMethodBuilder.cs</Link>
</Compile>
<Compile Include="..\..\mcs\anonymous.cs">
<Link>anonymous.cs</Link>
</Compile>
@@ -218,18 +232,6 @@
<Link>CryptoConvert.cs</Link>
</Compile>
<Compile Include="cs-parser.cs" />
<Compile Include="..\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs">
<Link>MonoSymbolFile.cs</Link>
</Compile>
<Compile Include="..\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs">
<Link>MonoSymbolTable.cs</Link>
</Compile>
<Compile Include="..\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs">
<Link>MonoSymbolWriter.cs</Link>
</Compile>
<Compile Include="..\Mono.CompilerServices.SymbolWriter\SourceMethodBuilder.cs">
<Link>SourceMethodBuilder.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
+45
View File
@@ -0,0 +1,45 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.CSharp", "Mono.CSharp.csproj", "{817CE046-07E8-409D-84BF-A6EA4F2879DE}"
ProjectSection(ProjectDependencies) = postProject
{5D485D32-3B9F-4287-AB24-C8DA5B89F537} = {5D485D32-3B9F-4287-AB24-C8DA5B89F537}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jay2010", "..\..\jay\jay2010.vcxproj", "{5D485D32-3B9F-4287-AB24-C8DA5B89F537}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|Win32 = Debug|Win32
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|Win32.ActiveCfg = Debug|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|Any CPU.Build.0 = Release|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|Win32.ActiveCfg = Release|Any CPU
{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Debug|Any CPU.ActiveCfg = Debug|Win32
{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Debug|Win32.ActiveCfg = Debug|Win32
{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Debug|Win32.Build.0 = Debug|Win32
{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Release|Any CPU.ActiveCfg = Release|Win32
{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Release|Mixed Platforms.Build.0 = Release|Win32
{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Release|Win32.ActiveCfg = Release|Win32
{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{4FCB063A-0731-4286-843F-7B85910C30D5}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mono.CSharp.Tests</RootNamespace>
<AssemblyName>Mono.CSharp.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="AssertReportPrinter.cs" />
<Compile Include="Evaluator\BuildinCommands.cs" />
<Compile Include="Evaluator\CompletionTest.cs" />
<Compile Include="Evaluator\EvaluatorFixture.cs" />
<Compile Include="Evaluator\EvaluatorTest.cs" />
<Compile Include="Evaluator\ExpressionsTest.cs" />
<Compile Include="Evaluator\TypesTest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mono.CSharp.csproj">
<Project>{817CE046-07E8-409D-84BF-A6EA4F2879DE}</Project>
<Name>Mono.CSharp</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
@@ -0,0 +1,42 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.CSharp.Tests", "Mono.CSharp.Tests.csproj", "{4FCB063A-0731-4286-843F-7B85910C30D5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.CSharp", "..\Mono.CSharp.csproj", "{817CE046-07E8-409D-84BF-A6EA4F2879DE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4FCB063A-0731-4286-843F-7B85910C30D5}.Debug|Any CPU.ActiveCfg = Debug|x86
{4FCB063A-0731-4286-843F-7B85910C30D5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{4FCB063A-0731-4286-843F-7B85910C30D5}.Debug|Mixed Platforms.Build.0 = Debug|x86
{4FCB063A-0731-4286-843F-7B85910C30D5}.Debug|x86.ActiveCfg = Debug|x86
{4FCB063A-0731-4286-843F-7B85910C30D5}.Debug|x86.Build.0 = Debug|x86
{4FCB063A-0731-4286-843F-7B85910C30D5}.Release|Any CPU.ActiveCfg = Release|x86
{4FCB063A-0731-4286-843F-7B85910C30D5}.Release|Mixed Platforms.ActiveCfg = Release|x86
{4FCB063A-0731-4286-843F-7B85910C30D5}.Release|Mixed Platforms.Build.0 = Release|x86
{4FCB063A-0731-4286-843F-7B85910C30D5}.Release|x86.ActiveCfg = Release|x86
{4FCB063A-0731-4286-843F-7B85910C30D5}.Release|x86.Build.0 = Release|x86
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|x86.ActiveCfg = Debug|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|Any CPU.Build.0 = Release|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<NoConfig>true</NoConfig>
<CodePage>65001</CodePage>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'basic|AnyCPU' ">
<DefineConstants>BOOTSTRAP_BASIC,NET_1_1,NET_2_0</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.dll"/>
</ItemGroup>
<Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="BeforeBuild" DependsOnTargets="SetupProject">
</Target>
</Project>
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Default.targets"/>
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<NoConfig>true</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodePage>65001</CodePage>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<DefineConstants>NET_1_1,NET_2_0,SQLITE_STANDARD</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<Reference Include="System"/>
<Reference Include="System.Data"/>
<Reference Include="System.Xml"/>
<Reference Include="System.Transactions"/>
</ItemGroup>
<Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="BeforeBuild" DependsOnTargets="SetupProject">
</Target>
</Project>
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<NoConfig>true</NoConfig>
<CodePage>65001</CodePage>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<Reference Include="System"/>
<Reference Include="System.Xml"/>
<Reference Include="Mono.Security">
<HintPath>..\lib\net_2_0\Mono.Security.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="BeforeBuild" DependsOnTargets="SetupProject">
</Target>
</Project>
+23
View File
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<NoWarn>0618,612</NoWarn>
<NoConfig>true</NoConfig>
<CodePage>65001</CodePage>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.dll"/>
</ItemGroup>
<Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="BeforeBuild" DependsOnTargets="SetupProject">
</Target>
</Project>
@@ -303,10 +303,6 @@ namespace Mono.Security.Cryptography {
e = new BigInteger (parameters.Exponent);
n = new BigInteger (parameters.Modulus);
//reset all private key values to null
d = dp = dq = qInv = p = q = null;
// only if the private key is present
if (parameters.D != null)
d = new BigInteger (parameters.D);
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<NoConfig>true</NoConfig>
<CodePage>65001</CodePage>
<UseVSHostingProcess>false</UseVSHostingProcess>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'basic|AnyCPU' ">
<DefineConstants>BOOTSTRAP_BASIC,NET_1_1,NET_2_0</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.dll"/>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="BeforeBuild" DependsOnTargets="SetupProject">
</Target>
</Project>
@@ -545,25 +545,5 @@ namespace MonoTests.Mono.Security.Cryptography {
byte [] bytes = Convert.FromBase64String (b64);
rsa.DecryptValue (bytes);
}
[Test]
public void Bug18482 ()
{
RSAManaged privateRsa = new RSAManaged ();
privateRsa.FromXmlString (MonoXml384);
var rsaParameters = privateRsa.ExportParameters (false);
RSAManaged publicRsa = new RSAManaged ();
//Generates a key pair with private key values
publicRsa.ExportParameters (false);
//Sets public key values and should reset private key values
publicRsa.ImportParameters (rsaParameters);
//Should export valid parameters without throwing an exception.
publicRsa.ExportParameters (false);
}
}
}
+5 -1
View File
@@ -7,7 +7,11 @@ LIB_MCS_FLAGS = -r:System.dll -warn:1
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES = README
EXTRA_DISTFILES = README build-csproj2k5
Mono.WebBrowser2K5.csproj: Mono.WebBrowser.dll.sources build-csproj2k5
./build-csproj2k5
include ../../build/library.make
$(the_lib): Mono.WebBrowser2K5.csproj
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Default.targets"/>
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<NoConfig>true</NoConfig>
<CodePage>65001</CodePage>
<NoWarn>108</NoWarn>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<Reference Include="System"/>
</ItemGroup>
<Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="BeforeBuild" DependsOnTargets="SetupProject">
</Target>
</Project>
@@ -0,0 +1,250 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5E6C996A-007F-40CE-B244-006EFCFB77D2}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>Mono.WebBrowser</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
<RootNamespace>Mono.WebBrowser</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>true</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
<Name>System</Name>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Mono.Mozilla\AsciiString.cs" />
<Compile Include="Mono.Mozilla\Base.cs" />
<Compile Include="Mono.Mozilla\Callback.cs" />
<Compile Include="Mono.Mozilla\DOM\ContentListener.cs" />
<Compile Include="Mono.Mozilla\DOM\DocumentEncoder.cs" />
<Compile Include="Mono.Mozilla\DOM\DocumentType.cs" />
<Compile Include="Mono.Mozilla\DOM\DOMImplementation.cs" />
<Compile Include="Mono.Mozilla\DOM\EventListener.cs" />
<Compile Include="Mono.Mozilla\DOM\NamedNodeMap.cs" />
<Compile Include="Mono.Mozilla\DOM\Stream.cs" />
<Compile Include="Mono.Mozilla\DOM\Stylesheet.cs" />
<Compile Include="Mono.Mozilla\DOM\StylesheetList.cs" />
<Compile Include="Mono.Mozilla\interfaces\extras\DocumentEncoderFlags.cs" />
<Compile Include="Mono.Mozilla\interfaces\extras\nsIReadSegmentFun.cs" />
<Compile Include="Mono.Mozilla\interfaces\extras\nsITimerCallbackDelegate.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIAccessibilityService.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIAccessible.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIAccessibleDocument.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIAccessibleRelation.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIAccessibleRetrieval.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIAccessNode.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIArray.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsICancelable.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIChannel.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIClassInfo.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDocumentEncoder.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDocumentEncoderNodeFixup.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMCounter.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSPrimitiveValue.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSRule.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSRuleList.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSStyleDeclaration.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSStyleSheet.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSValue.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentEvent.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentStyle.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMDOMStringList.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMEvent.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMEventListener.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMEventTarget.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLStyleElement.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMKeyEvent.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMMediaList.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMMouseEvent.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMNSRange.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMRect.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMRGBColor.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMStyleSheet.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMStyleSheetList.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMUIEvent.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMViewCSS.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIErrorService.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIFile.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIIOService.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsILoadGroup.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIObserver.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIOutputStream.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIPersistentProperties.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIPrefBranch.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIPrefService.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIProperties.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIProtocolHandler.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIRequest.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIRequestObserver.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIServiceManager.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIStreamListener.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsITimer.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsITimerCallback.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIURIContentListener.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIWeakReference.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIWebBrowser.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserChrome.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserPersist.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserStream.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIWebProgress.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIWebProgressListener.cs" />
<Compile Include="Mono.Mozilla\UniString.cs" />
<Compile Include="Mono.Mozilla\WebBrowser.cs" />
<Compile Include="Mono.Mozilla\DOM\Attribute.cs" />
<Compile Include="Mono.Mozilla\DOM\AttributeCollection.cs" />
<Compile Include="Mono.Mozilla\DOM\Document.cs" />
<Compile Include="Mono.Mozilla\DOM\DOMObject.cs" />
<Compile Include="Mono.Mozilla\DOM\Element.cs" />
<Compile Include="Mono.Mozilla\DOM\HTMLElement.cs" />
<Compile Include="Mono.Mozilla\DOM\HTMLElementCollection.cs" />
<Compile Include="Mono.Mozilla\DOM\History.cs" />
<Compile Include="Mono.Mozilla\DOM\Navigation.cs" />
<Compile Include="Mono.Mozilla\DOM\Node.cs" />
<Compile Include="Mono.Mozilla\DOM\NodeList.cs" />
<Compile Include="Mono.Mozilla\DOM\Window.cs" />
<Compile Include="Mono.Mozilla\DOM\WindowCollection.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDocCharset.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMAbstractView.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMBarProp.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentView.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMWindow.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMWindowCollection.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIInterfaceRequestor.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsISelection.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserChromeFocus.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIWebBrowserFocus.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMAttr.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMCDATASection.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMCharacterData.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMComment.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMDocument.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentFragment.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentRange.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentType.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMDOMImplementation.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMElement.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMEntityReference.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLBodyElement.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLCollection.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLDocument.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMHTMLElement.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMNamedNodeMap.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMNode.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMNodeList.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMNSHTMLElement.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMProcessingInstruction.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMRange.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIDOMText.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIHistoryEntry.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIInputStream.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsISHistory.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsISHistoryListener.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsISimpleEnumerator.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIURI.cs" />
<Compile Include="Mono.Mozilla\interfaces\nsIWebNavigation.cs" />
<Compile Include="Mono.Mozilla\interfaces\extras\NodeType.cs" />
<Compile Include="Mono.Mozilla\interfaces\extras\nsIWriteSegmentFun.cs" />
<Compile Include="Mono.Mozilla\interfaces\extras\Options.cs" />
<Compile Include="Mono.WebBrowser\DOM\IDocumentType.cs" />
<Compile Include="Mono.WebBrowser\DOM\IDOMImplementation.cs" />
<Compile Include="Mono.WebBrowser\DOM\IMediaList.cs" />
<Compile Include="Mono.WebBrowser\DOM\INamedNodeMap.cs" />
<Compile Include="Mono.WebBrowser\DOM\IStylesheet.cs" />
<Compile Include="Mono.WebBrowser\DOM\IStylesheetList.cs" />
<Compile Include="Mono.WebBrowser\DOM\EventArgs.cs" />
<Compile Include="Mono.WebBrowser\DOM\EventHandlers.cs" />
<Compile Include="Mono.WebBrowser\IWebBrowser.cs" />
<Compile Include="Mono.WebBrowser\Manager.cs" />
<Compile Include="Mono.WebBrowser\Exception.cs" />
<Compile Include="Mono.WebBrowser\DOM\IAttribute.cs" />
<Compile Include="Mono.WebBrowser\DOM\IAttributeCollection.cs" />
<Compile Include="Mono.WebBrowser\DOM\IDocument.cs" />
<Compile Include="Mono.WebBrowser\DOM\IElement.cs" />
<Compile Include="Mono.WebBrowser\DOM\IElementCollection.cs" />
<Compile Include="Mono.WebBrowser\DOM\IHistory.cs" />
<Compile Include="Mono.WebBrowser\DOM\INavigation.cs" />
<Compile Include="Mono.WebBrowser\DOM\INode.cs" />
<Compile Include="Mono.WebBrowser\DOM\INodeList.cs" />
<Compile Include="Mono.WebBrowser\DOM\IWindow.cs" />
<Compile Include="Mono.WebBrowser\DOM\IWindowCollection.cs" />
</ItemGroup>
<ItemGroup>
<None Include="ChangeLog" />
<None Include="Mono.WebBrowser.dll.sources" />
<None Include="README" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
+134
View File
@@ -0,0 +1,134 @@
#!/bin/sh
#
# This script will generate SWF.cs.target from our System.Windows.Forms.dll.sources
#
#
exec > Mono.WebBrowser2K5.csproj
Source=Mono.WebBrowser.dll.sources
dohead()
{
cat <<EOF
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5E6C996A-007F-40CE-B244-006EFCFB77D2}</ProjectGuid>
<Configuration Condition=" '\$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '\$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>Mono.WebBrowser</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
<RootNamespace>Mono.WebBrowser</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
</PropertyGroup>
<PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>true</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
<Name>System</Name>
</Reference>
</ItemGroup>
EOF
}
dotail()
{
cat <<EOF
<ItemGroup>
<None Include="ChangeLog" />
<None Include="Mono.WebBrowser.dll.sources" />
<None Include="README" />
</ItemGroup>
<Import Project="\$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
EOF
}
dofilelist()
{
echo " <ItemGroup>"
cat $Source | while read SRC; do
# Don't do AssemblyInfo, it's got signing requests and such that we don't want
if [ "x$SRC" != "xAssembly/AssemblyInfo.cs" -a "x$SRC" != "x../../build/common/Consts.cs" ] ; then
SRC=`echo $SRC | sed 's/..\/..\/build\///'`
SRC=`echo $SRC | tr '/' '\\\\'`
cat <<EOF
<Compile Include="$SRC" />
EOF
fi
done
echo " </ItemGroup>"
}
dohead
dofilelist
dotail
@@ -1 +1,2 @@
/makefile.build -crlf
/net_1_1_java_Novell.Directory.Ldap.dll.sources -crlf
+19
View File
@@ -4,12 +4,22 @@ include ../../build/rules.make
LIBRARY = Novell.Directory.Ldap.dll
ifeq (net_1_1_java, $(PROFILE))
LIB_MCS_FLAGS = \
/nowarn:649 /nowarn:169 /nowarn:219 /nowarn:168 \
-r:$(corlib) \
-r:System.dll \
-r:rt.dll \
-r:J2SE.Helpers.dll \
$(RESX_RES:%=/res:%)
else
LIB_MCS_FLAGS = \
-warn:1 -nowarn:612 \
-r:$(corlib) \
-r:System.dll \
-r:Mono.Security.dll \
$(RESX_RES:%=/res:%)
endif
include ../../build/library.make
@@ -23,7 +33,16 @@ $(RESULTCODE_MESSAGES): Novell.Directory.Ldap.Utilclass/ResultCodeMessages.txt
$(RESGEN) $< $@
EXTRA_DISTFILES = \
net_1_1_java_Novell.Directory.Ldap.dll.sources \
Novell.Directory.Ldap.Rfc2251/RfcLdapURL.cs \
Novell.Directory.Ldap.Security.jvm/AuthenticationCallbackHandler.cs \
Novell.Directory.Ldap.Security.jvm/ChangeLog \
Novell.Directory.Ldap.Security.jvm/CreateContextPrivilegedAction.cs \
Novell.Directory.Ldap.Security.jvm/ExchangeTokenPrivilegedAction.cs \
Novell.Directory.Ldap.Security.jvm/Krb5Helper.cs \
Novell.Directory.Ldap.Security.jvm/SecureStream.cs \
Novell.Directory.Ldap.Security.jvm/UnwrapPrivilegedAction.cs \
Novell.Directory.Ldap.Security.jvm/WrapPrivilegedAction.cs \
Novell.Directory.Ldap.Utilclass/ExceptionMessages.resx \
Novell.Directory.Ldap.Utilclass/ExceptionMessages.txt \
Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resx \
@@ -0,0 +1,7 @@
/AuthenticationCallbackHandler.cs -crlf
/CreateContextPrivilegedAction.cs -crlf
/ExchangeTokenPrivilegedAction.cs -crlf
/Krb5Helper.cs -crlf
/SecureStream.cs -crlf
/UnwrapPrivilegedAction.cs -crlf
/WrapPrivilegedAction.cs -crlf
@@ -0,0 +1,80 @@
//
// Novell.Directory.Ldap.Security.AuthenticationCallbackHandler.cs
//
// Authors:
// Boris Kirzner <[email protected]>
// Konstantin Triger <[email protected]>
//
// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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 javax.security.auth.callback;
using java.io;
namespace Novell.Directory.Ldap.Security
{
internal class AuthenticationCallbackHandler : CallbackHandler
{
#region Fields
private readonly string _username;
private readonly string _password;
#endregion //Fields
#region Constructors
public AuthenticationCallbackHandler(string username, string password)
{
_username = username;
_password = password;
}
#endregion // Constructors
#region Methods
public void handle(Callback [] callbacks)
{
for (int i = 0; i < callbacks.Length; i++) {
if (callbacks [i] is NameCallback) {
NameCallback nc = (NameCallback) callbacks [i];
nc.setName (_username);
}
else if (callbacks [i] is PasswordCallback) {
PasswordCallback pc = (PasswordCallback) callbacks [i];
pc.setPassword (_password.ToCharArray ());
}
else {
throw new UnsupportedCallbackException (callbacks [i], "Unrecognized Callback");
}
}
}
#endregion // Methods
}
}
@@ -0,0 +1,27 @@
2005-11-06 Konstantin Triger <[email protected]>
* SecureStream.cs, CreateContextPrivilegedAction.cs, Krb5Helper.cs:
create GSSCredential only once, cleanup
2005-11-03 Konstantin Triger <[email protected]>
* CreateContextPrivilegedAction.cs: always require mutual auth;
require integrity by default.
* Krb5Helper.cs: for wrap/unwrap: always create MessageProp with
pribState set.
2005-14-08 Boris Kirzner <[email protected]>
* Krb5Helper.cs: ExchangeTokens does proper final handshaking. Wrap/Unwrap
perform no action if no integrity and encryption accured.
* SecureStream.cs: Private convertion methods became internal, used by
Krb5Helper.
2005-28-07 Boris Kirzner <[email protected]>
* Novell.Directory.Ldap.Security.jvm/ExchangeTokenPrivilegedAction.cs,
Novell.Directory.Ldap.Security.jvm/CreateContextPrivilegedAction.cs,
Novell.Directory.Ldap.Security.jvm/SecureStream.cs,
Novell.Directory.Ldap.Security.jvm/WrapPrivilegedAction.cs,
Novell.Directory.Ldap.Security.jvm/Krb5Helper.cs,
Novell.Directory.Ldap.Security.jvm/UnwrapPrivilegedAction.cs,
Novell.Directory.Ldap.Security.jvm/AuthenticationCallbackHandler.cs: added
new classes implementing kerberos authntication support.
@@ -0,0 +1,105 @@
//
// Novell.Directory.Ldap.Security.CreateContextPrivilegedAction.cs
//
// Authors:
// Boris Kirzner <[email protected]>
// Konstantin Triger <[email protected]>
//
// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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 java.security;
using org.ietf.jgss;
namespace Novell.Directory.Ldap.Security
{
internal class CreateContextPrivilegedAction : PrivilegedAction
{
#region Fields
private readonly bool _encryption;
private readonly bool _signing;
private readonly bool _delegation;
private readonly string _name;
private readonly string _clientName;
private readonly string _mech;
#endregion //Fields
#region Constructors
public CreateContextPrivilegedAction(string name, string clientName, string mech, bool encryption, bool signing, bool delegation)
{
_name = name;
_clientName = clientName;
_mech = mech;
_encryption = encryption;
_signing = signing;
_delegation = delegation;
}
#endregion // Constructors
#region Methods
public object run()
{
try {
Oid krb5Oid = new Oid (_mech);
GSSManager manager = GSSManager.getInstance ();
GSSName clientName =
manager.createName(_clientName, GSSName__Finals.NT_USER_NAME);
GSSCredential clientCreds =
manager.createCredential(clientName,
GSSContext__Finals.INDEFINITE_LIFETIME,
krb5Oid,
GSSCredential__Finals.INITIATE_ONLY);
// try {
GSSName serverName = manager.createName (_name, GSSName__Finals.NT_HOSTBASED_SERVICE, krb5Oid);
GSSContext context = manager.createContext (serverName, krb5Oid, clientCreds, GSSContext__Finals.INDEFINITE_LIFETIME);
context.requestMutualAuth(true);
context.requestConf (_encryption);
if (!_encryption || _signing)
context.requestInteg (!_encryption || _signing);
context.requestCredDeleg (_delegation);
return context;
// }
// finally {
// // Calling this throws GSSException: Operation unavailable...
// clientCreds.dispose();
// }
}
catch (GSSException e) {
throw new PrivilegedActionException (e);
}
}
#endregion // Methods
}
}
@@ -0,0 +1,73 @@
//
// Novell.Directory.Ldap.Security.ExchangeTokenPrivilegedAction.cs
//
// Authors:
// Boris Kirzner <[email protected]>
// Konstantin Triger <[email protected]>
//
// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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 org.ietf.jgss;
using java.security;
namespace Novell.Directory.Ldap.Security
{
internal class ExchangeTokenPrivilegedAction : PrivilegedAction
{
#region Fields
private readonly sbyte [] _token;
private readonly GSSContext _context;
#endregion // Fields
#region Constructors
public ExchangeTokenPrivilegedAction(GSSContext context, sbyte [] token)
{
_token = token;
_context = context;
}
#endregion // Constructors
#region Methods
public object run()
{
try {
sbyte [] token = _context.initSecContext (_token, 0, _token.Length);
return token;
}
catch (GSSException e) {
throw new PrivilegedActionException (e);
}
}
#endregion // Methods
}
}
@@ -0,0 +1,197 @@
//
// Novell.Directory.Ldap.Security.Krb5Helper.cs
//
// Authors:
// Boris Kirzner <[email protected]>
// Konstantin Triger <[email protected]>
//
// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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 vmw.common;
using java.security;
using javax.security.auth;
using org.ietf.jgss;
namespace Novell.Directory.Ldap.Security
{
internal class Krb5Helper : IDisposable
{
enum QOP {
NO_PROTECTION = 1,
INTEGRITY_ONLY_PROTECTION = 2,
PRIVACY_PROTECTION = 4
}
#region Fields
internal static readonly sbyte [] EmptyToken = new sbyte [0];
private readonly bool _encryption;
private readonly bool _signing;
private readonly bool _delegation;
private readonly GSSContext _context;
#endregion // Fields
#region Constructors
public Krb5Helper(string name, string clientName, Subject subject, AuthenticationTypes authenticationTypes, string mech)
{
_encryption = (authenticationTypes & AuthenticationTypes.Sealing) != 0;
_signing = (authenticationTypes & AuthenticationTypes.Signing) != 0;
_delegation = (authenticationTypes & AuthenticationTypes.Delegation) != 0;
CreateContextPrivilegedAction action = new CreateContextPrivilegedAction (name, clientName, mech,_encryption,_signing,_delegation);
try {
_context = (GSSContext) Subject.doAs (subject,action);
}
catch (PrivilegedActionException e) {
throw new LdapException ("Problem performing token exchange with the server",LdapException.OTHER,"",e.getCause());
}
}
#endregion // Constructors
#region Properties
internal GSSContext Context
{
get { return _context; }
}
#endregion // Properties
#region Methods
public sbyte [] ExchangeTokens(sbyte [] clientToken)
{
if (Context.isEstablished ()) {
if (clientToken == null || clientToken.Length == 0)
return Krb5Helper.EmptyToken;
//final handshake
byte [] challengeData = (byte []) TypeUtils.ToByteArray (clientToken);
byte [] gssOutToken = Unwrap (challengeData, 0, challengeData.Length, new MessageProp (false));
QOP myCop = QOP.NO_PROTECTION;
if (_encryption)
myCop = QOP.PRIVACY_PROTECTION;
else if (_signing || (((QOP)gssOutToken [0] & QOP.INTEGRITY_ONLY_PROTECTION) != 0))
myCop = QOP.INTEGRITY_ONLY_PROTECTION;
if ((myCop & (QOP)gssOutToken [0]) == 0)
throw new LdapException ("Server does not support the requested security level", 80, "");
int srvMaxBufSize = SecureStream.NetworkByteOrderToInt (gssOutToken, 1, 3);
//int rawSendSize = Context.getWrapSizeLimit(0, _encryption, srvMaxBufSize);
byte [] gssInToken = new byte [4];
gssInToken [0] = (byte) myCop;
SecureStream.IntToNetworkByteOrder (srvMaxBufSize, gssInToken, 1, 3);
gssOutToken = Wrap (gssInToken, 0, gssInToken.Length, new MessageProp (true));
return TypeUtils.ToSByteArray (gssOutToken);
}
sbyte [] token = Context.initSecContext (clientToken, 0, clientToken.Length);
if (Context.isEstablished ()) {
if (Context.getConfState () != _encryption)
throw new LdapException ("Encryption protocol was not established layer between client and server", 80, "");
if (Context.getCredDelegState () != _delegation)
throw new LdapException ("Credential delegation was not established layer between client and server", 80, "");
if (_signing && (Context.getIntegState () != _signing))
throw new LdapException ("Signing protocol was not established layer between client and server", 80, "");
if (token == null)
return EmptyToken;
}
return token;
}
public byte [] Wrap(byte [] outgoing, int start, int len)
{
return Wrap (outgoing, start, len, new MessageProp(true));
}
public byte [] Wrap(byte [] outgoing, int start, int len, MessageProp messageProp)
{
if (!Context.isEstablished ())
throw new LdapException ("GSSAPI authentication not completed",LdapException.OTHER,"");
if (!(Context.getConfState () || Context.getIntegState ())) {
// in the case no encryption and no integrity required - return the original data
byte [] buff = new byte [len];
Array.Copy (outgoing, start, buff, 0, len);
return buff;
}
sbyte [] result = Context.wrap (TypeUtils.ToSByteArray (outgoing), start, len, messageProp);
return (byte []) TypeUtils.ToByteArray (result);
}
public byte [] Unwrap(byte [] incoming, int start, int len)
{
return Unwrap (incoming, start, len, new MessageProp(true));
}
public byte [] Unwrap(byte [] incoming, int start, int len, MessageProp messageProp)
{
if (!Context.isEstablished ())
throw new LdapException ("GSSAPI authentication not completed",LdapException.OTHER,"");
if (!(Context.getConfState () || Context.getIntegState ())) {
// in the case no encryption and no integrity required - return the original data
byte [] buff = new byte [len];
Array.Copy (incoming, start, buff, 0, len);
return buff;
}
sbyte [] result = Context.unwrap (TypeUtils.ToSByteArray (incoming), start, len, messageProp);
return (byte []) TypeUtils.ToByteArray (result);
}
#endregion // Methods
#region IDisposable Members
public void Dispose() {
Context.dispose();
}
#endregion
}
}
Loaded 100 of 1175 files, more files were not shown because too many files have changed in this diff. Show more