Compare commits

...
1068 Commits
Author SHA1 Message Date
Miguel de Icaza 1887074366 [SslClientStream] Add extra logging information, prevent crashes
Based on a number of exceptions being raised, we want to track down the reason
for some of the exception.   This patch both fixes the build (fixes the last
commit) and provides more information for the reason that the Alert is being
sent to the remote end.

The alert is currently being sent to the remote end when something fails in
the negotiation.   We likely need to *not send* alerts when the reason the
negotiation failed was that the connection was shutdown in some form (that is
why we have ObjectDisposed, or NotConnected exceptions).

This patch is a step towards verifying the theory.  This will help us
establish which step failed.   And the next step is determine why it failed.
2015-02-24 11:12:34 -05:00
Martin Baulig a901ec0ba3 Add new ServicePointManager.Mono_Suppress_TLS_Alerts property to make it conditionally. 2015-02-23 13:58:43 +01:00
Martin Baulig aca7cfd994 Revert "Step II: rethrow the exception"
This reverts commit 88950e72bb.
2015-02-23 13:55:18 +01:00
Martin Baulig 7bf7bc69a5 Revert "Step III: do not catch the exception in the first place."
This reverts commit b2269514e9.
2015-02-23 13:54:49 +01:00
Martin Baulig b2269514e9 Step III: do not catch the exception in the first place. 2015-02-20 11:07:48 +01:00
Martin Baulig 88950e72bb Step II: rethrow the exception 2015-02-20 11:07:06 +01:00
Martin Baulig 049023723d Step I: do not send any TLS alerts. 2015-02-20 11:06:59 +01:00
Zoltan Varga 3245d4bab4 [jit] Fix a regression introduced by 00a28a7dfd which disabled liveness2 for most methods. 2015-02-14 16:01:56 -05:00
Alexander Köplinger 2121f55593 Fix CookieContainerTest to use expiration date in the future
It is 2015 now, so the cookie is already expired and the test fails otherwise.
2015-02-12 09:53:15 -05:00
Rolf Bjarne Kvinge 924483c9d6 [mono-api-html] Take arity into account when comparing methods.
Fixes a crash when there are two methods overloaded by arity:

System.InvalidOperationException: Sequence contains more than one matching element
  at System.Linq.Enumerable.Single[XElement] (IEnumerable`1 source, System.Func`2 predicate, Fallback fallback) [0x00038] in /private/tmp/source-mono-mac-3.10.0-branch/bockbuild-mono-3.10.0-branch/profiles/mono-mac-xamarin/build-root/mono-3.10.0/mcs/class/System.Core/System.Linq/Enumerable.cs:2371
  at System.Linq.Enumerable.SingleOrDefault[XElement] (IEnumerable`1 source, System.Func`2 predicate) [0x00007] in /private/tmp/source-mono-mac-3.10.0-branch/bockbuild-mono-3.10.0-branch/profiles/mono-mac-xamarin/build-root/mono-3.10.0/mcs/class/System.Core/System.Linq/Enumerable.cs:2445
  at Xamarin.ApiDiff.MemberComparer.Find (IEnumerable`1 target) [0x00019] in /Users/builder/data/lanes/macios-mac-master/177810cb/source/mono/mcs/tools/corcompare/mono-api-html/MemberComparer.cs:72
  at Xamarin.ApiDiff.MemberComparer.Compare (IEnumerable`1 source, IEnumerable`1 target) [0x0003c] in /Users/builder/data/lanes/macios-mac-master/177810cb/source/mono/mcs/tools/corcompare/mono-api-html/MemberComparer.cs:83
  at Xamarin.ApiDiff.MemberComparer.Compare (System.Xml.Linq.XElement source, System.Xml.Linq.XElement target) [0x000a2] in /Users/builder/data/lanes/macios-mac-master/177810cb/source/mono/mcs/tools/corcompare/mono-api-html/MemberComparer.cs:55
  at Xamarin.ApiDiff.ClassComparer.Modified (System.Xml.Linq.XElement source, System.Xml.Linq.XElement target) [0x0005b] in /Users/builder/data/lanes/macios-mac-master/177810cb/source/mono/mcs/tools/corcompare/mono-api-html/ClassComparer.cs:210
  at Xamarin.ApiDiff.Comparer.Compare (IEnumerable`1 source, IEnumerable`1 target) [0x00093] in /Users/builder/data/lanes/macios-mac-master/177810cb/source/mono/mcs/tools/corcompare/mono-api-html/Comparer.cs:80
  at Xamarin.ApiDiff.ClassComparer.Compare (System.Xml.Linq.XElement source, System.Xml.Linq.XElement target) [0x00055] in /Users/builder/data/lanes/macios-mac-master/177810cb/source/mono/mcs/tools/corcompare/mono-api-html/ClassComparer.cs:67
  at Xamarin.ApiDiff.NamespaceComparer.Modified (System.Xml.Linq.XElement source, System.Xml.Linq.XElement target) [0x0001a] in /Users/builder/data/lanes/macios-mac-master/177810cb/source/mono/mcs/tools/corcompare/mono-api-html/NamespaceComparer.cs:75
  at Xamarin.ApiDiff.Comparer.Compare (IEnumerable`1 source, IEnumerable`1 target) [0x00093] in /Users/builder/data/lanes/macios-mac-master/177810cb/source/mono/mcs/tools/corcompare/mono-api-html/Comparer.cs:80
  at Xamarin.ApiDiff.NamespaceComparer.Compare (System.Xml.Linq.XElement source, System.Xml.Linq.XElement target) [0x00055] in /Users/builder/data/lanes/macios-mac-master/177810cb/source/mono/mcs/tools/corcompare/mono-api-html/NamespaceComparer.cs:49
  at Xamarin.ApiDiff.AssemblyComparer.Modified (System.Xml.Linq.XElement source, System.Xml.Linq.XElement target) [0x0002b] in /Users/builder/data/lanes/macios-mac-master/177810cb/source/mono/mcs/tools/corcompare/mono-api-html/AssemblyComparer.cs:70
  at Xamarin.ApiDiff.Comparer.Compare (IEnumerable`1 source, IEnumerable`1 target) [0x00093] in /Users/builder/data/lanes/macios-mac-master/177810cb/source/mono/mcs/tools/corcompare/mono-api-html/Comparer.cs:80
  at Xamarin.ApiDiff.AssemblyComparer.Compare () [0x0004a] in /Users/builder/data/lanes/macios-mac-master/177810cb/source/mono/mcs/tools/corcompare/mono-api-html/AssemblyComparer.cs:50
  at Xamarin.ApiDiff.Program.Main (System.String[] args) [0x00328] in /Users/builder/data/lanes/macios-mac-master/177810cb/source/mono/mcs/tools/corcompare/mono-api-html/ApiDiff.cs:164
2015-02-12 09:52:53 -05:00
Zoltan Varga 5b9ec05150 [amd64] Fix r8->int conversions. Fixes #26219. 2015-02-11 17:25:35 -05:00
Zoltan Varga aa81a7132b [jit] Avoid live range indexes overflowing for large basic blocks in the liveness pass. Fixes #26732. 2015-02-11 16:34:25 -05:00
Zoltan Varga 1f46d47c3a [arm64] Increase the size of the dyn_call instruction, and the buffers used during dyn calls. 2015-01-20 17:44:21 -05:00
Zoltan Varga 8f828ff4ac [jit] Add a MONO_PATCH_INFO_LDSTR_LIT patch type to handle strings which do not come from metadata, i.e. they are used in wrappers. Fixes #25891. 2015-01-14 16:47:19 -05:00
Zoltan Varga 6544cc7f15 [arm] Fix OP_ICLE_UN. Fixes #25798. 2015-01-08 13:00:46 -05:00
Zoltan Varga 67ef18be7d [arm64] Mark the 'tailcall' opcode as a call. Fixes #25646. 2015-01-06 13:48:20 -05:00
Zoltan Varga 92be1aebdb Revert "[android] Add a workaround for ndk r10c defining RTLD_DEFAULT as 0 on 64 bit platforms."
This reverts commit 5ee92ecb76.

Revert this. There was already some android specific code in LL_SO_OPEN ().
2014-11-23 02:32:26 -05:00
Zoltan Varga 7138ab117f [runtime] Add a wrapper around atexit () since it is missing on some android versions. 2014-11-22 00:08:18 -05:00
Zoltan Varga 09d18d4f47 [android] Avoid referencing SYS_fork which is not defined in some ndk versions. 2014-11-21 23:17:13 -05:00
Zoltan Varga 75b30d0fd9 [android] Add a workaround for ndk r10c defining RTLD_DEFAULT as 0 on 64 bit platforms. 2014-11-21 23:17:08 -05:00
Zoltan Varga b813e56737 [android] Disable the usage of tkill () on android/arm64, the tkill () function is no longer there. 2014-11-21 23:17:03 -05:00
Zoltan Varga 117302400a [runtime] Remove another getdtablesize () reference. 2014-11-21 20:40:16 -05:00
Zoltan Varga 399facb8ca [jit] Fix the AOT part of #24577, the epilog beginning was calculated using the code size, which can be different in AOT mode due to alignment padding between methods. 2014-11-21 20:32:27 -05:00
Zoltan Varga 2311da7b9a [runtime] Remove a getdtablesize () reference from eglib too. 2014-11-21 20:32:07 -05:00
Marek Safar 5b3813b1d2 [system.data] Fixes DbEnumerator current property to clone read data. Fixes #24452 2014-11-21 10:28:04 +01:00
Rodrigo Kumpera 2e5167402b [profiler] Use the new hidden API to attach the helper thread as a tools thread. This makes JI lookup work more reliably. 2014-11-20 18:35:21 -05:00
Rodrigo Kumpera bf54221823 [jit] Don't sample threads that are not fully attached. 2014-11-20 18:35:21 -05:00
Rodrigo Kumpera f9afcf06b9 [runtime] Introduce the notion of a tools thread.
A tools thread is one that can access core runtime structures but not touch anything managed (code or heap).

It's intended to enable the profiler to resolve missing backtraces from its helper thread.

THIS IS A HACK.

The right solution would be to not perform this on the profiler at all and simply log IPs and let the decoder
resolve them. But then there's reality and we can't simply break the current format without consequences.

We're taking this hack for now until we can fix the profiler to do something sensible.
2014-11-20 18:35:20 -05:00
Rodrigo Kumpera d955217874 [utils] Add foreach variant that supports filtering the list as you go. 2014-11-20 18:35:20 -05:00
Zoltan Varga d457bae593 Merge pull request #1411 from jbevain/sdb-frame-domain
[sdb] Expose the domain of the stack frames
2014-11-20 04:49:30 -05:00
Zoltan Varga 6e152a16a1 Fix #24577 correctly, cfg->code_len is the size of the code, while cfg->code_size is the size of the memory area allocated for code. 2014-11-20 04:46:24 -05:00
Rolf Bjarne Kvinge a824dad5f6 Fix typo, there is no profile called 'xammaci'. 2014-11-19 10:50:07 +01:00
Zoltan Varga 55fcfb81be [sdb] Avoid asserts on shutdown when the appdomain unload callbacks are called on the debugger thread during shutdown. Fixes #24342. 2014-11-18 20:55:20 -05:00
Zoltan Varga f8691c441b [jit] Remove an assert from mono_arch_find_jit_info () on x86 which can be hit when a profiler stack walk is done while in a jump trampoline. 2014-11-18 16:55:25 -05:00
Zoltan Varga 2f569721a7 [jit] Fix the calculation of the epilog size for EH info. Fixes #24577. 2014-11-18 16:54:48 -05:00
Zoltan Varga f07e7d0850 [jit] Fix a class initialization race which happens if a class initializer initializes a got slot before it finishes running. Fixes #23242. 2014-11-17 21:45:28 -05:00
Rolf Bjarne Kvinge a9a6e86072 [System] Ignore two tests which are failing due to external factors changing.
See https://bugzilla.xamarin.com/show_bug.cgi?id=24340
2014-11-14 00:30:50 +01:00
Jonathan Pryor 219bd64946 [mono-api-html] Allow ignoring addition of property setters.
As mentioned in commit 789517f8, I'm trying to compare inter-API level
differences in Mono.Android.dll, and want to reduce as much
"meaningless noise" as possible -- changes which don't meaningfully
break API or ABI.

Among those "meaningless" changes are the addition of property setters
to properties. Adding a setter doesn't break API or ABI.

Add a `mono-api-html --ignore-changes-property-setters` option.

  --ignore-changes-property-setters:
      Ignore the addition of property setters.

      If a source property contains a getter and the target property
      contains both a getter and a setter, do not flag this as a
      change.
2014-11-13 14:15:52 -05:00
Jonathan Pryor 255a8971e5 [mono-api-html] Make --ignore-changes-virtual less lenient.
As mentioned in commit 789517f8, the intentino of
`mono-api-html --ignore-changes-virtual` is so that when a method is
changed from non-virtual to virtual or override, or from virtual to
override, a "Removed member" message isn't triggered.

However, the previous implementation was too lenient. While *adding*
virtual to the method is fine, *removing* is NOT fine, as that would
be an API breaking change (e.g. all classes which attempt to override
a previously virtual method could no longer do so).

Make the virtual check stricter so that virtual/override to
non-virtual changes are not ignored.
2014-11-13 14:15:52 -05:00
Zoltan Varga 91a4a3d504 Fix the build. 2014-11-13 03:58:22 -05:00
Zoltan Varga 6d5c45d559 [jit] Fix gshared and aot support for --debug=casts. 2014-11-12 20:15:30 -05:00
Zoltan Varga 5e1afc4533 [jit] Fix --debug=casts support for casts in gshared methods. 2014-11-12 20:15:23 -05:00
Jonathan Pryor e7da99bb17 [mono-api-html] Allow ignoring parameter names, virtual.
I've been trying to review API diffs in Xamarin.Android between API
levels, but the diffs are "noisy" because Google will change parameter
names at-will, or will change a non-virtual method into a virtual
method, or a virtual method into an override, all of which are
acceptable changes but individually generate a Removed line in
mono-api-html output, and manually removing the *hundreds* of changes
is error-prone.

Add two new option flags to mono-api-html:

  --ignore-changes-parameter-names:
      Ignore changes in constructor and method parameter names.

      If parameter names change between <reference.xml> and
      <assembly.xml>, don't report a change for the constructor or
      method.

  --ignore-changes-virtual:
      Ignore changes in "virtual-ness".

      If a method or property changes from non-virtual to virtual,
      non-virtual to override, or virtual to override, don't report a
      change for the member.
2014-11-12 17:45:37 -05:00
Rodrigo Kumpera e9e611d501 [runtime] Remove the second signal used by profiling and now multiplex distribution and sampling with the same signal. 2014-11-10 18:40:00 -05:00
Rodrigo Kumpera cefe30a5cc [runtime] Introduce new MonoThread API for signal multiplexing. It's a provisional API until we figure out more of how it's suposed to work. 2014-11-10 18:39:59 -05:00
Rodrigo Kumpera 928436efc6 [profiler] Guard against null sbuff when serializing statistical data. 2014-11-10 18:39:58 -05:00
Rodrigo Kumpera 838ec2fb6f [profiler] Fix statistical backtraces to work and collect as many frames as possible.
This is a jumbo commit that addresses multiple issues with statistical backtrace collection:

1) It's not possible to reliably collect MonoMethod* so we check that they exist before
serializing to the .mlpd file and retrieve in sync context.

2) It was reporting the generic instance MonoMethod* under gsharing. Those methods are
not reported to the profiler since they are never compiled. They would turn out as unknowns.

3) Collecting IL offsets from async context is currently impossible to be done safely, so it's
now disabled. The way we'll do it in the future is by serializing the sequence point table when
JIT'ing.

4) The way we used to collect frames in statistical ignored all frames until the first LMF, which
discards a lot of them under statistical mode. We now properly pass sigcontext and have it been consumed.
In the future we should simply use the callchain mode.
2014-11-10 18:39:58 -05:00
Rodrigo Kumpera 45d8971caa [runtime] Changes mono_stack_walk_async_safe API to be truly async safe.
This is a very very tricky API, so we restrict the returned data to be what's really
possible under sig context.
2014-11-10 18:39:51 -05:00
Rodrigo Kumpera cf53f2aab3 [runtime] Harden the profiler signal handlers against not fully attached threads and HP reentrancy. 2014-11-10 16:46:03 -05:00
Zoltan Varga f2c520372f [jit] Use xmm5 as an fp scratch register on winx64. 2014-11-10 15:31:30 -05:00
Zoltan Varga 3bc58c925b Fix a problem introduced by e19f539121. 2014-11-10 15:31:23 -05:00
Zoltan Varga 3790413f38 [amd64] Make xmm6:xmm15 callee saved on winx64 as required by the ABI. 2014-11-10 15:31:17 -05:00
Rodrigo Kumpera ef4965a6dd [profiler] Expose new profiling modes and allow sampling rate to be set when using signal-based sampling. 2014-11-05 14:01:56 -05:00
Rodrigo Kumpera 7cb75c8355 [profiler] Add new profiler API mono_profiler_set_statistical_mode that gives control to statistical mode and sampling rate. 2014-11-05 14:01:53 -05:00
Rodrigo Kumpera 90a83b65df [profiler] Fix signal based profiling to sample all registered threads.
The current signal profiling code depended on invalid linux behavior of setitimer
allowing multiple threads to register for the same timer. Linux kernel 2.6.12 fixed
this and only the main thread gets the signal. Always.

The correct POSIX behavior happens on OSX/iOS.

On Linux we could use timer_create and SIGEV_THREAD_ID but that would not work on iOS/OSX
since it's specific to it. Given that little detail, I'll leave implementing it as an
exercise to the reader.

The solution, which aims to be as portable as possible, is to use a pair of signals and
have the first one fire the second one against all other threads.

We use a pair of signals since it's not well defined which thread will receive the signal
so detecting this from the signal is non-trivial.
2014-11-05 14:01:49 -05:00
Rodrigo Kumpera 96a5c1247e Make mono_threads_pthread_kill available to mach targets. 2014-11-05 14:01:44 -05:00
Zoltan Varga b5a5402beb [arm] Fix OP_LOCALLOC on arm so it correctly adjusts sp with the param area size even if the size is large. Fixes #24221. 2014-11-04 22:56:38 -05:00
Zoltan Varga 9d2eec1131 [runtime] Fix the android build with ndk r10c. 2014-10-30 18:44:19 -04:00
Zoltan Varga a825298e9d [Mono.Data.Tds] Allow sending of text data longer than 4000 characters by using a different column type. Fixes #21172. 2014-10-30 14:40:26 -04:00
Alexis Christoforides e11a0b175d Revert "[runtime] Fix allocation size calculation for strings in 64-bit builds."
The change has been implicated in https://bugzilla.xamarin.com/show_bug.cgi?id=12842.

This reverts commit b0cff959e4.
2014-10-29 14:58:30 -04:00
Alexis Christoforides 2f5ddd0210 Bump Mono version -> 3.12.0 2014-10-29 13:14:44 -04:00
Zoltan Varga dcdc8414df [llvm] Disable the extension of i8/i16 arguments to i32 on arm64, since the ios calling convention passes them differently than i32. Fixes #22800. 2014-10-29 12:55:31 -04:00
Zoltan Varga 2e8f21d4f2 [llvm] Fix a regression caused by 6ec1ebf990. Do the direct call rewrite only if the caller and callee signature matches. 2014-10-28 23:30:44 -04:00
Zoltan Varga 7e8a11f888 [runtime] Disable the check for overlapping reference and non-reference fields, too much code depends on this to work. 2014-10-28 17:08:09 -04:00
Neale Ferguson 872e97cb30 Add OP_LREM_IMM support;Add implementation of mono_arch_get_delegate_virtual_invoke_impl 2014-10-28 14:48:45 -04:00
Marcos Henrich 36c9c006bc Merge pull request #1298 from esdrubal/uploadfileasync
Fixes missing ContentType on WebClient.UploadFileTaskAsync
2014-10-28 18:21:22 +00:00
Marcos Henrich 137718d9b4 Merge pull request #1321 from esdrubal/currentsystemtimezone
CurrentSystemTimeZone.GetUtcOffset now supports multiple DST periods.
2014-10-28 18:18:54 +00:00
Zoltan Varga 424d1cdc8b Merge pull request #1376 from StephenMcConnel/bug-24109
Zero out pointers to freed memory in AudioDevice
2014-10-28 13:40:28 -04:00
Stephen McConnel 328defdcde Zero out pointers to freed memory in AudioDevice
This fixes https://bugzilla.xamarin.com/show_bug.cgi?id=24109.
2014-10-28 12:10:43 -05:00
Alexis Christoforides e0dab7749a Merge pull request #1373 from michaldobrodenka/master
Fix for random ObjectDiposedException in DispatcherCB class when connecting
2014-10-28 12:48:14 -04:00
João Matos e4b431e3a5 Merge pull request #1369 from DynamicDevices/ajl/appveyor
[CI] Add appveyor.yml configuration file to support Windows build
2014-10-28 16:47:19 +00:00
Zoltan Varga 039ffcafca Merge pull request #1374 from directhex/master
Add missing header file to s390x_sources
2014-10-28 01:08:37 -04:00
Alexis Christoforides 717c6de1cc [System.IO] Phase 2 of revamping KeventWatcher (FileSystemWatcher implementation for OS X/kqueue). Dozens of bugs and reliability issues fixed.
FileSystemWatcher.cs: Fixed multicast events.
SearchPattern.cs :  Fixed issue where case insensitivity was not being honored.
KeventWatcher.cs:
* Fixed several race conditions
* Fixed file descriptor duplication & leaks
* thread-safe/cleaner state transitions for watcher, and much cleaner stopping
* Now uses fsw.Filter parameter and respects IncludeSubdirectories = false. Use fsw.Filter to watch very large trees
* Added more error handling + OnError event
* Lots of behavior/reliability fixes and optimizations for Monitor() loop
* Fixed kevent/timespec struct definitions (for 64-bit build)
2014-10-27 21:20:16 -04:00
Cody Russell 13fd028ee8 [System.IO] Reimplemented much of the kqueue-based file watcher so that watching subdirectories works.
Reworked a lot of the internals of the kqueue FileSystemWatcher. There
is now a separate thread and a separate kqueue for each FileSystemWatcher
object.

https://bugzilla.xamarin.com/show_bug.cgi?id=16259
2014-10-27 21:20:16 -04:00
Zoltan Varga 80ca0394cd [jit] Fix the decomposition of OP_IREM_IMM on arm64. 2014-10-27 20:55:51 -04:00
Jo Shields 8b80178115 Add missing header file to s390x_sources, otherwise a required header file for s390x builds is missing from tarball builds. 2014-10-27 22:51:47 +00:00
Ludovic Henry 447975c12c [threadpool] Fix race condition on threads variable cleanup 2014-10-27 12:28:19 -04:00
michaldobrodenka 7174b069cf Fix for ObjectDiposedException in DispatcherCB class
https://bugzilla.xamarin.com/show_bug.cgi?id=23700
2014-10-27 13:28:59 +01:00
Miguel de Icaza 45d831259b Merge pull request #1368 from martinjt/SuppressFormsAuthRedirect
Implement the SuppressFormsAuthenticationRedirect properties
2014-10-26 18:53:05 -04:00
Zoltan Varga c170351fde Merge pull request #1366 from DynamicDevices/ajl/win32build
Fix Windows build by including wstcpip.h before winsock.h is included
2014-10-26 11:17:39 -04:00
Martin Thwaites e55e70f8c7 Implement the SuppressFormsAuthenticationRedirect properties 2014-10-26 14:55:41 +00:00
Zoltan Varga 5a234d5d16 Merge pull request #1367 from kornelpal/dolt-mingw32
[build] Enable dolt on mingw32
2014-10-26 10:07:51 -04:00
Kornel Pal 0635a83c89 [build] Enable dolt on mingw32 2014-10-26 14:49:45 +01:00
Alex J Lennon ff1817f017 [CI] Add appveyor.yml configuration file to support Windows build
Adds a configuration file to facilitate build of Mono with Cygwin
on Appveyor Windows-based build workers.

Dependencies are installed on a clean Appveyor build image for
each build and the result of the 'make install' step is stored
as a build output 'artifact' for further testing or deployment.

Signed-off-by: Alex J Lennon <[email protected]>
2014-10-26 14:06:08 +01:00
Alex J Lennon d663c9f65c Fix Windows build by including wstcpip.h before winsock.h is included
Error generated by socket-io.c was:

/usr/i686-pc-mingw32/sys-root/mingw/include/ws2tcpip.h:38:2:
error: #error "ws2tcpip.h is not compatible with winsock.h.
Include winsock2.h instead."

Signed-off-by: Alex J Lennon <[email protected]>
2014-10-26 12:49:59 +01:00
Zoltan Varga 8f9a74f2f6 Merge pull request #1364 from muojp/addDotNet45_SocketCtor
[System] Added missing ctor to Socket for initializing dual-mode socket
2014-10-25 17:24:53 -04:00
Kei Nakazawa dc30595ace [System] Added missing ctor to Socket for initializing dual-mode socket
- Ref: https://bugzilla.xamarin.com/show_bug.cgi?id=20048
 - Mono currently doesn't support 2-args Socket ctor added in .NET 4.5
 - Absence of this ctor prevents KestrelHttpServer (web server for
   ASP.NET vNext: https://github.com/aspnet/KestrelHttpServer ) test
   code from working
 - I hesitated to put IPv4 only implementation, but full dual stack
   (IPv4/v6) support would need bunch of works to be done. So, I pinned
   supported protocol of new ctor to IPv4. Also, I filed v4/v6 support
   issue as a MonoTODO entry inside the source code.
2014-10-26 02:57:22 +09:00
Jonathan Pryor f7fd52ad18 [mscorlib/Android] TimeZoneInfo.Local.Id should be "Local".
On Mono/.NET, TimeZoneInfo.Local has a TimeZoneInfo.Id value of
"Local" and a TimeZoneInfo.DisplayName value of "Local":

	$ csharp
	csharp> TimeZoneInfo.Local.Id;
	"Local"
	csharp> TimeZoneInfo.Local.DisplayName;
	"Local"

That isn't the case on Xamarin.Android, which returns the timezoneinfo
ID value from both DisplayName and Id, e.g. TimeZoneInfo.Local could
have Id and DisplayName values of "Australia/Sydney".

Rework things so that the TimeZoneInfo.Id and TimeZoneInfo.DisplayName
properties return "Local" on Xamarin.Android for the instance returned
from TimeZoneInfo.Local, just like normal Mono/.NET does.
2014-10-24 15:56:13 -04:00
Miguel de Icaza 84472a332e Merge pull request #1348 from ermshiperete/ImproveButtonTextLayout
[MWF] Improve button text layout
2014-10-24 14:44:29 -04:00
Miguel de Icaza c19e821763 Merge pull request #1357 from emergent-design/master
Include /dev/ttyACM in the search for serial port devices
2014-10-24 14:43:49 -04:00
Miguel de Icaza e867622025 Merge pull request #1362 from echampet/dupfix
Webapp stuck with "Key duplication when adding: httpModules"
2014-10-24 14:43:00 -04:00
Etienne CHAMPETIER c46234bf0c HttpApplication: if there is an exception in InitOnce, output it on the Console
Signed-off-by: Etienne CHAMPETIER <[email protected]>
2014-10-24 16:17:10 +02:00
Etienne CHAMPETIER 9b7b75d7ec WebConfigurationManager: simplify call to ConfigurationSection.GetRuntimeObject ()
this call come from an obfuscation contest :) ?

Signed-off-by: Etienne CHAMPETIER <[email protected]>
2014-10-24 16:17:01 +02:00
Etienne CHAMPETIER 3fd3541704 WebConfigurationManager: protect GetSection
all public static should be thread-safe

Signed-off-by: Etienne CHAMPETIER <[email protected]>
2014-10-24 16:16:55 +02:00
Etienne CHAMPETIER 8630afbd9b HttpApplication: set StatusCode = 500 when we send an exception to the client
Signed-off-by: Etienne CHAMPETIER <[email protected]>
2014-10-24 16:16:47 +02:00
Jo Shields 8da186ea62 Merge pull request #1361 from akoeplinger/fix-forms
[MWF] Use overload of Marshal.PtrToStringUni that reads up until the first null instead of explicitly specifying length
2014-10-24 13:23:15 +01:00
Atsushi Eno 976be34045 [xml] XmlTextReader: Value was wrong after ReadAttributeValue() on xml declaration. 2014-10-24 12:20:09 +08:00
Zoltan Varga e6b335e7f7 [runtime] Remove build system support for the interpreter. 2014-10-23 23:01:28 -04:00
Atsushi Eno 3d9a2b7175 [relaxng] fix default namespace handling in compact syntax.
Also had to disable RNC tests that depended on vanished web resource...
2014-10-24 07:14:58 +08:00
Alexander Köplinger ede4f3a8c6 [MWF] Use overload of Marshal.PtrToStringUni that reads up until the first null instead of explicitly specifying length
This fixes the two tests broken by 0ac61b03fc
2014-10-24 00:11:03 +02:00
Zoltan Varga e1da8e304d [jit] Use NULLIFY_INS () to nullify instructions and use MONO_INST_NEW to create phi node instructions to avoid asserts in the spill pass. Fixes #24006. 2014-10-23 14:47:19 -04:00
Zoltan Varga 2d3dd5a40a [runtime] Fix a regression introduced by 8d9f05ea9a. Only do the check for overlapping fields when the size of the type is known. 2014-10-23 14:04:32 -04:00
Zoltan Varga 87f4b14752 [jit] Print out methods which failed to JIT when using --regression. 2014-10-23 13:56:38 -04:00
Ludovic Henry 916abe5f57 [bcl] Restore ThreadPool number of threads configuration after each test 2014-10-23 11:00:47 -04:00
Zoltan Varga 8d9f05ea9a [runtime] Add checks for overlapping reference and non-reference fields when using explicit layout. Fixes #23954. 2014-10-22 18:20:41 -04:00
Zoltan Varga de8ca8fdf6 Merge pull request #1358 from madewokherd/win32build
Fix win32 build.
2014-10-22 17:47:48 -04:00
Zoltan Varga 6ec1ebf990 [llvm] Rewrite the way direct calls are made between llvm methods. Previously all calls were made to plt entries and the plt entry symbols were aliased to point to the corresponding method if the method was directly callable using the .set assembler directive. This doesn't seem to work with newer LLVM/CLANG versions, so do this completely on the LLVM side using Value::replaceAllUsesWith (). Fixes #23976. 2014-10-22 17:14:00 -04:00
Ludovic Henry a142d922aa [threadpool] Fix deadlock/starvation of the thread pool
The issue was with the new heuristic of the thread pool which would not create new threads, leading to deadlock between dependent tasks.
The fix is to check if every worker threads are sleeping, waiting or joining, and if that's the case, then we create a new thread because we might be in the case where the tasks being currently run depends on one still being enqueued in the cq or one of the wsq.

The following tests would previously fail :

1) MonoTests.System.Threading.Tasks.TaskTests.DoubleWaitTest :   #1
  Expected: True
  But was:  False

at MonoTests.System.Threading.Tasks.TaskTests.<DoubleWaitTest>m__27 () [0x00077] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs:800
at MonoTests.System.Threading.Tasks.ParallelTestHelper.Repeat (System.Action action, Int32 numRun) [0x00007] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/Test/System.Threading.Tasks/ParallelTestHelper.cs:48
at MonoTests.System.Threading.Tasks.TaskTests.DoubleWaitTest () [0x00000] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs:790
at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&)
at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00054] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/System.Reflection/MonoMethod.cs:230

2) MonoTests.System.Threading.Tasks.TaskTests.HideSchedulerTest :   #1
  Expected: True
  But was:  False

at MonoTests.System.Threading.Tasks.TaskTests.HideSchedulerTest () [0x0003d] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs:1914
at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&)
at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00054] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/System.Reflection/MonoMethod.cs:230

3) MonoTests.System.Threading.Tasks.TaskTests.WaitAll_TimeoutWithExceptionsAfter :   #1
  Expected: True
  But was:  False

at MonoTests.System.Threading.Tasks.TaskTests.WaitAll_TimeoutWithExceptionsAfter () [0x00070] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs:317
at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&)
at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00054] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/System.Reflection/MonoMethod.cs:230

4) MonoTests.System.Threading.Tasks.TaskTests.WaitAll_TimeoutWithExceptionsBefore :   #1
  Expected: True
  But was:  False

at MonoTests.System.Threading.Tasks.TaskTests.WaitAll_TimeoutWithExceptionsBefore () [0x00070] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs:341
at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&)
at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00054] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/System.Reflection/MonoMethod.cs:230

5) MonoTests.System.Threading.Tasks.TaskTests.WaitAnyTest :   #3
  Expected: not -1
  But was:  -1

at MonoTests.System.Threading.Tasks.TaskTests.<WaitAnyTest>m__0 () [0x00026] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs:142
at MonoTests.System.Threading.Tasks.ParallelTestHelper.Repeat (System.Action action, Int32 numRun) [0x00007] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/Test/System.Threading.Tasks/ParallelTestHelper.cs:48
at MonoTests.System.Threading.Tasks.ParallelTestHelper.Repeat (System.Action action) [0x00000] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/Test/System.Threading.Tasks/ParallelTestHelper.cs:42
at MonoTests.System.Threading.Tasks.TaskTests.WaitAnyTest () [0x00000] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs:128
at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&)
at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00054] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/System.Reflection/MonoMethod.cs:230

6) MonoTests.System.Threading.Tasks.TaskTests.WaitChildTestCase :   #0b
  Expected: True
  But was:  False

at MonoTests.System.Threading.Tasks.TaskTests.<WaitChildTestCase>m__25 () [0x0006d] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs:705
at MonoTests.System.Threading.Tasks.ParallelTestHelper.Repeat (System.Action action, Int32 numRun) [0x00007] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/Test/System.Threading.Tasks/ParallelTestHelper.cs:48
at MonoTests.System.Threading.Tasks.TaskTests.WaitChildTestCase () [0x00000] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs:684
at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&)
at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00054] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/System.Reflection/MonoMethod.cs:230

7) MonoTests.System.Threading.Tasks.TaskTests.WaitingForChildrenToComplete :   #3
  Expected: True
  But was:  False

at MonoTests.System.Threading.Tasks.TaskTests.WaitingForChildrenToComplete () [0x00048] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs:734
at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&)
at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00054] in /Users/ludovic/Xamarin/mono/mcs/class/corlib/System.Reflection/MonoMethod.cs:230
2014-10-22 17:09:11 -04:00
Vincent Povirk 21656fd89f Fix win32 build.
This commit licensed as MIT/X11.
2014-10-22 15:19:39 -05:00
Zoltan Varga bb86670c28 [bcl] Fix races in task tests. 2014-10-22 14:22:17 -04:00
Dan Parnham 87e7f1c2d7 Included /dev/ttyACM in the search for serial port devices, since CDC ACM is a standard
protocol for emulating serial ports over USB.
2014-10-22 16:21:20 +01:00
Ludovic Henry e15463e38a [sgen] Add GC max collection time counter 2014-10-21 15:28:59 -07:00
Ludovic Henry c4f72def57 [sgen] Add memory governor allocated size counter 2014-10-21 15:28:59 -07:00
Ludovic Henry 2a14bc4dad [sgen] Fix assertion error on 32bits 2014-10-21 10:03:31 -04:00
Jo Shields 63eb94b524 Merge pull request #1356 from martinjt/ReadEntityV2
Removed erroneously added property to HttpRequestBase in pull #1353
2014-10-21 14:17:36 +01:00
Zoltan Varga 066bdb9c24 [jit] Add some micro-optimizations to speed up the AOT compiler. 2014-10-20 22:51:49 -04:00
Zoltan Varga a26b297e11 Fix a warning. 2014-10-20 20:49:01 -04:00
Ludovic Henry 18cd82b380 [sgen] Adjust internal allocator block size to slot size.
The internal allocator used size segregated blocks which were always
16k large.  Since we have quite a few different size classes this led
to a lot of allocation even for very small programs.

We now use block sizes that are determined by the slot size and are as
small as possible.  They're power-of-two multiples of the page size,
so we end up with blocks of 4k, 8k and 16k.
2014-10-20 16:24:06 -07:00
Ludovic Henry 1daac38948 [sgen] Add assertion on power of 2 for internal allocator section size 2014-10-20 16:24:05 -07:00
Ludovic Henry 4619f9f070 [sgen] Add internal allocator default sizes usage statistic 2014-10-20 16:24:05 -07:00
Ludovic Henry d3788f892f [sgen] Utility function to compute number of unfaulted pages. 2014-10-20 16:24:05 -07:00
Ludovic Henry 26364535a0 [sgen] Cleanup some allocation code 2014-10-20 16:24:05 -07:00
Zoltan Varga 639413ef89 Fix the build after the signals changes. 2014-10-20 19:19:27 -04:00
Zoltan Varga 6716d439e9 [jit] Remove some unused definitions. 2014-10-20 18:22:40 -04:00
Zoltan Varga c3bd8334a3 Fix a typo. 2014-10-20 18:08:19 -04:00
Zoltan Varga 8410c9bb00 [runtime] Clean up the signal handling code by moving the signal handler signature definitions to mono-signal-handler.h and using them everywhere. 2014-10-20 18:07:24 -04:00
Mark Probst 5ae9f7d93f [sgen] Fix allowance calculation.
The formula for calculating allowance was not only overly complicated
but completely broken, which resulted in the allowance always being the
minimum (4 times the nursery size).  That resulted in too frequent garbage
collections when the heap grew larger.

Now we do something very similar to what Boehm does: Allow the heap
to grow by a third before the next major collection happens.
2014-10-20 13:40:50 -07:00
Martin Thwaites ce348f12da Removed erroneously added property to HttpRequestBase in pull #1353 2014-10-20 21:34:27 +01:00
Miguel de Icaza 643ad918e0 Merge pull request #1354 from martinjt/RequestAbort
Implement Request.Abort()
2014-10-20 10:04:35 -04:00
Miguel de Icaza e9ef2be437 Merge pull request #1353 from martinjt/ReadEntityBodyMode
Implement the ReadEntityBodyMode properties
2014-10-20 10:04:00 -04:00
Martin Thwaites 7eeb7f14f3 Implement Request.Abort() 2014-10-18 22:31:14 +01:00
Martin Thwaites 0db6c1418f Implement the ReadEntityBodyMode properties 2014-10-18 21:55:47 +01:00
Rodrigo Kumpera 6edd8bf89e [runtime] Don't define ucontext_t for android if PLATFORM is not android. 2014-10-17 15:37:14 -04:00
Zoltan Varga b67c4fe1c5 Fix a warning. 2014-10-17 12:14:26 -04:00
Zoltan Varga 36bfeec103 Fix a warning. 2014-10-16 18:35:55 -04:00
Zoltan Varga 77f9b3dc10 Fix a warning. 2014-10-16 17:11:19 -04:00
Zoltan Varga ddb83ce172 [bcl] Add an AppDomain.DoUnhandledException () internal method which can be used to invoke the UnhandledException event handlers. 2014-10-16 16:03:49 -04:00
Zoltan Varga 6f53824f35 [io-layer] Make _wapi_shm_enabled () inline so more code can be optimized away if shared handles are disabled. 2014-10-16 13:53:56 -04:00
Zoltan Varga 97866fc145 [io-layer] Remove more dead process code, add comments. 2014-10-16 12:59:11 -04:00
Paolo Molaro c5d4e39545 [jit] Fix -O=precomp option to skip generic methods and not crash. 2014-10-16 10:40:45 -04:00
Eberhard Beilharz 1189d3706a [MWF] Use full available height for text
This is especially relevant if we have to shrink the width because of
padding. In this case it is possible that MeasureString calculated that
the string would fit in one line, but because of padding we reduce the
width. If the button is large enough we want to display additional lines
even if MeasureString told us we only need one line.
2014-10-16 14:09:24 +02:00
Eberhard Beilharz 885b065e06 [MWF] Use full width for measuring text
Previously we applied the padding twice.
2014-10-16 14:08:53 +02:00
Zoltan Varga 45deb48384 [io-layer] Allocate the process name dynamically to make WapiHandle_process smaller. 2014-10-15 18:56:01 -04:00
Zoltan Varga b0077e8c2a [io-layer] Remove WapiHandle_process.self field, its no longer needed. 2014-10-15 18:50:09 -04:00
Zoltan Varga 1784575ef2 Include ucontext.h on android if it exists. 2014-10-15 17:22:08 -04:00
Zoltan Varga 5a4cd56c04 [runtime] Add a 'shared_handles' --enable-minimal option, same as --disable-shared-handles. 2014-10-15 17:18:21 -04:00
Zoltan Varga 04967b8dba Fix a warning. 2014-10-15 17:17:41 -04:00
Zoltan Varga ba6a479e5d [io-layer] Remove another usage of getdtablesize (). 2014-10-15 16:52:56 -04:00
Zoltan Varga 179fbf4b23 [runtime] Use getrlimit () to obtain the size of the fd table instead of getdtablesize () which is getting deprecated in Android. 2014-10-15 16:45:19 -04:00
Zoltan Varga 8e6ae13499 [io-layer] More coding convention/formatting fixes. 2014-10-15 16:28:47 -04:00
Zoltan Varga b58da19a66 [corlib] Implement MonoGenericClass:GetCustomAttributes () for created types. Fixes #23769. 2014-10-15 15:21:53 -04:00
Zoltan Varga 2ec479b762 [io-layer] Fix the linux build. 2014-10-15 15:08:54 -04:00
Zoltan Varga bf87077ac9 [io-layer] Make process handles non-shared. Fixes #23423. 2014-10-15 15:01:31 -04:00
João Matos e78e74cc1c Fixed linking on MinGW. 2014-10-15 14:37:25 -04:00
Zoltan Varga 727f8fe28d [jit] Fix the return of vtypes containing a single fp member from pinvoke methods on osx/x86. Fixes #23813. 2014-10-15 12:54:16 -04:00
Rodrigo Kumpera a9f31e63db [build] Rework the buildver dep check. 2014-10-14 18:12:08 -04:00
Zoltan Varga 30ed59ce3e Revert "Fixed buildver generated headers automake dependency tracking."
This reverts commit 8f41328a78.

Revert this for now as it breaks the parallel build.
2014-10-14 15:59:24 -04:00
Zoltan Varga 60d10d5464 Merge pull request #1341 from smortex/patch-2
Fix build on FreeBSD
2014-10-14 14:12:19 -04:00
Romain Tartière 54f5b48d44 Protect #include <unistd.h>
Protect inclusion as reported by @vargaz
2014-10-14 20:03:29 +02:00
Zoltan Varga 88ed113252 Merge pull request #1340 from smortex/patch-1
Add missing header
2014-10-14 13:49:53 -04:00
Romain Tartière 855bb5648b Fix build on FreeBSD
pid_t (used at line 216) is available on Linux in `unistd.h` and so on on FreeBSD (`sys/types.h` to be precise, included in `unistd.h`), yet on FreeBSD this header is not automatically included.
2014-10-14 19:48:31 +02:00
Romain Tartière 55fc7c277f Add missing header 2014-10-14 19:42:44 +02:00
Zoltan Varga 123d9a05db Merge pull request #1339 from tritao/master
Fixed buildver generated headers automake dependency tracking.
2014-10-14 12:54:48 -04:00
João Matos 8f41328a78 Fixed buildver generated headers automake dependency tracking.
We now include buildver-sgen/boehm.h in BUILT_SOURCES to have proper dependency tracking for these generated files.

Fixes the MinGW OSX cross build.
2014-10-14 11:46:36 -04:00
Zoltan Varga 4cba98f8c0 [runtime] Fix an SRE assert. Fixes #19039. 2014-10-13 18:39:56 -04:00
Zoltan Varga 3b484c1fcb Merge pull request #1335 from nlhepler/master
Fix relocatable mono
2014-10-13 13:56:29 -04:00
Lance Hepler e3abaa85d8 Fix relocatable mono 2014-10-13 09:32:30 -07:00
Marek Safar 10b5567b3d [mcs] A pointer-type may be used as the type of a volatile field. Fixes #23770 2014-10-13 12:28:08 +02:00
Zoltan Varga 6e4ab1d3eb [runtime] Remove some dead code from the io-layer process code, avoid mixing ifdefs with control flow. 2014-10-12 18:03:02 -04:00
Marek Habersack abb760f376 Merge pull request #1333 from joero74/ignore-missing-host
Prevent NullReferenceException in case of missing Host
2014-10-10 18:36:50 +02:00
Joerg Rosenkranz f927c83afe Prevent NullReferenceException in case of missing Host
Do not throw a NullReferenceException when Host variable is not set.
Ignore the calls to RegisterObject and UnregisterObject instead.
2014-10-10 16:23:22 +02:00
Zoltan Varga 5f2f74f5de [runtime] Rewrite io-layer process code to reduce duplication and make it conform to the mono coding conventions. 2014-10-09 21:46:01 -04:00
Zoltan Varga 02be6a4f28 [runtime] Use explicit initialization in the io-layer process code instead of pthread_once (). Get rid of the WAPI_PROCESS_HANDLE_OFFSET code which was only used in shared mode. 2014-10-09 16:49:13 -04:00
Zoltan Varga e1af46ef45 [runtime] More win32 build fixes. 2014-10-09 16:21:56 -04:00
Zoltan Varga a487812e61 runtime] Really use WinXP SP2 as the minimum version on the msvc builds too. Update project files with newly
added/removed sources.
2014-10-09 15:51:49 -04:00
Zoltan Varga eea8080dad [runtime] Use WinXP SP2 as the minimum version on the msvc builds too. 2014-10-09 15:20:06 -04:00
Mark Probst a68a793383 Merge pull request #1326 from BrzVlad/master
[sgen] Fix pointer access.
2014-10-09 11:43:03 -07:00
Zoltan Varga 92d86659ca [runtime] Remove pre WinXP SP2 windows support code. 2014-10-09 14:04:31 -04:00
Zoltan Varga 4109ab0ee4 [runtime] Use the functionality in mono-proclib.c to get the current pid, remove duplicate code from the io-layer. 2014-10-09 14:04:31 -04:00
Zoltan Varga 43fd14b9d8 [runtime] Use the functionality in mono-proclib.c to enumerate processes, remove duplicate code from the io-layer. 2014-10-09 14:04:31 -04:00
Alexis Christoforides e92af12248 Fix oops in DataContractJsonSerializer fix 2014-10-08 22:04:34 -07:00
Zoltan Varga 17edd267ab [bcl] Use List instead of ArrayList () in a few places. 2014-10-08 16:12:01 -04:00
Zoltan Varga c33600f57d [bcl] Free strings allocated using Marshal.SecureStringToBSTR () using Marshal.ZeroFreeBSTR (). 2014-10-08 15:12:35 -04:00
Marek Safar 114a27e57c Merge pull request #1330 from esdrubal/blockingcollection
Improved BlockingCollection.AddAny.
2014-10-08 15:02:54 -04:00
Ludovic Henry 98ce3f76b2 [threaddpool] Fix deadlock in thread pool with monitor thread (2nd attempt)
Because the monitor thread was not marked as background thread, remove_and_abort_threads (threads.c:2807) would mark it as needed to be waited to shutdown the runtime, and wait_for_tids (threads.c:2652) would then wait indefinitely for it to finish. The issue was that the monitor was waiting on the semaphore monitor_sem, and thus would never exit.

Thread 7 (Thread 0x1c13 of process 99776):
#0  0x00007fff86590a56 in ?? () from /usr/lib/system/libsystem_kernel.dylib
#1  0x00000001003cc03a in mono_sem_wait (sem=0x1004f7f50, alertable=0) at mono-semaphore.c:103
#2  0x00000001002cef41 in monitor_thread (unused=0x0) at threadpool.c:898
#3  0x00000001002cb78f in start_wrapper_internal (data=0x10500abf0) at threads.c:657
#4  0x00000001002cb4a1 in start_wrapper (data=0x10500abf0) at threads.c:704
#5  0x00000001003d61d4 in inner_start_thread (arg=0x7fff5fbfe500) at mono-threads-posix.c:84
#6  0x00007fff8e7c9899 in _pthread_body () from /usr/lib/system/libsystem_pthread.dylib
#7  0x00007fff8e7c972a in _pthread_start () from /usr/lib/system/libsystem_pthread.dylib
#8  0x00007fff8e7cdfc9 in thread_start () from /usr/lib/system/libsystem_pthread.dylib
#9  0x0000000000000000 in ?? ()

Thread 1 (Thread 0x1503 of process 99776):
#0  0x00007fff86594716 in ?? () from /usr/lib/system/libsystem_kernel.dylib
#1  0x00007fff8e7cbc3b in _pthread_cond_wait () from /usr/lib/system/libsystem_pthread.dylib
#2  0x000000010039cfaa in _wapi_handle_timedwait_signal_handle (handle=0xa55, timeout=0x0, alertable=1, poll=0) at handles.c:1595
#3  0x000000010039d03d in _wapi_handle_wait_signal_handle (handle=0xa55, alertable=1) at handles.c:1540
#4  0x00000001003b7ba3 in WaitForSingleObjectEx (handle=0xa55, timeout=4294967295, alertable=1) at wait.c:194
#5  0x00000001003b865d in WaitForMultipleObjectsEx (numobjects=1, handles=0x7fff5fbff1f8, waitall=1, timeout=4294967295, alertable=1) at wait.c:516
#6  0x00000001002c75df in wait_for_tids (wait=0x7fff5fbff1f8, timeout=4294967295) at threads.c:2658
#7  0x00000001002c70e5 in mono_thread_manage () at threads.c:2951
#8  0x00000001000d551b in mono_main (argc=6, argv=0x7fff5fbff9e8) at driver.c:2021
#9  0x0000000100001bd1 in mono_main_with_options (argc=6, argv=0x7fff5fbff9e8) at ./main.c:91
#10 0x00000001000017d3 in main (argc=6, argv=0x7fff5fbff9e8) at ./main.c:122

Thanks @akoeplinger for the help debugging
2014-10-08 14:39:18 -04:00
Marcos Henrich 54844b08ef Refactored AddToAny and TakeFromAny to reuse code. 2014-10-08 12:59:42 +01:00
Marcos Henrich 7724a608a5 Improved BlockingCollection.AddAny. Fixes #22775.
AddAny no longer consumes OperationCanceledException.
AddAny no longer blocks while adding an item to the first collection when its full.
2014-10-08 12:16:36 +01:00
Marcos Henrich 0e13745ec2 Test BlockCollection.AddAny. Covers #22775. 2014-10-08 11:58:26 +01:00
Marcos Henrich 00c918e0a9 BlockingCollection.Add was adding one more item than it should. 2014-10-08 11:51:59 +01:00
Marcos Henrich 7e034defbc Test that BlockingCollection.Add blocks when there is no more space. 2014-10-08 10:41:14 +01:00
Zoltan Varga f51b9a4bb2 [jit] Extract the ctor calling code from the NEWOBJ implementation into a separate function. 2014-10-07 20:44:28 -04:00
Zoltan Varga c01afa20e8 [jit] Clean up the jit failure handling code a bit, move the the bulk of the eror handling macros into functions, unify the cleanup code at the end of mono_method_to_ir (). 2014-10-07 20:21:09 -04:00
Alexis Christoforides 71e152accc [bcl] Implement KnownTypes for DataContractJsonSerializer. Fixes #23058 and polymorphism support.
Also discarded old __type hint behavior in JsonSerializationReader that potentially allowed any loaded type to be instantiated.
2014-10-07 16:24:41 -07:00
Alexis Christoforides fbea921536 [tests] Add tests for Bug #23058 and polymorphism/known types in DataContractJsonSerializer. 2014-10-07 16:24:41 -07:00
Ludovic Henry 478f99f398 [threaddpool] Fix deadlock in thread pool with monitor thread
Because the monitor thread was not marked as background thread, remove_and_abort_threads (threads.c:2807) would mark it as needed to be waited to shutdown the runtime, and wait_for_tids (threads.c:2652) would then wait indefinitely for it to finish. The issue was that the monitor was waiting on the semaphore monitor_sem, and thus would never exit.

Thread 7 (Thread 0x1c13 of process 99776):
#0  0x00007fff86590a56 in ?? () from /usr/lib/system/libsystem_kernel.dylib
#1  0x00000001003cc03a in mono_sem_wait (sem=0x1004f7f50, alertable=0) at mono-semaphore.c:103
#2  0x00000001002cef41 in monitor_thread (unused=0x0) at threadpool.c:898
#3  0x00000001002cb78f in start_wrapper_internal (data=0x10500abf0) at threads.c:657
#4  0x00000001002cb4a1 in start_wrapper (data=0x10500abf0) at threads.c:704
#5  0x00000001003d61d4 in inner_start_thread (arg=0x7fff5fbfe500) at mono-threads-posix.c:84
#6  0x00007fff8e7c9899 in _pthread_body () from /usr/lib/system/libsystem_pthread.dylib
#7  0x00007fff8e7c972a in _pthread_start () from /usr/lib/system/libsystem_pthread.dylib
#8  0x00007fff8e7cdfc9 in thread_start () from /usr/lib/system/libsystem_pthread.dylib
#9  0x0000000000000000 in ?? ()

Thread 1 (Thread 0x1503 of process 99776):
#0  0x00007fff86594716 in ?? () from /usr/lib/system/libsystem_kernel.dylib
#1  0x00007fff8e7cbc3b in _pthread_cond_wait () from /usr/lib/system/libsystem_pthread.dylib
#2  0x000000010039cfaa in _wapi_handle_timedwait_signal_handle (handle=0xa55, timeout=0x0, alertable=1, poll=0) at handles.c:1595
#3  0x000000010039d03d in _wapi_handle_wait_signal_handle (handle=0xa55, alertable=1) at handles.c:1540
#4  0x00000001003b7ba3 in WaitForSingleObjectEx (handle=0xa55, timeout=4294967295, alertable=1) at wait.c:194
#5  0x00000001003b865d in WaitForMultipleObjectsEx (numobjects=1, handles=0x7fff5fbff1f8, waitall=1, timeout=4294967295, alertable=1) at wait.c:516
#6  0x00000001002c75df in wait_for_tids (wait=0x7fff5fbff1f8, timeout=4294967295) at threads.c:2658
#7  0x00000001002c70e5 in mono_thread_manage () at threads.c:2951
#8  0x00000001000d551b in mono_main (argc=6, argv=0x7fff5fbff9e8) at driver.c:2021
#9  0x0000000100001bd1 in mono_main_with_options (argc=6, argv=0x7fff5fbff9e8) at ./main.c:91
#10 0x00000001000017d3 in main (argc=6, argv=0x7fff5fbff9e8) at ./main.c:122
2014-10-07 18:15:04 -04:00
Zoltan Varga ac2d851398 [jit] Reduce code duplication in the inlining code. 2014-10-07 15:43:17 -04:00
Marek Safar c74ca49869 Merge pull request #1329 from esdrubal/httputility
HttpQSCollection.ToString now url encodes values.
2014-10-07 14:31:50 -04:00
Alexis Christoforides c677be429f Merge pull request #1327 from ermshiperete/Xamarin-23168
[MWF] Pass graphics when calculating button text and image
2014-10-07 11:30:52 -07:00
Jonathan Pryor 8b90653ff3 [System.Core/Android] Fix standalone unit tests.
Commit 5564dad1 broke the self-test (for testing on the developer
machine, not an Android target). Fixup the comment so that appropriate
data is grabbed and used for testing, and improve
AndroidTimeZones.GetDefaultTimeZoneName() so that the default timezone
ID can be specified via the __XA_OVERRIDE_TIMEZONE_ID__ environment
variable for testing.

Finally, demonstrate TimeZoneInfo.GetUtcOffset(DateTime) use so that I
can get better insight into the timezone data stored within the
database:

	$ __XA_OVERRIDE_TIMEZONE_ID__=America/New_York ANDROID_ROOT=`pwd` ANDROID_DATA=`pwd` mono --debug tzi.exe --offset=1969-01-01
	Using DateTime Offset: 1/1/1969 12:00:00 AM
	DB type: System.AndroidTzData
	name=Africa/Abidjan                           Africa/Abidjan                          From Offset: 00:00:00
	name=Africa/Accra                             Africa/Accra                            From Offset: 00:00:00
	name=Africa/Addis_Ababa                       Africa/Addis_Ababa                      From Offset: 03:00:00
	...
2014-10-07 13:59:49 -04:00
Marcos Henrich 843fe0b3c6 HttpQSCollection.ToString now url encodes values. Fixes 22557. 2014-10-07 18:50:45 +01:00
Marcos Henrich 6abce1e8d8 Test HttpQSCollection.ToString url encoding. Covers #22557. 2014-10-07 18:45:50 +01:00
Zoltan Varga 10c2cc4d3f [runtime] Move the MonoJit/MonoJitInfoTable code to a separate file from domain.c. 2014-10-07 13:26:12 -04:00
Zoltan Varga 7cfd463841 [runtime] Factor out some duplicate code from the MonoJitInfo creation code. 2014-10-07 13:03:41 -04:00
Zoltan Varga 04f89bb6fe Merge pull request #1328 from vkargov/master
[runtime] Take correct domain information from StackFrameInfo for each stack frame.
2014-10-07 12:45:52 -04:00
Eberhard Beilharz aab88e769c [MWF] Pass graphics when calculating button text and image
This fixes a problem with calculating the text width of a button
which caused the text to get truncated under certain circumstances
instead of being wrapped. This fixes Xamarin-23168.

Change-Id: Iac0d8a2720a99cf5433e05d5123a04c4b019e493
2014-10-07 17:34:44 +02:00
Vladimir Kargov 4cda578c6a [runtime] Take correct domain information from StackFrameInfo for each stack frame. 2014-10-07 19:30:31 +04:00
Rodrigo Kumpera bd002446fc Merge pull request #1179 from ludovic-henry/pr25-threadpool
[threadpool] Improve heuristic to approach optimal number of threads based on workload
2014-10-07 10:34:43 -04:00
Marcos Henrich fa2c2870e5 Added missing files to projects csproj files. 2014-10-07 14:03:29 +01:00
Marcos Henrich a1e558f6c6 Reset stream position before doing CopyToAsync.
CopyToAsync begins copying at the current position.
2014-10-07 09:53:01 +01:00
Marcos Henrich aea4abc755 Call SetupRequestAsync only after ContentType changes. Fixes 19529. 2014-10-07 09:52:54 +01:00
Alexis Christoforides 14d49cce10 [runtime] Fix another lost canary change 2014-10-06 17:02:23 -07:00
Zoltan Varga f533903590 Kill timed-out tests when using the managed test runner. 2014-10-06 16:13:54 -04:00
Vlad Brezae 7ecf25c7a1 [sgen] Fix pointer access.
Thanks to @martinpotter for finding the bug.
2014-10-06 12:19:52 -07:00
Zoltan Varga 5a22dacd4e [bcl] Remove some verbose test output. 2014-10-06 14:56:32 -04:00
Marcos Henrich 457c87c69f TimeZoneInfo.CreateLocal now handles environment variable TZ. 2014-10-06 15:57:13 +01:00
Rodrigo Kumpera b97e3209b3 [runtime] Silence a warning that has not helped us fix anything. 2014-10-06 10:54:16 -04:00
Marcos Henrich 27d26c36cc Added bash script to test DateTime.Now.
The test changes TZ environment variable and compares DateTime.Now with system date.
The test checks all the timezones installed in /usr/share/zoneinfo/.
2014-10-06 15:32:45 +01:00
Alexis Christoforides d29a341e73 [runtime] Fix canary oops 2014-10-05 23:08:48 -07:00
Alexis Christoforides ee90d5ff1d [runtime] Implement 'nursery-canaries' option for SGen. 2014-10-05 22:32:53 -07:00
Alexis Christoforides 84110040aa [runtime] Convert String.InternalSetLength to an icall. Needed for canary support.
The change does not have a negative impact on StringBuilder performance; under variable-string-length microbenchmarks it seems to perform ~15-20% faster than the managed implementation.
2014-10-05 22:21:15 -07:00
Alexis Christoforides d8ae2993ef [runtime] Implement nursery canaries.
Use the new MONO_GC_DEBUG option "nursery-canaries"  to suffix each nursery object with a canary (guard) word, which is checked on each minor collection. Can be used to detect/debug
heap corruption issues.

Adding canaries to LOS is also easy if wanted - not sure about major heap.
2014-10-05 22:16:27 -07:00
Marek Safar 153d104c07 [system.xml] Make XmlSerializer work even when XmlTextReader has explicitly set its resolver 2014-10-05 17:58:02 -04:00
Marek Safar 58105a4dc6 [system.xml] Add missing 4.0 property 2014-10-05 15:44:55 -04:00
Marek Safar f39cc88e58 [corlib] Notify parent task when child task uses NotOnFaulted. Fixes #23594 2014-10-05 14:36:05 -04:00
Zoltan Varga 9e573872f0 [arm] Increase size of tls_get opcode to 24. 2014-10-05 00:04:58 -04:00
Marcos Henrich 2a73a83d89 Use TZ transitions when AdjustementRules are ignored. Fixes 23170.
In some cases the timezone transitions provided by iOS are not convertible to AdjustmentRules because of changes on the base offset.
Now we store the transitions so they can be used instead of an incomplete list of AdjustmentRules.
2014-10-04 17:32:03 +01:00
Marcos Henrich 97c6bc06ea Refactored TimeZoneInfo.GetUtcOffset.
Added GetUtcOffset auxiliar methods with bool out parameter that is true when the given DateTime is a DST.
2014-10-04 16:46:47 +01:00
Marcos Henrich 1a92f4e90b TimeZoneInfo.IsDaylightSavingTime now uses GetUtcOffset. 2014-10-03 17:43:47 +01:00
Marcos Henrich 374e1b13e0 TimeZoneInfo.GetUtcOffset now handles all DateTimeKinds.
Removed GetUtcOffset cohesion with TimeZoneInfo.IsDaylightSavingTime.
2014-10-03 17:43:32 +01:00
Marcos Henrich 09fc592499 Created helper method TimeZoneInfo.IsInDST. 2014-10-03 10:38:13 +02:00
Marcos Henrich 306ac05ea1 Removed repeated logic from TimeZoneInfo.ConvertTimeToUtc. 2014-10-03 10:38:13 +02:00
Marcos Henrich d6848d1ef6 ConvertTimeToUtc no longer relies in DateTime.ToUniversalTime. 2014-10-03 10:38:12 +02:00
Marcos Henrich b863d3c58d Simplified TimeZone.ToLocalTime.
Old code was producing invalid DST dates.
2014-10-03 10:38:11 +02:00
Marcos Henrich 411d4aa0bb Test TimeZoneInfo.GetUtcOffset with multiple DST and DateTimeKind. 2014-10-03 10:38:11 +02:00
Marcos Henrich 8ab9a76c7e Updated TimeZoneInfoTest.DSTTransisions to correct .NET behavior. 2014-10-03 10:38:10 +02:00
Alexis Christoforides b0cff959e4 [runtime] Fix allocation size calculation for strings in 64-bit builds.
Depending on alignment and packing, part of the string might be inside the MonoString struct boundaries. This e.g. shows up on 64-bit builds of mono where we were allocating 4 extra bytes per string.
2014-10-02 21:04:39 -07:00
Zoltan Varga 6e27f984ab [bcl] Use random ports for the HttpListener tests. 2014-10-02 23:29:53 -04:00
Zoltan Varga af33ad4eaa [jit] Implement 5dbf97e660 for calls made from NEWOBJ too. Fixes #23557. 2014-10-02 21:29:51 -04:00
Zoltan Varga 7a430acd77 [jit] Get rid of unused MONO_ARCH_THIS_AS_FIRST_ARG define. 2014-10-02 20:40:38 -04:00
Zoltan Varga 9523b73148 [arm] Implement handler block guards. 2014-10-02 20:35:42 -04:00
Zoltan Varga f862057fb1 [amd64] Simplify mono_arch_install_handler_block_guard (). 2014-10-02 19:04:27 -04:00
Zoltan Varga c1fe551f9c [arm] Increase the length of the tls_get opcode. 2014-10-02 18:41:42 -04:00
Chris Hamons 4c6a463678 [mono-api-html] Add filter for new namespaces/types
- Reviewed by Sebastien
2014-10-02 15:35:21 -05:00
Zoltan Varga e7778f3fd5 Fix a warning. 2014-10-02 16:06:24 -04:00
Zoltan Varga 4437ecea91 Fix the arm build. 2014-10-02 16:06:01 -04:00
Zoltan Varga 1317d99cae [sgen] Reorganize sgen-archdep.h to remove unused defines. 2014-10-02 15:49:00 -04:00
Zoltan Varga 1e709688bb [jit] Remove unused defines. 2014-10-02 14:32:11 -04:00
Zoltan Varga da3b7dd271 [amd64] Define MONO_ARCH_NOMAP32BIT on all non-linux platforms instead of defining it once for each platform. 2014-10-02 14:23:15 -04:00
Sebastien Pouliot 3e3fe21e7f Revert "Finish test changes started in 7ece665d16714db0979bde5df254231c5be24f10"
This reverts commit d171cdf5e2.
2014-10-02 13:45:11 -04:00
Sebastien Pouliot d525ff73e1 Revert "Refresh HashAlgorithmTest to match changed NullStream behaviour in 8b9c60075f7b97fe88c3c588968977ff9bcf8c28"
This reverts commit 7ece665d16.
2014-10-02 13:44:58 -04:00
Sebastien Pouliot 16dbea555d Revert "Missing Args checks."
This reverts commit 8b9c60075f.
2014-10-02 13:44:35 -04:00
Marcos Henrich 709d2c58ad Removed unused CurrentSystemTimeZone fields and methods. 2014-10-02 09:31:06 +01:00
Marcos Henrich 9be262f8cc CurrentSystemTimeZone.GetUtcOffset now supports multiple DST periods.
DateTime.Now was returning wrong values when system TimeZone had more than one daylight saving time.
Fixes 22648.
2014-10-02 09:31:06 +01:00
Marcos Henrich 88297792e7 TimeZoneInfo is now always present in corlib.
Prior to net_4_0 TimeZoneInfo is a private class.
2014-10-02 09:31:06 +01:00
Zoltan Varga aa73f76a34 [jit] Define NOMAP32BIT on winx64. 2014-10-01 22:49:29 -04:00
Mark Probst b86bd886d6 [sgen] Fix concurrent mark with split nursery. 2014-10-01 14:52:07 -07:00
Zoltan Varga c856758e54 [jit] Remove the unused MONO_DISABLE_PENDING_EXCEPTIONS env var, the functionality it disable is not experimental anymore. 2014-10-01 16:42:47 -04:00
Zoltan Varga d659d7540d [x86] Remove the now unused push based parameter passing code. 2014-10-01 16:36:27 -04:00
Jonathan Pryor 87454f9f83 Merge pull request #1306 from joelmartinez/docs-privateinterface
mdoc no longer documents private interfaces
2014-10-01 15:23:08 -04:00
Rodrigo Kumpera 0ac61b03fc [corlib] Fix UnicodeEncoding GetMaxByteCount and GetMaxCharCount to return the same values as .net. 2014-10-01 15:11:20 -04:00
Zoltan Varga 52834175e1 [runtime] Add a missing call to mono_thread_notify_pending_exc_fn () to the thread abort code. 2014-10-01 15:02:25 -04:00
Zoltan Varga 9aaf79b055 Fix some warnings by not including utils/mono-threads.h into threads-types.h. 2014-10-01 14:27:18 -04:00
Zoltan Varga fc7c8e9765 [jit] Make each CASTCLASS_CACHE patch unique by generating a unique identifier from the method index and an per-method counter. Fixes #23478. 2014-09-30 22:12:53 -04:00
Jo Shields d171cdf5e2 Finish test changes started in 7ece665d16 2014-09-30 14:51:13 +01:00
Jo Shields a49bd2664f Add new cert-sync command to scripts/.gitignore 2014-09-30 13:22:00 +01:00
Jo Shields 7ece665d16 Refresh HashAlgorithmTest to match changed NullStream behaviour in 8b9c60075f 2014-09-30 13:22:00 +01:00
Marek Safar 497481742a [mcs] Undo bool loads normalization from byte arrays 2014-09-30 13:02:32 +02:00
Marek Safar 999e88dcd5 [mcs] Correctly identify constant switch section when value match is not section start. Fixes #23475 2014-09-30 11:12:24 +02:00
Marek Safar 01ffcd4145 [mcs] struct initializers are still experimental 2014-09-30 09:48:41 +02:00
Marek Safar 2476a1b728 Merge pull request #1318 from AlexanderBekrenev/baa-membershipuser
MembershipUser::UpdateUser method fix
2014-09-29 22:28:19 -09:00
Alexander Bekrenev c9044d71bb MembershipUser::UpdateUser method fix 2014-09-30 10:46:14 +04:00
Mark Probst 4e3ca74fcb Fix build on pre-C99 compilers. 2014-09-29 13:52:00 -07:00
Ludovic Henry ada4b4b06f [sgen] Remove useless internal allocation 2014-09-29 16:16:31 -04:00
Zoltan Varga 1fbdf06d04 [runtime] Enable the new interrupt code on ios. 2014-09-29 14:30:19 -04:00
Mark Probst c70c3c429a [sgen] Don't use callback for pinning cemented objects. 2014-09-29 11:04:03 -07:00
Mark Probst a12c4b8099 [sgen] Tag block pointers with whether the blocks contain references. 2014-09-29 11:04:02 -07:00
Mark Probst e8efdfa360 [sgen] Macro abstractions for pointer tagging. 2014-09-29 11:04:02 -07:00
Mark Probst ac83118056 [sgen] Shift, don't divide, just to make sure. 2014-09-29 11:04:02 -07:00
Mark Probst 70980c0cde [sgen] Move SGen statistics out of gc-internal.h.
This introduced a dependency from sgen-conf.h to a lot of compilation units
in metadata, leading to long build times when experimenting with SGen.
2014-09-29 11:04:02 -07:00
Mark Probst 0cfc7008a0 [sgen] Don't unroll run-length scanning loop. 2014-09-29 11:04:01 -07:00
Mark Probst 8e714a70a1 [sgen] Keep allocated blocks in array instead of linked list.
We were spending a lot of time in major_iterate_live_block_ranges() on
the lcscbench benchmark, mainly from following the linked block list.
This change makes it much faster.
2014-09-29 11:04:01 -07:00
Mark Probst 18ee4f22a3 [sgen] Move GRAY_OBJECT_ENQUEUE/DEQUEUE to sgen-gray.h. 2014-09-29 11:04:01 -07:00
Mark Probst 62df12c0e4 [sgen] Move HEAVY_STAT macro to sgen-conf.h.
That's where we define HEAVY_STATISTICS, too.
2014-09-29 11:04:01 -07:00
Mark Probst aa82365b6b [sgen] Scoping fix in a macro. 2014-09-29 11:04:01 -07:00
Mark Probst 0f7be7ca38 [sgen] Heavy statistics counters for scanned object descriptors. 2014-09-29 11:04:00 -07:00
Mark Probst aa8cabc373 [sgen] do-while loop instead of 1-unrolled while loop in bitmap scan. 2014-09-29 11:04:00 -07:00
Mark Probst 53b798f915 [sgen] Added some comments. 2014-09-29 11:04:00 -07:00
Mark Probst 533b11a0f6 [sgen] Simplify sgen_drain_gray_stack().
This seems to have accumulated code duplication by accident.
2014-09-29 11:03:59 -07:00
Mark Probst 78408ae100 [sgen] Free gray queue sections after GC, not at start of next.
We trim the free list of the gray queue to a maximum number of
sections, but we did it at each collection start, so the extraneous
sections were kept around between collections.
2014-09-29 11:03:59 -07:00
Mark Probst 72c15bb6f2 [sgen] Enqueue objects with their descriptors.
At the point where we enqueue objects we have already fetched their
descriptors, and when we later scan them (after dequeuing) we need the
descriptor again, so we avoid cache misses by enqueuing them together.
2014-09-29 11:03:59 -07:00
Mark Probst 96e37d79b3 [sgen] Pass descriptor, not vtable, to OBJ_COMPLEX_ARR_FOREACH_PTR.
Later on, when we enqueue objects with their GC descriptors, we won't
load the vtable before scanning (because we'll already have the
descriptor), so the scanning macros shouldn't take them as arguments.
2014-09-29 11:03:59 -07:00
Mark Probst 003488cc2a [sgen] GrayQueueEntry struct instead of just char*.
This makes it easier to later enqueue the GC descriptor with the
object.
2014-09-29 11:03:58 -07:00
Mark Probst c2022b34b7 [sgen] Remove obsolete check in #ifdef.
That macro doesn't exist anymore.
2014-09-29 11:03:58 -07:00
Mark Probst d07b7650c7 [sgen] Abstract block info->block via macro.
If we want to experiment with putting the block info into the block this
makes it easy.
2014-09-29 11:03:58 -07:00
Mark Probst 050ee93a67 [sgen] Implement get_and_reset_num_major_objects_marked() for non-conc, too.
This is used for profiling and debugging.  There's no reason to only
have it for concurrent.
2014-09-29 11:03:58 -07:00
Mark Probst 8a005b8290 [sgen] Remove parallel collector.
This was almost completely untested and performance was
erratic.
2014-09-29 11:03:57 -07:00
Mark Probst 06ba93fd0e [sgen] Remove SGen fixed heap configuration.
It's not well-tested, not widely used, we can surpass its speed with
upcoming improvements and we won't put those into the fixed
configuration because it's too much of a diversion.
2014-09-29 11:03:57 -07:00
Marek Safar 2a4230fe3b [facades] Add ComInterfaceType type forwarder 2014-09-29 19:50:29 +02:00
Zoltan Varga 67297b2710 Fix a warning. 2014-09-29 13:37:03 -04:00
Zoltan Varga 7968a8df16 [x86] Reenable the no pushes code again. 2014-09-29 13:01:52 -04:00
Marek Safar f1ca57ebb3 [mcs] Don't consider loads from captured local cheap 2014-09-29 16:44:46 +02:00
Marek Safar 5d762ffe93 [mcs] null operator on unconstrained generic values 2014-09-29 16:44:46 +02:00
Alexander Köplinger 22a218578a Updated links in CONTRIBUTING.md 2014-09-29 14:11:06 +02:00
Marek Safar 84f9d58737 [mcs] Handle crash in binary operators when enum is used and nullable type is undefined 2014-09-29 11:41:35 +02:00
Marek Safar 1e5638b59c Merge pull request #1316 from Therzok/addSealed
Improvements in CorCompare
2014-09-28 21:27:08 -09:00
Zoltan Varga 75eb6a9caf Revert "[jit] Enable deadce on fp instructions on x86. Fixes #23392."
This reverts commit a32e2c7fe6.

Revert this as it breaks the build.
2014-09-29 01:06:50 -04:00
Zoltan Varga b533e2abac Fix a warning. 2014-09-28 19:57:52 -04:00
Zoltan Varga 9ac8be28af [bcl] Add AppDomain.FirstChangeException event, not implemented yet. 2014-09-28 19:56:53 -04:00
Zoltan Varga 5d3a42dc0f [runtime] Disallow generic classes with explicit layout. Fixes #23438. 2014-09-28 19:44:23 -04:00
Marius Ungureanu 63f50e9a1a [CorCompare] Add pointer as a class type. 2014-09-28 23:50:39 +03:00
Marius Ungureanu a5439f9646 [CorCompare] Add sealed methods parsing. 2014-09-28 23:48:58 +03:00
Marek Safar f289255ed5 Merge pull request #1315 from rjvdboon/BootstrapContext
Add System.IdentityModel.BootstrapContext to .Net 4.5 profile, fixes #22560
2014-09-27 20:59:02 -09:00
Zoltan Varga 657b6caad6 [runtime] Implement and enable the new interrupt code on amd64. 2014-09-28 01:50:51 -04:00
rjvdboon 2f9fb9e888 more coding style changes 2014-09-27 21:32:46 +02:00
rjvdboon d90ab2a697 Adhere to mono coding guidelines. 2014-09-27 21:27:44 +02:00
Marek Safar bb12899b3a [corlib] Timespan ticks formatting rewrite. Fixes #23376 2014-09-27 16:41:46 +02:00
Marek Safar bd3f6f5abc Merge pull request #1314 from alesliehughes/master
Add basic implement of ManagementObjectSearcher
2014-09-27 02:13:34 -09:00
Alistair Leslie-Hughes 13e0175fc8 Add basic implement of ManagementObjectSearcher
This change is released under the MIT license.
2014-09-27 20:16:32 +10:00
Zoltan Varga a32e2c7fe6 [jit] Enable deadce on fp instructions on x86. Fixes #23392. 2014-09-26 19:48:21 -04:00
Zoltan Varga cca43a2d34 [sdb] Add an option to make debugger invokes virtual. Part of the fix for #23385. 2014-09-26 18:16:17 -04:00
Sebastien Pouliot f234e421ae Merge pull request #1282 from madrang/MinorChangesOfPull1281
Add missing argument validations and set disposed flag to true once Dispose is called
2014-09-26 16:24:22 -04:00
Sebastien Pouliot c648f28f54 [corlib] Move iOS-specific code to a separate file for System.Environment 2014-09-26 15:40:34 -04:00
Ludovic Henry 62edb78cd6 [threadpool] Put the monitor thread to sleep if there has been no tasks for the past 5 seconds (NON_BUSY_INTERATION * SAMPLES_PERIOD)
This should improve a lot power consumption, because this avoir having a thread waking up every 500ms keeping the CPU awake.
2014-09-26 15:06:43 -04:00
Ludovic Henry 681a0061ad [threadpool] Remove process_idle_times so monitor_thread is the only function to change the number of threads 2014-09-26 15:06:42 -04:00
Ludovic Henry c93f120211 [threadpool] Add heuristic to approach the optimal number of threads 2014-09-26 15:06:42 -04:00
Ludovic Henry 1210628a04 [threadpool] Add suspend pushing to a WSQ 2014-09-26 15:06:42 -04:00
Sebastien Pouliot 1641a095bb [Mono.Security] Clear Certificates after Import or Remove [part of PR #1004]
PR: https://github.com/mono/mono/pull/1004

commit: https://github.com/rahvee/mono/commit/9fa2a1928a50114eb144202b939269f3f8d823f2

Modified to match Mono guidelines.
2014-09-26 14:35:20 -04:00
Marek Safar 0567e7763e [mcs] Check for true/false user operators on unwrapped nullable type. Fixes #23199 2014-09-26 20:34:01 +02:00
Rodrigo Kumpera aa11aa6184 Revert "[runtime] Implement lazy resolution of array interfaces."
This reverts commit 6ee08cf772.

This broke corlib compilation in a very weird way. Reverting it for now as I have no idea on why things break.
2014-09-26 14:12:32 -04:00
Rodrigo Kumpera 0e37ed19be Revert "[runtime] Remove a bit chunk of what's dead code now."
This reverts commit cab1c00168.
2014-09-26 14:12:22 -04:00
Marek Safar 96b46d1ad0 [mcs] Add check for parameterless user constructor used as default parameter value 2014-09-26 14:31:40 +02:00
Marek Safar a59c434f46 Merge pull request #1312 from esdrubal/xmltext
Property with attribute XmlTest is now set from ReadString only.
2014-09-26 02:47:15 -09:00
Marcos Henrich 916121f3d7 Property with attribute XmlTest is now set from ReadString only.
Before the change when the property default value was not null or empty the deserialized value would be the concatenation of the default value and the serialized value.
The correct behavior is to use the serialized value only.
Fixes 18908.
2014-09-26 10:35:57 +01:00
Marcos Henrich 007413298d Test Xml serialization of a property with attribute XmlText.
The tested property has a default value that is not null.
Covers 18908.
2014-09-26 10:31:51 +01:00
Marek Safar c5cf618a14 [mcs] Fix codegen for coalescing operator involving user operator conversion to result type 2014-09-26 09:27:49 +02:00
Zoltan Varga 6c4bc5f9d7 [aot] Pass additional arguments to llc on x86. 2014-09-25 17:12:17 -04:00
Robert J. van der Boon 11049f9dd7 Added serialization of SecurityToken with Handler 2014-09-26 05:39:48 +09:00
Rodrigo Kumpera cab1c00168 [runtime] Remove a bit chunk of what's dead code now. 2014-09-25 16:23:24 -04:00
Rodrigo Kumpera 6ee08cf772 [runtime] Implement lazy resolution of array interfaces.
To resolve casting we make all relevant interfaces to use the generic variance casting code.
This only affected ICollection`1 and IList`1, which are not terribly popular.

To fix dispatch we augment vtable resolution to treat those interfaces as variant and use
the already in place machinery.

Memory reduction numbers for the corlib test suite:

Initialized classes 8004 -> 7470 (7% reduction)
Corlib mempool size: 2719832 -> 2678872 (1.5% reduction)

Inflated classes 4500: 3.972 (12% reduction)
Inflated signatures size: 166128 -> 139812 (16% reduction)
Inflated methods size: 565152 -> 485664 (15$ reduction)
2014-09-25 16:23:23 -04:00
rjvdboon 4d7a441967 Update unit tests for binary serialization 2014-09-25 22:09:21 +02:00
rjvdboon 8d405e7aa1 Change unittest to not use the UserNameSecurityTokenHandler base class (as it does not-exist in mono) 2014-09-25 21:33:22 +02:00
Marek Safar 410af9c0cc Merge pull request #1309 from esdrubal/json
Improved Json deserialization of floating-point numbers.
2014-09-25 07:42:36 -09:00
Joel Martinez 8f2377e855 [mdoc] No longer documenting explicitly implemented private interface members.
https://bugzilla.xamarin.com/show_bug.cgi?id=18411

If a class explicitly implements an internal interface, those members will no
longer be documented, nor will the interface show up in the class' signature.
This allows for a library to hide internal implementation details that an end
user would not be able to take advantage of (ie. can't cast to internal
interface to call methods).

Includes test (check-monodocer-internal-interface)  added to makefile.
2014-09-25 10:41:42 -04:00
Marcos Henrich 92a4fd26ac Improved Json deserialization of floating-point numbers.
When DataContractJsonSerializer was created from type object, deserialization of floating.point numbers was not possible.
Fixes 21583.
2014-09-25 15:30:46 +01:00
Marcos Henrich ee71f0a1e6 Test Json deserialization of a floating-point number as object.
Covers 21583.
2014-09-25 15:15:38 +01:00
Miguel de Icaza 40ccf510c6 Merge pull request #1307 from esdrubal/servicemodelrss
Rss20ItemFormatter.ReadFrom now sets Id when guid is PermaLink.
2014-09-25 09:52:23 -04:00
Marcos Henrich d7c598b74c Rss20ItemFormatter.ReadFrom now sets Id when guid is PermaLink.
Fixes 23262.
2014-09-25 13:38:59 +01:00
Marcos Henrich 5ddcc07c67 Test Rss20ItemFormatter.ReadFrom Guid. Covers 23262. 2014-09-25 13:36:40 +01:00
Mark Probst 294e5214b2 [sgen] Don't get time twice at the same time. 2014-09-24 16:31:19 -07:00
Ludovic Henry 546831886e [sgen] Add concurrent collector counter for time spent during concurrent phase 2014-09-24 16:31:19 -07:00
Ludovic Henry 5d4b1f978b [sgen] Add major concurrent collector stw time to "Major GC time" counter 2014-09-24 16:31:18 -07:00
Miguel de Icaza 4320e844e9 Merge pull request #1304 from slluis/mac-proxy-autoconfig
[System.Net] Add support for .pac proxy config scripts on mac
2014-09-24 11:17:33 -04:00
Lluis Sanchez f5f69e540e [System.Net] Add support for .pac proxy config scripts on mac 2014-09-24 16:50:15 +02:00
Miguel de Icaza c6ab899595 [System] Fix most warnings on the System test suite 2014-09-24 10:43:46 -04:00
Marcos Henrich 67ea9985cb UriParserTest.GetComponents_Ftp2 now uses the variable 'ftp2'. 2014-09-24 12:22:30 +01:00
João Matos e150fde4e2 Fixed TLS detection to check for TARGET_MACH instead of __APPLE__.
In the case of cross-compiling to x86 Linux from OSX we'd hit compilation issues here.
2014-09-24 12:21:35 +01:00
João Matos de0543fbea Added support for cross-compiling to x86 Linux/Android. 2014-09-24 12:21:34 +01:00
Marek Safar 1d94d1770d [mcs] More tweaks to conditional tokenizer. Fixes #23319 2014-09-24 12:29:06 +02:00
Jo Shields ff165854bd Move llvm_init_inner inside #ifdef ENABLE_LLVM
This should fix c30a3e46d2 failing to link properly with ld 2.22 and GCC 4.9.1, on Linux, with non-LLVM builds.

./.libs/libmini.a(libmini_la-mini.o): In function `llvm_init_inner':
mini.c:(.text+0x1182b): undefined reference to `mono_llvm_init'
/usr/bin/ld: .libs/libmonoboehm-2.0.so.1.0.0: hidden symbol `mono_llvm_init' isn't defined
/usr/bin/ld: final link failed: Bad value
2014-09-24 10:40:03 +01:00
Atsushi Eno db5275ca56 [xlinq] fix bug #23318 - XComment.ToString() accepts "invalid" values.
Before it passes the value to XmlWriter.WriteComment(), it replaces
invalid values to valid form.
2014-09-24 15:30:32 +08:00
Zoltan Varga da335abfba Merge pull request #1301 from Unity-Technologies/fix-isuserprotected
Fix Win32 call in IsUserProtected. Usage was incorrect and freeing the w...
2014-09-23 18:59:15 -04:00
Zoltan Varga 2b5078c306 [bcl] Fix the RenameTpThread test, renaming a tp thread should not fail. 2014-09-23 18:40:34 -04:00
Zoltan Varga a8185f3374 [jit] Fix LLVM support on amd64 which got broken by the epilog size changes. 2014-09-23 18:36:23 -04:00
Zoltan Varga c30a3e46d2 [aot] Fix running with a loadable llvm module in aot-cache mode. 2014-09-23 18:26:18 -04:00
Marcos Henrich feacff0185 Revert "Uri made from UNIX path and RelativeOrAbsolute is now relative."
This reverts commit 116f4d2749.
2014-09-23 22:30:24 +01:00
Rodrigo Kumpera 6fe521be5c Merge pull request #1302 from mono/revert-1300-unixrelativeorabsolute
Revert "Uri made from UNIX path and RelativeOrAbsolute is now relative."
2014-09-23 17:12:10 -04:00
Rodrigo Kumpera 7d3eaf50a8 Revert "Uri made from UNIX path and RelativeOrAbsolute is now relative." 2014-09-23 17:05:30 -04:00
Michael Hutchinson 18186487ee Environment.IsRunningOnWindows can be true on MOBILE 2014-09-23 15:03:09 -04:00
Sebastien Pouliot d127a1a911 [System.Data] Add new file to the mobile_* sources build (to fix XI build) 2014-09-23 14:23:12 -04:00
Zoltan Varga 42173889e7 [jit] Fix EH on amd64 which got broken by d5a18ba292. 2014-09-23 14:16:16 -04:00
Rodrigo Kumpera 7c7ae04f7f Merge pull request #1299 from esdrubal/uriuserinfo
UriParseComponents no longer decodes '@' in UserInfo.
2014-09-23 14:00:13 -04:00
Marcos Henrich 116f4d2749 Uri made from UNIX path and RelativeOrAbsolute is now relative.
This was changed because the path might be a relative http path and should take precedence over an absolute UNIX path.
2014-09-23 18:01:38 +01:00
Jonathan Chambers d56a23750b Fix Win32 call in IsUserProtected. Usage was incorrect and freeing the wrong parameter causing a memory corruption. 2014-09-23 12:54:44 -04:00
Miguel de Icaza 0699e4da36 Fix warnings in mscorlib's Test suite + bring a couple more tests + fix thread rename test 2014-09-23 10:56:04 -04:00
Marcos Henrich b89b5c46d6 Test WebClient.UploadFileTaskAsync ContentType. Covers 19529. 2014-09-23 15:30:50 +01:00
Marek Safar 84ab6a7833 Merge pull request #1300 from esdrubal/unixrelativeorabsolute
Uri made from UNIX path and RelativeOrAbsolute is now relative.
2014-09-23 05:11:15 -09:00
Marcos Henrich b6874fa16b Uri made from UNIX path and RelativeOrAbsolute is now relative.
Fixes 22954.
2014-09-23 14:32:59 +01:00
Marcos Henrich f6f80d5e4d Test that Uri made from UNIX path and RelativeOrAbsolute is relative. 2014-09-23 14:27:35 +01:00
Marcos Henrich 2d52cec1ce Merge pull request #1203 from esdrubal/protect
KeyPairPresistence now tries to fix folder permissions.
2014-09-23 13:58:19 +01:00
Marcos Henrich e074772e92 UriParseComponents no longer decodes '@' in UserInfo. Fixes 23246. 2014-09-23 12:42:11 +01:00
Marcos Henrich b63c44670a Test Uri.UserInfo with percentage encoded '@'. 2014-09-23 12:42:10 +01:00
Marcos Henrich 2cf751f7f7 Fixed additional Uri.UserInfo char consumed after an escaped char. 2014-09-23 12:42:10 +01:00
Marcos Henrich ac52aece46 Test Uri.UserInfo with escaped 'a'. 2014-09-23 12:42:09 +01:00
Zoltan Varga 745a2b16ec [aot] Add an 'options' argument to the AOT cache configuration where additional --aot= options can be passed. 2014-09-22 21:11:03 -04:00
Zoltan Varga b0523c4ee8 [aot] Add more verbose aot cache logging, fix failure detection. 2014-09-22 20:52:53 -04:00
Zoltan Varga 627fc398ad [aot] Make --aot=llvm actually work by passing the flag down to the JIT. 2014-09-22 20:18:33 -04:00
Zoltan Varga 19619d925e [aot] Fix a regression introduced by 82c15fa592. 2014-09-22 20:11:22 -04:00
Zoltan Varga 82c15fa592 [aot] Add an 'llvm' aot option which does the same as --llvm. This allows running the AOT compiler with LLVM enabled in aot cache mode. 2014-09-22 20:03:48 -04:00
Zoltan Varga 40ca3ae249 [llvm] Fix support for unaligned offsets in the store_membase_imm opcodes. Fixes #23267. 2014-09-22 18:52:54 -04:00
Ludovic Henry 24013364b7 [sgen] Use memcpy to copy object
It is faster by around 5-6% on copy heavy gc stress tests.
2014-09-22 14:52:16 -07:00
Zoltan Varga 16d9d07821 [runtime] Allow renaming of threadpool threads. Fixes #23206. 2014-09-22 17:07:26 -04:00
Zoltan Varga 74b76bdc11 [runtime] Fix the lookup of nested types which have a namespace. Fixes #21653. 2014-09-22 16:20:25 -04:00
Marek Safar 0f36581baa [mcs] Populate inherited constraints member cache from types not only base types. Fixes #23017 2014-09-22 22:12:49 +02:00
Marek Safar b99e7ab957 Fixes commit ef94fbfd9c 2014-09-22 22:12:49 +02:00
Marius Ungureanu 32318db8cf Fixup to ef94fbfd9c
Thanks @ezavaleta
2014-09-22 21:16:13 +03:00
Marek Safar ef94fbfd9c [corlib] Update en-NZ designators. Fixes #22212 2014-09-22 17:30:35 +02:00
Marek Safar 5ad92e6b10 [mcs] declaration expression after ref/out argument 2014-09-22 17:30:34 +02:00
Miguel de Icaza fb3a6d1cd2 Merge pull request #1295 from nealef/master
Add SqlCredential support to SqlClient/Tds
2014-09-22 10:41:58 -04:00
Rodrigo Kumpera c47fab9285 Merge pull request #1296 from directhex/master
Add a tool which can sync the Mono cert store from an arbitrary cert bundle
2014-09-22 10:29:33 -04:00
Jo Shields 452073b91e Add a tool which can sync the Mono cert store from an arbitrary cert bundle (i.e. every trusted CA.pem in one big text file). This is a format used by most Linux distributions, so allows Mono packagers to automatically integrate the Mono cert store with the OS cert store. 2014-09-22 14:02:03 +01:00
Zoltan Varga 5f9c74f4c5 [runtime] Fix mono_sigctx_to_monoctx () on win32. 2014-09-22 01:16:00 -04:00
Zoltan Varga df43380ea6 [runtime] Fix the win32 build. 2014-09-22 01:01:11 -04:00
Zoltan Varga ab5dda7fba Fix warnings. 2014-09-22 06:46:23 +02:00
Zoltan Varga 12bceb1700 [jit] Fix the handler block trampolines on windows. 2014-09-22 06:44:54 +02:00
Zoltan Varga f930824ea9 [runtime] Enable the fastpath in CEE_MONO_JIT_ATTACH on windows. 2014-09-22 06:44:54 +02:00
Zoltan Varga e0a408f702 [runtime] Treat the tls key as the tls offset on windows, since they are the same. 2014-09-22 06:44:53 +02:00
Zoltan Varga 12dc660454 [runtime] Enable fp elimination on winx64. 2014-09-21 23:07:30 -04:00
Zoltan Varga ac2e2c7703 [runtime] Disable a few more tests on windows which hang on winx64. 2014-09-21 22:48:42 -04:00
Zoltan Varga d5a18ba292 [jit] Enable the pushless call code on windows too, get rid of the non-pushless code. 2014-09-21 22:21:41 -04:00
Zoltan Varga dfb8d2ac8e [jit] Implement the pushless call code on winx64. 2014-09-21 22:01:03 -04:00
Zoltan Varga ea77b1f9fb [jit] Enable monitor fast paths on win64. 2014-09-22 01:45:28 +02:00
Zoltan Varga 558750f053 [runtime] Fix the windows build. 2014-09-21 17:42:45 -04:00
Zoltan Varga e2e74c95e6 [runtime] Fix the unregistration of our exception handler on windows. Fixes #23221. 2014-09-21 14:54:24 -04:00
rjvdboon edca3467ce Added System.IdentityModel.Tokens.BootstrapContext including tests. 2014-09-20 22:44:34 +02:00
Zoltan Varga ca51c3b026 [runtime] Enable the new interrupt code on arm linux. 2014-09-20 02:43:47 -04:00
Zoltan Varga d4b4c2dbbc [runtime] Add wrappers around the wapi interrupt functions to mono-threads to reduce the amount of #ifdef WIN32 blocks in threads.c. 2014-09-19 17:51:14 -04:00
Sebastien Pouliot 23042a0aa3 Fix typo (and XI builds) 2014-09-19 16:48:37 -04:00
Sebastien Pouliot 64b8e0c063 [System.Numerics] Fix unit test to succeed on different culture (XI runs tests them on several cultures) 2014-09-19 16:30:16 -04:00
Neale Ferguson a83e9cf4aa Add SqlCredential support -
- Tds.cs: Use SecureString objects for passwords; Add method to retrieve string from SecureString
- Tds42.cs: Use SecureString for passwords
- Tds50.cs: Use SecureString for passwords
- Tds70.cs: Use SecureString for passwords
- TdsConnectionParameters.cs: Use SecureString for passwords; Initialize Password parameter as cleared string; Add indicator for when password is set
- SqlConnection.cs: Use SecureString for passwords; Add SqlConnect method that accepts an SqlCredential along with the Connection string; Perform checking of parameters to ensure user/password not specified in connection string if credentials have been specified or using credentials when domain login is specified.
- SqlCredential.cs: Add new class with support for credentials
- System.Data.dll.sources: Add SqlCredential.cs to the build list
2014-09-19 11:52:52 -04:00
Ludovic Henry 05d341392c [sgen] Fix wbarrier use if we define SGEN_HEAVY_BINARY_PROTOCOL, HEAVY_STATISTICS or XDOMAIN_CHECKS_IN_WBARRIER 2014-09-19 11:14:48 -04:00
Miguel de Icaza af429ecfd0 Merge pull request #1245 from StephenMcConnel/bug-22483
Fix scrolling in SWF.ListView.EnsureVisible(int index)
2014-09-19 10:17:09 -04:00
Miguel de Icaza d2c021407d Merge pull request #1287 from akoeplinger/fix-appconfig-performancecounters
[System] Add performanceCounters element to System.Diagnostics app.config configuration section
2014-09-19 10:15:05 -04:00
Miguel de Icaza 3461617bc2 Merge pull request #1290 from directhex/master
Put KeyPairPersistence load into a try{}catch{} block.
2014-09-19 10:13:55 -04:00
Miguel de Icaza 605c8771b8 Merge pull request #1273 from joelmartinez/docs-unified-fix
bugfix for mdoc update with --dropns feature
2014-09-19 10:11:01 -04:00
Ludovic Henry fcb9de513a [utils] Fix force inlining compilation error with gcc on linux
[02131]   CC       libmonoruntimesgen_la-sgen-marksweep.lo
[02131] In file included from sgen-major-copy-object.h:35:0,
[02131]                  from sgen-marksweep.c:1128:
[02131] sgen-copy-object.h:38:1: warning: always_inline function might not be inlinable [-Wattributes]
[02131]  par_copy_object_no_checks (char *destination, MonoVTable *vt, void *obj, mword objsize, SgenGrayQueue *queue)
[02131]  ^
[02131] sgen-marksweep.c: In function 'par_copy_object_no_checks':
[02131] sgen-copy-object.h:38:1: error: function 'par_copy_object_no_checks' can never be copied because it saves address of local label in a static variable
[02131] make[3]: *** [libmonoruntimesgen_la-sgen-marksweep.lo] Error 1
[02131] make[3]: Leaving directory `/root/rpmbuild/BUILD/mono-3.10.1/mono/metadata'
[02131] make[2]: *** [all-recursive] Error 1
[02131] make[2]: Leaving directory `/root/rpmbuild/BUILD/mono-3.10.1/mono'
[02131] make[1]: *** [all-recursive] Error 1
[02131] make[1]: Leaving directory `/root/rpmbuild/BUILD/mono-3.10.1'
[02131] make: *** [all] Error 2
[02131] error: Bad exit status from /var/tmp/rpm-tmp.YxcUOE (%build)
2014-09-19 09:46:09 -04:00
Marek Safar 7ad366c25a [mcs] Improve scoring of failed overload resolution. Fixes #22989 2014-09-19 00:09:35 +02:00
Ludovic Henry d1ffd5a794 [utils] Use MONO_ALWAYS_INLINE + Add MONO_NEVER_INLINE 2014-09-18 16:42:00 -04:00
Jo Shields 3552179bda Put KeyPairPersistence load into a try{}catch{} block.
Kpp.Load() will throw an unhandled exception if _filename (a folder to use as the key store) does not exist and it cannot be created.

This is an entirely valid thing to have happen - cert importing into the machine store (mozroots --import --machine --sync) as root will create a /usr/share/.mono/certs/ folder, but will not create /usr/share/.mono/keypairs - and since the root user owns /usr/share/.mono/, if the user tries to enumerate the certificates in /usr/share/.mono/certs/, they get 0 certificates returned due to the unhandled exception dropping each loaded certificate on the floor.

Closes: Xamarin bug 23015
2014-09-18 17:32:06 +01:00
Marek Safar eb6781f3cd [mcs] Fix output type inference when parameters after first one depend on fixed first set. Fixes #23024 2014-09-18 14:47:19 +02:00
Marek Safar 548dca4730 [mcs] Better check for parameterless constructor overload 2014-09-18 10:10:46 +02:00
Zoltan Varga a4024ba4ae [sdb] Use new style interrupt on win32 if available. 2014-09-17 22:49:02 -04:00
Zoltan Varga 8ed233ef06 [runtime] Use the windows CONTEXT<->MonoContext conversion code to mono-context.c, simplify some code. 2014-09-17 22:37:18 -04:00
Zoltan Varga 4fc8068d2a [runtime] Implement the new suspend infrastructure on windows. 2014-09-17 18:25:00 -04:00
Zoltan Varga 28179361ec [sdb] Implement support for win64. 2014-09-17 15:21:11 -04:00
Marek Safar d62679a4a4 [xbuild] Workaround for issues with CreateItem task where metadata are not generated due to up-to-data inputs. Fixes #23022 2014-09-17 20:22:36 +02:00
Zoltan Varga e2f24086a8 Merge pull request #1288 from ylatuya/patch-2
[mkbundle] Fix check for dos2unix
2014-09-17 14:03:43 -04:00
Jonathan Pryor 818b81ef40 [runtime] Use statfs(2) on Android.
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=23077

Reverts commit 53ce92470.

Commit 53ce92470 disabled use of statfs(2) on Android, for unspecified
reasons. (My *suspicion* is that the Android version mono was
originally ported to didn't have statfs(2), but I can neither confirm
nor deny that guess.)

Android has supported statfs(2) since API-4 Android v1.6 (in that
statfs(2) is in the header files); what's missing is MNT_RDONLY. What
IS present is MS_RDONLY, which appears to serve the same purpose.

Re-enable use of statfs(2) and use MS_RDONLY when building against the
Android NDK.
2014-09-17 12:56:44 -04:00
Andoni Morales Alastruey 753f233a31 [mkbundle] Fix check for dos2unix
This fixes the command to check for dos2unix and makes mkbundle usable again with mingw.
We need first to redirect the standard input, otherwise the check always fails with an InvalidOperationException and set CreateNoWindow=false to avoid spawning a new window.
2014-09-17 16:17:33 +02:00
Marek Safar 4f719f9ce9 [xbuild] Fix few crashes when task loading fails 2014-09-17 11:19:57 +02:00
Zoltan Varga 5dbf97e660 [jit] Make calls from gshared to gsharedvt sharable methods indirect since otherwise at runtime we might find an instantiation and we cannot patch the call, leading to performance problems. Fixes #23021. 2014-09-16 23:17:54 -04:00
Michael Hutchinson 2804d6af37 Fix mobile and mobile_static profiles
And bring them to parity with monodroid and monotouch
2014-09-16 19:14:20 -04:00
Martin Baulig 87622fc711 [WCF]: Update to my last fix for bug #22129.
The problem already starts when creating the OperationDescription; we need
to also look at the End* method here to correctly parse the reply parameters.

Then ClientRuntimeChannel.Process needs to distinguish between sync/async
and copy the out/byref parameters when needed.
2014-09-16 21:34:20 +02:00
Zoltan Varga 4e1e37519a [runtime] Make stack walks done by the sampling profiler async safe. 2014-09-16 15:07:55 -04:00
Marek Safar 9aed010782 [mcs] struct parameterless instance constructors 2014-09-16 19:19:32 +02:00
Zoltan Varga 80b14d356f [runtime] Disable VS warnings C4273 (inconsistent dll linkage), and C4005 (macro redefinition). The former occurs becase we mark exported function declarations using MONO_API, but not the definitions. The latter occurs because we define _WINSOCKAPI_. 2014-09-15 23:30:40 -04:00
Zoltan Varga 557390ee46 [runtime] Fix the my_g_bit_nth_msf () function for win64. 2014-09-15 22:10:23 -04:00
Zoltan Varga 02f48039b1 [runtime] Add support for setting the thread name on windows. On windows, this will only work when running under a debugger. 2014-09-15 19:14:09 -04:00
Zoltan Varga ae030203e7 [arm64] Increase some opcode sizes. Fixes #23026. 2014-09-15 18:09:43 -04:00
Zoltan Varga fad438976c [runtime] Fix an assert in w32_dlerror () on winx64. 2014-09-15 17:35:05 -04:00
Marek Safar 240cf239a2 [xbuild] More tweaks to tool path setup 2014-09-15 22:25:11 +02:00
Zoltan Varga 64f6eb2d1d [aot] Use gsharedvt for collection types instantiated with generic structs as well. 2014-09-15 15:31:38 -04:00
Marcos Henrich 1531798bbe Added missing files to projects csproj files. 2014-09-15 19:14:48 +01:00
Marek Safar 2320d0dc40 [mcs] Revert usage of closed delegates for compiler generated anonymous method 2014-09-15 18:34:20 +02:00
Rodrigo Kumpera 6ea08668a2 Merge pull request #1280 from nealef/master
Maximum large object size should be limited by SSIZE_MAX not SIZE_MAX.
2014-09-15 12:31:16 -04:00
Martin Baulig 8b10d9bb0b [WCF]: Copy out/ref parameters on async call; bug #22129. 2014-09-15 18:25:54 +02:00
Marek Safar b7fb736254 Merge pull request #1286 from esdrubal/xmlnullablearrayitem
XmlSerializer nullable array items.
2014-09-15 07:20:02 -09:00
Marcos Henrich 5fc6ecd7c7 If not specified assume that array items are nullable. Fixes #19012. 2014-09-15 16:57:13 +01:00
Marcos Henrich 8790297c85 Test xml serialization of nullable array items. Covers #19012. 2014-09-15 16:55:31 +01:00
Marek Safar 1afc866f87 [xbuild] Workaround for null log service (which should never be null) 2014-09-15 17:37:49 +02:00
Marek Safar 52cdea5c0a Merge pull request #1257 from esdrubal/xmloptional
Added optional serialization based on ShouldSerialize{V}.
2014-09-15 03:44:30 -09:00
Marcos Henrich be02242f8b Ignore method ShouldSerialize if it is a generic. 2014-09-15 13:02:00 +01:00
Marcos Henrich 85650c7528 Test serialization wen class has method bool ShouldSerialize<T>().
.NET throws an exception but it should have no effect on the serialization.
2014-09-15 13:02:00 +01:00
Marcos Henrich 79de2b62f9 Added optional serialization based on ShouldSerialize{V}.
SerializationCodeGenerator and XmlSerializationWriterInterpreter will no longer serialize an attribute named {V} if its object has a method named ShouldSerialize{V}() that returns false.
{V}Specified now is also checked to be true before serializating the attribute even if it is a property that is not settable.
Fixes #1852.
2014-09-15 13:02:00 +01:00
Marcos Henrich 17ad50a165 Added test for optional {V}Specified and ShouldSerialize{V}.
{V}Specified is a property or field and ShouldSerialize{V} is a method that can be set to false if we do not want to serialize an attribute with name {V}.
2014-09-15 13:02:00 +01:00
Marcos Henrich 1ec4bd5c26 Fixed NullReferenceException. 2014-09-15 13:01:04 +01:00
Marek Safar 7439e997ac [xbuild] Use ToolPath when building ToolTask execution path. Fixes #22981 2014-09-15 13:38:40 +02:00
Alexander Köplinger d77664ceb0 [System] Add performanceCounters element to System.Diagnostics app.config configuration section
See http://msdn.microsoft.com/en-us/library/ms229387(v=vs.110).aspx for details about the element.
The value that is set by the element isn't currently used in Mono, but applications using it in their app.config crash otherwise (e.g. http://stackoverflow.com/questions/25741651).
2014-09-14 07:45:11 +02:00
Marc-Andre Ferland 8b9c60075f Missing Args checks. 2014-09-14 00:28:33 -04:00
Marc-Andre Ferland 6354f74888 Missing setting disposed to true 2014-09-14 00:27:25 -04:00
Zoltan Varga 777f69153c [runtime] Remove an unused interpreter file. 2014-09-13 13:59:03 -04:00
Marek Safar 7f2825301e [mcs] nullable property pattern 2014-09-13 12:43:41 +02:00
Zoltan Varga a1f58d35be [runtime] Fix the windows build. Define _WINSOCKAPI_ to fix the compilation problems when windows.h is included before winsock2.h: http://stackoverflow.com/questions/1372480/c-redefinition-header-files. 2014-09-12 20:07:05 -04:00
Joel Martinez 6c1bf0d17e [mdoc] consolidated dropns and dropns-assemblies into a single parameter.
Based on pull request feedback, this is a simpler usage, and meets our required use-case. A sample version of this parameter would be: `--dropns MyUnifiedAssembly=MyDroppedPrefix`
2014-09-12 17:22:06 -04:00
Rodrigo Kumpera a8392ba567 [runtime] Improve thread dumping reliability by doing it while holding the fat locks.
We take the loader and the root domain locks before doing a thread dump. This reduces the odds
of us suspending a thread that holds either of them and deadlocking, for example, while decoding
AOT JIs.
2014-09-12 14:18:39 -04:00
Neale Ferguson f065a289f6 Maximum large object size should be limited by SSIZE_MAX not SIZE_MAX.
The latter appears to be a hangover from 32-bit systems.
2014-09-12 11:37:52 -04:00
Neale Ferguson 3f740f3d94 Fixes 19752 -
Users have been complaining about strange errors arising when using the OracleClient classes.
I have tracked it down to the OciDefineHandle and OciDefineByPos calls, and OracleParameter
handling of amanged objects by unmanaged code. Currently two of the parameters passed to the
above OCI  call are short variables. They are passed as "ref" fields as Oracle uses their
address to put size and indicator data once the data is fetched. However, being defined as
short means that they are eligible for being moved during garbage collection. Thus if that
field is moved between the OciDefineByPos call and the fetch of the data then what Oracle is
pointing to may no longer be variable. I'm thinking it may be better to define these fields as
IntPtr and allocate them and retrieve their values via Marshal.ReadInt16. As for OracleParameter,
it uses a managed object "indicator" that is also used in a similar way. This reference is replaced
by a IntPtr and a get/set method to access the contents.
2014-09-12 11:25:57 -04:00
Marek Safar 300876b229 [mcs] Don't use `1 naming for compiler generated second level and deeper nested types. Fixes #22893 2014-09-12 15:20:26 +02:00
Zoltan Varga 7f6a46403d Merge pull request #1276 from Therzok/master
Add concurrent hashtable test to gitignore.
2014-09-11 20:58:12 -04:00
Zoltan Varga f0d2ee46f8 Merge pull request #1275 from ranma42/fix-lib64
Fix build with lib64 folder for arch-specific libraries
2014-09-11 20:57:48 -04:00
Sebastien Pouliot 90bb9c6d00 [System] Fix building unit tests under the mobile profile 2014-09-11 20:43:21 -04:00
Zoltan Varga 41339d95c6 [jit] Always pass the imt arg to interface calls in gsharedvt methods. Fixes #22624. 2014-09-11 17:57:11 -04:00
Joel Martinez c842249d72 [mdoc] Formatting feedback from pull #1273 2014-09-11 15:43:28 -04:00
Marek Safar 9fd3c7ac4b [mcs] property pattern 2014-09-11 19:40:51 +02:00
Rolf Bjarne Kvinge 550d314e51 Don't throw TimeZoneNotFoundExceptions when iOS gives us invalid data.
iOS 8 GM lists "Asia/Chita" among its time zones, but when requesting
the time zone data for that time zone, no data is returned.

With this change we ignore time zones without any data when fetching
all the timezones on the system.
2014-09-11 19:04:00 +02:00
Marek Safar 0083728e19 Merge pull request #1278 from esdrubal/datetimegmt
GMT DateTimeOffset is now properly parsed.
2014-09-11 05:29:27 -09:00
Marcos Henrich e73499b337 GMT DateTimeOffset is now properly parsed. Fixes #22851.
GMT date formats set useutc to true, so now useutc is checked to init DateTimeOffset with a zero offset.
2014-09-11 15:12:36 +01:00
Marcos Henrich b818408b16 Test that offset is zero when date ends with GMT. Covers #22851. 2014-09-11 15:11:42 +01:00
Marek Safar b946785022 Merge pull request #1277 from esdrubal/calendarsdaysinyear
Improved CalendricalCalculations fixed_from_dmy methods.
2014-09-11 03:17:52 -09:00
Marcos Henrich 468160e712 Improved CalendricalCalculations fixed_from_dmy methods. Fixes #21930.
In some cases fixed_from_dmy is used with the month parameter greater than the number of months of that year.
Year is now incremented until month parameter is valid.
2014-09-11 12:54:36 +01:00
Marcos Henrich da04211894 Test Calendar.DaysInYear. Covers #21930. 2014-09-11 12:53:25 +01:00
Ungureanu Marius 924a954d1f Add concurrent hashtable test to gitignore. 2014-09-11 13:39:57 +03:00
Marek Safar 1242b4b82c [corlib] Enumerate all subdirectories including the first one. Fixes #22857 2014-09-11 11:20:44 +02:00
Marek Safar 1eb9ba45c4 [system] Fixes failing test 2014-09-11 10:31:26 +02:00
Andrea Canciani d2f391c80c Do not hardcode lib path
The changes from 3408b8e5f1 cause
regressions in distros which do not use lib as folder for
arch-specific libraries, like Fedora x86_64.

Instead, reloc_libdir should be used (as in data/mono.pc.in).

This change is released under the MIT/X11 license.
2014-09-11 08:50:47 +02:00
Zoltan Varga 2c11b2ea4a [aot] Avoid a stack overflow if profiler enter-leave events are requested in the full-aot mode. 2014-09-10 19:14:57 -04:00
Zoltan Varga 7912295bc9 [runtime] Fix the RESOLTION_SCOPE->RESOLUTION_SCOPE typo. 2014-09-10 19:07:04 -04:00
Joel Martinez 582b370761 [mdoc] added -dropns-assemblies parameter.
Will now only replace the namespace when the type or member is in a listed assembly
2014-09-10 16:54:54 -04:00
Zoltan Varga d3624fa257 [runtime] Redirect runtime logging to asl_log only on ios, not when running the cross compiler. 2014-09-10 14:24:11 -04:00
Marek Safar 1d63659429 Merge pull request #1271 from akoeplinger/fix-switch-ctor
[System] Fixed Diagnostics.Switch ctor behavior for null parameters
2014-09-10 08:19:20 -09:00
Alexander Köplinger 29abf6790d [System] Fixed Diagnostics.Switch ctor behavior for null parameters
Passing null to the displayName or description ctor parameter on MS.NET makes them equal to an empty string.
Fixed the Mono behavior to match .NET.
2014-09-10 19:09:34 +02:00
Marek Safar 6d07ad8e7a [system.net.http] Encode ContentDisposition name. Fixes #18422 2014-09-10 19:09:27 +02:00
Marek Safar 9050d9cba1 [mcs] Remove value type constrained type parameter instantiation optimization to handle parameterless struct constructors 2014-09-10 19:09:27 +02:00
Marek Safar 156c7cf97a Merge pull request #1270 from esdrubal/xmlimplicit
When needed serialized objects are now implicitly converted.
2014-09-10 08:08:26 -09:00
Marcos Henrich f8ff518ebe When needed serialized objects are now implicitly converted.
Fixes #20403.
2014-09-10 17:25:44 +01:00
Marcos Henrich 5fdbad2444 Changed method ImplicitConvert to internal static. 2014-09-10 17:24:38 +01:00
Marcos Henrich 0804720aaa ImplicitConvert was using method with wrong parameter and return type. 2014-09-10 17:23:44 +01:00
Marcos Henrich f008d4afb6 Test XmlSerialization of element that requires implicit conversion.
Covers #20403.
2014-09-10 16:30:03 +01:00
Martin Baulig bbbcc73bde [websocket]: Fix ClientWebSocket.ReceiveAsync() with small buffer; bug #22704.
When calling ClientWebSocket.ReceiveAsync() with a buffer that's smaller than
the received chunk, we need to cache the header until next call.
2014-09-10 17:09:43 +02:00
Alexander Köplinger 0537cb3c2a Fix the build 2014-09-10 14:26:36 +02:00
Marek Safar 95b09a1a79 Merge pull request #1269 from Therzok/refactorSwitches
[SourceSwitch] Refactor a piece of code.
2014-09-10 02:01:15 -09:00
Marius Ungureanu 6e5e8d7915 Fix build failure caused by #1267. 2014-09-10 13:59:49 +03:00
Marius Ungureanu 462c6b08e9 [SourceSwitch] Refactor a piece of code. 2014-09-10 13:04:10 +03:00
Marek Safar ebe2a3df1d [system.net.http] Handle Content-Disposition in textual form as well. 2014-09-10 09:48:26 +02:00
Marek Safar 5846c52247 Merge pull request #1267 from ramtinkermani/master
The ShouldTrace method's conditions are fixed to correctly trace the events based...
2014-09-09 20:40:10 -09:00
ramtin 6cb9a04fca Unit Tests for SourceSwitch. Counting the number of events traced based on the Trace Level 2014-09-09 15:07:14 -07:00
Marek Safar 5e9eba8ffb [system.net.http] Tokenize dash only in range values. Fixes #22764 2014-09-09 23:41:49 +02:00
Rodrigo Kumpera 65f17c2c26 [jit] Fix error handling in a few places in the jit. 2014-09-09 16:34:55 -04:00
Rodrigo Kumpera 00f631312f [runtime] Fix error handling in mono_metadata_parse_mh_full. 2014-09-09 16:34:54 -04:00
Rodrigo Kumpera 666ea5f867 [runtime] Update reflection.c to use mono_class_get_checked. 2014-09-09 16:34:54 -04:00
Rodrigo Kumpera 3bbedfebb7 [runtime] Update marshal.c to use mono_class_get_checked. 2014-09-09 16:34:54 -04:00
Rodrigo Kumpera a17da53c37 [runtime] Cleanup usage of mono_class_get to object.c 2014-09-09 16:34:54 -04:00
Rodrigo Kumpera 6382fd247d [runtime] Cleanup usage of mono_class_get in loader.c 2014-09-09 16:34:54 -04:00
Rodrigo Kumpera a94aa47cd8 [runtime] Make icall use mono_class_get_checked. 2014-09-09 16:34:53 -04:00
Rodrigo Kumpera ec7be0fd36 [utils] Add mono_error_convert_to_exception. 2014-09-09 16:34:53 -04:00
Rodrigo Kumpera 4b726a17b8 Introduce mono_class_from_name_case_checked 2014-09-09 16:34:53 -04:00
Rodrigo Kumpera 7dd6476b8e [runtime] Use MonoError in exception.c 2014-09-09 16:34:53 -04:00
Rodrigo Kumpera 2ed68d65e8 [runtime] Change mono_type_get_full to use MonoError properly. 2014-09-09 16:34:53 -04:00
Rodrigo Kumpera 3968beaced [runtime] Introduce MonoError to mono_type_create_from_typespec. 2014-09-09 16:34:52 -04:00
Rodrigo Kumpera 5fa8e1abe7 [runtime] Plug MonoError into another function. 2014-09-09 16:34:52 -04:00
Rodrigo Kumpera 6d60ff581c [runtime] Introduce MonoError to mono_class_get_full.
Introduce MonoError into callers of mono_class_get_full.

Make mono_class_get not abort on failure until all callers are fixed.
2014-09-09 16:34:52 -04:00
Rodrigo Kumpera 5c8ab13f0c Add mono_class_get_checked to mono_class_create_from_typedef. 2014-09-09 16:34:52 -04:00
Rodrigo Kumpera 32e2bb7c39 [runtime] Change mono_type_get_full to use mono_class_get_checked. 2014-09-09 16:34:52 -04:00
Rodrigo Kumpera a824dde30f [runtime] Change do_mono_metadata_parse_type to use mono_class_get_checked 2014-09-09 16:34:51 -04:00
Rodrigo Kumpera 3ee5d36ec7 [runtime] Introduce mono_class_get_checked. 2014-09-09 16:34:51 -04:00
Rodrigo Kumpera 57cce937d8 [runtime] Introduce mono_class_from_typeref_checked and replace usage of the old one with it.
This is another step into wiring up MonoError into the typeloading codebase. This is
one more function that needs it.
2014-09-09 16:34:51 -04:00
Rodrigo Kumpera efa5a5ad17 [utils] Add mono_error_set_assembly_load_simple to ease producing an error message for ref only assemblies. 2014-09-09 16:34:51 -04:00
Rodrigo Kumpera 82c38c4409 [metadata] Replace mono_class_get_full with a saner pair of mono_class_get and mono_class_inflate_generic_class_checked. 2014-09-09 16:34:51 -04:00
Rodrigo Kumpera d3da468965 [runtime] Expose mono_class_inflate_generic_class_checked to the internal API. 2014-09-09 16:34:50 -04:00
Rodrigo Kumpera 2006bf3f44 Add deprecation notice for mono_class_get_full. 2014-09-09 16:34:50 -04:00
ramtin 59be7ba9c5 The ShouldTrace conditions are fixed to correctly trace the events based on the Level 2014-09-09 11:50:06 -07:00
Marcos Henrich bb296086c0 TimeFormat "zzz" is only valid after a date. 2014-09-09 17:44:00 +01:00
Marek Safar ccbd0b1a0d Merge pull request #1266 from esdrubal/datetimenewformat
Added time format with only offset.
2014-09-09 05:29:34 -09:00
Rodrigo Kumpera a27d7ee86d Merge pull request #1248 from kumpera/kill_the_interpreter
[runtime] Remove the interpreter.
2014-09-09 09:15:01 -04:00
Rodrigo Kumpera 8602eed8f7 [cleanup] Remove more old files. 2014-09-09 09:14:37 -04:00
Marcos Henrich a27a42b99b Added time format with only offset. Fixes #22558. 2014-09-09 12:49:00 +01:00
Marcos Henrich cf7319008b Test DateTimeOffset.Parse with format yyyy-dd-MMzzz. Covers #22558. 2014-09-09 12:41:27 +01:00
Jo Shields 4f8114aabd Fix "make dist" error
ad8236ebb8 broke "make dist", by removing Makefile.am.in whilst leaving it in EXTRA_DIST
2014-09-09 11:30:52 +01:00
Ludovic Henry 749171e917 [sgen] Tweak internal class allocator sizes to add highly used on
We observed on multiples benchmarks that most internal allocations are for 8, 16, 296 (32bits), 328 (64bits), 504 (32bits) and 1016 (64bits) bytes of memory. To minimize waste, we added these memory sizes to the default allocator sizes.
2014-09-09 11:16:09 +02:00
Atsushi Eno 2b72c6bdf2 [aspnet/ajax] fix bug #6512 (by Mikkel Kruse Johnsen) - don't deserialize GET parameters. 2014-09-09 15:09:27 +08:00
Zoltan Varga c8e73660db Merge pull request #1263 from madewokherd/begindecls
Use G_BEGIN_DECLS instead of __BEGIN_DECLS.
2014-09-08 22:40:43 -04:00
Joel Martinez dc17504d3f [mdoc] New make test, reproduces issue with --dropns when run with a secondary assembly that doesn't drop the specified namespace 2014-09-08 20:45:16 -04:00
Zoltan Varga 4373bd213a [aot] Really fix the aot-cache logging. Rework how mscorlib is handled in the aot cache. 2014-09-08 20:25:49 -04:00
Zoltan Varga f574898b09 [aot] Fix a crash in the aot cache code if MONO_LOG_LEVEL is set. 2014-09-08 20:01:21 -04:00
Zoltan Varga ceb74f4118 Merge pull request #1264 from madewokherd/vasprintf
Avoid use of vasprintf.
2014-09-08 18:49:55 -04:00
Joel Martinez 41c28a59bb [mdoc] New make test for the --dropns functionality 2014-09-08 17:54:05 -04:00
Vincent Povirk 83924ebb2c Avoid use of vasprintf.
This is not available on mingw-w64, and the extra allocation is unnecessary.

This commit licensed as MIT/X11.
2014-09-08 15:48:20 -05:00
Vincent Povirk 3c920be3e5 Use G_BEGIN_DECLS instead of __BEGIN_DECLS.
__BEGIN_DECLS isn't available in mingw-w64.

This commit licensed as MIT/X11.
2014-09-08 13:54:48 -05:00
Marek Safar 27b3636cef Merge pull request #1262 from esdrubal/uriserializationinfo
Added support for UriComponents.SerializationInfoString.
2014-09-08 05:40:33 -09:00
Marcos Henrich ea6b8960d0 Added support for UriComponents.SerializationInfoString. Fixes #21571. 2014-09-08 22:21:02 +08:00
Marcos Henrich d2d338fe26 Test UriComponents.SerializationInfoString. Covers #21571. 2014-09-08 22:09:52 +08:00
Marek Safar 4bd9820eaa Merge pull request #1253 from esdrubal/datetimeiso8601
DateTime.Parse now handles unlimited number of fractional digits.
2014-09-08 03:52:54 -09:00
Marek Safar 14f56f6aea [system.numerics] Unify handling of default ctor and zero. Fixes #22591 2014-09-08 14:50:39 +02:00
Marek Safar 88bc5cee97 [mcs] switch statement with recursive pattern matching 2014-09-08 11:48:52 +02:00
Marek Safar 92ff3c372d [system.net.http] Make SendAsync state free to handle recursive calls. Fixes #22724 2014-09-08 11:48:51 +02:00
Rodrigo Kumpera 128f297b84 Merge pull request #1260 from khellang/patch-2
Added less media type
2014-09-07 12:26:57 -04:00
Rodrigo Kumpera 247bf1f21c Merge pull request #1259 from khellang/patch-1
Updated WOFF to official media type
2014-09-07 12:26:37 -04:00
Kristian Hellang d595c66bbd Added less media type 2014-09-07 17:24:37 +02:00
Kristian Hellang 788c95a0e0 Updated WOFF to official media type
See http://www.w3.org/TR/WOFF/#appendix-b for the media type registration
2014-09-07 17:19:42 +02:00
Marek Safar e207bf76ab Merge pull request #1258 from akoeplinger/unify-test-namespaces
Cleanup namespace names of class lib tests to follow convention
2014-09-06 21:25:38 -09:00
Zoltan Varga f8365f7900 [gsharedvt] Allow the SIZEOF opcode in gsharedvt code if it doesn't reference a gsharedvt type. Fixes #22711. 2014-09-06 00:38:38 -04:00
Zoltan Varga 4b6a2c8f89 Fix a warning. 2014-09-05 20:07:13 -04:00
Zoltan Varga 729bbe4041 [jit] Store the epilog length in MonoArchEHJitInfo instead of encoding it in jinfo->unwind_desc, since the latter can overflow for methods with large epilogs. Fixes #22685. 2014-09-05 18:07:42 -04:00
Zoltan Varga 3795639a4a Fix the linux build. 2014-09-05 17:18:18 -04:00
Zoltan Varga c8c4bd9a78 [runtime] Fix the linux build. 2014-09-05 15:46:19 -04:00
Martin Baulig 24fbaedcd2 [WCF]: Actually fix #22179 to allow concurrent requests.
Pass the 'OperationContext' around in a parameter instead of storing it
in an instance field to make this thread-safe.
2014-09-05 18:59:21 +02:00
Marcos Henrich 1852905c44 Test that wrong ISO8601 dates throw FormatException. 2014-09-05 21:31:53 +08:00
Zoltan Varga 385f84f18c [aot] Emit aot logging information to a per-assembly file when using the AOT cache. Cache aot failures. 2014-09-04 23:31:50 -04:00
Zoltan Varga 4f916f178b [aot] Print error messages to the aot logfile as well, avoid exiting the process on failures. 2014-09-04 20:06:53 -04:00
Zoltan Varga 39c87f6f69 [aot] Allow the redirection of output messages from the AOT compiler to a logfile. 2014-09-04 19:11:30 -04:00
Zoltan Varga d84d1a94a0 Fix the build. 2014-09-04 17:38:16 -04:00
Zoltan Varga ad8236ebb8 [runtime] Get rid of the Makefile.am.in->Makefile.am change in metadata/, its not needed. 2014-09-04 17:34:36 -04:00
Alexander Köplinger ddcfc42070 Cleanup namespace names of class lib tests to follow convention
A couple of the test suites didn't follow the MonoTests.<namespace of class under test> naming convention for the namespace.
2014-09-04 18:55:58 +02:00
Marek Safar 2b88d02356 [mcs] recursive pattern with named arguments 2014-09-04 15:12:21 +02:00
Marek Safar 806b95d844 [mcs] recursive pattern matching 2014-09-04 10:37:50 +02:00
Marek Safar e83f4a2ab3 Merge pull request #1254 from vkargov/master
[corlib] Take daylight change info for the current year in TimeZoneTest.cs
2014-09-03 20:30:38 -09:00
Alexis Christoforides 5d80954463 Bump Mono version -> 3.10.1 2014-09-04 00:15:40 -04:00
Zoltan Varga c7b3d5c3ba Revert "[build] Include mono/utils into the extensions module."
This reverts commit b760456501.

Revert this as it is not needed.
2014-09-03 21:20:33 -04:00
Zoltan Varga f746fe8d1b Revert "[build] Deps tracking for mono/utils/Makefile.am when extension module is disabled."
This reverts commit a2e939a8a3.

Revert this as is not needed.
2014-09-03 21:20:11 -04:00
Zoltan Varga d2cee144fe [sgen] Use mono_thread_info_get_stack_bounds () on win32 as well, the stack bottom value returned by it is correct, only the stack top value is unusable, since windows dynamically extends the stack. 2014-09-03 18:15:15 -04:00
Rodrigo Kumpera 43177ef54b [utils] Add android extension point to threading. 2014-09-03 16:58:30 -04:00
Rodrigo Kumpera a2e939a8a3 [build] Deps tracking for mono/utils/Makefile.am when extension module is disabled. 2014-09-03 16:34:18 -04:00
Rodrigo Kumpera b760456501 [build] Include mono/utils into the extensions module. 2014-09-03 16:32:30 -04:00
Rodrigo Kumpera 748fefa1d7 [runtime] Cleanup the horrible ifdef hell that is the stack bounds discovery code.
This split a single chunk of intractable ifdef hell into a beautiful set of per-target
files.

This will allow us to actually figure out what's going on on each target.
2014-09-03 16:30:35 -04:00
Zoltan Varga 4c1155f40a Merge pull request #1252 from alesliehughes/master
Stop warning about winsock2.h being included before windows.h
2014-09-03 14:44:32 -04:00
Vladimir Kargov 59668db7f4 [corlib] In a TimeZone test, UtcOffset is taken for the current year, so take DaylightChanges for the current year as well. 2014-09-03 16:36:35 +04:00
Marcos Henrich db57c23c29 DateTime.Parse now handles unlimited number of fractional digits.
This change was made because .NET can parse ISO8601 format with an unlimited number of fractional digits.
Fixes #22417.
2014-09-03 18:29:58 +08:00
Marcos Henrich 17972cec4f Added test ISO8601FractionalDigits.
Covers #22417.
2014-09-03 18:27:28 +08:00
Alistair Leslie-Hughes ec2b629fa9 Stop warning about winsock2.h being included before windows.h
This change is released under the MIT license.
2014-09-03 19:51:11 +10:00
Zoltan Varga f9b27e2e73 Fix a warning. 2014-09-02 21:10:11 -04:00
Zoltan Varga 541639c3bb [runtime] Load the runtime config file before initializing the runtime, so it can pick up the aot-cache configuration information. 2014-09-02 20:25:16 -04:00
Zoltan Varga 883f9399f4 [runtime] Add an 'app' attribute to the 'aotcache' config section to specify which apps should use the AOT cache. 2014-09-02 20:22:05 -04:00
Marek Safar b5fcd926f8 Merge pull request #1251 from esdrubal/utf8encoding
UTF8Encoding Fallback
2014-09-02 06:43:40 -09:00
Marcos Henrich f79c64942e Changed overlong byte to be processed again.
The byte is processed again because it can be the begin of a new multi-byte encoded character.
2014-09-02 23:14:09 +08:00
Marcos Henrich 91fa140dd0 Changed UTF8Encoding to call fallback with whole byte sequences.
Removed unnecessary parameters ref byte [] bufferArg.
This changes are required by UTF8EncodingTest.EncodingFallback that in some cases is expecting multibyte values..
2014-09-02 22:57:26 +08:00
Marcos Henrich 3d332ac26d Added UTF8EncodingTest.EncodingFallback.
EncodingFallback tests for multiple invalid inputs the unknownBytes that are given to the DecoderFallback.
2014-09-02 22:55:52 +08:00
Miguel de Icaza a7b779648b Bring fix for Cecil, includes fix for F#/Fody 2014-09-02 10:49:41 -04:00
Marcos Henrich 60aa49b35b Added class EncodingTester that can be used to test fallbacks.
EncodingTester is a testing helper class with a method TestDecoderFallback that makes DecoderFalback testing  easier.
2014-09-02 22:42:54 +08:00
Marek Habersack 10d4e76525 Do not specify key file when building for mobile, it should be passed on command line 2014-09-02 14:32:12 +02:00
Marcos Henrich 09bb2dc4bd Changed InternalGetCharCount to iterate the bytes as InternalGetChars. 2014-09-02 18:38:20 +08:00
Marek Safar fca9b48556 [mcs] more nonliteral constants pattern matching 2014-09-02 11:55:45 +02:00
Marek Habersack 38b25dc65a This method is internal in the mobile profile 2014-09-02 00:33:44 +02:00
Marek Habersack 14fba61b9d Added System.IO.InternalBufferOverflowException class to the mobile profile 2014-09-01 22:24:36 +02:00
Marek Habersack 58684cf2c4 Merge pull request #1249 from mattleibow/master
[system.data] DataRows with a NULL RowError incorrectly indicated HasError
2014-09-01 21:47:43 +02:00
Zoltan Varga eeb1227133 [runtime] Further reduce the usage of the loader lock in the metadata code by moving code out of locked regions and using the image lock instead. 2014-09-01 14:39:06 -04:00
Matthew Leibowitz a3c1bebc45 [system.data] DataRows with a NULL RowError incorrectly indicated HasError:
- MS.NET allows RowError to be set to NULL, but will convert it to string.Empty
2014-09-01 11:03:03 -07:00
Rodrigo Kumpera 6bee6a7b18 [runtime] Remove the interpreter. 2014-09-01 13:27:03 -04:00
Zoltan Varga bd8782b061 [runtime] Use a separate lock to protect global data structures in classes.c. 2014-09-01 13:05:25 -04:00
Zoltan Varga 03e4fe45d7 Disable a sys.data test which fails on wrench because of an old sqlite version. 2014-09-01 12:51:53 -04:00
Zoltan Varga f6ae9f133d Bump version to 3.10. 2014-09-01 11:47:11 -04:00
Zoltan Varga 00612b8049 [runtime] Factor out the nested types computation code from mono_class_get_nested_types () and reorganize it so most of the work is done outside the loader lock. 2014-09-01 11:40:56 -04:00
Zoltan Varga ea77a1201c [runtime] Use the image locks in many places instead of the loader lock. 2014-09-01 11:40:56 -04:00
Zoltan Varga 98ef62b1d1 [runtime] Remove a missed mono_loader_unlock () from mono_metadata_get_header (). 2014-09-01 11:40:55 -04:00
Zoltan Varga c73f87c669 [runtime] Reorganize mono_method_signature_checked () so most of the work is done outside the loader lock. 2014-09-01 11:40:55 -04:00
Zoltan Varga e043529add [runtime] Reorganize mono_method_get_header () so most of the work is done outside the loader lock. 2014-09-01 11:40:55 -04:00
Zoltan Varga 6730dfbf80 [runtime] Remove locking from the mono_get_method_constrained_... () functions, its not needed. 2014-09-01 11:40:55 -04:00
Zoltan Varga f5a0a351c2 [runtime] Reorganize mono_class_setup_interfaces () so most of the work is done outside the loader lock. 2014-09-01 11:40:54 -04:00
Zoltan Varga ff9b6836d2 [runtime] Move the initialization of class->has_finalize into mono_class_has_finalizer () in most cases. 2014-09-01 11:40:54 -04:00
Zoltan Varga e87e75fe3a [runtime] Reorganize mono_class_setup_methods () so most of the work is done outside the loader lock. 2014-09-01 11:40:54 -04:00
Zoltan Varga a3f28b43f7 [runtime] Reorganize mono_class_has_finalizer () so most of the work is done outside the loader lock. 2014-09-01 11:40:54 -04:00
Zoltan Varga 042114b194 [runtime] Reorganize mono_class_setup_events () so most of the work is done outside the loader lock. 2014-09-01 11:40:53 -04:00
Zoltan Varga 8dac2761fc [runtime] Reorganize mono_class_setup_properties () so most of the work is done outside the loader lock. 2014-09-01 11:40:53 -04:00
Zoltan Varga 7704a952f6 [runtime] Use the image lock in mono_type_from_typespec () instead of the loader lock. Also do most of the work outside the lock. 2014-09-01 11:40:53 -04:00
Rodrigo Kumpera 2c6b6ff553 Merge pull request #1246 from schani/feature-separate-pointer-queue
[sgen] Refactor pointer queue out of pinning code.
2014-09-01 10:13:41 -04:00
Marek Safar 79ea6ce4d0 Put back csharp project removed in 0450000dc4 2014-09-01 14:58:32 +02:00
Marek Safar 20c85188ab [mcs] Fix removing incomplete generic types from eval cache. Fixes #22393 2014-09-01 14:57:23 +02:00
Marek Safar 05feed5de7 [mcs] Parsing of ternary expressions whose then condition is a lambda. Fixes #22523 2014-09-01 13:26:48 +02:00
Marek Safar 11ac4dfb22 [mcs] Remove wrong test 2014-09-01 13:22:21 +02:00
Marek Safar 6e6ad378c0 Fixes c2ac44d3dd 2014-09-01 12:43:32 +02:00
Marek Safar c2ac44d3dd [system.data.linq] Delay reflection hit to actual execution point. Workarounds #22522 2014-09-01 11:22:57 +02:00
Marek Safar bcf33452dd [system.net.http] Update RequestMessage.RequestUri.AbsoluteUri after redirect. Fixes #22383 2014-09-01 10:10:30 +02:00
Zoltan Varga 5646004e39 [runtime] Fix the windows build. 2014-08-31 04:34:18 -04:00
Marek Safar 01bc7c1923 [mcs] Revert to broken native csc definite assignment for structs 2014-08-30 14:04:16 +02:00
Marek Safar c8b482d640 [mcs] nonliteral constants pattern matching 2014-08-30 14:04:16 +02:00
Marek Safar 723dc9ad6f [xbuild] Fix InstalledAssemblyTables signature 2014-08-30 14:04:15 +02:00
Marek Safar 8897b572c7 [mcs] simple constants pattern matching 2014-08-30 14:04:15 +02:00
Zoltan Varga 644ff6b019 [aot] Fix full-aot support when the AOT cache is enabled. 2014-08-29 23:47:33 -04:00
Zoltan Varga 567c08843d [jit] Avoid hardcoding tls offsets into the aot versions of the monitor enter/exit trampolines on amd64. 2014-08-29 23:47:01 -04:00
Zoltan Varga f8db51ecb4 [jit] Avoid uninitialized fields in the MonoDelegateTrampInfo structure. 2014-08-29 19:30:15 -04:00
Zoltan Varga 34df6ae34b [runtime] Fix reading past the end of a string when setting the native thread name. 2014-08-29 19:29:48 -04:00
Zoltan Varga 96b74d362a [runtime] Fix a problem introduced by 522663cdfa. 2014-08-29 17:42:37 -04:00
Zoltan Varga 522663cdfa [runtime] Add an adapter between the MonoPrintCallback and the eglib GPrintFunc types. 2014-08-29 17:03:23 -04:00
Mark Probst 2f126c13e8 [sgen] Refactor pointer queue out of pinning code. 2014-08-29 13:33:34 -07:00
Tom Hindle bb672ad95e Fix mono_marshal_free_ccw (). Fixes #22414. 2014-08-29 16:05:50 -04:00
Zoltan Varga bfc3336224 [bcl] Catch exceptions thrown by SerialPortStream.Dispose () when called from the finalizer. Fixes #15514. 2014-08-29 15:06:25 -04:00
Zoltan Varga abfd4b5732 [sdb] Fix the checking of the handshake message. 2014-08-29 15:04:40 -04:00
Zoltan Varga b8766a812d [runtime] Add functionality for AOTing assemblies on demand when they are first used. Configurable using a new "aotconfig" config element, i.e. <aotcache assemblies="mscorlib System"/>. 2014-08-29 15:02:52 -04:00
Zoltan Varga 8dea307fa4 [runtime] Add Steve Reid's public domain SHA1 code. 2014-08-29 15:01:26 -04:00
Rodrigo Kumpera 62b1e5a653 [eglib] Fix stderr output redirection. 2014-08-29 14:33:27 -04:00
Stephen McConnel 44acb717d8 Fix scrolling in SWF.ListView.EnsureVisible(int index)
This fixes https://bugzilla.xamarin.com/show_bug.cgi?id=22483
2014-08-29 12:25:48 -05:00
Marek Safar 38c3874627 Merge pull request #1242 from esdrubal/xelement
Fixes XContainer attempt to create a XNode from a null value.
2014-08-29 01:16:24 -09:00
Marcos Henrich acb0cc0d7d Fixes XContainer attempt to create a XNode from a null value.
Fixes #20151.
2014-08-29 17:59:39 +08:00
Marcos Henrich 8308eb87e0 Test XElement constructed from array with null values as object.
Covers #20151.
2014-08-29 17:57:31 +08:00
Marek Safar b2d61a33a6 Merge pull request #1237 from esdrubal/xdocument
Changed XObject OnChanged and OnChanging to use Owner.
2014-08-28 21:05:14 -09:00
Marek Safar ba64d7a8eb Merge pull request #1241 from RyanMelenaNoesis/patch-1
Update X509CertificateValidationMode.cs
2014-08-28 21:03:44 -09:00
Ryan Melena 5b8dad3895 Update X509CertificateValidationMode.cs
Remove explicit enum values for sake of consistency with existing enum.
2014-08-28 20:26:08 -05:00
Alexis Christoforides c109e47433 Merge pull request #1240 from NoesisLabs/master
Correct duplicate X509CertificateValidationMode definition error
2014-08-28 20:21:58 -04:00
Ryan J. Melena b1446b1982 Correct duplicate X509CertificateValidationMode definition error caused by enum changing assemblies between .NET 4.0 and 4.5. 2014-08-28 19:01:48 -05:00
Zoltan Varga 03aee949f1 Merge pull request #1200 from akoeplinger/remove-jvm
[Cleanup] Remove TARGET_JVM
2014-08-28 19:17:43 -04:00
Rodrigo Kumpera 903c5e3aa6 Revert "Merge pull request #1219 from panzone/los_partial_marking"
This reverts commit 397176d701, reversing
changes made to 33c345a945.
2014-08-28 19:12:51 -04:00
Zoltan Varga 7ec9786a3f Merge pull request #1235 from directhex/master
Add g_Ctoc to list of acceptable g_* symbols in mono, for test-eglib-remap
2014-08-28 18:50:47 -04:00
Zoltan Varga fff41afa51 [runtime] Fix a crash in the logging profiler when enumerating elf images. 2014-08-28 16:44:55 -04:00
Rodrigo Kumpera dc75a4a86e Merge pull request #1238 from esdrubal/datetimeoffset
Fixed DateTime compiler errors.
2014-08-28 16:12:47 -04:00
Alexis Christoforides b27c2d690d Merge pull request #1236 from NoesisLabs/master
Support JWT functionality in System.IdentityModel.Tokens.Jwt
2014-08-28 16:08:46 -04:00
Marcos Henrich 4fa7c08306 Fixed DateTime compiler errors. 2014-08-29 03:58:03 +08:00
Marcos Henrich 8854761cc4 Changed XObject OnChanged and OnChanging to use Owner.
When XObject.Owner is not a XElement XObject.Parent returns null and the owner would not be notified of changing and changed events.
Fixes:#18772
2014-08-29 02:12:39 +08:00
Marcos Henrich 74afbbb110 Test XDocument.Changed event. Covers #18772. 2014-08-29 02:00:30 +08:00
Ryan J. Melena b7f40f6682 Add compiler pragmas for conditional .NET 4.5 compilation 2014-08-28 11:57:47 -05:00
Ryan J. Melena 7f0fc12f3a Add file comment headers. This change is released under the MIT license. 2014-08-28 11:57:46 -05:00
Ryan J. Melena ed1e4e2918 Fix VS changes to .csproj file. This change is released under the MIT license. 2014-08-28 11:57:45 -05:00
Ryan J. Melena 725b211d9f Minimal implementation of classes and methods necessary to support the JWT functionality in System.IdentityModel.Tokens.Jwt (https://github.com/MSOpenTech/azure-activedirectory-identitymodel-extensions-for-dotnet). This change is released under the MIT license. 2014-08-28 11:57:44 -05:00
Rodrigo Kumpera 397176d701 Merge pull request #1219 from panzone/los_partial_marking
[Sgen parallel collector] Los partial marking
2014-08-28 12:28:05 -04:00
Jo Shields 4b48ec236a Add g_Ctoc to list of acceptable g_* symbols in mono, for test-eglib-remap.
In theory, this test is used to verify that no unknown glib symbols exist
in eglib. However, it's tripping on g_Ctoc which is not a glib (or eglib)
symbol, instead it comes from the IO layer - and glib symbols never use
uppercase characters anyway
2014-08-28 17:26:31 +01:00
Marek Safar 33c345a945 Merge pull request #1234 from esdrubal/datetimeoffset
DateTime.CoreParseExact.
2014-08-28 07:06:30 -09:00
Marek Safar fee0db958c [xbuild] Allow metadata in skipped task output expressions 2014-08-28 17:44:42 +02:00
Marcos Henrich 5e86fba0b9 Removed unreachable code. 2014-08-28 23:43:10 +08:00
Marcos Henrich cb0d8221e0 Changed DateTimeOffset.ParseExact to use DateTime.CoreParseExact. 2014-08-28 23:39:03 +08:00
Marcos Henrich af977863fe Improved DateTime._DoParse offset logic. 2014-08-28 23:37:29 +08:00
Marcos Henrich 727b045f36 Removed line causing problems when 'K' was followed by something. 2014-08-28 23:35:48 +08:00
Marcos Henrich a95479875e Improved DateTime parsing of years.
Years with 5 or more digits and less than 1000 are now correctly parsed.
2014-08-28 23:31:19 +08:00
Marcos Henrich 8c9f47900c Created DateTime.CoreParseExact so to be used by DateTimeOffset. 2014-08-28 23:27:57 +08:00
Marek Safar 924d6216bf [mcs] Fixes failing error test 2014-08-28 16:35:59 +02:00
Marek Safar 121766abb9 [mcs] type pattern expression 2014-08-28 16:35:59 +02:00
Marcos Henrich 379be33c4e Changed DateTime._DoParser to support DateTimeOffset patterns. 2014-08-28 22:11:15 +08:00
Marek Safar 4b2ddc74cc Merge pull request #1233 from esdrubal/uriparserisbaseof
UriParser.IsBaseOf now explicitly throws ArgumentNullException.
2014-08-28 03:22:48 -09:00
Marcos Henrich 8c6e7faba3 UriParser.IsBaseOf now explicitly throws ArgumentNullException.
A change in Uri.Compare was making IsBaseOf to return false when arguments were null.
NullReferenceException is thrown by .NET, nonetheless the correct behavior is to throw a ArgumentNullException..
2014-08-28 19:46:35 +08:00
Marek Safar ed9291e086 Merge pull request #1232 from akoeplinger/fix-test
[MSBuild] Fixed a test that failed when the GAC wasn't available
2014-08-27 20:44:34 -09:00
Alexander Köplinger b45cd3f489 [MSBuild] Fixed a test that failed when the GAC wasn't available
PR #1229 added a test that relies on the GAC and fails when it isn't available, like when building on a clean machine with monolite.
Skip the test in that case.
2014-08-27 22:28:49 +02:00
Rodrigo Kumpera 88c3f0b7ec [runtime] Incorporate team feedback on the new logging APIs. 2014-08-27 15:47:43 -04:00
Alexander Köplinger 7152730bcd Fix badge URL in README.md, the previous one got cached by GitHub 2014-08-27 20:06:47 +02:00
Marek Safar 9330b9f221 [mcs] Add 6.0 to version error reporting 2014-08-27 17:56:17 +02:00
Marek Safar 5787f73a39 Merge pull request #1231 from esdrubal/gthreshold
Serializer were not generated if generationThreshold was changed.
2014-08-27 06:13:45 -09:00
Marcos Henrich baa495e78b Serializer were not generated if generationThreshold was changed. 2014-08-27 22:20:00 +08:00
Marek Safar 4866102820 Merge pull request #1230 from esdrubal/xslattribute
Process XslLiteralElements with only child attributes as empty ones.
2014-08-27 03:58:41 -09:00
Marcos Henrich af4dcd117d Process XslLiteralElements with only child attributes as empty ones.
Fixes #14751
2014-08-27 20:51:49 +08:00
Marcos Henrich d7f5c71baa Test xls transformation of single child node to an attribute. 2014-08-27 20:20:47 +08:00
Sebastien Pouliot 2332ba9a10 [eglib] Fix logging on iOS (asl_vlog != asl_log)
asl_vlog last parameter is a va_list and giving it a char* leads to crash
which calls our native unhandled exception handler, which also tries to
log what happens making the watchdog unhappy about the food quality

0x000000008badf00d
2014-08-26 21:54:30 -04:00
Alexis Christoforides 813d6610ec Resolve build issues on Windows. 2014-08-26 15:49:19 -04:00
Zoltan Varga 3ccd45f8f3 Fix the build. 2014-08-26 15:01:24 -04:00
Martin Baulig 37d2e36ca9 [WCF]: Fix #22179 - 'finally' protect ClientRuntimeChannel.Begin/EndProcess(). 2014-08-26 20:00:44 +02:00
Marek Safar 7f030179c4 Merge pull request #1229 from andreiagaita/master
[MSBuild] Make sure assembly references with extensions are located correctly
2014-08-26 08:07:09 -09:00
Marek Safar f0afe2f9c4 [mcs] Predefined attibutes can have unresolved parameter types. 2014-08-26 17:13:41 +02:00
Marek Safar c106cdc775 [mcs] Put back future lang version for easier migration path 2014-08-26 13:46:16 +02:00
Marek Safar a8994e23a7 [mcs] Don't report error when predefined InterlockedCompareExchange_T is not available. 2014-08-26 13:39:15 +02:00
Marek Safar f5b09d21a5 [mcs] Hide backing fields in default debugger display 2014-08-26 10:02:38 +02:00
Marek Safar e1d28db6fc [mcs] Replace future with experimental 2014-08-26 10:02:37 +02:00
Marek Safar d87c706981 [mcs] Better error message 2014-08-26 10:02:37 +02:00
Marek Safar 8c6593f8a8 [system] Add AcceptWebSocketAsync signatures 2014-08-26 10:02:37 +02:00
Zoltan Varga ef5549b572 Update the LLVM backend to work with llvm branch mono-2014-08-23-b401e6b9699423409a055dc873e4d3f361a908c0. 2014-08-26 00:33:05 -04:00
T.J. Purtell 5d07b77a67 [runtime] Don't call mono_arch_handle_exception() when chaining
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=18763#c12
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=18763#c14
Context: http://stackoverflow.com/a/1789879/83444

mono_set_crash_chaining() was added in 8ffc4070 in order to better
support Android crash logs.

Crash logging in Android is "weird" (something we didn't know at the
time of 8ffc4070); when a process crashes on Android, ideally:

 1. The Android signal handler is executed,
 2. Bionic will attempt to connect to /system/bin/debuggerd.
 3. debuggerd will try to connect to the crashing process, then
    retrieve "useful" information from the crashing process (stack
    trace, register values, etc.)

The problem with 8ffc4070 was that there is a "window" between steps
(1) and (3) during which the crashing process continues to execute but
debuggerd hasn't attached to the process. It is possible that the
crashing process can thus exit before debuggerd has had a chance to
attach, killing the purpose of the crash logs.

Case in point: consider mono_sigsegv_signal_handler(). In 8ffc4070,
if mono_do_crash_chaining is TRUE, then Mono will execute:

  mono_handle_native_sigsegv (SIGSEGV, ctx);
  mono_chain_signal (SIG_HANDLER_PARAMS);
  mono_arch_handle_exception (ctx, NULL);

Because mono_chain_signal() doesn't block, abort the process, or
otherwise do anything to prevent execution from continuing, execution
will hit mono_arch_handle_exception(), which will exit the process.
If you're unlucky, this will happen before debuggerd has had a chance
to attach to the process.

The obvious fix is to prevent mono_arch_handle_exception() from being
invoked. The question is, *how*? jonp suggested [0] that after
mono_chain_signal() returns then _exit(2) or a busy loop could be
invoked. Unfortunately, _exit(2) makes the process exit explicit, and
~reliably prevents debuggerd from doing anything.

A busy loop doesn't work because it just causes the process to hang
within signal handler context, and debuggerd is never able to log
anything about the crashed process.

It would seem that the signal handler itself must exit without causing
the process to exit so that debuggerd has a chance to do ANYTHING,
otherwise nothing will happen reliably.

Thanks to T.J. Purtell for investigating and providing the patch.

[0]: https://github.com/mono/mono/pull/1206#issuecomment-52357802

--- Original commit message [formatted] ---

re #18763: After the chained handler executes, it may return to allow
the crashed instruction to be restarted or it may have taken
corrective action so the instruction can be resumed successfully.

For example, bionic resets the signal handler for SIGSEGV to default
expecting that the kernel will restart the offending instruction and
cause the kernel to abort the process.  Don't do mono exception
handling after chaining to support these types of signal management.
2014-08-25 23:54:36 -04:00
Jonathan Pryor 9e7713121b [eglib] Fix compilation on PLATFORM_ANDROID.
Compilation of eglib/src/goutput.c was broken in commit 989165e1:

	mono/eglib/src/goutput.c: In function 'monoeg_log_default_handler':
	mono/eglib/src/goutput.c:159:75: error: 'args' undeclared (first use in this function)
	  __android_log_vprint (to_android_priority (log_level), log_domain, "%s", args);
	                                                                           ^
	mono/eglib/src/goutput.c:159:75: note: each undeclared identifier is reported only once for each function it appears in
	mono/eglib/src/goutput.c: In function 'default_stdout_handler':
	mono/eglib/src/goutput.c:168:2: error: incompatible type for argument 4 of '__android_log_vprint'
	  __android_log_vprint (ANDROID_LOG_ERROR, "mono", "%s", message);
	  ^
	mono/eglib/src/goutput.c:139:0:
	$ANDROID_NDK_PATH/platforms/android-4/arch-arm/usr/include/android/log.h:109:5: note: expected 'va_list' but argument is of type 'const gchar *'
	 int __android_log_vprint(int prio, const char *tag,
	     ^
	mono/eglib/src/goutput.c: In function 'default_stderr_handler':
	mono/eglib/src/goutput.c:175:2: error: incompatible type for argument 4 of '__android_log_vprint'
	  __android_log_vprint (ANDROID_LOG_ERROR, "mono", "%s", message);
	  ^

(The cause of the breakage is that __android_log_vprint() takes a
va_args parameter, which is no longer present in 989165e1.)

Use __android_log_write() instead of __android_log_vprint().

Note: __android_log_write() writes a "simple string" to `adb logcat`,
meaning there is no printf(3)-style formatting applied.
2014-08-25 22:58:30 -04:00
Sebastien Pouliot 28d400df31 [corlib] Update ClaimsPrincipalTest to avoid Is[Not]Empty as this is not part of NUnitLite 1.0 (and can't be run on XiOS) 2014-08-25 20:43:31 -04:00
Rodrigo Kumpera debdc1c127 [eglib] Restore previous defaults for some platforms. 2014-08-25 14:51:07 -04:00
Rodrigo Kumpera 97c8674bf4 [msvc] Fix release 64bits builds. 2014-08-25 14:42:22 -04:00
Rodrigo Kumpera 1996d664b4 [jit] Ensure no threads are running when the JIT is asked to cleanup. 2014-08-25 14:42:22 -04:00
Rodrigo Kumpera 8c36d76bd2 [utils] Add runtime API for output redirection, logging and aborting. 2014-08-25 14:42:22 -04:00
Rodrigo Kumpera 0a08dede53 [eglib] g_assertion_message should not abort, g_logv will do it. 2014-08-25 14:42:22 -04:00
Rodrigo Kumpera 989165e12f [eglib] Add log/print redirection functions to eglib. 2014-08-25 14:42:22 -04:00
Martin Baulig 7d8798c15d [System]: WebClient.OpenWrite() must get the response on close; fixes #10163.
When the stream returned by WebClient.OpenWrite() / OpenWriteAsync() /
OpenWriteTaskAsync(), we need to call GetResponse() and read the full
response.

Unfortunately, there is no async API available for this, so this API should
not be used in async applications.
2014-08-25 18:15:49 +02:00
Martin Baulig d56c28373b [System]: Fix WebClient.UploadValuesTaskAsync(); bug #20359. 2014-08-25 18:15:48 +02:00
Marcos Henrich 5d2f303311 Test DateTimeOffest parsing of partial dates. 2014-08-25 23:51:37 +08:00
Marek Safar 60d9c66011 [msbuild] corcompare public API 2014-08-25 14:00:05 +02:00
Marek Safar 8c5488e79c [corlib] Fix ClaimsIdentity claim value comparison 2014-08-25 13:12:42 +02:00
Marek Safar 336382e2b1 [corlib] corcompare update 2014-08-25 13:12:42 +02:00
Marek Safar 4eb632730e Merge pull request #1224 from esdrubal/codecompiler
Changed mono_path profile replacement to be case insensitive.
2014-08-25 12:56:04 +02:00
Marek Safar 78b1cde8fc Merge pull request #1223 from esdrubal/xmlgenerator
Test SerializationCodeGenerator.
2014-08-25 12:55:33 +02:00
Marek Safar f2b5c86467 Merge pull request #1226 from mattleibow/TransactionScope-InvalidTimoutNotThrowingException
[system.transactions] Throw exception when an invalid TimeSpan is provided
2014-08-23 07:54:03 +02:00
Matthew Leibowitz 5b4172c8cc [system.transactions] Throw exception when an invalid TimeSpan is provided:
- MS.NET throws
 - prevent construction when an invalid (negative) timeout is provided
2014-08-23 00:38:15 +02:00
Alexis Christoforides 96b66b3867 Added mono_string_from_utf32() 2014-08-22 17:11:11 -04:00
Marek Safar 0661867309 [corlib] Improve System.Security.Claims. Fixes #22282 2014-08-22 22:09:11 +02:00
Marek Safar 289331a627 [mcs] Handle partial entry point method 2014-08-22 22:09:11 +02:00
Marek Safar 2712774292 Remove unused mdb icall 2014-08-22 22:09:10 +02:00
Zoltan Varga 0d839a1e09 [runtime] Add a mono_thread_detach_if_exiting () public api function which can be called by embedding code to detach the runtime if the code is running from a pthread dtor. Fixes part of #21164. 2014-08-22 11:37:14 -04:00
Marcos Henrich a6a4d75dda Changed mono_path profile replacement to be case insensitive. 2014-08-22 22:20:53 +08:00
Marcos Henrich 9d2ede6010 Fixed serialization of XmlNode field with attribute XmlAnyElement.
Fixes #3211.
2014-08-22 21:50:40 +08:00
Marcos Henrich 24bfa83876 Added missing XmlTypeMapping.IsAny logic.
This complements commit 05444c7c1c570db730f17b6d15dd66d3728b6.
2014-08-22 21:50:39 +08:00
Marcos Henrich 9f52a988cf Replaced incorrect bool.ToString() by GetLiteral(bool). 2014-08-22 21:50:39 +08:00
Marcos Henrich 1e5ce9cc4f Added GetTypeFullName, fixes wrong nullable valuetype names. 2014-08-22 21:50:38 +08:00
Marcos Henrich 526cbd5ced Changed UsageCount and generationThreshold to zero based. 2014-08-22 21:46:38 +08:00
Marek Safar 93e590439c [xbuild] Resolve output properties for skipped task to match task output when it's not skipped 2014-08-22 09:24:40 +02:00
Marcos Henrich 5df652e7d2 Test SerializationCodeGenerator.
XmlSerializerTests was mostly testing XmlSerializationReaderInterpreter and XmlSerializationWriterInterpreter.
XmlSerializerGeneratorTests forces the usage of SerializationCodeGenerator while running XmlSerializerTests.
2014-08-22 02:56:05 +08:00
Marcos Henrich dd6aca8621 Tests serialization of XmlNode field with attribute XmlAnyElement.
Covers #3211.
2014-08-22 02:42:19 +08:00
Andreia Gaita 5e8e4f3883 [MSBuild] Make sure assembly references with extensions are located correctly 2014-08-21 18:30:47 +01:00
Alex Rønne Petersen 8020aafc3b Update badge URL in README.md. 2014-08-21 18:30:17 +02:00
Alex Rønne Petersen 105c916504 Fix a warning in mono-conc-hashtable. 2014-08-21 18:23:06 +02:00
Alex Rønne Petersen 0d8ddc225a Remove unused/undefined function. 2014-08-21 18:23:06 +02:00
Marek Safar 8376abf928 Merge pull request #1221 from LogosBible/uri-compare
Fix NullReferenceException in Uri.Compare when only one of the Uris is null
2014-08-21 15:51:12 +02:00
Alex Rønne Petersen 0cdfb23e29 Merge pull request #1172 from roji/datarow_null
Fix DataRow error management
2014-08-21 14:59:28 +02:00
Martin Potter d990d904c4 Fix NullReferenceException in Uri.Compare when only one of the Uris is null 2014-08-21 05:52:38 -07:00
Marek Safar f070b646f6 [corlib] Handle String::Format with escaped closing }. Fixes #22114 2014-08-21 10:35:38 +02:00
Zoltan Varga bdeb6123fd [jit] Use mini_type_stack_size () instead of mono_type_size () in the stack slot allocation code, this aligns vtype size to a multiple of the pointer size, preventing problems when vtypes are returned in registers on some platforms like arm64. 2014-08-20 21:39:46 -04:00
Miguel de Icaza e9b93e2788 Merge pull request #1189 from joelmartinez/docs-64bit-squash
MDoc and monodoc.dll changes to support iOS 64Bit API
2014-08-20 16:56:57 -04:00
Zoltan Varga 776efa6920 [jit] Fix the switching of domains in native-to-managed wrappers, previously this only worked in some cases. 2014-08-20 13:55:28 -04:00
Marek Safar e57c1ed37d [mcs] Emit event fields even when compare-and-exchange is not available 2014-08-20 15:54:06 +02:00
Marek Safar 37e33ceb3e [mcs] Easy restrictions on enum base type epxression 2014-08-20 13:16:55 +02:00
Marek Safar ebcc2ee853 [corlib] Task never is CompletedSynchronously 2014-08-20 12:01:42 +02:00
Marek Safar 8aa250524c Fix wrong time test 2014-08-20 09:01:57 +02:00
Jo Shields 7178ce2c40 Switch to using jenkins.mono-project.com for DNS tests
This test requires a simple single mapping for Hostname<->IP with one IP and reverse DNS. Using EC2-hosted sites doesn't work as they don't have valid reverse DNS. Use the Jenkins subdomain, since that fits the criteria.
2014-08-20 07:20:41 +01:00
Marek Safar ca5e18f6a9 [mcs] Clean-up flow analysis for boolean expressions 2014-08-20 08:20:26 +02:00
Marek Safar 09f73f3070 [mcs] Null operator flow analysis 2014-08-20 08:20:26 +02:00
Mark Probst c69e743177 [sgen] Small simplification of sgen_pin_objects_in_section().
We only have one section, which is the nursery, so don't even pass it in.
Furthermore, it's only called locally, so make it static.
2014-08-19 12:17:50 -07:00
Mark Probst f35fa6adf5 [sgen] Simplify pin_objects_from_addresses() and fix potential performance issue.
In the case where more than one pointer pointed to the same empty region within
the nursery we would search through that empty region for each pointer instead of
just once.
2014-08-19 12:17:50 -07:00
Mark Probst 4564b54ded [sgen] Sanitize and fix pin_objects_from_addresses().
Assume we have an object at address 0x1000, with size 0xf0, then
a hole of size 0x10, and the next object starting at 0x1100, of
size 0x20.  In the pin queue we have the addresses 0x10f8 and
0x1100.

When we process the first pin queue entry, 0x10f8, we jump over
the object at 0x1000, to 0x10f0.  Then we skip the hole and end
up at 0x1100.  We set last_obj to that address.  Then we check
against the pin queue entry we're looking for and find that we've
overshot it, so we end our search and go to the next pin queue
entry, 0x1100.  There's an object at that address, but because of
this check we don't pin it:

	if (addr >= last_obj && (char*)addr < (char*)last_obj + last_obj_size) {

addr == 0x1100, last_obj == 0x1100, last_obj_size == 0x20
2014-08-19 12:17:50 -07:00
Mark Probst b4c9630073 [sgen] Make optimizations in new bridge turn-offable at compile-time.
This will help find bugs.
2014-08-19 12:09:34 -07:00
Mark Probst 8a56cba5b7 [sgen] Fix new bridge implementation. 2014-08-19 12:09:34 -07:00
Andrea Francesco Iuorio 24ef95ece8 [Sgen] Implement partial marking for big array of objects
This commit changed the gray stack to support work items. When a big
array of objects is marked, Sgen now create several work items. Every
work item rappresents a pieces of the array that must be scanned.
Since they are different pieces, the workers can now parallel scan
and mark the array, resulting in a better work distribution between
the workers.

I release this change under the MIT license.
2014-08-19 20:38:23 +02:00
Andrea Francesco Iuorio 30a627f9a8 [Sgen] Transport scan macros from sgen-descriptor.h to sgen-scan-object.h
This commit transport the scan macro from sgen-descritor.h to
sgen-scan-object.h. This is useful for modify at compile time
the scan macro according to the scan function.

I release this change under the MIT license.
2014-08-19 20:37:39 +02:00
Marek Safar 5c42807469 Merge pull request #1213 from fengari/system_timers_timer_opt
System.Timers.Timer optimization and small correction
2014-08-19 16:59:50 +02:00
Marek Safar 2c6797db48 [mcs] Add more error checks 2014-08-19 10:34:54 +02:00
fengari b3251b6248 Do not dispose the underlying Timer every time the Enabled is set to false, keep it around for as long as this Timer exists. Throw ObjectDisposedException on Enabled setter. ArgumentException throwing according to docs. Removed 'disposed' field. DueTime for underlying timer changes only if enabled (as per docs). Check for already disposed in Dispose(). Not firing Elapsed if disposed. Unit tests. 2014-08-19 11:21:52 +03:00
Marek Safar 74ad56cdfa [mcs] Complex binary logical expressions flowanalysis 2014-08-19 09:34:39 +02:00
Marek Safar a41a626dab [mcs] More warnings for lifted nullable operators working on value types 2014-08-19 09:26:25 +02:00
Marek Safar 9c46884097 Merge pull request #1216 from AndreyAkinshin/master
Removing excess line with debug Console.WriteLine
2014-08-19 09:00:58 +02:00
Andrey Akinshin 4be0d33040 Removing excess line with debug Console.WriteLine 2014-08-19 11:27:33 +07:00
Zoltan Varga 68e5cc395f [bcl] Add a missing check to TypeBuilder.CreateType (). Fixes #22059. 2014-08-18 21:38:50 -04:00
Zoltan Varga aa3e8cb211 Fix a warning. 2014-08-18 18:24:49 -04:00
Marek Safar 5809028135 Merge pull request #1214 from esdrubal/xmlbase
Xml Serialization of Base class w/o a parameterless constructor.
2014-08-18 16:57:43 +02:00
Marcos Henrich 8fa4a77948 Xml Serialization of Base class w/o a parameterless constructor.
Removed validation code that did not allowed serialization of base classes without a parameterless constructor.
Fixes #6913.
2014-08-18 15:27:53 +01:00
Rodrigo Kumpera b0a2135f5c [utils] Improve error message in case of thread suspend fails. 2014-08-18 09:18:37 -04:00
Marcos Henrich 2c5f30d7bd Added test BaseClassWithoutParameterlessConstructor.
Covers #6913
2014-08-18 14:08:02 +01:00
Marek Safar 24005444c7 Merge pull request #1212 from esdrubal/isany
Fixed XmlSerializer to handle attribute XmlSchemePrivider.IsAny.
2014-08-18 12:45:04 +02:00
Marcos Henrich 38d56909d9 Fixed XmlSerializer to handle attribute XmlSchemePrivider.IsAny.
XmlSerializer no longer outputs a root element with class name when the class has the attribute XmlSchemeProvider and IsAny is true.
Fixes #11916
2014-08-18 11:42:05 +01:00
Marcos Henrich 6c5ea03852 Test XmlSerialization of class with XmlSchemaProvider with IsAny.
Covers #11916.
2014-08-18 11:40:58 +01:00
Rodrigo Kumpera a8a518752e [runtime] Fix malloc backend for mempools. 2014-08-17 02:40:42 -04:00
Zoltan Varga 6986ed5c1c Merge pull request #1210 from Mailaender/mono-core-parallel-build
Fixed parallel build for MCS dir-check
2014-08-16 15:51:29 -04:00
Matthias Mailänder 7e267ff2fe fix parallel build 2014-08-16 16:48:01 +02:00
Zoltan Varga eaa343fcba Merge pull request #1208 from Mailaender/ppc-build-fixes
PowerPC Garbage Collector build fixes
2014-08-16 10:11:15 -04:00
Marek Safar 557ad88e3d [mcs] Extend missing type check to type lookups. Fixes #20933 2014-08-16 14:49:38 +02:00
Marek Safar 2c037b85c6 [mcs] Fix copy and paste error in constraints checker. Fixes #22131 2014-08-16 14:49:37 +02:00
Marek Safar 76efee0a49 Merge pull request #1207 from nlhepler/master
Fix buffer overflow for long paths in jay
2014-08-16 10:27:56 +02:00
Matthias Mailänder 58de3013d1 fix ppc build failures 2014-08-16 08:28:55 +02:00
Lance Hepler 015e847e11 Handle long paths in jay 2014-08-15 16:06:11 -07:00
Zoltan Varga 5ab34b2477 [jit] Fix yet another native types problem. Fixes #22053. 2014-08-15 15:32:00 -04:00
Marek Safar 230b3bfce4 [mcs] Add dictionary initializer 2014-08-15 20:51:18 +02:00
João Matos d34210d900 [System.IO.Compression] Fixed Zip support for empty directories. 2014-08-15 19:13:30 +01:00
Joel Martinez a8d74cc095 [mdoc] Changed 'old' and 'new' to 'classic' and 'unified' per feedback. 2014-08-15 11:19:48 -04:00
Zoltan Varga 31e92f2442 [runtime] Fix the leaking of mach ports introduced by 98bbf8512a. Fixes #22068. 2014-08-15 09:56:47 -04:00
Zoltan Varga 12e4b4fed4 [runtime] Make more wrappers use a WrapperInfo structure. 2014-08-14 22:06:15 -04:00
Zoltan Varga 844ad76318 [runtime] Integrate calls to mono_wrapper_info_set () into mono_mb_create_and_cache () to fix races when a wrapper is placed into a cache without its wrapper info set. 2014-08-14 21:45:31 -04:00
Zoltan Varga 407b8163c8 [jit] Add support for constrained calls with vtype return types in gsharedvt code. Fixes #22109. 2014-08-14 15:54:55 -04:00
Zoltan Varga 8e3b2fa421 [jit] Fix the stack alignment checking code in the x86 trampolines. 2014-08-14 15:54:55 -04:00
Marek Safar 33023bf7de [mcs] Improve commit 409024fcab 2014-08-14 21:01:28 +02:00
Joel Martinez 8b6a9693bd [mdoc] Style updates per pull request feedback 2014-08-14 14:16:29 -04:00
Marek Safar 5aeec74842 [mcs] null propagating operator on delegate invocation 2014-08-14 19:05:27 +02:00
Marek Safar acb5527b57 Warnings cleanup 2014-08-14 19:05:27 +02:00
Marek Safar 409024fcab [mcs] Speed up nullable tokenizer. Fixes #20195 2014-08-14 19:05:27 +02:00
Joel Martinez 1051734504 [mdoc] Moved enumeration back into deferred mode.
This resolved an issue with the ecmadoc importer that assumed execution would be deffered in order to keep reading from the XmlReader
2014-08-14 11:07:43 -04:00
Marek Safar 5f5bed4643 Merge pull request #1188 from arktronic/master
[TimeZoneInfo] Fix DST bug and implement To/FromSerializedString
2014-08-14 14:16:19 +02:00
Marek Safar 62a15c8e13 [mcs] coalescing operator if the lhs of a null is a integer type that is larger than the integer type on the rhs. Fixes #22054 2014-08-14 11:50:54 +02:00
Marek Safar 512c1407b3 Merge pull request #1205 from akoeplinger/fix-tests
[System] Use xamarin.com instead of mono-project.com for DNS tests
2014-08-14 08:54:24 +02:00
Alexander Köplinger a81feba777 [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 01:21:20 +02:00
Joel Martinez 867299720c [mdoc] Fixed issue with assembly versions being added incorrectly 2014-08-13 17:11:03 -04:00
Ludovic Henry d273a16452 [jit] Disable delegate virtual optimisation while we are fixing it 2014-08-13 16:34:30 -04:00
Mark Probst 37dcfd1819 [sgen] Use a power of two as the cement hash size.
Cementing, specifically the hashing, showed up when profiling GC heavy
code.  This reduces the footprint.
2014-08-13 13:00:05 -07:00
Mark Probst 60a6084e9b [sgen] In the GC pause visualizer histogram, label the axis. 2014-08-13 13:00:04 -07:00
Mark Probst 0e2322f9d8 [gc] Measure Boehm GC time correctly. 2014-08-13 13:00:04 -07:00
Zoltan Varga 2ceb43d380 [runtime] Fix the PLATFORM_GNU check so it works with gnueabi etc. as well. Fixes #21520. 2014-08-13 15:33:40 -04:00
Zoltan Varga e46452652f [runtime] Don't make runtime invoke signatures generic. Fixes #21973. 2014-08-13 15:17:40 -04:00
Marek Safar db3eb16307 Merge pull request #1204 from VQComms/claimsprincipaloverloads
Added HasClaim, FindFirst, FindAll into ClaimsPrincipal
2014-08-13 20:22:22 +02:00
Marek Safar 9c377582d1 [mcs] null operator on address locations 2014-08-13 20:21:10 +02:00
Marek Safar c8c631ae2b [mcs] Check for duplicate destructors. Fixes #21983 2014-08-13 20:21:10 +02:00
Zoltan Varga a4f96bc571 [aot] Fix a small memory leak. 2014-08-13 13:59:19 -04:00
Jonathan Channon db06435616 Added space before parenthesis according to Mono guidelines 2014-08-13 18:11:11 +01:00
Jonathan Channon 05bf78d278 added HasClaim, FindFirst, FindAll System.Security.Claims.ClaimsPrincipal method overloads - This change in released under the MIT license. 2014-08-13 17:57:55 +01:00
Atsushi Eno 0322d96b73 [MS.Build] when building MSBuild task, inherit properties.
This makes difference when the build has started from a solution especially
via command line with /p option. Those command-line-passed properties need
to be inherited to each project, but they weren't.
xbuild worked fine here.
2014-08-13 19:35:18 +09:00
Atsushi Eno 778c3b5a02 [MS.Build] add test regarding item condition and target-generated property. 2014-08-13 19:35:12 +09:00
Marek Safar b8d8f62956 [mcs] nameof operator with unbound type arguments 2014-08-13 07:05:10 +02:00
Zoltan Varga be86c5d406 [arm64] Allow v8..v15 in unwind info on arm64. Fixes part of #21615. 2014-08-12 19:52:47 -04:00
Joel Martinez 49699b8188 [mdoc] Fixed an issue with type-file path resolution.
In certain cases, such as stubbing out namespace-less classes it was failing to produce the right paths.
2014-08-12 17:45:54 -04:00
Joel Martinez 2cb5217d48 [mdoc] Added preserver.cs to build script so make compiles 2014-08-12 17:44:17 -04:00
Marcos Henrich 8e9da60e99 KeyPairPresistence now tries to fix folder permissions.
An exception is no longer thrown if the folder permissions can be fixed.
Fixes bug 19274.
2014-08-12 19:08:37 +01:00
Zoltan Varga abb5e6f7e1 Merge pull request #1161 from ludovic-henry/pr22-delegate-virtual-trampoline
[delegate virtual] Improve trampoline caching
2014-08-12 13:53:49 -04:00
Ludovic Henry 8022fec251 [delegate-virtual-trampoline] Add virtual functions delegate trampoline support
This optimization is activated in the ldvirtftn + delegate case, and is deactivated in the case where the architecture does not support it (mono_arch_get_delegate_virtual_invoke_impl return NULL)
2014-08-12 13:30:45 -04:00
Ludovic Henry 87b5b1c6ca [delegate-virtual-trampoline] Add virtual parameter to existing JIT time code path 2014-08-12 13:30:45 -04:00
João Matos 025877a34b [System] Restrict GZip/DeflateStream tests to .NET 4.5. 2014-08-12 17:36:26 +01:00
João Matos f39bebefea [System] Implemented .NET 4.5 overloads for GZipStream and DeflateStream.
Fixes xambug #21982.
2014-08-12 16:17:08 +01:00
Paolo Molaro 374b71131e [runtime] Fix logic when allocating code region if the first try at a fixed address fails. 2014-08-12 15:31:18 +02:00
Marek Safar e7dbeee80d Re-enable valid tests 2014-08-12 10:34:33 +02:00
Marek Safar 2f043e033d [System.Net.Http] Handle quoted filename value. Fixes #21960 2014-08-12 10:31:32 +02:00
Marek Safar b184bbea53 [corlib] Remove heavyweight EndsWith from 1bff9d890f 2014-08-12 08:49:29 +02:00
Marek Safar cd48aae3b8 [mcs] nameof operator 2014-08-12 08:16:21 +02:00
Marek Safar 147d410929 [mcs] Any type parameter is allowed for null propagating operator 2014-08-12 08:16:21 +02:00
Marek Safar 7bdcefb038 [mcs] auto-property initializer can be array initializer 2014-08-12 08:16:20 +02:00
Miguel de Icaza 7c9d050961 Merge pull request #1192 from LogosBible/regex-fixes-21803
Regex substring fix
2014-08-11 23:27:48 -04:00
Atsushi Eno 82f411d44a [ms.build] add some cyclic dependency related tests (some are not working). 2014-08-11 21:53:35 +09:00
Atsushi Eno 7ec59c3177 [ms.build] Fix bug #20961 - add KeepDuplicates etc. to 4.0 as internal.
Since NET_4_0 and NET_4_5 share the same ToolsVersion (4.0) there seems no
way to distinguish the appropriate framework .targets file, so I ended up
to add the missing members as internal for 4.0.
2014-08-11 21:53:34 +09:00
Atsushi Eno d09be4600c [ms.build] Do not try to release threads upon finalization. 2014-08-11 21:53:33 +09:00
Marek Safar 11a3daa71d Merge pull request #1190 from esdrubal/encoder-convert
System.Text.Encoder convert
2014-08-11 10:50:03 +02:00
Zoltan Varga 6f3ad3b7a2 Merge pull request #1201 from crisdut/fix-win-mono-dependencies
Adding the mutex header file dependency
2014-08-08 22:46:36 +02:00
João Matos 1bff9d890f Fixed Path.GetFullPath to work correctly when the current path is '/'.
Fixes xambug #833.
2014-08-08 19:03:39 +01:00
João Matos 90ccde72e5 Merge pull request #1196 from tritao/master
System.IO.Compression.FileSystem implementation
2014-08-08 18:42:29 +01:00
João Matos f17d714385 Implemented System.IO.Compression.FileSystem. 2014-08-08 18:40:01 +01:00
Armando C. Dutra 2549d18cb5 adding the mutex header file dependency 2014-08-08 04:29:40 -03:00
Alexander Köplinger 48e112d652 [Cleanup] Removed TARGET_JVM
It was once part of a special Java target profile, but this is no longer used today.
2014-08-08 03:28:34 +02:00
Zoltan Varga 5c59fee91f [jit] Reorganize the locking in mono_jit_compile_method_inner, the domain lock already makes the code lookup+insert atomic, no need to do more work inside the jit code hash lock. Also lock jit_code_hash in mono_jit_free_method (). 2014-08-08 02:17:54 +02:00
Zoltan Varga 1e8a5b2809 [jit] Avoid taking the loader lock in mono_jit_compile_method_inner (), it shouldn't be needed any more. 2014-08-08 02:09:06 +02:00
Zoltan Varga 766e8c3504 [sdb] Avoid asserting when a cattr cannot be loaded. Fixes #21653. 2014-08-08 00:37:04 +02:00
Alexander Köplinger c685b21764 [Cleanup] Removed files that imported Java namespaces
They were once part of a special Java target profile, but this is no longer used today.
2014-08-07 23:01:53 +02:00
Alexander Köplinger 5f4b8c2cf4 [Cleanup] Removed JavaEE csproj and sln files
They were once part of a special Java target profile, but this is no longer used today.
2014-08-07 23:01:53 +02:00
Alexander Köplinger 4165d879cd [Cleanup] Removed net_1_1_java from Makefiles
It was once part of a special Java target profile, but this is no longer used today.
2014-08-07 23:01:52 +02:00
Alexander Köplinger 31daf92e72 [Cleanup] Removed net_1_1_java*.sources files
They were once part of a special Java target profile, but this is no longer used today.
2014-08-07 23:01:52 +02:00
Alexander Köplinger a8b2f07578 [Cleanup] Removed .jvm.cs files that are no longer used
They were once part of a special Java target profile, but this is no longer used today.
2014-08-07 23:01:51 +02:00
Marek Safar 76c34a1574 [System] Disable failing test 2014-08-07 20:01:46 +02:00
Marek Safar f5629c16e0 [mcs] null propagating operator and expressions which cannot be null 2014-08-07 16:54:57 +02:00
Zoltan Varga 98bbf8512a [runtime] Fix Process.PrivateMemorySize64 etc. on ios. Fixes #21882. 2014-08-07 14:56:51 +02:00
Marek Safar c6ae57fa19 [mcs] null propagating operator and extension methods 2014-08-07 14:25:07 +02:00
Zoltan Varga 0f1a427b67 [jit] Fix enum->int casts in gsharedvt code. Fixes #21893. 2014-08-07 13:56:56 +02:00
Marek Safar d3553fefdc [mcs] null propagating operator with nested receiver 2014-08-07 11:04:16 +02:00
Marcos Henrich 631f3685bb Added classes EncodingEncoder and EncodingDecoder.
EncodingEncoder and EncodingDecoder override Encoder.Convert.
The Convert overrides allow retrieval of chars/bytes buffers with the same size as .NET.
2014-08-07 09:28:44 +01:00
Marek Safar ed065cd04d Merge pull request #1199 from esdrubal/packurihelper
PackUriHelper
2014-08-07 10:25:47 +02:00
Marcos Henrich 9d781928b2 Added argument validations to ComparePackUri an ComparePartUri. 2014-08-07 09:10:53 +01:00
Marcos Henrich d3d078eb51 Changed Check.PartUriIsValid to throw ArgumentException. 2014-08-07 09:09:22 +01:00
Marcos Henrich 33f0c427f7 Removed [Category("NotWorking")] from PackUriHelperTests.
CompareInvalidTest is still not working because .NET PackUriHelper.ComparePackUri is doing something that uses Uri and throws an exception whereas Mono is not.
2014-08-07 09:02:49 +01:00
Marek Safar bdd8f8212f Merge pull request #1198 from chriswebb/master
Fixed issue where XmlReflectionImporter unable to handle XmlEnums with colons
2014-08-07 08:18:30 +02:00
Chris Webb 1a3ec8c3b3 Fixed issue related to fully qualified namespaces being used for XmlEnumAttribute values. 2014-08-07 06:15:55 +00:00
Marek Safar 5398bc14a4 Merge pull request #1197 from akoeplinger/remove-csproj
[Cleanup] Removed a bunch of superfluous .csproj and .sln files
2014-08-07 07:44:36 +02:00
Alexander Köplinger 0450000dc4 [Cleanup] Removed a bunch of superfluous .csproj and .sln files
Most of these files weren't updated in the last >5 years and serve no purpose today, so they only clutter the repository.
2014-08-06 18:02:30 +02:00
Shay Rojansky 416c5e9df4 Correct code review comments on test 2014-08-06 17:37:51 +03:00
Marek Safar e64af2edbf Merge pull request #1195 from akoeplinger/fix-uri-with-digits
[System] Fix parsing of URI schemes with digits
2014-08-06 15:11:53 +02:00
Alexander Köplinger 636d9c3186 [System] Fix parsing of URI schemes with digits
Initializing an Uri previously throwed an exception when the URI scheme contained a digit (e.g. net.p2p).
The loop was missing a digit check, similar to https://github.com/mono/mono/blob/1f1dc988ad7b165603a1175bf0a92156c4372c43/mcs/class/System/System/Uri.cs#L767
2014-08-06 14:53:01 +02:00
Marek Safar 1f1dc988ad Merge pull request #1168 from esdrubal/iriparsing
IriParsing
2014-08-06 12:47:14 +02:00
Marek Safar e003c4e8f9 Merge pull request #1193 from esdrubal/decimal-round
Decimal.Round trailing zeros
2014-08-06 12:41:39 +02:00
Marek Safar 6b32f6951a Merge pull request #1180 from akoeplinger/no-net40-in-make-check
Don't run net_4_0 tests during "make check"
2014-08-06 12:40:30 +02:00
Marek Safar ba1842208d [mcs] switch statement with constant block at first label. Fixes #21805 2014-08-06 09:52:48 +02:00
Alexis Christoforides adf5717203 Added MonoString<->UTF-32 conversion helper functions. 2014-08-05 19:58:51 -04:00
Zoltan Varga 571df7ac2b Fix the build. 2014-08-06 01:33:48 +02:00
Zoltan Varga abde1a90c6 [runtime] Remove unused critical-sections files. 2014-08-05 23:52:07 +02:00
Zoltan Varga ee230d0620 [runtime] Use the mono_mutex types/functions instead of CriticalSection's. 2014-08-05 23:36:06 +02:00
Zoltan Varga 8fe4231357 [jit] Use the mono_mutex types/functions of CriticalSection's. 2014-08-05 23:21:14 +02:00
Dave Dunkin cd364b4374 Add test for Regex RTL substring matching. 2014-08-05 08:51:38 -07:00
Marcos Henrich 60022096d1 Decimal.Round output no longer keeps trailing zeros. 2014-08-05 14:00:12 +01:00
Marcos Henrich 880f273f56 Test Decimal.ToString after rounding with trailing zeros. 2014-08-05 13:58:07 +01:00
Paolo Molaro ff983a6a9e [profiler] Increase the number of maximum and default frames in backtraces. 2014-08-05 13:15:17 +02:00
Zoltan Varga 2897dba601 [jit] Emit OP_FMOVE instead of OP_MOVE for r4 arguments in hard float mode on arm. 2014-08-05 13:02:58 +02:00
Paolo Molaro d5bce925f0 [runtime] Don't assert when loading a generic methodspec with 0 arity (xambug #19097). 2014-08-05 11:52:35 +02:00
Sasha Kotlyar 76a25717e7 Miscellaneous changes per review 2014-08-04 19:15:10 -04:00
Martin Potter 1af8016a5c Regex fixes for substring parsing. 2014-08-04 14:42:35 -07:00
Dave Dunkin 509863e570 Add test for Regex.Match with anchors on a substring. 2014-08-04 14:42:34 -07:00
Rodrigo Kumpera 8da27c63c3 Merge pull request #1066 from esdrubal/bug19313
Changed DeflateStream to stop reading base_stream sooner. Fixes #19313.
2014-08-04 12:29:43 -04:00
Rodrigo Kumpera 9e91c36e1c Merge pull request #1063 from esdrubal/bug18482
Resets all private key values on RSAManaged.ImportParameters. Fixes #18482.
2014-08-04 12:28:50 -04:00
Marek Safar 3bd87b33c5 [mcs] null propagating operator on index expressions 2014-08-04 17:33:43 +02:00
Zoltan Varga 04ae3b8a2e [runtime] Remove unneccesary locking from some metadata functions. 2014-08-04 17:29:04 +02:00
Marcos Henrich 97e5bfb498 Test Encoder.Convert and UTF8Encoder.Convert behaviors.
Added class ExposedEncoder to test the virtual method Encoder.Convert behavior.
Test UTF8Encoder.Convert override.
2014-08-04 15:26:53 +01:00
Zoltan Varga e98a83ec63 [runtime] Initialize klass->supertypes properly for dynamic classes. 2014-08-03 22:09:51 +02:00
Sasha Kotlyar a66732c039 [TimeZoneInfo] Fix issue with some floating DST transition times creating invalid DateTime values, and implement ToSerializedString and FromSerializedString.
This change is released under the MIT license.
2014-08-03 15:25:43 -04:00
Marek Safar cc90ac0be7 [system.xml] Dispose XmlReader using correct value. Fixes #21771 2014-08-03 19:10:45 +02:00
Marek Safar 76875075df [mcs] decimal constants modulo folding. Fixes #21743 2014-08-03 18:55:53 +02:00
Marek Safar c8796a126d [mcs] null propagating operator cannot work on pointer types 2014-08-03 18:55:53 +02:00
Joel Martinez da44df5a50 [mdoc] Changes to support new-style iOS API:
- the dropns flag now lets you define a namespace that is dropped in a new version of the assembly during update.
- the ntypes flag lets you tell the update command that certain methods are now using native types, and as such will attempt to match with old types in order to preserve documentation.
- the preserve flag will avoid removing members. This is to avoid dropping documentation for members that changed from one version of the framework to another new-style version (ie. iOS).
2014-08-02 19:48:11 -04:00
Joel Martinez be7502c908 [monodoc] Changes to support new-style iOS documentation:
- Fixed bug in creating CREF strings.
- Refactored XML file processing for customization during new style iOS assembly. This was done through the new file source interface, which lets you use dependency injection to customize the process.
- Added the ability to rewrite CREF references when assembling docs that use native types. Also, the ability to handle dropped namespaces.
2014-08-02 19:48:11 -04:00
Marek Habersack 59258ea3f0 Turns out some devices can have network interfaces without names.
If we encounter such a device we assign it an empty name followed by index number, so that we can
put any number of such devices in the dictionary and report them to the user.

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=21741
2014-07-31 19:45:05 -04:00
Mark Probst 2169799f5a [sgen] File size limit for binary protocols.
We can now pass a file size limit to the `binary-protocol` option.  It will
create numbered binary protocol files, and only keep the last two around.
This is useful for cases where the only way to reproduce a bug is through
a long run that would otherwise create a protocol that's much too big.
2014-07-31 13:29:42 -07:00
Mark Probst da8f1879ad [sgen] Debug option for clear-at-tlab-creation nursery clear policy.
With the debug policy, we do clear at TLAB creation, but at GC time, whenever
we would clear with `clear-at-gc`, instead of not clearing, we fill with 0xff.
2014-07-31 13:29:36 -07:00
Zoltan Varga 597a3e8964 [jit] Avoid making generic calls from gsharedvt methods normally, go through the rgctx infrastructure instead. Fixes #21677. 2014-07-31 21:56:08 +02:00
Marek Safar c6685c1953 [mcs] Update codegen for boolean loads. Fixes #21685 2014-07-31 18:40:19 +02:00
Marek Safar ac9e90a89d [mcs] null coallescing operator can end up working on value types 2014-07-31 16:43:58 +02:00
Zoltan Varga c3a3132005 Merge pull request #1184 from directhex/kfreebsd
Support for GNU/kFreeBSD
2014-07-31 16:40:36 +02:00
Zoltan Varga 90c38a6b9e Merge pull request #1183 from directhex/xinerama
Don't do the soname checking dance for Xinerama.
2014-07-31 16:38:23 +02:00
Marek Safar 30407b77ce [xbuild] Fix handling of reference aliases 2014-07-31 15:21:46 +02:00
Jo Shields 056cc3be24 Define PLATFORM_GNU which covers any OS with GNU userland.
This define covers kFreeBSD, not just Linux. This is required because
the error which 120d194d10 works around is
a GNU problem, not a Linux problem, so causes FTBFS on kFreeBSD.
2014-07-31 12:04:59 +01:00
Jo Shields 0fe5be9fd8 Use host_win32 not platform_win32 in kfreebsd defines 2014-07-31 11:58:47 +01:00
Jo Shields edfbc1d848 Don't do the soname checking dance for Xinerama.
Xinerama has only ever had a soname of 1.

Checking for 1, 2, and 3 is just weird and pointless. And by not using a
default value, we duplicate the bug which add24aaa1 fixed.
2014-07-31 11:45:14 +01:00
Jo Shields 164ead5fb1 Fix warning message when libX11.so.* are not found.
We complain that we can't find "X development files", but the reverse
is true - if we had X development files, we'd find libX11.so (which
we aren't looking for). What we look for (and find) are the runtime files.
2014-07-31 11:45:13 +01:00
Jo Shields 1f513847b2 Support for GNU/kFreeBSD.
GNU/kFreeBSD is an experimental OS provided by the Debian project, consisting
of a FreeBSD kernel and GNU userland/libc. For a small number of cases, this
offers advantages over a more common GNU/Linux combination, such as fast
in-kernel support for ZFS storage.

This patch changes various ifdefs, either using __FreeBSD_kernel__ where a
trait from the kernel is what matters, or __GLIBC__ where a trait from the
C library matters.

This patch set has been carried downstream, in one form or another, since
1.2.3.1-1.

https://bugzilla.novell.com/show_bug.cgi?id=321634
2014-07-31 11:44:51 +01:00
Marek Safar 13f4ba52e0 [mcs] Fixes bootsrap with older mcs 2014-07-31 11:53:09 +02:00
Marek Safar e7bf6d81ea [mcs] Member access null propagating operator 2014-07-31 11:06:52 +02:00
Marek Safar 2915003696 [mcs] Finalizers cannot use expression_block syntax 2014-07-31 11:06:52 +02:00
Marek Habersack 303e42b130 Implement the Mono side of Android support for NetworkInterface.GetAllNetworkInterfaces ()
Added code to call Xamarin.Android internal implementation of getifaddrs/freeifaddrs to provide us
with the required information to fulfill the request.

Added a handful of Linux ARP hardware IDs which are considered to be tunnel devices and which may occur
on Android devices.

Part of fix for https://bugzilla.xamarin.com/show_bug.cgi?id=1969
2014-07-30 18:22:33 -04:00
Alexis Christoforides cd59827c22 Bump Mono version -> 3.8.1 2014-07-30 14:52:33 -04:00
Alexander Köplinger d16413148e Don't run net_4_0 tests during "make check"
As @marek-safar noted in mono@cf4f10e#commitcomment-7128403, the IL code for the 4.0 profile is never used
for running (the assemblies are just built for having metadata), so it makes no sense to execute 4.0 tests during "make check"
2014-07-30 18:58:08 +02:00
Zoltan Varga 81867287f8 [xbuild] Disable some tests which fail on wrench. 2014-07-30 17:41:51 +02:00
Ludovic Henry 44214ee4de [PLinq] Avoid cache thrashing of locals array when looping over enumerator 2014-07-30 11:40:30 -04:00
Marcos Henrich 1c815b18aa Uri.ToString now returns registered parser components when possible. 2014-07-29 07:46:56 +01:00
Marcos Henrich 6d7be6df27 ParseNoExceptions is now using registered parsers when possible. 2014-07-29 07:22:43 +01:00
Marcos Henrich 9f34f2d7f0 TryParseComponent returns when the scheme has a registered parser. 2014-07-29 07:17:21 +01:00
Marcos Henrich 17aeeb761f Removed parameter parser from UriParseComponents.ParseComponents. 2014-07-29 07:14:55 +01:00
Marcos Henrich 095c0f8513 Changed some IriParsing behaviors to be platform behaviors. 2014-07-28 12:37:58 +01:00
Marcos Henrich e7604d6268 Added UriTestAux that tests non default IriParsing. Fixed Tests. 2014-07-28 12:36:28 +01:00
Marcos Henrich efdbd10e61 Refactored ifs into switches. 2014-07-25 14:47:54 +01:00
Marcos Henrich d2ac7759d8 Removed unnecessary parameter modifier ref.
No need of modifier ref because ParserState is not a value type.
2014-07-25 14:05:23 +01:00
Marcos Henrich 6b4da3d6c4 Added missing spaces. 2014-07-25 13:57:09 +01:00
Marcos Henrich 0ad1394bcb Call more appropriate string.TrimStart overload. 2014-07-25 13:54:29 +01:00
Marcos Henrich d9936a0c15 Parse methods are now chained in conjunction. 2014-07-25 13:52:47 +01:00
Marcos Henrich c89e7905c7 Refactored UriHelper.Reduce to use string.Split. 2014-07-25 13:31:57 +01:00
Marcos Henrich 507d10aaa1 Removed redundant code. 2014-07-25 13:29:39 +01:00
Marcos Henrich ab60fa30d3 Splited if to test % first. 2014-07-25 13:28:29 +01:00
Marcos Henrich aa71718828 UriHelper.HexEscapeMultiByte is now using StringBuilder. 2014-07-25 13:20:38 +01:00
Marcos Henrich 9d7d96f594 Class UriHelper is now static. 2014-07-25 13:17:51 +01:00
Marcos Henrich a710d0b8ec Changed string operations to use StringComparison.Ordinal. 2014-07-25 13:14:16 +01:00
Marcos Henrich 351a689463 Removed redundant IriParsing init and changed if to else if. 2014-07-25 11:57:07 +01:00
Marcos Henrich d9ad2fd413 Removed redundant initializations. 2014-07-25 09:41:19 +01:00
Marcos Henrich d7d72f9a81 Control chars with invalid escape are no longer unescaped in 2.0. 2014-07-25 09:08:07 +01:00
Marcos Henrich dd88b4cc18 Results location is now set from defines NET_X_X. 2014-07-25 08:42:47 +01:00
Marcos Henrich 565432ae1f Removed bad LocalPath testing. 2014-07-24 18:21:51 +01:00
Marcos Henrich fc847d6e69 Test invalid utf8 encodings. 2014-07-24 18:12:09 +01:00
Marcos Henrich 9092b7f27f Added UriPermutationsTest.PercentageEncoding_AbsolutePath. 2014-07-24 18:04:40 +01:00
Marcos Henrich 695fb400b3 Added UriPermutationsTest.PercentageEncoding_Unescape. 2014-07-24 18:02:48 +01:00
Marcos Henrich 3b75fd9dea Updated UriBuilderTest.IPv6_Host with IriParsing behavior. 2014-07-24 17:30:14 +01:00
Marcos Henrich e95021f029 Custom schemes '\' are now replaced with '/' on windows paths. 2014-07-24 17:23:05 +01:00
Marcos Henrich 1aa8771d3f Changed Uri.Unescape to use UriHelper.FormatAbsolute. 2014-07-24 12:41:06 +01:00
Marcos Henrich d6b7409e73 Invalid escapes are left untouched on .NET 4.0 and higher. 2014-07-24 12:34:11 +01:00
Marcos Henrich de7e103073 Added HexUnescapeMultiByte overload with invalidEscape out param.
Invalid escapes are left untouched on .NET 4.0 and higher.
2014-07-24 12:31:53 +01:00
Marcos Henrich 21e2b4db20 Added missing FormatFlag.NoSlashReplace condition. 2014-07-24 12:27:47 +01:00
Marcos Henrich 4c5add3387 Added FormatFlag.NoReduce. 2014-07-24 12:26:46 +01:00
Marcos Henrich 59ca31f5d2 Uri.Merge ignores on 2.0 base filename when relative has a query. 2014-07-23 11:46:51 +01:00
Marcos Henrich de0ac0589a On .NET 4.0 and higher avoid unescaping of user escaped Uri. 2014-07-23 10:53:23 +01:00
Marcos Henrich 1ae9ae3b08 Format is now setting FormatFlags.HasUriCharactersToNormalize. 2014-07-23 10:48:30 +01:00
Marcos Henrich ff8156b040 Fixed UriHelper.Format to unescape surrogate char only when needed. 2014-07-23 10:40:07 +01:00
Marcos Henrich fffa1dadfa Added FormatFlag.UserEscaped to Uri.LocalPath. 2014-07-23 10:30:16 +01:00
Marcos Henrich 9bcae25144 Improved Uri.Merge.
Merge is now using UriParseComponents and UriHelper.Reduce.
2014-07-22 16:13:53 +01:00
Marcos Henrich 33f653951c UriHelper.Reduce visibility is now internal. 2014-07-22 16:05:54 +01:00
Marcos Henrich 4e925a2809 Fixed missing "/" after reduce of paths ending with "/..". 2014-07-22 16:01:13 +01:00
Marcos Henrich 16db13ed87 Refactored Uri.ParseNoExceptions to use UriParseComponents. 2014-07-22 10:58:30 +01:00
Marcos Henrich a4dc63385d Set isUnc to true for file scheme on windows. 2014-07-22 10:36:47 +01:00
Shay Rojansky 566646719f Test uses SQLite in-memory DB for test
Also spaces to tabs
2014-07-22 05:56:33 +00:00
Marcos Henrich 16cd5535c9 Improved UriParseComponents.
Added Uri.ParseNoException error cases.
Changed to behave as Uri.ParseNoException.
2014-07-21 23:22:01 +01:00
Marcos Henrich e87c78c022 Setting UriElements.isAbsoluteUri, isUnc, isUnixFilePath, scopeId. 2014-07-21 23:16:47 +01:00
Marcos Henrich 4d610d50db Added UriElements.isAbsoluteUri, isUnixFilePath, isUnc, scopeId. 2014-07-21 23:07:19 +01:00
Marcos Henrich e07d36786b Added parameter UriParser to UriParseComponent. 2014-07-21 23:05:15 +01:00
Marcos Henrich 02d383f202 Improved IPv6 parsing.
Parsing was failing when a port was specified after IPv6 address. ie: "http://[::1]:8080"
2014-07-21 21:57:51 +01:00
Marcos Henrich beca8d580c UriParseComponents is now parsing Uri port as an int. 2014-07-21 20:32:23 +01:00
Shay Rojansky c0d6c47c6b Added test for DataRow error 2014-07-21 09:10:08 +00:00
Shay Rojansky 4c31accaca Fix DataRow error management
DataRow's RowError is supposed to be String.Empty to indicate
no errors, but is sometimes wrongly set to null, falsely indicating
errors. Fixed to be String.Empty.
2014-07-20 15:48:21 +03:00
Marcos Henrich 37dbbb2172 UriParser now appends '/' to Uri path when delimiter is '://'. 2014-07-17 18:57:33 +01:00
Marcos Henrich add9f6a2d7 Changed property IriParsing visibility to internal. 2014-07-17 18:43:25 +01:00
Marcos Henrich adee464395 Replaced ToLower usage with ToLowerInvariant. 2014-07-17 18:15:30 +01:00
Marcos Henrich 88af5f54e7 Changed character comparison to a disjunction of equalities. 2014-07-17 18:11:56 +01:00
Marcos Henrich b8e2fad391 Moved s_IriParsing initialization and removed volatile modifier. 2014-07-17 16:17:16 +01:00
Marcos Henrich 1664692ddd Added TryParseComponent to UriParseComponent. 2014-07-17 09:21:11 +01:00
Marcos Henrich 156c7ce52a ParseQuery is now skipped if scheme does not support query. 2014-07-16 14:40:33 +01:00
Marcos Henrich 3e9e2c5fd3 Improved ParseHost of files and IpV6. 2014-07-16 14:32:39 +01:00
Marcos Henrich 6b8a3ac105 Moved scheme delimiter parsing into own method. 2014-07-16 14:12:14 +01:00
Marcos Henrich eb60e33d00 Added Unix and Windows file paths parsing. 2014-07-16 13:53:22 +01:00
Marcos Henrich 42482d540f Added UriKind and String error to UriParseComponent.ParserState.
UriKind was added so Relative Uri can be parsed by UriParseComponent.ParseComponents.
String error was added so a error can be returned when an invalid Uri is provided.
2014-07-16 13:45:04 +01:00
Marcos Henrich e9ccb6d1b4 Replaced Uri.LocalPath Unescape uses by UriHelper.FormatAbsolute. 2014-07-15 19:30:00 +01:00
Marcos Henrich f9ab3ac8de Added FormatFlag.NoSlashReplace. 2014-07-15 19:24:48 +01:00
Marcos Henrich d29b9c93f5 Host unicode characters are no longer escaped. 2014-07-15 19:20:39 +01:00
Marcos Henrich 2aac5c54aa IpV6 Host characters are no escaped or unescaped. 2014-07-15 19:08:06 +01:00
Marcos Henrich a0304b0ab9 Scope id is now removed from IpV6 Host. 2014-07-15 18:41:52 +01:00
Marcos Henrich a4089ba0ef Uri.Host is now escaped with UriHelper.FormatAbsolute. 2014-07-15 18:39:06 +01:00
Marcos Henrich 65f103458b Fixed EscapeDataString and EscapeUriString behavior.
The methods have now the same behavior as .NET 4.5, 4.0 and 2.0.
2014-07-14 10:07:50 +01:00
Marcos Henrich 2f1b0a3494 Missing line from previous commit cc4fae8. 2014-07-14 09:32:57 +01:00
Marcos Henrich 856306e21a With IriParsing some escaped chars are changed to upper case. 2014-07-12 09:48:59 +01:00
Marcos Henrich 00b7582bb2 Changed UriHelper.Format to case of percentage encoded characters. 2014-07-12 09:03:00 +01:00
Marcos Henrich 9ac47f6347 Tests lower case percentage encoding. 2014-07-11 14:58:35 +01:00
Marcos Henrich 3fe13e0b3c UriParser.GetComponentsHelper now sets flag UserEscaped. 2014-07-11 14:38:15 +01:00
Marcos Henrich c0c240bc65 Added uuid to Uri.schemes so its delimiter can be obtained. 2014-07-11 14:34:43 +01:00
Marcos Henrich 34005846d3 Replaced Escape and Reduce usage by FormatAbsolute.
Also removed userEscaped logic because it is verified by FormatAbsolute.
2014-07-11 14:22:19 +01:00
Marcos Henrich e25be38aea Added FormatFlag.UserEscaped. 2014-07-11 12:30:53 +01:00
Marcos Henrich cc4fae8c12 Fixed tests to pass in .NET 4.5, 4.0 and 2.0. 2014-07-10 15:38:14 +01:00
Marcos Henrich dfe46039b1 Changed cr lf end of lines to lf. 2014-07-10 12:44:06 +01:00
Marcos Henrich b13b5a366e Removed ToString call on OriginalString when source is null.
Uri.Merge is no longer leaving source with a null value.
2014-07-10 09:38:01 +01:00
Marcos Henrich 175a461d55 UriParser is now able to print empty user info. 2014-07-10 09:18:28 +01:00
Marcos Henrich 9d83e94b4d UriHelper.GetScheme is now case insensitive. 2014-07-10 09:09:18 +01:00
Marcos Henrich 27c58c5d70 Changed '#' in a fragment to be escaped in a special case.
When a fragment contains a unescaped or escaped '%', characters '#' are escaped in some cases.
2014-07-10 09:06:44 +01:00
Marcos Henrich bad111fc45 Test special case of '#' escaping in fragment.
When a fragment contains a unescaped or escaped '%' characters '#' are escaped in some cases.
2014-07-10 09:00:01 +01:00
Marcos Henrich be150ba5ea LocalPath expected values are now generated for UNIX and MS-DOS.
Depending on the OS the directory separator may be different.
2014-07-08 13:26:12 +01:00
Marcos Henrich 9cbe36c6d8 Fragment_Escape '#' escaping with and without IriParsing.
With IriParsing '#' in a fragment is not escaped in Uri.Fragment while without IriParsing it is.
2014-07-08 13:19:10 +01:00
Marcos Henrich 8de4ca3e16 QueryEscape '%2f' unescaping with and without IriParsing.
With IriParsing '%2f' in a query is not unescaped by ToString while without IriParsing it is.
2014-07-08 13:15:00 +01:00
Marcos Henrich ca9c20afaa Changed reduce to keep consecutive slashes. 2014-07-08 10:24:31 +01:00
Marcos Henrich 0851d2b3ca Added "" to reduceElements to test consecutive slashes.
Changed some paths to avoid id conflicts.
2014-07-08 10:20:25 +01:00
Marcos Henrich 4c737936bc Updated IPv6 test to use the correct form.
With IriParsing the IPv6 is on the mixed form n:n:n:n:n:n:d.d.d.d
Without IriParsing the address is on the hexa-decimal form n:n:n:n:n:n:n:n
2014-07-08 07:52:51 +01:00
Marcos Henrich 449040617c ParseHost is now retrieving IPv6 addresses with the correct form.
With IriParsing the IPv6 is on the mixed form n:n:n:n:n:n:d.d.d.d
Without IriParsing the address is on the hexa-decimal form n:n:n:n:n:n:n:n
2014-07-07 18:09:13 +01:00
Marcos Henrich cf21937a2e ParseScheme now retrieves a lower case scheme. 2014-07-07 18:00:29 +01:00
Marcos Henrich 1eb4eadd02 Removed schemes news: and custom: from tests.
Those schemes have a wrong behavior in .NET.
new Uri("news:a/a%30").ToString() == "news:a/a%30a/a0"
2014-07-07 11:56:41 +01:00
Marcos Henrich e5048fc268 Updated method UriHelper.SupportsQuery to return false with news. 2014-07-07 11:52:56 +01:00
Marcos Henrich 163fe0450a Fixed path starting with '/' on custom schemes, mailto and news. 2014-07-07 11:46:52 +01:00
Marcos Henrich 6311335d7b Added method UriHelper.IsKnownScheme(string scheme). 2014-07-07 11:45:14 +01:00
Marcos Henrich 3c23b670fa Support for custom scheme parsing.
Custom schemes can have a delimiter "://" with a host and a delimiter ":" without a host.
Added FormatFlag.HasHost and UriScheme.CustomWithHost.
2014-07-07 11:35:51 +01:00
Marcos Henrich 9aab7beda3 Change UriParser to correctly parse scheme separator ":" or "://"
Schemes expect a separator ":" or "://" but unknown schemes can use either one, so the used delimiter is now stored in UriElement.
2014-07-07 11:21:01 +01:00
Marcos Henrich 8695716072 Changed Uri.ToString() to use property Uri.Parser. 2014-07-07 11:09:58 +01:00
Marcos Henrich 82a4c17b2b Uri.IriParsing can now be set by using an environment variable.
The Uri static constructor reads the environment variable MONO_URI_IRIPARSIN and sets Uri.IriParsing.
2014-07-04 11:25:48 +01:00
Marcos Henrich 98b6fe5827 Fixed missing # encoding.
With IriParsing disabled if the fragment has a character to be normalized then an # should be encoded.
new Uri("http://a/a?#%30#").ToString() should be "http://a/a?#0%23".
new Uri("http://a/a?#0#").ToString() should be "http://a/a?#0#".
2014-07-03 19:26:18 +01:00
Marcos Henrich c4508573a9 Updated UriHelper.FormatFlags.
Renamed HasCharactersToNormalize to HasUriCharactersToNormalize
Added HasComponentCharactersToNormalize.
2014-07-03 19:24:32 +01:00
Marcos Henrich 2d12b5be53 Fixed bad reduce of "ftp://a\.\". 2014-07-03 18:18:41 +01:00
Marcos Henrich d66a5dafb4 Added backslash to reduceLocations. Simplified componentLocations. 2014-07-03 18:02:55 +01:00
Marcos Henrich 94ca53a315 StringTester.Assert parameter message is now optional.
Additionaly if no message is provided the assert id is used instead.
2014-07-03 17:55:51 +01:00
Marcos Henrich a810e34cdb Updated Uri.Tostring.
Uri.ToString now use GetComponentsHelpers to get and format an absolute Uri and uses FormatRelative to format a relative Uri.
2014-07-03 17:41:14 +01:00
Marcos Henrich 48b81e65ff Added method GetComponentsHelper.
With GetComponentsHelper components with format UriHelper.ToStringUnescape can be retrieve without the ArgumentOutOfRangeException thrown by GetComponents.
2014-07-03 17:39:52 +01:00
Marcos Henrich 986071016d Updated Fragment, Query, AbsoluteUri.
Fragment and Query are now processed with UriHelper.FormatAbsolute.
AbsoluteUri is using obtained from GetComponents.
2014-07-03 14:43:43 +01:00
Marcos Henrich c55d3dfa29 UriHelper.Format now reduces paths. 2014-07-03 12:55:07 +01:00
Marcos Henrich b3dc98ad27 Improved reduce tests.
Reduce tests now test sequences of 1 to 3 encoded or decoded dots inside paths with or without trailing character and encoded fowardslash and backslash.
2014-07-03 12:46:13 +01:00
Marcos Henrich 5119bb867e Improved unescape testing.
With IriParsing the presencee of encoded alpha numeric, non ASCII, '-', '.', '_' and '~' characters trigger the decoding of some other characters.
Tested permutations now include tests with and tests without those characters.
2014-07-02 21:02:07 +01:00
Marcos Henrich aa1130e4fe Added methods FormatAbsolute, FormatRelative, and enum FormatFlags.
Changed Format methods to receive FormatFlags.
Added FormatFlag.HasCharactersToNormalize, which improves character decoding.
The flag is set when Iriparsing is true and the Uri contains an encoded alpha numeric, non ASCII, '-', '.' , '_' and '~'.
When the flag is set some other encoded charcaters need also to be decoded.
2014-07-02 19:17:03 +01:00
Marcos Henrich 4d3934f7c9 Changed UriPermutationsTest createMode to false. 2014-07-01 14:49:09 +01:00
Marcos Henrich b827f67a4e Added UriPermutationsTest.
Created a new set of tests that create&store or that load&assert uri permutations.
Uris are created with permutations of schemes, components, characters then methods and properties output is asserted against expected values obtained on .NET.
2014-07-01 12:14:31 +01:00
Marcos Henrich 085fc9b574 Improved UriHelper.Format '%' handling.
When a % was found HexUnescapeMultiByte output was always considered escaped.
Now a % that is not a percentage encoded character will be processed has a not escaped character.
2014-06-29 15:44:20 +01:00
Marcos Henrich 666987dbcf Changed Uri.SupportsQuery to use UriHelper.SupportsQuery. 2014-06-29 11:26:33 +01:00
Marcos Henrich 048d3a198e Changed ParsePath to only break on '?' if scheme supports queries. 2014-06-29 11:01:36 +01:00
Marcos Henrich addeff3b8f Replaced UriParser.Format with UriHelper.Format.
UriParser.Format was deleted and UriParser.GetComponents is now using UriHelper.Format.
2014-06-29 10:51:09 +01:00
Marcos Henrich 77113c8429 Changed UriElements query and fragment default values to null.
Default values are now null so UriParser.GetComponents can return an empty query or fragment..
2014-06-29 10:31:43 +01:00
Marcos Henrich 6b9726ed2a Created file UriHelper.cs.
UriHelper has the method Format that escapes or unescapes a string's characters depending on the Scheme, UriKind, UriComponent and UriFormat.
2014-06-29 10:06:22 +01:00
Marcos Henrich e5eea6a591 Changed method HexUnescapeMultiByte to internal. 2014-06-29 09:48:48 +01:00
Marcos Henrich b31f2bf454 Added property IriParsing and field s_IriParsing.
The property IriParsing will be used to change between .NET 4.5 and .NET 4.0 default percentage encoding/decoding behavior.
A private field named s_IriParsing same as .NET was also added so it can be changed the same way through reflection in .NET and Mono.
2014-06-29 09:10:00 +01:00
Marcos Henrich 9d624b7d4e Added UriScheme name.
Added UriSchemeTelnet, UriSchemeLdap, UriSchemeUuid.
2014-06-28 19:15:07 +01:00
marcos henrich 6a6631d883 Removed DeflateStream.UnmanagedRead Read loop. Fixes #19313.
If the base_stream was a NetworkStream UnmanagedRead loop would call base_stream.Read a second time and block until one byte was available to return. Without the loop UnmanagedRead will only read the base_stream once.
2014-06-02 08:22:33 +01:00
marcos henrich 19f48e7920 Test that DeflateStream.Read does read an empty stream. Covers #19313. 2014-06-02 08:21:08 +01:00
marcos henrich da47aed900 Fixed bug 18482. Reseting all private key values to null is required because a new import may not overwrite existing values. 2014-05-27 12:11:32 +01:00
marcos henrich 1cc3bead45 Added test that covers bug 18482. 2014-05-27 12:06:55 +01:00
1636 changed files with 31443 additions and 105809 deletions

No files matched your search

+2 -2
View File
@@ -5,7 +5,7 @@ When contributing to the Mono project, please follow the [Mono Coding
Guidelines][1]. We have been using a coding style for many years,
please make your patches conform to these guidelines.
[1] http://www.mono-project.com/Coding_Guidelines
[1] http://www.mono-project.com/community/contributing/coding-guidelines/
Etiquette
=========
@@ -68,7 +68,7 @@ status of your pull request. If it succeeded and we like the changes,
a maintainer will likely merge it. Otherwise, you can amend your pull
request to fix build breakage and Jenkins will test it again.
[2] http://monojenkins.cloudapp.net
[2] http://jenkins.mono-project.com/
# Inactivity
+1 -5
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://monojenkins.cloudapp.net/job/Mono/badge/icon)](http://monojenkins.cloudapp.net/job/Mono/)
[![Build Status](http://jenkins.mono-project.com/job/test-mono-mainline/badge/icon/)](http://jenkins.mono-project.com/job/test-mono-mainline/)
1. [Installation](#compilation-and-installation)
2. [Using Mono](#using-mono)
@@ -494,16 +494,12 @@ Directory Roadmap
* `dis/` - CIL executable Disassembler
* `cli/` - Common code for the JIT and the interpreter.
* `io-layer/` - The I/O layer and system abstraction for
emulating the .NET IO model.
* `cil/` - Common Intermediate Representation, XML
definition of the CIL bytecodes.
* `interp/` - Interpreter for CLI executables (obsolete).
* `arch/` - Architecture specific portions.
* `man/` - Manual pages for the various Mono commands and programs.
+1 -1
View File
@@ -26,7 +26,7 @@ i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-li
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
pic_options='-fPIC'
;;
?86-pc-cygwin*|i?86-pc-cygwin*)
?86-pc-cygwin*|i?86-pc-cygwin*|i?86-pc-mingw32*)
pic_options='-DDLL_EXPORT'
;;
i?86-apple-darwin*|arm-apple-darwin*)
+98
View File
@@ -0,0 +1,98 @@
#
# Appveyor configuration file for CI build of Mono on Windows (under Cygwin)
#
# For further details see http://www.appveyor.com
#
# Use 'unstable' Appveyor build worker image as Appveyor have added Cygwin to this for us
os: Unstable
#
# Custom environment variables
#
environment:
global:
CYG_ROOT: C:/cygwin
CYG_MIRROR: http://cygwin.mirror.constant.com
CYG_CACHE: C:/cygwin/var/cache/setup
NSIS_ROOT: C:\nsis
#
# Initialisation prior to pulling the Mono repository
#
init:
- 'echo Building Mono for Windows'
- 'echo System architecture: %PLATFORM%'
- 'echo Repo build branch is: %APPVEYOR_REPO_BRANCH%'
- 'echo Build folder is: %APPVEYOR_BUILD_FOLDER%'
# Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
- 'git config --global core.autocrlf input'
#
# Install needed build dependencies
#
install:
# NOTE: Already installed on current Appveyor unstable image
# - 'echo Retrieving Cygwin'
# - 'appveyor DownloadFile http://cygwin.com/setup-x86.exe -FileName %CYGROOT%/setup-x86.exe'
- 'echo Setting up Cygwin dependencies'
- '%CYG_ROOT%\setup-x86.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P autoconf -P automake -P bison -P gcc-core -P gcc-g++ -P mingw-runtime -P mingw-binutils -P mingw-gcc-core -P mingw-gcc-g++ -P mingw-pthreads -P mingw-w32api -P libtool -P make -P python -P gettext-devel -P gettext -P intltool -P libiconv -P pkg-config -P git -P wget -P curl > NUL'
- 'echo Check Cygwin setup'
- '%CYG_ROOT%/bin/bash -lc "cygcheck -dc cygwin"'
- 'echo Done setting up Cygwin'
- 'echo Retrieving NSIS'
- 'appveyor DownloadFile "http://sunet.dl.sourceforge.net/project/nsis/NSIS 2/2.46/nsis-2.46-setup.exe" -FileName nsissetup.exe'
- 'echo Setting up NSIS'
- 'nsissetup.exe /S /D=%NSIS_ROOT%'
- 'echo Done setting up NSIS'
#
# NOTE: msbuild doesn't work at present so use Cygwin to build
#
#build:
# project: C:\projects\mono\msvc\mono.sln
# verbosity: detailed
# Cygwin build script
#
# NOTES:
#
# The stdin/stdout file descriptor appears not to be valid for the Appveyor
# build which causes failures as certain functions attempt to redirect
# default file handles. Ensure a dummy file descriptor is opened with exec.
#
build_script:
- cmd: 'echo Cygwin root is: %CYG_ROOT%'
- cmd: 'echo Build folder is: %APPVEYOR_BUILD_FOLDER%'
- cmd: 'echo Repo build branch is: %APPVEYOR_REPO_BRANCH%'
- cmd: 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%'
- cmd: 'echo Autogen running...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; NOCONFIGURE=1 ./autogen.sh --prefix=/usr/local --with-preview=yes"'
- cmd: 'echo Configure running...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./configure --host=i686-pc-mingw32"'
- cmd: 'echo Pulling monolite latest...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make get-monolite-latest"'
- cmd: 'echo Make running...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make"'
- cmd: 'echo Installing...'
- cmd: 'mkdir %APPVEYOR_BUILD_FOLDER%\install'
- cmd: '%CYG_ROOT%/bin/bash --login -lc "export CYGWIN=winsymlinks:native; mount \"$APPVEYOR_BUILD_FOLDER\install\" /usr/local; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make install; umount /usr/local"'
# - cmd: 'echo Building package...'
# - cmd: 'cd %APPVEYOR_BUILD_FOLDER%'
# - cmd: '%NSIS_ROOT%\makensis /DMILESTONE=%APPVEYOR_REPO_BRANCH% /DSOURCE_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER\install\*.* /DBUILDNUM=%APPVEYOR_BUILD_VERSION% monowiz.win32.nsi'
# - cmd: 'Building distribution...'
# - cmd: '%CYG_ROOT%/bin/bash -lc "export CYGWIN=winsymlinks:native; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make dist"'
#
# Disable tests for now
#
test: off
#
# NOTE: Currently this is the Mono installation tree. In future we will create an installation package artifact.
# It has to be relative to the project path. Thus we have installed to within the build tree.
#
artifacts:
- path: install
name: mono-binaries
type: zip
-1
View File
@@ -123,7 +123,6 @@ 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
+47 -72
View File
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
#AC_PREREQ([2.62])
AC_INIT(mono, [3.6.1],
AC_INIT(mono, [3.12.0],
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
AC_CONFIG_SRCDIR([README.md])
@@ -115,9 +115,9 @@ case "$host" in
AC_DEFINE(MINGW_CROSS_COMPILE,1,[Cross-compiling using MinGW])
fi
HOST_CC="gcc"
# Windows 2000 is required that includes Internet Explorer 5.01
# Windows XP SP2 is required
CPPFLAGS="$CPPFLAGS -DWINVER=0x0502 -D_WIN32_WINNT=0x0502 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
LDFLAGS="$LDFLAGS -lmswsock -lws2_32 -lole32 -loleaut32 -lpsapi -lversion -ladvapi32 -lwinmm -lkernel32"
LDFLAGS="$LDFLAGS -lmswsock -lws2_32 -lole32 -loleaut32 -lpsapi -lversion -ladvapi32 -lwinmm -lkernel32 -liphlpapi"
libmono_cflags="-mms-bitfields -mwindows"
libmono_ldflags="-mms-bitfields -mwindows"
libdl=
@@ -142,6 +142,17 @@ 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
@@ -357,6 +368,7 @@ 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)
@@ -755,7 +767,7 @@ DISABLED_FEATURES=none
AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems.
LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier,
reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, assembly_remapping, shared_perfcounters, remoting,
security, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying.],
security, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying, shared_handles.],
[
for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
eval "mono_feature_disable_$feature='yes'"
@@ -929,6 +941,11 @@ if test "x$mono_feature_disable_sgen_copying" = "xyes"; then
AC_MSG_NOTICE([Disabled major=copying support in SGEN.])
fi
if test "x$mono_feature_disable_shared_handles" = "xyes"; then
AC_DEFINE(DISABLE_SHARED_HANDLES, 1, [Disable inter-process shared handles])
AC_SUBST(DISABLE_SHARED_HANDLES)
fi
AC_ARG_ENABLE(executables, [ --disable-executables disable the build of the runtime executables], enable_executables=$enableval, enable_executables=yes)
AM_CONDITIONAL(DISABLE_EXECUTABLES, test x$enable_executables = xno)
@@ -1182,7 +1199,7 @@ if test x$target_win32 = xno; then
AC_CHECK_HEADERS(execinfo.h)
AC_CHECK_HEADERS(sys/auxv.h)
AC_CHECK_HEADERS(sys/auxv.h sys/resource.h)
AC_CHECK_FUNCS(getgrgid_r)
AC_CHECK_FUNCS(getgrnam_r)
@@ -1201,6 +1218,7 @@ if test x$target_win32 = xno; then
AC_CHECK_FUNCS(dl_iterate_phdr)
AC_CHECK_FUNCS(dladdr)
AC_CHECK_FUNCS(sysconf)
AC_CHECK_FUNCS(getrlimit)
AC_CHECK_FUNCS(sched_setaffinity)
AC_CHECK_FUNCS(sched_getcpu)
@@ -2270,6 +2288,7 @@ if test "x$ac_cv_have_dev_random" = "xno" \
fi
AC_MSG_CHECKING([if inter-process shared handles are requested])
# Same as --enable-minimal=shared_handles
AC_ARG_ENABLE(shared-handles, [ --disable-shared-handles disable inter-process shared handles], try_shared_handles=$enableval, try_shared_handles=yes)
AC_MSG_RESULT($try_shared_handles)
if test "x$try_shared_handles" != "xyes"; then
@@ -2486,8 +2505,6 @@ AM_CONDITIONAL(LOADED_LLVM, [test x$enable_loadedllvm = xyes])
TARGET="unknown"
ACCESS_UNALIGNED="yes"
JIT_SUPPORTED=no
INTERP_SUPPORTED=no
LIBC="libc.so.6"
INTL="libc.so.6"
SQLITE="libsqlite.so.0"
@@ -2495,12 +2512,11 @@ SQLITE3="libsqlite3.so.0"
X11="libX11.so"
GDKX11="libgdk-x11-2.0.so.0"
GTKX11="libgtk-x11-2.0.so.0"
XINERAMA="libXinerama.so"
XINERAMA="libXinerama.so.1"
sizeof_register="SIZEOF_VOID_P"
jit_wanted=true
interp_wanted=false
sgen_supported=false
boehm_supported=true
case "$host" in
@@ -2509,7 +2525,6 @@ case "$host" in
arch_target=mips;
sgen_supported=true
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
AC_MSG_CHECKING(for mips n32)
AC_TRY_COMPILE([],[
@@ -2527,7 +2542,6 @@ case "$host" in
i*86-*-*)
TARGET=X86;
arch_target=x86;
JIT_SUPPORTED=yes
case $host_os in
solaris*)
LIBC="libc.so"
@@ -2565,7 +2579,7 @@ case "$host" in
sgen_supported=true
AOT_SUPPORTED="yes"
;;
openbsd*|freebsd*)
openbsd*|freebsd*|kfreebsd-gnu*)
sgen_supported=true
;;
esac
@@ -2573,7 +2587,6 @@ case "$host" in
x86_64-*-* | amd64-*-*)
TARGET=AMD64;
arch_target=amd64;
JIT_SUPPORTED=yes
if test "x$ac_cv_sizeof_void_p" = "x4"; then
AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
sizeof_register=8
@@ -2587,7 +2600,7 @@ case "$host" in
sgen_supported=true
AOT_SUPPORTED="yes"
;;
openbsd*|freebsd*)
openbsd*|freebsd*|kfreebsd-gnu*)
sgen_supported=true
;;
mingw*)
@@ -2605,7 +2618,6 @@ case "$host" in
TARGET=IA64
arch_target=ia64
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
LIBC="libc.so.6.1"
INTL="libc.so.6.1"
AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)])
@@ -2618,7 +2630,6 @@ case "$host" in
TARGET=SPARC
fi
arch_target=sparc;
JIT_SUPPORTED=yes
ACCESS_UNALIGNED="no"
case $host_os in
linux*) ;;
@@ -2651,7 +2662,6 @@ case "$host" in
CPPFLAGS="$CPPFLAGS -D__mono_ppc__"
fi
arch_target=ppc;
JIT_SUPPORTED=yes
case $host_os in
linux*|darwin*)
sgen_supported=true
@@ -2662,7 +2672,6 @@ case "$host" in
TARGET=ARM;
arch_target=arm;
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
sgen_supported=true
;;
@@ -2670,7 +2679,6 @@ case "$host" in
TARGET=ARM;
arch_target=arm;
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
sgen_supported=true
AOT_SUPPORTED="yes"
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
@@ -2680,7 +2688,6 @@ case "$host" in
# TARGET=ARM;
# arch_target=arm;
# ACCESS_UNALIGNED="no"
# JIT_SUPPORTED=yes
# sgen_supported=true
# AOT_SUPPORTED="no"
# ;;
@@ -2688,7 +2695,6 @@ case "$host" in
# https://lkml.org/lkml/2012/7/15/133
TARGET=ARM64
arch_target=arm64
JIT_SUPPORTED=yes
sgen_supported=true
boehm_supported=false
;;
@@ -2696,7 +2702,6 @@ case "$host" in
TARGET=S390X;
arch_target=s390x;
ACCESS_UNALIGNED="yes"
JIT_SUPPORTED=yes
sgen_supported=true
CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES"
;;
@@ -2712,9 +2717,7 @@ if test "x$host" != "x$target"; then
TARGET=ARM;
arch_target=arm;
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
jit_wanted=true
# Can't use tls, since it depends on the runtime detection of tls offsets
# in mono-compiler.h
with_tls=pthread
@@ -2752,7 +2755,6 @@ if test "x$host" != "x$target"; then
# arch_target=arm
# AC_DEFINE(TARGET_ARM, 1, [...])
# ACCESS_UNALIGNED="no"
# JIT_SUPPORTED=yes
# sizeof_register=4
# CPPFLAGS="$CPPFLAGS \
# -D__ARM_EABI__ \
@@ -2762,7 +2764,6 @@ if test "x$host" != "x$target"; then
# -DDISABLE_SOCKETS \
# -DDISABLE_ATTACH \
# -DUSE_NEWLIB"
# jit_wanted=true
# Can't use tls, since it depends on the runtime detection of tls offsets
# in mono-compiler.h
# with_tls=pthread
@@ -2779,9 +2780,7 @@ if test "x$host" != "x$target"; then
AC_DEFINE(TARGET_ARM, 1, [...])
AC_DEFINE(TARGET_ANDROID, 1, [...])
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
jit_wanted=true
# Can't use tls, since it depends on the runtime detection of tls offsets
# in mono-compiler.h
with_tls=pthread
@@ -2796,10 +2795,20 @@ if test "x$host" != "x$target"; then
;;
esac
;;
i686*-linux-*)
TARGET=X86;
arch_target=x86;
AC_DEFINE(TARGET_X86, 1, [...])
AC_DEFINE(TARGET_ANDROID, 1, [...])
CPPFLAGS="$CPPFLAGS"
sgen_supported=true
# Can't use tls, since it depends on the runtime detection of tls offsets
# in mono-compiler.h
with_tls=pthread
target_mach=no
;;
aarch64-*)
TARGET=ARM64
JIT_SUPPORTED=yes
jit_wanted=true
;;
*)
AC_MSG_ERROR([Cross compiling is not supported for target $target])
@@ -2922,27 +2931,7 @@ fi
AC_SUBST(SGEN_DEFINES)
AM_CONDITIONAL(SUPPORT_SGEN, test x$buildsgen = xyes)
USEJIT=false
if test x$JIT_SUPPORTED = xyes; then
if $jit_wanted; then
USEJIT=true
jit_status="Building and using the JIT"
else
if $interp_wanted; then
jit_status="Building the JIT, defaulting to the interpreter"
else
AC_ERROR(No JIT or interpreter support available or selected.)
fi
fi
else
if test x$interp_wanted = xtrue; then
jit_status="interpreter"
else
AC_ERROR(No JIT or interpreter support available or selected.)
fi
fi
AM_CONDITIONAL(USE_JIT, test x$USEJIT = xtrue)
jit_status="Building and using the JIT"
libsuffix=".so"
@@ -2961,6 +2950,11 @@ 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"
@@ -2987,21 +2981,9 @@ case "$host" in
done
if test "x$X11" = "xlibX11.so"; then
AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? Assuming libX11.so.6...]);
AC_MSG_WARN([Could not find libX11.so. Do you have X.org or XFree86 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
@@ -3352,8 +3334,6 @@ AM_CONDITIONAL(HOST_ARM, test x$HOST = xARM)
AM_CONDITIONAL(HOST_ARM64, test x$HOST = xARM64)
AM_CONDITIONAL(CROSS_COMPILE, test "x$host" != "x$target")
AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
AM_CONDITIONAL(INTERP_SUPPORTED, test x$interp_wanted = xtrue)
AM_CONDITIONAL(INCLUDED_LIBGC, test x$libgc = xincluded)
AC_SUBST(LIBC)
@@ -3373,11 +3353,7 @@ AC_SUBST(LDFLAGS)
mono_build_root=`pwd`
AC_SUBST(mono_build_root)
if test x$USEJIT = xtrue; then
mono_runtime=mono/mini/mono
else
mono_runtime=mono/interpreter/mint
fi
mono_runtime=mono/mini/mono
AC_SUBST(mono_runtime)
mono_cfg_root=$mono_build_root/runtime
@@ -3574,7 +3550,6 @@ mono/arch/arm/Makefile
mono/arch/arm64/Makefile
mono/arch/ia64/Makefile
mono/arch/mips/Makefile
mono/interpreter/Makefile
mono/tests/Makefile
mono/tests/tests-config
mono/tests/assemblyresolve/Makefile
-9
View File
@@ -26,17 +26,8 @@ else
SGENPCFILE=
endif
if JIT_SUPPORTED
if INTERP_SUPPORTED
pkgconfig_DATA= mono.pc mono-2.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
else
pkgconfig_DATA= mono.pc mono-2.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
endif
else
pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc
endif
DISTCLEANFILES= mono-2.pc mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE) mono-sgen-gdb.py
+1 -1
View File
@@ -10,7 +10,7 @@
<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
<dllmap dll="MonoPosixHelper" target="@prefix@/lib/libMonoPosixHelper@libsuffix@" os="!windows" />
<dllmap dll="MonoPosixHelper" target="@prefix@/@reloc_libdir@/libMonoPosixHelper@libsuffix@" os="!windows" />
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
+1 -1
View File
@@ -26,7 +26,7 @@ i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-li
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
pic_options='-fPIC'
;;
?86-pc-cygwin*|i?86-pc-cygwin*)
?86-pc-cygwin*|i?86-pc-cygwin*|i?86-pc-mingw32*)
pic_options='-DDLL_EXPORT'
;;
i?86-apple-darwin*|arm-apple-darwin*)
+2 -1
View File
@@ -135,6 +135,7 @@ AC_CHECK_SIZEOF(void *)
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(long long)
AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf)
AC_CHECK_FUNCS(getrlimit)
#
# Mono currently supports 10.6, but strndup is not available prior to 10.7; avoiding
@@ -179,7 +180,7 @@ if test "x$have_iso_varargs" = "xyes"; then
fi
AC_SUBST(G_HAVE_ISO_VARARGS)
AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h)
AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h sys/resource.h)
AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0])
AC_SUBST(HAVE_ALLOCA_H)
+6
View File
@@ -273,3 +273,9 @@
#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
+6 -3
View File
@@ -176,7 +176,6 @@ typedef struct _GMemChunk GMemChunk;
/*
* Misc.
*/
#define g_atexit(func) ((void) atexit (func))
const gchar * g_getenv(const gchar *variable);
gboolean g_setenv(const gchar *variable, const gchar *value, gboolean overwrite);
@@ -603,10 +602,14 @@ 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)
#define G_GNUC_INTERNAL
typedef void (*GLogFunc) (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data);
typedef void (*GPrintFunc) (const gchar *string);
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
*/
+165 -92
View File
@@ -35,85 +35,47 @@
/* 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;
#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
static void default_stdout_handler (const gchar *string);
static void default_stderr_handler (const gchar *string);
void
g_print (const gchar *format, ...)
{
char *msg;
va_list args;
va_start (args, format);
out_vfprintf (stdout, format, args);
if (vasprintf (&msg, format, args) < 0)
return;
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);
out_vfprintf (stderr, format, args);
if (vasprintf (&msg, format, args) < 0)
return;
va_end (args);
if (!stderr_handler)
stderr_handler = default_stderr_handler;
stderr_handler (msg);
free (msg);
}
GLogLevelFlags
@@ -140,42 +102,16 @@ 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;
#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
default_log_func (log_domain, log_level, msg, default_log_func_user_data);
free (msg);
if (log_level & fatal){
fflush (stdout);
fflush (stderr);
}
#endif
if (log_level & fatal){
abort ();
}
}
void
@@ -196,6 +132,143 @@ g_assertion_message (const gchar *format, ...)
va_start (args, format);
g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
va_end (args);
abort ();
}
#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 defined(HOST_IOS)
#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;
}
+23 -2
View File
@@ -53,6 +53,10 @@
#include <sys/wait.h>
#endif
#ifdef HAVE_SYS_RESOURCE_H
# include <sys/resource.h>
#endif
#ifdef G_OS_WIN32
#include <io.h>
#include <winsock2.h>
@@ -213,6 +217,23 @@ write_all (int fd, const void *vbuf, size_t n)
return nwritten;
}
#ifndef G_OS_WIN32
static int
g_getdtablesize (void)
{
#ifdef HAVE_GETRLIMIT
struct rlimit limit;
int res;
res = getrlimit (RLIMIT_NOFILE, &limit);
g_assert (res == 0);
return limit.rlim_cur;
#else
return getdtablesize ();
#endif
}
#endif
gboolean
g_spawn_command_line_sync (const gchar *command_line,
gchar **standard_output,
@@ -256,7 +277,7 @@ g_spawn_command_line_sync (const gchar *command_line,
close (stderr_pipe [0]);
dup2 (stderr_pipe [1], STDERR_FILENO);
}
for (i = getdtablesize () - 1; i >= 3; i--)
for (i = g_getdtablesize () - 1; i >= 3; i--)
close (i);
/* G_SPAWN_SEARCH_PATH is always enabled for g_spawn_command_line_sync */
@@ -417,7 +438,7 @@ g_spawn_async_with_pipes (const gchar *working_directory,
}
if ((flags & G_SPAWN_LEAVE_DESCRIPTORS_OPEN) != 0) {
for (i = getdtablesize () - 1; i >= 3; i--)
for (i = g_getdtablesize () - 1; i >= 3; i--)
close (i);
}
+1 -1
+1 -1
+1 -1
View File
@@ -26,7 +26,7 @@ i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-li
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
pic_options='-fPIC'
;;
?86-pc-cygwin*|i?86-pc-cygwin*)
?86-pc-cygwin*|i?86-pc-cygwin*|i?86-pc-mingw32*)
pic_options='-DDLL_EXPORT'
;;
i?86-apple-darwin*|arm-apple-darwin*)
+11
View File
@@ -114,6 +114,17 @@ 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(__native_client__)) && !defined(_GNU_SOURCE)
#if (defined(__linux__) || defined(__GLIBC__) || 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(NACL)) /* Are others OK here, too? */ \
# if (defined(LINUX) || defined (__GLIBC__) || 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
#ifdef __linux__
#if defined(__linux__) || defined(__GLIBC__)
# include <features.h>
# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
&& !defined(__ia64__)
+22 -8
View File
@@ -55,7 +55,7 @@
# endif
/* And one for FreeBSD: */
# if defined(__FreeBSD__) && !defined(FREEBSD)
# if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(FREEBSD)
# define FREEBSD
# endif
@@ -1371,8 +1371,15 @@
# ifndef GC_FREEBSD_THREADS
# define MPROTECT_VDB
# endif
# define SIG_SUSPEND SIGTSTP
# define SIG_THR_RESTART SIGCONT
# 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 FREEBSD_STACKBOTTOM
# ifdef __ELF__
# define DYNAMIC_LOADING
@@ -2132,8 +2139,15 @@
# ifndef GC_FREEBSD_THREADS
# define MPROTECT_VDB
# endif
# define SIG_SUSPEND SIGTSTP
# define SIG_THR_RESTART SIGCONT
# 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 NEED_FIND_LIMIT
# define FREEBSD_STACKBOTTOM
# ifdef __ELF__
@@ -2230,7 +2244,7 @@
# define SUNOS5SIGS
# endif
# if defined(FREEBSD) && (__FreeBSD__ >= 4)
# if defined(FREEBSD) && ((__FreeBSD__ >= 4) || (__FreeBSD_kernel__ >= 4))
# define SUNOS5SIGS
# endif
@@ -2293,7 +2307,7 @@
# define CACHE_LINE_SIZE 32 /* Wild guess */
# endif
# ifdef LINUX
# if defined(LINUX) || defined(__GLIBC__)
# 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 */
@@ -2374,7 +2388,7 @@
#if defined(SPARC)
# define CAN_SAVE_CALL_ARGS
#endif
#if (defined(I386) || defined(X86_64)) && defined(LINUX)
#if (defined(I386) || defined(X86_64)) && (defined(LINUX) || defined(__GLIBC__))
/* 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
+20 -13
View File
@@ -1075,19 +1075,10 @@ first generation (of two). A larger nursery will usually speed up the
program but will obviously use more memory. The default nursery size
4 MB.
.TP
\fBmajor=\fIcollector\fR
Specifies which major collector to use. Options are `marksweep' for
the Mark&Sweep collector, `marksweep-conc' for concurrent Mark&Sweep,
`marksweep-par' for parallel Mark&Sweep, `marksweep-fixed' for
Mark&Sweep with a fixed heap, and `marksweep-fixed-par' for parallel
Mark&Sweep with a fixed heap. The Mark&Sweep collector is the default.
.TP
\fBmajor-heap-size=\fIsize\fR
Sets the size of the major heap (not including the large object space)
for the fixed-heap Mark&Sweep collector (i.e. `marksweep-fixed' and
`marksweep-fixed-par'). The size is in bytes, with optional suffixes
`k', `m' and `g' to specify kilo-, mega- and gigabytes, respectively.
The default is 512 megabytes.
\fBmajor=\fIcollector\fR Specifies which major collector to use.
Options are `marksweep' for the Mark&Sweep collector, and
`marksweep-conc' for concurrent Mark&Sweep. The non-concurrent
Mark&Sweep collector is the default.
.TP
\fBsoft-heap-limit=\fIsize\fR
Once the heap size gets larger than this size, ignore what the default
@@ -1216,6 +1207,17 @@ 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
@@ -1255,6 +1257,11 @@ work, Mono needs to be compiled with the BINARY_PROTOCOL define on
sgen-gc.c. You can then use this command to explore the output
.nf
sgen-grep-binprot 0x1234 0x5678 < file
.TP
\fBnursery-canaries\fR
If set, objects allocated in the nursery are suffixed with a canary (guard)
word, which is checked on each minor collection. Can be used to detect/debug
heap corruption issues.
.fi
.ne
.RE
+3 -1
View File
@@ -12,6 +12,7 @@ monotouch_SUBDIRS := build class
monotouch_runtime_SUBDIRS := build class
xammac_SUBDIRS := build class
mobile_SUBDIRS := build class
mobile_static_SUBDIRS := build class
net_3_5_SUBDIRS := build class tools/xbuild
net_4_0_SUBDIRS := build class
net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
@@ -82,7 +83,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
@@ -114,6 +115,7 @@ $(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%:
$(_boot_:%=profile-do--monotouch_runtime--%): profile-do--monotouch_runtime--%: profile-do--build--%
$(_boot_:%=profile-do--xammac--%): profile-do--xammac--%: profile-do--build--%
$(_boot_:%=profile-do--mobile--%): profile-do--mobile--%: profile-do--build--%
$(_boot_:%=profile-do--mobile_static--%): profile-do--mobile_static--%: profile-do--build--%
$(_boot_:%=profile-do--net_2_0--%): profile-do--net_2_0--%: profile-do--build--%
$(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--%
+16 -1
View File
@@ -12,7 +12,22 @@ profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:MOBILE -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
PROFILE_MCS_FLAGS = \
-d:NET_1_1 \
-d:NET_2_0 \
-d:NET_2_1 \
-d:MOBILE \
-d:MOBILE_DYNAMIC \
-d:NET_3_5 \
-d:NET_4_0 \
-d:NET_4_5 \
-nowarn:1699 \
-nostdlib \
-lib:$(topdir)/class/lib/$(PROFILE) \
$(DEFAULT_REFERENCES) \
$(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.1
NO_INSTALL = yes
+18 -1
View File
@@ -12,7 +12,24 @@ profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:FULL_AOT_RUNTIME -d:DISABLE_REMOTING -d:DISABLE_COM -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
PROFILE_MCS_FLAGS = \
-d:NET_1_1 \
-d:NET_2_0 \
-d:NET_2_1 \
-d:NET_3_5 \
-d:NET_4_0 \
-d:NET_4_5 \
-d:MOBILE \
-d:FULL_AOT_RUNTIME \
-d:DISABLE_REMOTING \
-d:DISABLE_COM \
-nowarn:1699 \
-nostdlib \
-lib:$(topdir)/class/lib/$(PROFILE) \
$(DEFAULT_REFERENCES) \
$(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.1
NO_TEST = yes
+18 -1
View File
@@ -12,7 +12,24 @@ profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MOBILE_DYNAMIC -d:MONODROID -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
PROFILE_MCS_FLAGS = \
-d:NET_1_1 \
-d:NET_2_0 \
-d:NET_2_1 \
-d:NET_3_5 \
-d:NET_4_0 \
-d:NET_4_5 \
-d:MOBILE \
-d:MOBILE_DYNAMIC \
-d:MONODROID \
-d:ANDROID \
-nowarn:1699 \
-nostdlib \
-lib:$(topdir)/class/lib/$(PROFILE) \
$(DEFAULT_REFERENCES) \
$(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.1
NO_TEST = yes
+20 -2
View File
@@ -12,9 +12,27 @@ profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONOTOUCH -d:DISABLE_REMOTING -d:DISABLE_COM -d:FULL_AOT_RUNTIME -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
PROFILE_MCS_FLAGS = \
-d:NET_1_1 \
-d:NET_2_0 \
-d:NET_2_1 \
-d:NET_3_5 \
-d:NET_4_0 \
-d:NET_4_5 \
-d:MOBILE \
-d:MONOTOUCH \
-d:DISABLE_REMOTING \
-d:DISABLE_COM \
-d:FULL_AOT_RUNTIME \
-nowarn:1699 \
-nostdlib \
-lib:$(topdir)/class/lib/$(PROFILE) \
$(DEFAULT_REFERENCES) \
$(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.1
NO_TEST = yes
# the tuner takes care of the install
NO_INSTALL = yes
NO_INSTALL = yes
+3
View File
@@ -17,3 +17,6 @@ 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
@@ -1,70 +0,0 @@
<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,10 +55,8 @@ 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")]
@@ -107,7 +107,7 @@ namespace Commons.Xml.Relaxng.Rnc
public RelaxngPattern Parse (TextReader source, string baseUri, string defaultNamespace)
{
this.defaultNamespace = defaultNamespace;
this.defaultNamespace = defaultNamespace ?? string.Empty;
if (defaultNamespace != null && defaultNamespace.Length != 0)
nsmgr.AddNamespace (String.Empty, defaultNamespace);
try {
@@ -13,7 +13,7 @@ using System.Xml;
using Commons.Xml.Nvdl;
using NUnit.Framework;
namespace MonoTests.Commons.Xml.Nvdl
namespace MonoTests.Commons.Xml.Relaxng
{
[TestFixture]
public class NvdlValidatingReaderTests
@@ -95,5 +95,19 @@ start = mine";
r.Close ();
}
}
[Test]
public void SimpleDefaultNamespace ()
{
var g = RncParser.ParseRnc (new StringReader ("element e { empty }"));
var x = XmlReader.Create (new StringReader ("<e/>"));
var r = new RelaxngValidatingReader (x, g);
try {
while (!r.EOF)
r.Read ();
} finally {
r.Close ();
}
}
}
}
@@ -8,7 +8,7 @@ TEST_ARCHIVE = testSuite.zip
RNCTESTS = test/RNCTest.xml
RNCTEST_ARCHIVE = anglia-test-suite.zip
all : relaxngtest.exe anglia-test-runner.exe
all : relaxngtest.exe #anglia-test-runner.exe
relaxngtest.exe : relaxngtest.cs $(TESTS)
$(MCS_RUNTIME) $(MCS) -debug+ relaxngtest.cs -r:Commons.Xml.Relaxng.dll
@@ -40,6 +40,7 @@
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.COMException))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.ComMemberType))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.ComSourceInterfacesAttribute))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.ComInterfaceType))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.ComTypes.IStream))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.ComTypes.STATSTG))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.CriticalHandle))]
-32
View File
@@ -1,32 +0,0 @@
<?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
@@ -1,20 +0,0 @@
<?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>
@@ -1,25 +0,0 @@
<?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
@@ -1,25 +0,0 @@
<?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
@@ -1,25 +0,0 @@
<?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
@@ -1,25 +0,0 @@
<?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>
+23 -29
View File
@@ -16,15 +16,6 @@ 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 \
@@ -115,7 +106,7 @@ net_2_0_only_dirs := \
pcl_facade_dirs := Facades
mobile_dirs := \
mobile_common_dirs := \
corlib \
System \
System.Core \
@@ -143,19 +134,27 @@ mobile_dirs := \
System.Net \
System.Windows \
System.Xml.Serialization \
$(pcl_facade_dirs)
monodroid_dirs := \
Mono.CompilerServices.SymbolWriter \
Mono.CSharp \
Microsoft.CSharp \
$(pcl_facade_dirs)
mobile_static_dirs := \
$(mobile_common_dirs) \
Mono.Dynamic.Interpreter
mobile_dynamic_dirs := \
$(mobile_common_dirs) \
Mono.CompilerServices.SymbolWriter \
System.Net.Http
xammac_dirs := \
Mono.CompilerServices.SymbolWriter \
Mono.CSharp \
Microsoft.CSharp \
System.Net.Http
$(mobile_dynamic_dirs)
monodroid_dirs := \
$(mobile_dynamic_dirs)
monotouch_dirs := \
$(mobile_static_dirs)
monotouch_runtime_dirs := \
corlib \
@@ -164,11 +163,6 @@ monotouch_runtime_dirs := \
System.XML \
Mono.CSharp
monotouch_dirs := \
Mono.CSharp \
Microsoft.CSharp \
Mono.Dynamic.Interpreter
net_4_0_dirs := \
System.Numerics \
Microsoft.CSharp \
@@ -238,12 +232,12 @@ xbuild_4_0_dirs := \
Microsoft.Build
net_2_0_SUBDIRS := $(net_2_0_dirs) $(net_2_0_only_dirs) $(xbuild_2_0_dirs) aot-compiler
monodroid_SUBDIRS := $(mobile_dirs) $(monodroid_dirs)
monotouch_SUBDIRS := $(mobile_dirs) $(monotouch_dirs)
monodroid_SUBDIRS := $(monodroid_dirs)
monotouch_SUBDIRS := $(monotouch_dirs)
monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
mobile_static_SUBDIRS := $(mobile_dirs)
mobile_SUBDIRS := $(mobile_dirs)
xammac_SUBDIRS := $(mobile_dirs) $(xammac_dirs)
mobile_static_SUBDIRS := $(mobile_static_dirs)
mobile_SUBDIRS := $(mobile_dynamic_dirs)
xammac_SUBDIRS := $(xammac_dirs)
net_3_5_SUBDIRS := $(xbuild_2_0_dirs)
net_4_0_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(xbuild_4_0_dirs)
net_4_5_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
@@ -251,7 +245,7 @@ xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
include ../build/rules.make
SUBDIRS = $(net_2_0_dirs) $(net_2_0_only_dirs) $(mobile_dirs) $(monotouch_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
SUBDIRS = $(net_2_0_dirs) $(net_2_0_only_dirs) $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
DIST_ONLY_SUBDIRS = dlr aot-compiler $(xbuild_4_0_dirs)
+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) build-csproj build-csproj2k5 \
$(RESX_RESOURCES:.resources=.resx) $(CUR_RESOURCES) $(PREBUILT) \
$(IMAGES_RESOURCES) \
$(TEST_DISTFILES)
File diff suppressed because it is too large. Load diff
-35
View File
@@ -1,35 +0,0 @@
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
@@ -1,402 +0,0 @@
<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
@@ -1,35 +0,0 @@
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
@@ -1,35 +0,0 @@
<?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>
@@ -175,7 +175,7 @@ namespace System.Windows.Forms {
Rectangle text_rectangle;
Rectangle image_rectangle;
ThemeEngine.Current.CalculateButtonTextAndImageLayout (this, out text_rectangle, out image_rectangle);
ThemeEngine.Current.CalculateButtonTextAndImageLayout (pevent.Graphics, this, out text_rectangle, out image_rectangle);
// Draw our button
if (this.FlatStyle == FlatStyle.Standard)
@@ -3663,7 +3663,8 @@ namespace System.Windows.Forms
if (View != View.Details) {
if (bounds.Left < 0)
h_scroll.Value += bounds.Left;
else if (bounds.Right > view_rect.Right)
// Don't shift right unless right-to-left layout is active. (Xamarin bug 22483)
else if (this.RightToLeftLayout && bounds.Right > view_rect.Right)
h_scroll.Value += (bounds.Right - view_rect.Right);
}
@@ -258,11 +258,19 @@ namespace System.Windows.Forms
StringFormat sf = FlagsToStringFormat (flags);
Size retval;
int proposedWidth;
if (proposedSize.Width == 0)
proposedWidth = Int32.MaxValue;
else {
proposedWidth = proposedSize.Width;
if ((flags & TextFormatFlags.NoPadding) == 0)
proposedWidth -= 9;
}
if (dc is Graphics)
retval = (dc as Graphics).MeasureString (text, font, proposedSize.Width == 0 ? Int32.MaxValue : proposedSize.Width, sf).ToSize ();
retval = (dc as Graphics).MeasureString (text, font, proposedWidth, sf).ToSize ();
else
retval = TextRenderer.MeasureString (text, font, proposedSize.Width == 0 ? Int32.MaxValue : proposedSize.Width, sf).ToSize ();
retval = TextRenderer.MeasureString (text, font, proposedWidth, sf).ToSize ();
if (retval.Width > 0 && (flags & TextFormatFlags.NoPadding) == 0)
retval.Width += 9;
@@ -698,7 +698,7 @@ namespace System.Windows.Forms
#region Button
public abstract Size CalculateButtonAutoSize (Button button);
public abstract void CalculateButtonTextAndImageLayout (ButtonBase b, out Rectangle textRectangle, out Rectangle imageRectangle);
public abstract void CalculateButtonTextAndImageLayout (Graphics g, ButtonBase b, out Rectangle textRectangle, out Rectangle imageRectangle);
public abstract void DrawButton (Graphics g, Button b, Rectangle textBounds, Rectangle imageBounds, Rectangle clipRectangle);
public abstract void DrawFlatButton (Graphics g, ButtonBase b, Rectangle textBounds, Rectangle imageBounds, Rectangle clipRectangle);
public abstract void DrawPopupButton (Graphics g, Button b, Rectangle textBounds, Rectangle imageBounds, Rectangle clipRectangle);
@@ -364,24 +364,23 @@ namespace System.Windows.Forms
return ret_size;
}
public override void CalculateButtonTextAndImageLayout (ButtonBase button, out Rectangle textRectangle, out Rectangle imageRectangle)
public override void CalculateButtonTextAndImageLayout (Graphics g, ButtonBase button, out Rectangle textRectangle, out Rectangle imageRectangle)
{
Image image = button.Image;
string text = button.Text;
Rectangle content_rect = button.PaddingClientRectangle;
Size text_size = TextRenderer.MeasureTextInternal (text, button.Font, content_rect.Size, button.TextFormatFlags, button.UseCompatibleTextRendering);
Size text_size = TextRenderer.MeasureTextInternal (g, text, button.Font, content_rect.Size, button.TextFormatFlags | TextFormatFlags.NoPadding, button.UseCompatibleTextRendering);
Size image_size = image == null ? Size.Empty : image.Size;
textRectangle = Rectangle.Empty;
textRectangle = Rectangle.Inflate (content_rect, -4, -4);
imageRectangle = Rectangle.Empty;
switch (button.TextImageRelation) {
case TextImageRelation.Overlay:
// Overlay is easy, text always goes here
textRectangle = Rectangle.Inflate (content_rect, -4, -4);
if (button.Pressed)
textRectangle.Offset (1, 1);
if (button.Pressed)
textRectangle.Offset (1, 1);
// Image is dependent on ImageAlign
if (image == null)
@@ -438,20 +437,16 @@ namespace System.Windows.Forms
imageRectangle = new Rectangle (image_x, image_y, image_width, image_height);
break;
case TextImageRelation.ImageAboveText:
content_rect.Inflate (-4, -4);
LayoutTextAboveOrBelowImage (content_rect, false, text_size, image_size, button.TextAlign, button.ImageAlign, out textRectangle, out imageRectangle);
LayoutTextAboveOrBelowImage (textRectangle, false, text_size, image_size, button.TextAlign, button.ImageAlign, out textRectangle, out imageRectangle);
break;
case TextImageRelation.TextAboveImage:
content_rect.Inflate (-4, -4);
LayoutTextAboveOrBelowImage (content_rect, true, text_size, image_size, button.TextAlign, button.ImageAlign, out textRectangle, out imageRectangle);
LayoutTextAboveOrBelowImage (textRectangle, true, text_size, image_size, button.TextAlign, button.ImageAlign, out textRectangle, out imageRectangle);
break;
case TextImageRelation.ImageBeforeText:
content_rect.Inflate (-4, -4);
LayoutTextBeforeOrAfterImage (content_rect, false, text_size, image_size, button.TextAlign, button.ImageAlign, out textRectangle, out imageRectangle);
LayoutTextBeforeOrAfterImage (textRectangle, false, text_size, image_size, button.TextAlign, button.ImageAlign, out textRectangle, out imageRectangle);
break;
case TextImageRelation.TextBeforeImage:
content_rect.Inflate (-4, -4);
LayoutTextBeforeOrAfterImage (content_rect, true, text_size, image_size, button.TextAlign, button.ImageAlign, out textRectangle, out imageRectangle);
LayoutTextBeforeOrAfterImage (textRectangle, true, text_size, image_size, button.TextAlign, button.ImageAlign, out textRectangle, out imageRectangle);
break;
}
}
@@ -537,12 +532,14 @@ namespace System.Windows.Forms
offset += (int)(2 * (excess_height / 3));
if (textFirst) {
final_text_rect = new Rectangle (AlignInRectangle (totalArea, textSize, textAlign).Left, totalArea.Top + offset, textSize.Width, textSize.Height);
var textHeight = excess_height >= 0 ? totalArea.Height - imageSize.Height - element_spacing: textSize.Height;
final_text_rect = new Rectangle (AlignInRectangle (totalArea, textSize, textAlign).Left, totalArea.Top + offset, textSize.Width, textHeight);
final_image_rect = new Rectangle (AlignInRectangle (totalArea, imageSize, imageAlign).Left, final_text_rect.Bottom + element_spacing, imageSize.Width, imageSize.Height);
}
else {
final_image_rect = new Rectangle (AlignInRectangle (totalArea, imageSize, imageAlign).Left, totalArea.Top + offset, imageSize.Width, imageSize.Height);
final_text_rect = new Rectangle (AlignInRectangle (totalArea, textSize, textAlign).Left, final_image_rect.Bottom + element_spacing, textSize.Width, textSize.Height);
var textHeight = excess_height >= 0 ? totalArea.Height - final_image_rect.Height : textSize.Height;
final_text_rect = new Rectangle (AlignInRectangle (totalArea, textSize, textAlign).Left, final_image_rect.Bottom + element_spacing, textSize.Width, textHeight);
if (final_text_rect.Bottom > totalArea.Bottom)
final_text_rect.Y = totalArea.Top;
@@ -1296,7 +1296,7 @@ namespace System.Windows.Forms {
buffer [i] = Marshal.ReadByte (prop, i);
Clipboard.Item = Encoding.UTF8.GetString (buffer);
} else if (property == UTF16_STRING) {
Clipboard.Item = Marshal.PtrToStringUni (prop, Encoding.Unicode.GetMaxCharCount ((int)nitems));
Clipboard.Item = Marshal.PtrToStringUni (prop);
} else if (property == RICHTEXTFORMAT)
Clipboard.Item = Marshal.PtrToStringAnsi(prop);
else if (DataFormats.ContainsFormat (property.ToInt32 ())) {
@@ -1,217 +0,0 @@
#!/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
@@ -1,247 +0,0 @@
#!/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
@@ -1,267 +0,0 @@
#!/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,43 +78,38 @@ namespace Microsoft.Build.BuildEngine {
if (propertyName != null)
element.SetAttribute ("PropertyName", propertyName);
}
[MonoTODO]
public bool Execute ()
{
bool result = false;
TaskEngine taskEngine;
LogTaskStarted ();
ITask task = null;
ITask task;
try {
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);
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;
}
return result;
try {
taskEngine = new TaskEngine (parentTarget.Project, task, Type);
taskEngine.Prepare (GetParameters ());
var result = taskEngine.Execute ();
if (result)
taskEngine.PublishOutput (taskElement, taskEngine.ValueFromExecution);
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;
}
}
@@ -140,6 +135,21 @@ 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,6 +73,11 @@ namespace Microsoft.Build.BuildEngine
foreach (XmlAttribute attrib in XmlElement.Attributes)
yield return attrib.Value;
}
public bool ResolveOutputItems ()
{
return true;
}
}
}
@@ -52,7 +52,11 @@ namespace Microsoft.Build.BuildEngine {
{
return GetAttributes ();
}
public bool ResolveOutputItems ()
{
return true;
}
}
}
@@ -1018,13 +1018,27 @@ namespace Microsoft.Build.BuildEngine
if (!StartHandlerHasExecuted)
return;
if (EventArgs is ProjectStartedEventArgs)
ConsoleLogger.ProjectFinishedHandler (Sender, finished_args as ProjectFinishedEventArgs);
else if (EventArgs is TargetStartedEventArgs)
ConsoleLogger.TargetFinishedHandler (Sender, finished_args as TargetFinishedEventArgs);
else if (EventArgs is TaskStartedEventArgs)
ConsoleLogger.TaskFinishedHandler (Sender, finished_args as TaskFinishedEventArgs);
else if (!(EventArgs is BuildStartedEventArgs))
if (EventArgs is ProjectStartedEventArgs) {
var pfa = finished_args as ProjectFinishedEventArgs;
// FIXME: BuildFinishedHandlerActual sends us BuildFinishedEventArgs via PopEvent
if (pfa == null)
return;
ConsoleLogger.ProjectFinishedHandler (Sender, pfa);
} else if (EventArgs is TargetStartedEventArgs) {
var fa = finished_args as TargetFinishedEventArgs;
// FIXME: BuildFinishedHandlerActual sends us BuildFinishedEventArgs via PopEvent
if (fa == null)
return;
ConsoleLogger.TargetFinishedHandler (Sender, fa);
} else if (EventArgs is TaskStartedEventArgs) {
// FIXME: BuildFinishedHandlerActual sends us BuildFinishedEventArgs via PopEvent
if (!(finished_args is TaskFinishedEventArgs))
return;
ConsoleLogger.TaskFinishedHandler (Sender, (TaskFinishedEventArgs) finished_args);
} else if (!(EventArgs is BuildStartedEventArgs))
throw new InvalidOperationException ("Unexpected event on the stack, type: " + EventArgs.GetType ());
}
}
@@ -38,6 +38,7 @@ namespace Microsoft.Build.BuildEngine {
}
bool Execute ();
bool ResolveOutputItems ();
IEnumerable<string> GetAttributes ();
}
@@ -36,7 +36,6 @@ using System.Xml;
using Microsoft.Build.Framework;
namespace Microsoft.Build.BuildEngine {
internal class TargetBatchingImpl : BatchingImplBase
{
string inputs;
@@ -58,17 +57,6 @@ 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);
@@ -104,24 +92,52 @@ namespace Microsoft.Build.BuildEngine {
executeOnErrors = false;
LogTargetStarted (target);
if (bucket != null)
project.PushBatch (bucket, commonItemsByName);
try {
string reason;
if (!BuildTargetNeeded (out reason)) {
LogTargetSkipped (target, reason);
return true;
}
if (!String.IsNullOrEmpty (reason))
target.Engine.LogMessage (MessageImportance.Low, reason);
try {
TaskExecutionMode taskExecutionMode;
string reason;
bool skip_completely;
if (!BuildTargetNeeded (out reason, out skip_completely)) {
LogTargetSkipped (target, reason);
if (skip_completely)
return true;
taskExecutionMode = TaskExecutionMode.SkipAndSetOutput;
} else {
taskExecutionMode = TaskExecutionMode.Complete;
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];
// HACK: need some form of cross references checks
var tem = taskExecutionMode;
if (tem == TaskExecutionMode.SkipAndSetOutput) {
var bti = bt as BuildTask;
//
// BuildTargetNeeded checks only files timestamps but ignores any metadata dependencies
// that way we can end up in the situation when output metadata are populated but from
// incomplete dependencies.
//
// E.g.
// <CreateItem Include="$(IntermediateOutputPath)%(_PngImage.LogicalName)" AdditionalMetadata="LogicalName=%(_PngImage.LogicalName)">
// <Output TaskParameter="Include" />
// </CreateItem>
//
if (bti != null && bti.Name == "CreateItem")
tem = TaskExecutionMode.Complete;
}
TaskBatchingImpl batchingImpl = new TaskBatchingImpl (project);
bool task_result = batchingImpl.Build (bt, out executeOnErrors);
bool task_result = batchingImpl.Build (bt, tem, out executeOnErrors);
if (task_result)
continue;
@@ -138,6 +154,7 @@ namespace Microsoft.Build.BuildEngine {
} finally {
if (bucket != null)
project.PopBatch ();
LogTargetFinished (target, target_result);
}
@@ -155,15 +172,17 @@ namespace Microsoft.Build.BuildEngine {
ParseAttribute (outputs);
}
bool BuildTargetNeeded (out string reason)
bool BuildTargetNeeded (out string reason, out bool skipCompletely)
{
reason = String.Empty;
ITaskItem [] inputFiles;
ITaskItem [] outputFiles;
DateTime youngestInput, oldestOutput;
skipCompletely = false;
if (String.IsNullOrEmpty (inputs.Trim ()))
if (String.IsNullOrEmpty (inputs.Trim ())) {
return true;
}
if (String.IsNullOrEmpty (outputs.Trim ())) {
project.ParentEngine.LogError ("Target {0} has inputs but no outputs specified.", name);
@@ -184,6 +203,7 @@ namespace Microsoft.Build.BuildEngine {
}
if (inputFiles == null || inputFiles.Length == 0) {
skipCompletely = true;
reason = String.Format ("No input files were specified for target {0}, skipping.", name);
return false;
}
@@ -40,7 +40,7 @@ namespace Microsoft.Build.BuildEngine {
{
}
public bool Build (IBuildTask buildTask, out bool executeOnErrors)
public bool Build (IBuildTask buildTask, TaskExecutionMode taskExecutionMode, out bool executeOnErrors)
{
executeOnErrors = false;
try {
@@ -49,15 +49,11 @@ namespace Microsoft.Build.BuildEngine {
// populate list of referenced items and metadata
ParseTaskAttributes (buildTask);
if (consumedMetadataReferences.Count == 0) {
// No batching required
if (ConditionParser.ParseAndEvaluate (buildTask.Condition, project))
return buildTask.Execute ();
else // skipped, it should be logged
return true;
return Execute (buildTask, taskExecutionMode);
}
BatchAndPrepareBuckets ();
return Run (buildTask, out executeOnErrors);
return Run (buildTask, taskExecutionMode, out executeOnErrors);
} finally {
consumedItemsByName = null;
consumedMetadataReferences = null;
@@ -68,7 +64,7 @@ namespace Microsoft.Build.BuildEngine {
}
}
bool Run (IBuildTask buildTask, out bool executeOnErrors)
bool Run (IBuildTask buildTask, TaskExecutionMode taskExecutionMode, out bool executeOnErrors)
{
executeOnErrors = false;
@@ -76,11 +72,9 @@ namespace Microsoft.Build.BuildEngine {
bool retval = true;
if (buckets.Count == 0) {
// batched mode, but no values in the corresponding items!
if (ConditionParser.ParseAndEvaluate (buildTask.Condition, project)) {
retval = buildTask.Execute ();
if (!retval && !buildTask.ContinueOnError)
executeOnErrors = true;
}
retval = Execute (buildTask, taskExecutionMode);
if (!retval && !buildTask.ContinueOnError)
executeOnErrors = true;
return retval;
}
@@ -89,12 +83,10 @@ namespace Microsoft.Build.BuildEngine {
foreach (Dictionary<string, BuildItemGroup> bucket in buckets) {
project.PushBatch (bucket, commonItemsByName);
try {
if (ConditionParser.ParseAndEvaluate (buildTask.Condition, project)) {
retval = buildTask.Execute ();
if (!retval && !buildTask.ContinueOnError) {
executeOnErrors = true;
break;
}
retval = Execute (buildTask, taskExecutionMode);
if (!retval && !buildTask.ContinueOnError) {
executeOnErrors = true;
break;
}
} finally {
project.PopBatch ();
@@ -104,6 +96,22 @@ 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,10 +38,9 @@ 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;
@@ -52,9 +51,11 @@ namespace Microsoft.Build.BuildEngine {
outputAttribute = typeof (Microsoft.Build.Framework.OutputAttribute);
}
public TaskEngine (Project project)
public TaskEngine (Project project, ITask task, Type taskType)
{
parentProject = project;
this.task = task;
this.taskType = taskType;
}
// Rules (inferred) for property values incase of empty data
@@ -69,17 +70,13 @@ namespace Microsoft.Build.BuildEngine {
// string/
// ITaskItem[] empty/whitespace null No
public void Prepare (ITask task, XmlElement taskElement,
IDictionary <string, string> parameters, Type taskType)
public void Prepare (IDictionary <string, string> parameters)
{
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) {
@@ -131,20 +128,18 @@ namespace Microsoft.Build.BuildEngine {
InitializeParameter (pi, val);
}
}
public bool Execute ()
{
return task.Execute ();
}
public void PublishOutput ()
public void PublishOutput (XmlElement taskElement, Func<PropertyInfo, object> valueProvider)
{
XmlElement xmlElement;
PropertyInfo propertyInfo;
string propertyName;
string taskParameter;
string itemName;
object o;
foreach (XmlNode xmlNode in taskElement.ChildNodes) {
if (!(xmlNode is XmlElement))
@@ -165,16 +160,17 @@ namespace Microsoft.Build.BuildEngine {
taskParameter = xmlElement.GetAttribute ("TaskParameter");
itemName = xmlElement.GetAttribute ("ItemName");
propertyName = xmlElement.GetAttribute ("PropertyName");
propertyInfo = taskType.GetProperty (taskParameter, BindingFlags.Public | BindingFlags.Instance |
BindingFlags.IgnoreCase);
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));
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.");
throw new InvalidProjectFileException ("This is not output property.");
o = propertyInfo.GetValue (task, null);
var o = valueProvider (propertyInfo);
if (itemName != String.Empty) {
PublishItemGroup (propertyInfo, o, itemName);
} else {
@@ -260,5 +256,10 @@ namespace Microsoft.Build.BuildEngine {
return true;
}
public object ValueFromExecution (PropertyInfo propertyInfo)
{
return propertyInfo.GetValue (task, null);
}
}
}
@@ -1,7 +1,10 @@
//
// (C) 2005 Mainsoft Corporation (http://www.mainsoft.com)
// TaskExecutionMode.cs
//
// Authors:
// Marek Safar <[email protected]>
//
// Copyright (C) 2014 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
@@ -23,22 +26,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System.Runtime.CompilerServices;
namespace System.Web.Util
namespace Microsoft.Build.BuildEngine
{
class ICalls
enum TaskExecutionMode
{
ICalls () {}
static public string GetMachineConfigPath ()
{
return ".";
}
static public string GetMachineInstallDirectory ()
{
return ".";
}
Complete = 0,
SkipAndSetOutput = 1
}
}
}
@@ -112,6 +112,7 @@
<Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />
<Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />
<Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />
<Compile Include="Microsoft.Build.BuildEngine\TaskExecutionMode.cs" />
<Compile Include="Microsoft.Build.BuildEngine\Token.cs" />
<Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />
<Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />
@@ -65,6 +65,7 @@ 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,6 +1402,8 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
}
[Test]
// Fails on wrench
[Category ("NotWorking")]
public void TestItemsWithWildcards ()
{
Engine engine = new Engine (Consts.BinPath);
@@ -1476,6 +1478,8 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
}
[Test]
// Fails on wrench
[Category ("NotWorking")]
public void TestReservedMetadata ()
{
Engine engine = new Engine (Consts.BinPath);
@@ -1,66 +0,0 @@
<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>
@@ -1,20 +0,0 @@

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,6 +83,11 @@ 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 targetId, int projectContextId, int taskId)
: this (rnd.Next (), nodeId, projectInstanceId, targetId, projectContextId, taskId)
public BuildEventContext (int nodeId, int projectInstanceId, int projectContextId, int targetId, int taskId)
: this (rnd.Next (), nodeId, projectInstanceId, projectContextId, targetId, taskId)
{
}
public BuildEventContext (int submissionId, int nodeId, int projectInstanceId, int targetId, int projectContextId, int taskId)
public BuildEventContext (int submissionId, int nodeId, int projectInstanceId, int projectContextId, int targetId, 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 other)
public override bool Equals (object obj)
{
var o = other as BuildEventContext;
var o = obj as BuildEventContext;
return (object) o != null &&
o.NodeId == NodeId &&
o.ProjectContextId == ProjectContextId &&
@@ -32,7 +32,7 @@ using System;
namespace Microsoft.Build.Framework
{
[Serializable]
public abstract class LazyFormattedBuildEventArgs : BuildEventArgs {
public class LazyFormattedBuildEventArgs : BuildEventArgs {
string message, format;
object[] args;
@@ -3,8 +3,8 @@ namespace Microsoft.Build.Framework
{
public enum RegisteredTaskObjectLifetime
{
AppDomain,
Build
Build,
AppDomain
}
}
#endif
@@ -1,76 +0,0 @@
<?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>
@@ -1,20 +0,0 @@

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 : ITaskFactory2
public class CodeTaskFactory : ITaskFactory
{
public CodeTaskFactory ()
{
@@ -51,11 +51,12 @@ namespace Microsoft.Build.Tasks
public void CleanupTask (ITask task)
{
}
public ITask CreateTask (IBuildEngine taskFactoryLoggingHost)
public ITask CreateTask (IBuildEngine loggingHost)
{
return CreateTask (taskFactoryLoggingHost, null);
return CreateTask (loggingHost, null);
}
public ITask CreateTask (IBuildEngine taskFactoryLoggingHost, IDictionary<string, string> taskIdentityParameters)
ITask CreateTask (IBuildEngine taskFactoryLoggingHost, IDictionary<string, string> taskIdentityParameters)
{
if (assembly == null)
return null;
@@ -66,11 +67,11 @@ namespace Microsoft.Build.Tasks
{
return parameter_group != null ? parameter_group.Values.ToArray () : new TaskPropertyInfo [0];
}
public bool Initialize (string taskName, IDictionary<string, TaskPropertyInfo> parameterGroup, string taskBody, IBuildEngine taskFactoryLoggingHost)
public bool Initialize (string taskName, IDictionary<string, TaskPropertyInfo> taskParameters, string taskElementContents, IBuildEngine taskFactoryLoggingHost)
{
return Initialize (taskName, null, parameterGroup, taskBody, taskFactoryLoggingHost);
return Initialize (taskName, null, taskParameters, taskElementContents, taskFactoryLoggingHost);
}
public bool Initialize (string taskName, IDictionary<string, string> factoryIdentityParameters, IDictionary<string, TaskPropertyInfo> parameterGroup, string taskBody, IBuildEngine taskFactoryLoggingHost)
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 rootNamespace,
string rootNamespaceName,
string dependentUponFileName,
Stream binaryStream);
@@ -26,7 +26,7 @@
///// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/////
#if NET_2_0
#if !NET_4_0
using System;
using Microsoft.Build.Framework;
@@ -25,8 +25,6 @@
// 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;
@@ -102,12 +100,12 @@ namespace Microsoft.Build.Tasks {
//
if (References != null)
foreach (ITaskItem item in References) {
string aliases = item.GetMetadata ("Aliases") ?? String.Empty;
aliases = aliases.Trim ();
if (aliases.Length > 0)
commandLine.AppendSwitchIfNotNull ("/reference:" + aliases + "=", item.ItemSpec);
else
string aliases = item.GetMetadata ("Aliases");
if (!string.IsNullOrEmpty (aliases)) {
AddAliasesReference (commandLine, aliases, item.ItemSpec);
} else {
commandLine.AppendSwitchIfNotNull ("/reference:", item.ItemSpec);
}
}
if (ResponseFiles != null)
@@ -125,6 +123,21 @@ 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 ()
{
@@ -232,4 +245,3 @@ 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 importance)
protected override void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
{
#if NET_4_0
if (IgnoreStandardErrorWarningFormat ||
(!errorMatcher (singleLine) && !warningMatcher (singleLine)))
#endif
Log.LogMessage (importance, singleLine);
Log.LogMessage (messageImportance, 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 sealed class FindAppConfigFile : TaskExtension {
public class FindAppConfigFile : TaskExtension {
public FindAppConfigFile ()
{
@@ -222,7 +222,6 @@ 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; }
@@ -233,10 +232,10 @@ namespace Microsoft.Build.Tasks
public string TargetFrameworkMonikerDisplayName { get; set; }
[Output]
public string[] ReferenceAssemblyPaths { get; set; }
public string[] ReferenceAssemblyPaths { get; private set; }
[Output]
public string[] FullFrameworkReferenceAssemblyPaths { get; set; }
public string[] FullFrameworkReferenceAssemblyPaths { get; private set; }
static string DefaultFrameworksBasePath {
get {
@@ -53,7 +53,6 @@ namespace Microsoft.Build.Tasks {
bool findRelatedFiles;
bool findSatellites;
bool findSerializationAssemblies;
string[] installedAssemblyTables;
ITaskItem[] relatedFiles;
ITaskItem[] resolvedDependencyFiles;
ITaskItem[] resolvedFiles;
@@ -156,6 +155,9 @@ 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);
@@ -182,6 +184,19 @@ 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)
{
@@ -610,12 +625,15 @@ namespace Microsoft.Build.Tasks {
get { return findSerializationAssemblies; }
set { findSerializationAssemblies = value; }
}
public string[] InstalledAssemblyTables {
get { return installedAssemblyTables; }
set { installedAssemblyTables = value; }
}
public
#if NET_4_0
ITaskItem[]
#else
string[]
#endif
InstalledAssemblyTables { get; set; }
[Output]
public ITaskItem[] RelatedFiles {
get { return relatedFiles; }
@@ -1,5 +1,5 @@
//
// UpdateManifest.cs
// VCBuild.cs
//
// Author:
// Leszek Ciesielski <[email protected]>
@@ -26,7 +26,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
#if !NET_4_0
using System;
using System.Collections.Specialized;
@@ -158,7 +158,7 @@ namespace Microsoft.Build.Tasks {
return true;
}
protected override void LogEventsFromTextOutput (string singleLine, MessageImportance importance)
protected override void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
{
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 (importance, singleLine);
Log.LogMessage (messageImportance, 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 (importance, singleLine);
Log.LogMessage (messageImportance, singleLine);
}
}
@@ -433,6 +433,24 @@ 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,6 +227,52 @@ 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
@@ -1,56 +0,0 @@
<?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>
@@ -1,20 +0,0 @@

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 verbosity)
public bool IsVerbosityAtLeast (LoggerVerbosity checkVerbosity)
{
return (this.verbosity >= verbosity) ? true : false;
return this.verbosity >= checkVerbosity;
}
}
}
@@ -127,31 +127,31 @@ namespace Microsoft.Build.Utilities
hasLoggedErrors = true;
}
public void LogErrorFromException (Exception e)
public void LogErrorFromException (Exception exception)
{
LogErrorFromException (e, true);
LogErrorFromException (exception, true);
}
public void LogErrorFromException (Exception e,
public void LogErrorFromException (Exception exception,
bool showStackTrace)
{
LogErrorFromException (e, showStackTrace, true, String.Empty);
LogErrorFromException (exception, showStackTrace, true, String.Empty);
}
[MonoTODO ("Arguments @showDetail and @file are not honored")]
public void LogErrorFromException (Exception e,
public void LogErrorFromException (Exception exception,
bool showStackTrace, bool showDetail, string file)
{
if (e == null)
throw new ArgumentNullException ("e");
if (exception == null)
throw new ArgumentNullException ("exception");
StringBuilder sb = new StringBuilder ();
sb.Append (e.Message);
sb.Append (exception.Message);
if (showStackTrace == true)
sb.Append (e.StackTrace);
sb.Append (exception.StackTrace);
BuildErrorEventArgs beea = new BuildErrorEventArgs (
null, null, buildEngine.ProjectFileOfTaskNode, 0, 0, 0, 0, sb.ToString (),
e.HelpLink, e.Source);
exception.HelpLink, exception.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 importance)
MessageImportance messageImportance)
{
if (lineOfText == null)
throw new ArgumentNullException ("lineOfText");
BuildMessageEventArgs bmea = new BuildMessageEventArgs (
lineOfText, helpKeywordPrefix,
null, importance);
null, messageImportance);
buildEngine.LogMessageEvent (bmea);
return true;
@@ -313,18 +313,18 @@ namespace Microsoft.Build.Utilities
buildEngine.LogWarningEvent (bwea);
}
public void LogWarningFromException (Exception e)
public void LogWarningFromException (Exception exception)
{
LogWarningFromException (e, false);
LogWarningFromException (exception, false);
}
public void LogWarningFromException (Exception e,
public void LogWarningFromException (Exception exception,
bool showStackTrace)
{
StringBuilder sb = new StringBuilder ();
sb.Append (e.Message);
sb.Append (exception.Message);
if (showStackTrace)
sb.Append (e.StackTrace);
sb.Append (exception.StackTrace);
LogWarning (null, null, null, null, 0, 0, 0, 0,
sb.ToString (), null);
}
@@ -1,12 +1,14 @@
//
// ToolTask.cs: Base class for command line tool tasks.
//
// Author:
// Authors:
// Marek Sieradzki ([email protected])
// Ankit Jain ([email protected])
// Marek Safar ([email protected])
//
// (C) 2005 Marek Sieradzki
// Copyright 2009 Novell, Inc (http://www.novell.com)
// Copyright 2014 Xamarin Inc
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -90,12 +92,45 @@ namespace Microsoft.Build.Utilities
return true;
}
string CreateToolPath ()
{
string tp;
if (string.IsNullOrEmpty (ToolPath)) {
tp = GenerateFullPathToTool ();
if (string.IsNullOrEmpty (tp))
return null;
//
// GenerateFullPathToTool can return path including tool name
//
if (string.IsNullOrEmpty (ToolExe))
return tp;
tp = Path.GetDirectoryName (tp);
} else {
tp = ToolPath;
}
var path = Path.Combine (tp, ToolExe);
if (!File.Exists (path)) {
if (Log != null)
Log.LogError ("Tool executable '{0}' could not be found", path);
return null;
}
return path;
}
public override bool Execute ()
{
if (SkipTaskExecution ())
return true;
exitCode = ExecuteTool (GenerateFullPathToTool (), GenerateResponseFileCommands (),
var tool_path = CreateToolPath ();
if (tool_path == null)
return false;
exitCode = ExecuteTool (tool_path, GenerateResponseFileCommands (),
GenerateCommandLineCommands ());
// HandleTaskExecutionErrors is called only if exitCode != 0
@@ -233,10 +268,10 @@ namespace Microsoft.Build.Utilities
}
}
protected virtual void LogEventsFromTextOutput (string singleLine, MessageImportance importance)
protected virtual void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
{
if (singleLine.Length == 0) {
Log.LogMessage (singleLine, importance);
Log.LogMessage (singleLine, messageImportance);
return;
}
@@ -254,7 +289,7 @@ namespace Microsoft.Build.Utilities
var result = MSBuildErrorParser.TryParseLine (singleLine);
if (result == null) {
Log.LogMessage (importance, singleLine);
Log.LogMessage (messageImportance, singleLine);
return;
}
@@ -289,14 +324,14 @@ namespace Microsoft.Build.Utilities
protected virtual string GenerateCommandLineCommands ()
{
return null;
return "";
}
protected abstract string GenerateFullPathToTool ();
protected virtual string GenerateResponseFileCommands ()
{
return null;
return "";
}
protected virtual string GetResponseFileSwitch (string responseFilePath)
@@ -304,7 +339,7 @@ namespace Microsoft.Build.Utilities
return String.Format ("@{0}", responseFilePath);
}
protected virtual ProcessStartInfo GetProcessStartInfo (string pathToTool, string commandLineCommands, string responseFileSwitch)
protected ProcessStartInfo GetProcessStartInfo (string pathToTool, string commandLineCommands, string responseFileSwitch)
{
var pinfo = new ProcessStartInfo (pathToTool, String.Format ("{0} {1}", commandLineCommands, responseFileSwitch));
@@ -26,6 +26,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using System;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
@@ -424,6 +425,53 @@ namespace MonoTests.Microsoft.Build.Utilities {
Assert.AreEqual (a.ToolPath, "Bar", "#5");
a.ToolPath = "";
Assert.AreEqual (a.ToolPath, "", "#6");
a.Execute ();
}
[Test]
public void Execute_1 ()
{
var t = new TestExecuteToolTask ();
t.OnExecuteTool = delegate { Assert.Fail ("#1"); };
t.BuildEngine = new MockBuildEngine ();
Assert.IsFalse (t.Execute (), "result");
}
[Test]
public void Execute_2 ()
{
var t = new TestExecuteToolTask ();
t.BuildEngine = new MockBuildEngine ();
t.ToolPath = Directory.GetCurrentDirectory ();
t.ToolExe = "Makefile";
t.OnExecuteTool = (pathToTool, responseFileCommands, commandLineCommands) => {
Assert.AreEqual (Path.Combine (Directory.GetCurrentDirectory (), "Makefile"), pathToTool, "#1");
Assert.AreEqual ("", responseFileCommands, "#2");
Assert.AreEqual ("", commandLineCommands, "#3");
};
Assert.IsTrue (t.Execute (), "result");
}
[Test]
public void Execute_3 ()
{
var t = new TestExecuteToolTask ();
t.FullPathToTool = "fpt";
t.BuildEngine = new MockBuildEngine ();
t.ToolExe = "Makefile.mk";
t.OnExecuteTool = (pathToTool, responseFileCommands, commandLineCommands) => {
Assert.AreEqual ("Makefile.mk", pathToTool, "#1");
Assert.AreEqual ("", responseFileCommands, "#2");
Assert.AreEqual ("", commandLineCommands, "#3");
};
Assert.IsFalse (t.Execute (), "result");
}
}
@@ -548,9 +596,86 @@ namespace MonoTests.Microsoft.Build.Utilities {
}
protected override string GenerateFullPathToTool ()
{
return "";
}
}
class MockBuildEngine : IBuildEngine
{
public int ColumnNumberOfTaskNode {
get {
return 0;
}
}
public bool ContinueOnError {
get {
throw new NotImplementedException ();
}
}
public int LineNumberOfTaskNode {
get {
return 0;
}
}
public string ProjectFileOfTaskNode {
get {
return "ProjectFileOfTaskNode";
}
}
public bool BuildProjectFile (string projectFileName, string[] targetNames, IDictionary globalProperties, IDictionary targetOutputs)
{
throw new NotImplementedException ();
}
public void LogCustomEvent (CustomBuildEventArgs e)
{
}
public void LogErrorEvent (BuildErrorEventArgs e)
{
Console.WriteLine (e.Message);
}
public void LogMessageEvent (BuildMessageEventArgs e)
{
}
public void LogWarningEvent (BuildWarningEventArgs e)
{
}
}
class TestExecuteToolTask : ToolTask
{
public Action<string, string, string> OnExecuteTool;
public string FullPathToTool;
protected override string ToolName {
get { return "TestTool.exe"; }
}
protected override bool CallHostObjectToExecute ()
{
return base.CallHostObjectToExecute ();
}
protected override string GenerateFullPathToTool ()
{
return FullPathToTool;
}
protected override int ExecuteTool (string pathToTool, string responseFileCommands, string commandLineCommands)
{
if (OnExecuteTool != null)
OnExecuteTool (pathToTool, responseFileCommands, commandLineCommands);
return 0;
}
}
}
@@ -62,14 +62,28 @@ namespace Microsoft.Build.Construction
}
string @remove;
public string Remove { get { return @remove ?? String.Empty; } set { @remove = value; } }
#if NET_4_5
string keepDuplicates;
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; } }
string keepMetadata;
string removeMetadata;
#if NET_4_5
public
#else
internal
#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);
@@ -83,11 +97,9 @@ 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);
}
@@ -101,7 +113,6 @@ namespace Microsoft.Build.Construction
case "Exclude":
Exclude = value;
break;
#if NET_4_5
case "KeepDuplicates":
KeepDuplicates = value;
break;
@@ -111,7 +122,6 @@ namespace Microsoft.Build.Construction
case "RemoveMetadata":
RemoveMetadata = value;
break;
#endif
case "Remove":
Remove = value;
break;
@@ -61,7 +61,6 @@ 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,6 +595,10 @@ 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,6 +15,7 @@ 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
Loaded 100 of 1636 files, more files were not shown because too many files have changed in this diff. Show more