Compare commits

..
Author SHA1 Message Date
Zoltan Varga 974943dcf9 Merge pull request #1476 from DavidKarlas/ignoreHiddenSeqPoints
[Sdb] Ignore hidden sequence points
2015-01-04 12:55:25 -05:00
David Karlaš d4c52c0ae0 [Sdb] Ignore hidden sequence points 2014-12-23 16:24:08 +01:00
Zoltan Varga 8fe6c1d0d1 Merge pull request #1463 from DavidKarlas/seq-points
[Sdb] Debugger stepping like .Net
2014-12-18 16:41:46 -05:00
David Karlaš f131d0cf61 [Sdb] With better mimicking of .Net debugging experience stepping out of method returns to method call instead of next statement 2014-12-18 22:21:10 +01:00
David Karlaš 4538e3e0f2 [Sdb] Fixed bug with STEP_DEPTH_MIN+STEP_SIZE_MIN which stopped on NONEMPTY_STACK sequence point in same method as it begin stepping 2014-12-18 19:03:23 +01:00
David Karlaš 615fa21dcc [Sdb] Removed exclusion of CEE_POP and CEE_NOP sequence point creation 2014-12-18 19:02:52 +01:00
David Karlaš b389278fcb [Sdb] Set filter on ss_req in ss_create because filter was never set condition "if ((ss_req->filter & STEP_FILTER_STATIC_CTOR) &&" in process_single_step_inner was nerver true 2014-12-18 19:00:37 +01:00
Zoltan Varga 0690ce6405 [sdb] Fix single stepping problems caused by missing seq point info in .mdb files. When stepping in, we have to put a single stepping breakpoint into the parent method, otherwise a missing seq point could cause the debugger to continue until it hits a method entry seq point. 2014-12-16 16:46:05 -05:00
Zoltan Varga e851dde346 [sdb] Avoid putting implicit seq points at nops followed by a sym seq point. 2014-12-15 19:10:53 -05:00
Zoltan Varga cbe8767979 [sdb] Put seq points at nop's following calls as well. 2014-12-15 17:57:08 -05:00
Zoltan Varga 8f1e376d7e [sdb] Emit an implicit sequence point after every call and newobj instruction. 2014-12-15 17:35:52 -05:00
Zoltan Varga db5eb9ff5a [sdb] Avoid using implicit sequence points for methods without debug info in images which have debug info, like auto generated property accessors. 2014-12-15 17:34:02 -05:00
Marcos Henrich c750dcca8c Disable sequence points
Sequence points were disabled until the optimization issues it causes are handled.
2014-12-12 21:29:20 +00:00
Marcos Henrich c9f09f1354 Do not call seq_point_info_get_write_size with no seq points.
This change fixes a segfault when sequence points are disabled.
2014-12-12 21:29:19 +00:00
João Matos c7593a29f8 [System] Fixed Ping returning invalid results on OSX.
Simplify the code by re-using the OSX check from Platform which is more robust and add some tests to make sure we don't regress.

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=25210.
2014-12-12 18:25:44 +00:00
Jonathan Pryor ade02c3f67 [mscorlib/Android] CultureInfo.ClearCachedData() clears DateTime.
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=24947

When an Android user changes the timezone, those TimeZone changes
aren't reflected in Xamarin.Android apps. Part of this is a
Xamarin.Android bug, in which it needs to listen for TimeZone change
notifications and in turn let Mono know that the TimeZone changed.

Xamarin.Android can/will call Thread.CurrentCulture.ClearCachedData()
and Thread.CurrentUICulture.ClearCachedData() when the TimeZone has
changed. This will allow Mono to lookup the TimeZone info again.

At which point we hit two problems within Mono:

 1. TimeZoneInfo.AndroidTimeZones.Local is unnecessarily cached.
 2. DateTime itself caches the UTC offset for use by DateTime.Now.

TimeZoneInfo.Local is *already* cached, and TimeZoneInfo.Local is
properly cleared by TimeZoneInfo.ClearCachedData() while
TimeZoneInfo.AndroidTimeZones.Local wasn't. Removing the extra
cache allows the TimeZoneInfo to be looked up again.

Which brings us to DateTime.Now: for my simple test case, after
calling CultureInfo.ClearCachedData() the result of
DateTime.Now.ToString() didn't reflect the newly current TimeZone. The
cause for this was DateTime.to_local_time_span_object and
DateTime.last_now, which DateTime.Now uses as a cache for the
TimeZone's UTC offset.

Since these DateTime fields weren't cleared, subsequent DateTime.Now
invocations reported the *previous* TimeZone instead of the current
timezone.

To fix this, add an `internal` DateTime.ClearCachedData() method, and
call DateTime.ClearCachedData() from CultureInfo.ClearCachedData().
2014-12-12 12:29:04 -05:00
Zoltan Varga 8f21c92ad9 [amd64] Fix a simple peephole opt broken by the OP_IL_SEQ_POINT changes. 2014-12-11 19:30:07 -05:00
Zoltan Varga b9a6f0e669 [jit] Mark OP_IL_SEQ_POINT as not having side effects. 2014-12-11 19:14:18 -05:00
Zoltan Varga f372ba68ec [bcl] Fix another test failure caused by the usage of the reference version of System.ComponentModel. 2014-12-11 18:31:59 -05:00
Mark Probst 5e7e4438e7 [sgen] Add an assertion. 2014-12-11 15:02:15 -08:00
Mark Probst a8fd467805 [sgen] Use the SGEN_UPDATE_REFERENCE macro in optimized copy. 2014-12-11 15:01:45 -08:00
Mark Probst a532321bc4 [sgen] Fix evacuation.
We can't dereference an object's VTable before we know that it's not
tagged.  In this case, forwarded.  The access would be unaligned and
might even fault.
2014-12-11 14:57:58 -08:00
Zoltan Varga fcc0c902ea Revert "[jit] Enable tail calls from gshared code. Fixes #25224."
This reverts commit ca0dd5c0bb.

Revert this as it causes a performance regression in f#.
2014-12-11 17:51:19 -05:00
Alexis Christoforides 0146e5c751 Fix merge typo 2014-12-11 16:00:40 -05:00
Alexis Christoforides 2f1a136583 [System.IO.KeventWatcher] Fixed deadlock when watcher stopped/disposed from its own event handler.
This fixes hangs in tests that do that (ie. System.Runtime.Caching).
2014-12-11 15:44:54 -05:00
Zoltan Varga ca0dd5c0bb [jit] Enable tail calls from gshared code. Fixes #25224. 2014-12-11 15:40:00 -05:00
Zoltan Varga cd74f7a191 [jit] Remove some dead code. 2014-12-11 15:40:00 -05:00
Joao Matos 4733e56feb [runtime] Fixed shutdown crasher in mono_thread_pool_cleanup.
We call `mono_thread_pool_cleanup` twice from `mono_runtime_try_shutdown` and later `mono_domain_finalize`, which meant we tried to destroy the semaphore twice and that caused a crasher.

Fix this by clearing out the semaphore pointer. That way when we try to destroy it again it's already null and execution continues just fine.
2014-12-11 18:47:11 +00:00
Zoltan Varga 2040537203 [sdb] Fix the decoding of the next array when decoding sequence points. 2014-12-11 13:23:08 -05:00
Joao Matos 7453ec0520 [sgen] Fixed dump_alloc_records() to work on MSVC.
We are getting some crashers in printf when using the 'z' size_t printf specifier.
2014-12-11 17:49:06 +00:00
Joao Matos 9e85fd5fa9 [sgen] Align vtable pointers to 8-bytes for phony vtable used for filling the nursery.
Thanks to Kumpera for providing the fix!
2014-12-11 17:48:56 +00:00
Mark Probst e8791b18fe [sgen] Disable evacuation temporarily to fix crashes. 2014-12-11 09:30:12 -08:00
Zoltan Varga 0e311c027d [sdb] Another try at fixing #25009. 2014-12-11 11:58:41 -05:00
Marek Safar 554ee2294d Fix DateTimeConverter test 2014-12-11 13:40:29 +01:00
Zoltan Varga c4d9659266 [sdb] Fix another shutdown crash. Fixes #25009. 2014-12-11 07:34:04 -05:00
Rodrigo Kumpera 5572635566 Merge pull request #1403 from schani/fix-roslyn-linux-oom
Fix Roslyn Linux OOM
2014-12-10 10:53:16 -05:00
Atsushi Eno 8432d2d010 bump rx to rx-oss-v2.2 and add branch info on .gitmodules. 2014-12-10 23:16:35 +08:00
Marek Safar b691656aaf [mcs] Better recovery from failed async return type inference. Fixes #25165 2014-12-10 15:08:01 +01:00
Jo Shields 72c52fe46c Distribute reference assemblies in source tarball. Yuck. 2014-12-10 12:57:14 +00:00
Marek Safar f893a4ca84 [System.Drawing] Fixes commit 2abd0ed92e 2014-12-10 12:52:23 +01:00
Marek Safar 922ec7ce2a [mcs] Update static using to match the latest update (still work in progress) 2014-12-10 12:32:21 +01:00
Marek Habersack 99b622120b Specify referencesource branch in .gitmodules to make updating easier 2014-12-10 11:33:14 +01:00
Marek Habersack 7856988e65 Update external/referencesource to fix mobile builds 2014-12-10 11:31:27 +01:00
Mark Probst 4e58de23d2 [sgen] Always alloc degraded when nursery allocation fails.
There's an unlikely case that Roslyn triggers quite often on Linux: A
thread tries to allocate from the nursery, but it's full.  It triggers
a nursery collection, then tries allocating again.  Between the
collection and the allocation retry, another thread fills the nursery
so that the retry also fails.

We failed an assertion in this case.  Now we always go to the major
heap if it happens.
2014-12-09 17:31:25 -08:00
Zoltan Varga bcc31684e4 [arm] Really fix the build. 2014-12-09 18:34:35 -05:00
Zoltan Varga 7a242d8132 [arm] Fix the build. 2014-12-09 18:19:46 -05:00
Mark Probst d45c58afcd [runtime] Fix string size calculation in mono_string_new_size().
This bug is not hit when doing managed allocations with SGen because the
managed allocator catches it.  It can be triggered with the embedding API, as
well as when the heavy binary protocol is enabled, in which case `bug-17590`
fails.
2014-12-09 13:16:25 -08:00
Zoltan Varga 2607beed06 [runtime] Allow StructLayoutAttribute.Pack values between 16 and 128. Fixes #25059. 2014-12-09 15:40:11 -05:00
Zoltan Varga 2abd0ed92e [System.Drawing] Add support for a null culture argument to the ConvertFrom () method in RectangeConverter/SizeFConverter, the reference sources version of TypeConverter.ConvertFromString () passes null as the culture. 2014-12-09 15:16:49 -05:00
Zoltan Varga 476e87f593 [System.Data] Fix a test failure caused by the transition to the reference sources version of System.ComponentModel. 2014-12-09 14:53:18 -05:00
Marcos Henrich b99438f021 Merge pull request #1436 from esdrubal/readerwriterlockslim
[System.Core] Bring .NET implementation of ReaderWriterLockSlim.
2014-12-09 19:01:46 +00:00
Zoltan Varga 5c39898c62 Merge pull request #1448 from ermshiperete/TSBTextTruncation
[MWF] Don't truncate text on ToolStripButton
2014-12-09 13:34:47 -05:00
Zoltan Varga eb60df89d0 Merge pull request #1449 from ermshiperete/Xamarin-bug-23591
[MWF] Fix crash in multi-selection list view
2014-12-09 12:29:58 -05:00
Eberhard Beilharz c7ad829794 [MWF] Fix crash in multi-selection list view
Calling owner.UpdateMultiSelection can also change the selected item,
causing a crash.

This change improves the fix for Xamarin bug #23591.
2014-12-09 18:15:12 +01:00
Paolo Molaro bb4213224a [profiler] Enhance the profiler to keep track of and summarize jit trampolines and helpers. 2014-12-09 17:47:28 +01:00
Paolo Molaro 2946a09c04 [profiler] Report trampolines and other JIT helpers to the profiler. 2014-12-09 17:47:28 +01:00
Paolo Molaro 5664e72b7c [jit] Expose helper method to the rest of the JIT to get specific trampoline descriptions. 2014-12-09 17:47:28 +01:00
Paolo Molaro 017c171b36 [profiler] Provide more options for describing jit code buffers precisely. 2014-12-09 17:47:28 +01:00
Jo Shields 11a5109e41 ReferenceSource ComponentModel changes to mobile_System.dll.sources 2014-12-09 16:44:27 +00:00
Eberhard Beilharz c66e9e63c2 [MWF] Don't truncate text on ToolStripButton
Previous code subtracted 4 pixels of the height of the text of a
toolstrip button, presumably to leave a margin. However, margins
are handled elsewhere, so we ended up with truncated text.
2014-12-09 17:22:30 +01:00
Marek Safar 8a249042e4 [system] Workaround boostrap issue with HostProtectionAttribute 2014-12-09 15:56:45 +01:00
Zoltan Varga 91e3a07ece Merge pull request #1447 from chrisvire/bug-25102
[MWF] Use Ctrl+PageUp/PageDown for Tab Navigation
2014-12-09 09:25:03 -05:00
Marek Safar 0cff8cb933 [corlib] Workaround boostrap issue with HostProtectionAttribute 2014-12-09 15:09:34 +01:00
Marek Safar 767b1570f2 [System] Use ComponentModel from reference sources 2014-12-09 14:30:40 +01:00
Marek Safar c64b1d4809 Merge pull request #1446 from odinserj/master
Add DateTimeOffsetConverter to the default converters list
2014-12-09 10:03:30 +01:00
Marek Safar 8913ef3449 make dist fix 2014-12-09 09:59:25 +01:00
Marek Safar 7ac15125c0 Fix dmcs to have correct sdk value 2014-12-09 09:46:47 +01:00
Marek Safar 5c7bc03833 Update mcs test 2014-12-09 09:30:14 +01:00
Zoltan Varga 5e46fb50ca [sdb] Fix more crashes on shutdown when the assembly unload callbacks are called on the debugger thread. Fixes #25009. 2014-12-08 17:54:42 -05:00
Zoltan Varga 56a0a9e75e [build] Print out the version of the bootstrap mcs if the profile check fails. 2014-12-08 15:56:01 -05:00
Zoltan Varga b7925f2cfd [runtime] Remove the bug-438454.exe test, it tests behaviour which is by design. 2014-12-08 15:48:17 -05:00
Zoltan Varga bab4b8f9d2 [runtime] Add another rule for the builder-sgen.h -> main-sgen.o dependency since apparently some versions of automake etc. generate a main-sgen.o file too. 2014-12-08 15:18:06 -05:00
Zoltan Varga e0b6b44866 Revert "[build] Rework the buildver dep check."
This reverts commit a9f31e63db.

Revert this as it breaks make dist by having a source file depend on a generated file.
2014-12-08 15:18:06 -05:00
Marek Safar b304ec5e0e gmcs script is no longer installed.
The intention is to make build failures easy to spot instead of silently upgrading
target framework from 2 to 4 and then fail down the road on e.g type ambiguity
caused by new 4.0 framework types or methods
2014-12-08 19:59:07 +01:00
Sergey Odinokov 4a8e13a99b Add DateTimeOffsetConverter to the default converters list.
This is the fix for https://bugzilla.xamarin.com/show_bug.cgi?id=25158

Current implementation does not contain the DateTimeOffsetConverter
in the list of default converters. This cause NotSupportedException
to be thrown when trying to serialize/deserialize DateTimeOffset
values to/from strings.

In .NET Framework implementation this class is added to such a list.
2014-12-08 21:59:00 +03:00
Alex Rønne Petersen 41ee4e7cee Use git://... instead of git@... for submodules. 2014-12-08 19:40:15 +01:00
Marek Safar 067634117c [corlib] Update SafeHandle dispose pattern to match .net. Fixes #25132 2014-12-08 17:51:38 +01:00
Marek Habersack 142b512e9a Added reference-assemblies submodule to fix the build 2014-12-08 17:23:11 +01:00
Marek Safar 9546550237 Change 4.0 profile to metadata reference only profile 2014-12-08 16:46:54 +01:00
Marek Safar e00126f61e [corlib] Remove duplicate FirstChanceExceptionEventArgs 2014-12-08 16:46:53 +01:00
Atsushi Eno bcfec743d5 [mkbundle] fix execution for X.Android on Windows regarding dos2unix.
This fixes bug #25086 (Xamarin.Android). Details described there.

To fix the issue, we use #if XAMARIN_ANDROID to avoid that old cygwin-only
code path. (We are not sure if simply removing the old code still works,
so we don't remove that for now.)
2014-12-08 23:40:52 +08:00
Chris Hubbard 80b32bec27 [MWF] Use Ctrl+PageUp/PageDown for Tab Navigation
In the Windows implementation of the TabControl, Ctrl+PageUp
navigates to the previous tab and Ctrl+PageDown navigates to the
next tab (with both wrapping around).  This change implements this
feature in the Mono implementation.

Change-Id: Ib940bd08d5ba641f05ed91c0e789e356e68f72bb
2014-12-08 10:35:56 -05:00
Marek Safar 73699dc332 [system] Replace System.Collections.Generic from reference sources 2014-12-08 12:04:28 +01:00
Marek Safar f22e4d8986 [system] Add test for #25137 2014-12-08 12:04:28 +01:00
Marek Safar fb85eae8fc [system] Fix soctec test to not block indefinitely 2014-12-08 12:04:28 +01:00
Marek Safar a6e0aefa29 Merge pull request #1445 from meebey/registry_fix_unneeded_write_permission
[corlib] Fix needing write permission when reading registry values. Fixe...
2014-12-08 10:49:01 +01:00
Mirco Bauer 55e85a6da8 [corlib] Fix needing write permission when reading registry values. Fixes #25106
ToKey() ignores the setting parameter when calling RegistryKey.OpenSubKey() and
thus always asks for write permission. If you try to read read-only keys (say
HKLM without admin rights) it will fail with a  SecurityException.
2014-12-08 10:39:20 +01:00
Zoltan Varga 2a8f86f223 [amd64] Fix the passing of nested structures in registers which cross an 8 byte boundary in pinvoke. Fixes #25095. 2014-12-06 06:18:02 -05:00
Alexis Christoforides e010856ace [canaries] Removed accidental hardcode 2014-12-05 15:53:55 -05:00
Alexis Christoforides fdf9cf74a6 [runtime] Replace offsetof with G_STRUCT_OFFSET on commit's @b0cff959e47c3d9955e6675364bf71404cd74bac changes 2014-12-05 15:48:21 -05:00
Alexis Christoforides b5ed5a3631 [System.IO.KeventWatcher] More fixes and MS behavior matching for the new implementation.
* Fixed the FileSystemEventArgs.Name property for all events
* Fixed regression of bug #5747 (and related path normalizing issues) https://bugzilla.xamarin.com/show_bug.cgi?id=5747
* Improved error handling, set hard limit on file descriptors to 200 for now to help isolate issues
* Fixed issues with rapid event Changed+Renamed firing
2014-12-05 15:09:59 -05:00
Mark Probst 2f8e36d300 [sgen] Remove debugging comment. 2014-12-05 11:55:20 -08:00
Mark Probst 6c60288739 [sgen] Fix pinning in the presence of canaries. 2014-12-05 11:11:02 -08:00
Zoltan Varga 2b19bdc99c Merge pull request #980 from StephenMcConnel/bug-18638
Fix bugs in sizing TableLayoutPanel (Xamarin bug 18638)
2014-12-05 14:09:00 -05:00
Zoltan Varga c49994e904 Merge pull request #1442 from ermshiperete/TextOverlapsImage
[MWF] Fix problem when button text overlaps image
2014-12-05 14:07:39 -05:00
Zoltan Varga a1ab4919b0 Merge pull request #1322 from StephenMcConnel/bug23532
Remove excessive shortcut key matching in ToolStrip
2014-12-05 14:07:20 -05:00
Zoltan Varga fd556a44fe Merge pull request #1323 from StephenMcConnel/bug-23591
Fix potential crash in ListView.ItemControl.ItemsMouseDown
2014-12-05 14:06:36 -05:00
Jonathan Pryor 8be960fc36 [mscorlib/Android] TimeZoneInfo.Local.Id should NOT be "Local".
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=24742
Context: Commit f7fd52ad
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=24958

The logic of Commit f7fd52ad was 'Desktop Mono returns "Local" from
TimeZoneInfo.Local.Id, so surely Xamarin.Android should', predicated
in part on the assumption that whatever Desktop Mono does should be
the same as what Desktop .NET does.

This assumption wasn't verified, and is in fact wrong; Desktop .NET
doesn't return "Local" from TimeZoneInfo.Local.Id, it returns an
actual identifier.

The reason why Desktop Mono returns "Local" is due to implementation
sanity, particularly on OS X: /etc/localtime may be a symlink OR a
copy of the timezone data, and when it's a copy there's no way to
determine the Olson ID for the timezone. Consequently, it may not be
possible to determine the TimeZone ID.

Xamarin.Android doesn't have that problem; it uses the Android
persist.sys.timezone system property value,
falling back to java.util.TimeZone.getDefault().getID() if necessary,
and thus always has access to an Olson ID.

Change TimeZoneInfo.Local.Id on Xamarin.Android to return the Olson ID
instead of "Local", partially reverting Commit f7fd52ad.
2014-12-05 13:36:04 -05:00
Marek Safar 1e1f1fc5b9 Update profiler tests environment 2014-12-05 18:51:28 +01:00
Marcos Henrich 2b668c2e50 Bump referencesource 2014-12-05 17:12:28 +00:00
Marek Safar 21bd41b1d6 [mcs] Fix null operator on arrays with property receiver. 2014-12-05 17:57:36 +01:00
Marek Safar 385bda0cad Merge pull request #1443 from esdrubal/userinfoescape
[System] Fixed UriParseComponents.ParseUser.
2014-12-05 17:41:05 +01:00
Eberhard Beilharz 3ae08e65b8 [MWF] Fix problem when button text overlaps image
When we draw a button with ImageAboveText.ImageAboveText and the
text is too big to fit below the image we have to draw the text over
the image. This should happen from the bottom, not from the top as
the previous implementation did. With the previous code we ended up
having the text at the top of the button under certain conditions.
2014-12-05 17:35:35 +01:00
Marcos Henrich b97f24c4ad [System] Fixed UriParseComponents.ParseUser. Fixes #25087.
UriParseComponents.ParseUser was unescaping all escaped chars and when a non valid user info char was encountered it was assuming that those chars were not part of the user info. The chars were not consumed thus the problems while parsing the rest of the input.
UriParseComponents.ParseUser now keeps non valid user info chars escaped.
2014-12-05 16:13:57 +00:00
Marcos Henrich f7ead304f6 [System] Test Uri constructor with escaped user info chars. 2014-12-05 16:11:32 +00:00
Marek Safar 2c6eb4f9b7 [mcs] Add dictionary initializer for arrays. 2014-12-05 16:51:25 +01:00
Marek Safar 79c0d7bcd3 Update runtime tests environment 2014-12-05 16:39:44 +01:00
Marek Safar 9df8a9e4f7 Fix resgen 4.0 profile path 2014-12-05 15:03:04 +01:00
Zoltan Varga ad5e7e102a Fix the DISABLE_REMOTING build. 2014-12-05 08:51:27 -05:00
Marek Safar b993596e59 Restore 4.0 profile as metadata only profile 2014-12-05 12:01:50 +01:00
Marek Safar 0c99796db6 [corlib] Add missing API 2014-12-05 12:01:50 +01:00
Atsushi Eno 991658d40d revive nunit-console which referenced lib/mono/2.0.
Actually the entire REWRITE2_* should be killed.
2014-12-05 14:55:33 +08:00
Mark Probst 8d2613ef44 Fix a C compiler warning. 2014-12-04 14:35:27 -08:00
Alex Rønne Petersen a46e3a51ba No longer include Volatile.cs in Mvc3 since the 4.0 profile is gone now. 2014-12-04 19:53:33 +01:00
Marek Safar db94f6284f Add System.Data.Entity assembly 2014-12-04 18:59:42 +01:00
Marek Safar 9f86d82be8 Bump referencesource 2014-12-04 18:54:41 +01:00
Marek Safar 2fa7448bf6 [corlib] Add missing API to AppDomainSetup 2014-12-04 18:49:45 +01:00
Marcos Henrich 049533031d Bump referencesource submodule. 2014-12-04 17:40:13 +00:00
Marek Safar b71ef88f44 Merge pull request #1441 from akoeplinger/fix-incorrect-test
[System.Web.DynamicData] Fixed test to verify the right behavior
2014-12-04 17:46:07 +01:00
Marek Safar 7fb7c91aaa Fix xbuild profile dependencies 2014-12-04 16:25:17 +01:00
Marek Safar 29b89dbfc9 Remove old (now unused) 2.0 sources 2014-12-04 15:25:41 +01:00
Marek Safar a1aced8ab2 Remove 4.0 profile 2014-12-04 15:16:31 +01:00
Marek Safar 336755ca9e [mcs] Validate more nameof argument expressions 2014-12-04 14:18:18 +01:00
Alexander Köplinger e6a473c659 [System.Web.DynamicData] Fixed test to verify the right behavior
The exception that is thrown is now consistent with MS.NET due to the imported System.ComponentModel.DataAnnotations code.
2014-12-04 02:35:39 +01:00
Marek Safar b50017eba3 [mcs] Improve extension methods error reporting 2014-12-03 22:02:22 +01:00
Marek Safar 93dfcdb60a [mcs] At least one of nameof methodgroup argument candidates needs to be accessible 2014-12-03 22:02:22 +01:00
Marek Safar 0f7d153c0b [mcs] Add support for __refvalue passed as a reference 2014-12-03 22:02:21 +01:00
Joao Matos de77d24361 [driver] Fixed outdated URL in help message. 2014-12-03 20:57:35 +00:00
Joao Matos d509226413 [msvc] Fixed heap problems at runtime when calling free().
Due to an incompatibility in the project files and DLL API setup code, we were importing locally defined symbols as DLL. This manifested as a debug heap dialog in VS caused by allocating and freeing memory between two Windows modules (which have their own memory heap).

Fix this by simplifying the DLL defines in MSVC, we are relying on .def files to manually specify the exports anyway.
2014-12-03 20:56:52 +00:00
Joao Matos 60361f26eb [msvc] Updated project files. 2014-12-03 20:07:23 +00:00
Joao Matos 23467f62c2 [msvc] Fixed empty struct declaration (it's not valid C according to MSVC). 2014-12-03 20:06:59 +00:00
Joao Matos b69666d434 Removed some dead code. 2014-12-03 20:05:40 +00:00
Joao Matos 562e497f8b [msvc] Fixed missing semi-colon. 2014-12-03 20:04:39 +00:00
Marcos Henrich 3a613dfd42 [runtime] Added missing else branch setting il_offset to -1. 2014-12-03 18:45:00 +00:00
Alex Rønne Petersen bc876c2427 [bcl] Remove all uses of Thread.Volatile{Read,Write}.
These methods are broken, misleading, and generally harmful. Always prefer the
`Volatile` class over these to make intent clear and to get sensible semantics.

http://blog.alexrp.com/2014/03/30/dot-net-atomics-and-memory-model-semantics/
2014-12-03 19:19:51 +01:00
Alex Rønne Petersen aec3ef0e8e Fix a bunch of warnings in the runtime code. 2014-12-03 19:13:58 +01:00
Zoltan Varga fa9c1f016c Fix make dist if boehm is disabled. 2014-12-03 17:33:11 +01:00
Jonathan Pryor 77e11f7fa9 [mscorlib/Android] Support TimeZoneInfo.FindSystemTimeZoneById("Local")
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=24741

Xamarin.Android didn't previously support
TimeZoneInfo.FindSystemTimeZoneById("Local") because of oversight (and
overly nested #if conditionals).

Compare `id` against "Local" *before* doing platform-specific
codepaths so that finding the "Local" TimeZone works as expected on
Xamarin.Android, and merge the `#if MONODROID` with the existing code.
2014-12-03 11:25:29 -05:00
Marcos Henrich 5c02f3efab [System.Core] Removed no longer used files.
System.Core is now using .NET implementations of LockRecursionPolicy and ReaderWriterLockSlim.
2014-12-03 13:24:22 +00:00
Marcos Henrich 4e735b6e30 [System.Core] Bring .NET implementation of ReaderWriterLockSlim. 2014-12-03 13:24:21 +00:00
Jo Shields 6856ccab7c Merge pull request #1410 from alesliehughes/master
Improved support for TimeZoneInfo under windows.
2014-12-03 12:20:13 +00:00
Zoltan Varga 90977ef96c Merge pull request #1437 from jonorossi/io_compression_fs_fix
Fixed ZipFile.CreateFromDirectory overload to use compressionLevel
2014-12-03 07:40:21 +01:00
Zoltan Varga e6b3e75226 Merge pull request #1438 from jonorossi/patch-1
Fixed incorrect markdown syntax for two links
2014-12-03 07:39:41 +01:00
Jonathon Rossi 184324e9cb Fixed incorrect markdown syntax for two links 2014-12-03 16:27:04 +10:00
Jonathon Rossi 7cabb3706b Fixed System.IO.Compression.FileSystem.ZipFile.CreateFromDirectory overload to use compressionLevel. 2014-12-03 16:13:06 +10:00
Mark Probst 8dde6e2c81 [sgen] Remove SGEN_HAVE_CONCURRENT_MARK.
We always have concurrent mark.
2014-12-02 15:16:14 -08:00
Marek Safar 080b48683c [xbuild] Update another default tools setting 2014-12-02 23:29:15 +01:00
Marek Safar dfebf124e5 Change bootstrap profile to target 4.0 framework. Bump system mono requirement to version 3.2 at least 2014-12-02 22:37:43 +01:00
Mark Probst f766a777e6 [counters] ulongs can be time, too. 2014-12-02 12:39:54 -08:00
Neale Ferguson 0526e429aa Minor reformatting 2014-12-02 13:59:03 -05:00
Zoltan Varga bc7badab34 Merge pull request #1434 from akoeplinger/fix-filehandle-leak
[counters] Fix file handle leak in cpu_load ()
2014-12-02 18:06:41 +01:00
Rodrigo Kumpera 3954590386 Merge pull request #1317 from nealef/master
Enable build on RHEL and CentOS
2014-12-02 10:16:06 -05:00
Marek Safar d9d6806867 [mcs] nameof implementation rewrite to match the latest spec 2014-12-02 16:01:59 +01:00
João Matos 320b2264cd Merge pull request #1435 from akoeplinger/fix-s390-build
Fix build on s390
2014-12-02 09:28:04 -05:00
Alex Rønne Petersen c9e3a47dd7 Merge pull request #1400 from RiJo/patch-1
Let ListViewItem implement interface IDataItemContainer
2014-12-02 05:55:21 +01:00
Alexander Köplinger e6bd66abf6 Fix build on s390 2014-12-02 05:49:59 +01:00
Alexander Köplinger b2b0d6c00f [counters] Fix file handle leak in cpu_load ()
If a premature return is taken, the FILE pointer f is not fclose()-ed.

Report and fix provided by Markus Beth on the mailing list: http://lists.ximian.com/pipermail/mono-devel-list/2014-December/042459.html
2014-12-02 05:41:00 +01:00
Mark Probst d09264fa13 [sgen] Fix 32 bits.
We didn't allocate proxy vtables aligned to 8 bytes.
2014-12-01 18:03:08 -08:00
Mark Probst 31fba69618 [sgen] Fix a bug when waking up workers. 2014-12-01 15:32:49 -08:00
RiJo 56178e6215 ListViewItem class now implements interface IDataItemContainer 2014-12-01 15:07:23 +01:00
Zoltan Varga ded052883b Fix a layout problem in the mono man page. 2014-12-01 10:45:19 +01:00
Zoltan Varga 92388f7d09 [runtime] Add support for jagged array ctors which create an array of arrays. Fixes #17944. 2014-12-01 10:26:51 +01:00
Zoltan Varga 33861cf32b Merge pull request #1412 from esdrubal/stackframe
Release sequence points and Symbolicate tool
2014-11-30 15:11:03 +01:00
Zoltan Varga c1d6e85d4a [runtime] Call mono_gc_base_init () in sdb, since it is no longer called by the code in mono-debug.c. 2014-11-30 15:02:46 +01:00
Zoltan Varga 7c009e0ece Fix the build. 2014-11-30 11:32:09 +01:00
Zoltan Varga 743ef03fd9 [runtime] Use SIGWINCH as the android debugger signal (), SIGUSR2 doesn't seem to work on emulators. 2014-11-30 03:13:03 +01:00
Zoltan Varga 173eaf1dfa Merge remote-tracking branch 'mfoliveira/ppc64el-v2'
This is a merge of:

https://github.com/mono/mono/pull/1409
2014-11-30 02:48:38 +01:00
Zoltan Varga 79bbcb6c04 [runtime] Remove some unused metadata includes from utils/. 2014-11-30 02:34:13 +01:00
Marek Safar f8a517624d Fixes build 2014-11-28 21:34:15 +01:00
Marek Safar e24b4f1d34 [mcs] new test 2014-11-28 20:23:40 +01:00
Marek Safar c1118b521e [mcs] Less cascading errors 2014-11-28 18:22:40 +01:00
Marek Safar 7e39c6e604 [mcs] Extend tie-breaking rules in overload resolution when default parameters are unused 2014-11-28 18:22:39 +01:00
João Matos 59c664f04e [build] Added support for ARM64 Android cross-compilation. 2014-11-28 17:07:05 +00:00
Alex Rønne Petersen e666a5ee28 Merge pull request #1401 from fquiroz01/patch-1
Add IE9 and newer to Up level navigator
2014-11-28 18:05:35 +01:00
Zoltan Varga 760db842cc [runtime] Fix a copyright date. 2014-11-28 17:43:19 +01:00
Marek Safar 4316b458e3 [mcs] Check delegate return type conversion during implicit delegate conversion 2014-11-28 15:23:09 +01:00
Marek Safar 69de3c2bd4 [mcs] Tweak naming of nested types. Fixes #24172 2014-11-28 13:24:36 +01:00
Zoltan Varga fff6d6d6f4 [runtime] Add a remoting.h file and move the remoting related marshal function declarations there. Add a low level lock used by the remoting.c file and an initialization function. 2014-11-28 06:23:48 +01:00
Zoltan Varga 9c658f2031 [runtime] Fix the build. 2014-11-28 06:15:05 +01:00
Zoltan Varga e211e33c1e [runtime] Fix the DISABLE_REMOTING build. 2014-11-28 05:55:18 +01:00
Zoltan Varga 3769cef763 [runtime] Extract the remoting code from marshal.c into a separate remoting.c file. 2014-11-28 05:50:39 +01:00
Zoltan Varga 7ac6b6b937 [runtime] Remove more unused debug code. 2014-11-28 03:40:42 +01:00
Zoltan Varga 69ba0b04fd [runtime] Simplify mono-debug.c since we no longer have to serialize a lot of the data. 2014-11-28 03:36:56 +01:00
Zoltan Varga 62e4fbe3ca [runtime] Remove an obsolete comment. 2014-11-28 01:10:03 +01:00
Zoltan Varga c476529db3 [runtime] Change the default runtime version to 4.5. 2014-11-28 01:07:15 +01:00
Alex Rønne Petersen d4ce72973d Merge pull request #1431 from esdrubal/enummap
Fixed how EnumMap serializes flag values.
2014-11-28 00:30:44 +01:00
Zoltan Varga 1e662349d1 Make the various '2' (al2/resgen2 etc.) scripts target net 4.5. 2014-11-28 00:26:28 +01:00
Zoltan Varga e037864832 Fix the build. 2014-11-28 00:11:27 +01:00
Marcos Henrich 37dabfc9f1 Fixed how EnumMap serializes flag values. Fixes #21072.
While serializing an enum value, EnumMap no longer considers partial matching flags when there is a flag that matches exactly.
2014-11-27 16:51:39 +00:00
Marcos Henrich 0eaf2a4ea1 Test DataContractSerializer with flags enum. Covers #21072.
When serializing an enum value, matching flags should not be consider when there is a flag that matches exactly.
2014-11-27 16:51:22 +00:00
Zoltan Varga 5314425331 Make gmcs/dmcs the same as mcs. 2014-11-27 17:42:10 +01:00
Marek Safar c7d8c2bb96 [mcs] Update import of private struct fields for flow analysis. 2014-11-27 17:36:44 +01:00
Marek Safar 0602561a31 Merge pull request #1432 from akoeplinger/parallel-fix
[corlib] Fix Parallel.ForEach overload that hardcoded -1 for the item index
2014-11-27 16:12:11 +01:00
Alexander Köplinger f5c32ef7bd [corlib] Fix Parallel.ForEach overload that hardcoded -1 for the item index
Xamarin bug #24891
2014-11-27 16:08:18 +01:00
Jo Shields 3080be5f20 Fix EXTRA_DIST of file in deleted regex folder 2014-11-27 11:22:03 +00:00
Alexander Köplinger fb7332bec1 [MWF] Fix bug in DataGridViewRowCollection Clear() introduced by recent commit
7d1b878fbf altered the behavior of removing rows, breaking
the DataGridViewRowCollectionTest.ClearRows () test

Before the change, this is what happened when the list was cleared
(the number in brackets is the value of the Index property of the DataGridViewRow):

[0]  Remove   [1]  ReIndex  [0] Remove  [1] ReIndex  [0]
[1] --------> [2] --------> [1] ------> [2] -------> [1]  ...
[2]           [3]           [2]
[3]

After the offending commit, ReIndex is only called after the list is cleared, which means
the Index property of the rows is never updated (as there are no items in the list).

The fix is to explicitly set the Index of each row to 0.
This was the end result before the commit anyway, so we can omit the ReIndex call entirely.
2014-11-27 12:11:20 +01:00
Marek Safar b044fa0f26 [system.net.http] Update range checks for invalid characters. Fixes #18800 2014-11-27 11:58:49 +01:00
Jo Shields a42ca4aeb2 Fix "make dist" error caused by renamed sgen-marksweep-drain-gray-stack.h 2014-11-27 09:20:39 +00:00
Alexander Köplinger 8473459f32 Fix build (SHARED_EXT was renamed to MONO_SOLIB_EXT in 4342bce441) 2014-11-27 03:26:11 +01:00
Marek Safar 21ac07aa0a [system.net.http] Escape more RFC5987 characters. Fixes #24785 2014-11-27 09:07:46 +01:00
Miguel de Icaza bb1d917b88 Merge pull request #1430 from akoeplinger/readme
Improve README.md and focus on relevant content
2014-11-26 22:17:23 -05:00
Alex Rønne Petersen e4aa060bea Merge pull request #1319 from directhex/systemwide-per-arch-aot-cache
Add a third AOT location, alongside ~/.mono/aot-cache and the assembly dir
2014-11-27 01:28:49 +01:00
Alexander Köplinger f6d6af35d7 Improve README.md and focus on relevant content
Before, the first thing the user saw were instructions for niche platforms like Itanium or Solaris.
Instead, we now just link to the "Compiling Mono" guides for OSX, Linux and Windows on the Mono website.

Additionally, a bunch of instructions were outdated / no longer relevant, updated those.

The "Configuration options" section was moved to the bottom of the readme, it was pretty long and pushed
the other sections into oblivion.
2014-11-27 01:16:14 +01:00
Alex Rønne Petersen d7e3600338 Merge pull request #1407 from chrisvire/bug-24587
[MWF] Fix focus issue when removing last item in ListView
2014-11-27 00:43:18 +01:00
Alex Rønne Petersen affa77b2fd Merge pull request #1424 from akoeplinger/remove-enable-nunit-tests
Remove --enable-nunit-tests option from build system
2014-11-27 00:41:29 +01:00
Marek Safar f40e35aed1 [mcs] Remove declaration expression named argument parsing (not part of the language yet). Fixes #24784 2014-11-26 22:59:07 +01:00
Mark Probst 805d6a8775 [sgen] Fix concurrent M&S. 2014-11-26 13:53:08 -08:00
Sebastien Pouliot 6744637030 Bump referencesource to fix mobile profile compilation of System.ComponentModel.DataAnnotations 2014-11-26 16:26:35 -05:00
Sebastien Pouliot f14dd6af87 Fix mobile build wrt System.Core changes 2014-11-26 16:00:57 -05:00
Miguel de Icaza efbcabe64d [System] Make it build with the MonoTouch profile 2014-11-26 14:43:25 -05:00
Miguel de Icaza f1ffa95460 Drop dead notes/code 2014-11-26 14:30:57 -05:00
Marek Safar d05e3e7a86 Fixes build 2014-11-26 19:54:35 +01:00
Mark Probst 890975f608 [sgen] Use all 3 lower vtable bits on 32 bits.
We can't actually use the trick of setting both the pinned and forwarded
bits to indicate cemented objects because the Tarjan bridge requires those
two bits never be set at the same time.
2014-11-26 10:38:50 -08:00
Mark Probst 4911c0b3c8 [sgen] Align vtable pointers to 8 bytes on 32 bits, too. 2014-11-26 10:38:50 -08:00
Mark Probst 51b8187b7a [sgen] Mempool allocations should be 8 byte aligned. Fix this on 32 bits.
The `MonoMemPool` struct is not a multiple of 8 bytes large, so we need
to align up to get the actual start of the pool data.
2014-11-26 10:38:50 -08:00
Mark Probst c6505f7830 [sgen] Remove unused defines. 2014-11-26 10:38:50 -08:00
Mark Probst fc0780b026 [sgen] Document descriptor types in comment. 2014-11-26 10:38:49 -08:00
Mark Probst 0087b319dd [sgen] Symbolic constants for pointer-free descriptor types. 2014-11-26 10:38:49 -08:00
Mark Probst c6c6095bcf [sgen] Separate descriptor type enums. 2014-11-26 10:38:49 -08:00
Mark Probst c4a119c05e [sgen] Use a symbolic constant for the descriptor type mask. 2014-11-26 10:38:49 -08:00
Mark Probst dba00f7fc9 [sgen] Rename LARGE_BITMAP to BITMAP.
There's only one bitmap descriptor type left and no need to
distinguish between large and small.
2014-11-26 10:38:49 -08:00
Mark Probst a81428f4c9 [sgen] Use guint64 for most counters, not long long. 2014-11-26 10:38:48 -08:00
Mark Probst 78a99907c0 [sgen] Fix cementing tag bit on 32 bits.
We used the third-lowest vtable bit to tag cemented objects.  On 32 bits,
vtables are only 4-byte aligned so we have to make do with 2 bits.
2014-11-26 10:38:48 -08:00
Mark Probst 6b7bd8250c [sgen] Remove DESCRIPTOR_FAST_PATH option - don't use it.
We're removing options that we've introduced for experimentation but that
didn't pan out.
2014-11-26 10:38:48 -08:00
Mark Probst 34bb779707 [sgen] Remove MARK_ON_ENQUEUE option - always use it now.
We're removing options that we've introduced for experimentation but that
didn't pan out.
2014-11-26 10:38:48 -08:00
Mark Probst 1729d16031 [sgen] Remove GRAY_QUEUE_HAVE_DESCRIPTORS option - always use it now.
We're removing options that we've introduced for experimentation but that
didn't pan out.
2014-11-26 10:38:47 -08:00
Mark Probst 4433d45d22 [sgen] Remove USE_PREFETCH_QUEUE option - don't use it.
We're removing options that we've introduced for experimentation but that
didn't pan out.
2014-11-26 10:38:47 -08:00
Mark Probst 6c7c1b8dda [sgen] Remove BLOCK_INFO_IN_HEADER option - always use it now.
We're removing options that we've introduced for experimentation but that
didn't pan out.
2014-11-26 10:38:47 -08:00
Mark Probst eee52c4f71 [sgen] Use a smaller slot size scaling factor.
The factor we used previously gave us object sizes in increments that made
some benchmarks use quite a lot more memory than necessary.  In particular,
we didn't have a size for 24 byte objects (on 64 bits), just for 16 and 32.
2014-11-26 10:38:47 -08:00
Mark Probst 5eadfaf8bb [sgen] Make block size fastenable. 2014-11-26 10:38:47 -08:00
Mark Probst 6f4e74bf77 [sgen] Fix card scanning with larger block sizes.
The card scanning code assumed that the size of the block header is less
than the size of a card.  If we put the block info into the header and increase
the block size enough, that assumption isn't true anymore, because the
mark bits take up space in proportion to the block size.
2014-11-26 10:38:46 -08:00
Mark Probst 77d2d231f0 [sgen] Experimental pre-fetch scan fast-path.
The idea here is to first extract all the references within an object
and then to process them, pre-fetching the objects they point to a few
steps ahead.
2014-11-26 10:38:46 -08:00
Mark Probst 06d43c4a91 [sgen] Fix build for mark-on-dequeue. 2014-11-26 10:38:46 -08:00
Mark Probst a3e7d28caa [sgen] Nicer visualization of concurrent collector pauses in gcpausevis.py. 2014-11-26 10:38:46 -08:00
Mark Probst 4318dac63c [sgen] Separate binary protocol entries for concurrent update and finish. 2014-11-26 10:38:46 -08:00
Mark Probst edeb654914 [sgen] Flush binary protocol buffers after unloading a domain.
When the runtime shuts down the last thing the GC usually hears about it
is that the root domain is unloaded.  If we don't flush the binary protocol
buffers at that point, we lose entries.
2014-11-26 10:38:45 -08:00
Mark Probst 21435d870f [sgen] Fix build on C99. 2014-11-26 10:38:45 -08:00
Mark Probst bc1b889fd5 [sgen] Fix build with heavy statistics. 2014-11-26 10:38:45 -08:00
Mark Probst f61314689f [sgen] Rename sgen-major-scan-object.h to sgen-marksweep-scan-object-concurrent.h. 2014-11-26 10:38:45 -08:00
Mark Probst fc6850fd1c [sgen] Remove some dead code in sgen-major-scan-object.h. 2014-11-26 10:38:44 -08:00
Mark Probst f469db655a [sgen] Unify scanning code a bit.
We still have two separate implementations of the scanning code: The optimized
one and the old one.  The old one is still needed because it supports the concurrent
collector.  For the non-concurrent collector we can now use the optimized
implementation, however.
2014-11-26 10:38:44 -08:00
Mark Probst 32bb23041f [sgen] Add/fix some assertions. 2014-11-26 10:38:44 -08:00
Mark Probst 0bbb8c9c6f [sgen] Add some missing binary protocol invocations. 2014-11-26 10:38:44 -08:00
Mark Probst 66311912de [sgen] New protocol entry for processing of individual reference. 2014-11-26 10:38:44 -08:00
Mark Probst 60b927f6df [sgen] In binary protocol grep, gray en-/dequeue must not always match. 2014-11-26 10:38:43 -08:00
Mark Probst d4945212c5 [sgen] Remove binary protocol entry for null dequeue. 2014-11-26 10:38:43 -08:00
Mark Probst 371372c137 [sgen] Fix build on highest debug level. 2014-11-26 10:38:43 -08:00
Mark Probst 11c326fc27 [sgen] Handle copy object failure.
This is just a verbatim copy of the old code.  It's unlikely it's ever
been tested, though.
2014-11-26 10:38:43 -08:00
Mark Probst ef8b82c738 [sgen] Increase debug level of assertions in inner loops. 2014-11-26 10:38:43 -08:00
Mark Probst 5d94bc96e5 [sgen] Remove dead code.
This was still left from the parallel collector.
2014-11-26 10:38:42 -08:00
Mark Probst eddce3e79f [sgen] Fix build with prefetch queue enabled. 2014-11-26 10:38:42 -08:00
Mark Probst f0149f2a73 [sgen] Make new M&S parameters fastenable.
Fasten is a small tool for optimizing compile-time options:

    https://github.com/evincarofautumn/fasten

It does that by parsing source files for numbers that have been marked
as "fastenable", and fiddling around with them.  We do this for all
the new optimizations.
2014-11-26 10:38:42 -08:00
Mark Probst 9664e14771 [sgen] Support evacuation in the optimized mark/scan loop.
We actually implement two separate mark/scan loops: One that doesn't
support evacuation and one that does.  We dynamically choose which one
to use.  The evacuation-less loop is faster, so we use it whenever we can.
2014-11-26 10:38:42 -08:00
Mark Probst 7c4a16d41d [sgen] Move drain_gray_stack() to copy/mark header file, too.
This inlines the scan/copy functions, so if we duplicate them we need
to duplicate this, too.
2014-11-26 10:38:42 -08:00
Mark Probst 3cd8c7ea50 [sgen] Remove old copy/mark function.
The new, optimized function can now do everything the old one did, so
let's get rid of it.
2014-11-26 10:38:41 -08:00
Mark Probst 0213613f58 [sgen] Move copy/mark function into separate header file.
So we can later include them twice, once with support for evacuation
and once without.
2014-11-26 10:38:41 -08:00
Mark Probst 5d209c8563 [sgen] Support evacuation again.
The performance impact of this is significant, so we will later make
two separate scan functions: one with evacuation and one without.
2014-11-26 10:38:41 -08:00
Mark Probst 28de59a2fc [sgen] Support split nursery again.
This might degrade performance, in which case we'll special-case it
later on.
2014-11-26 10:38:41 -08:00
Mark Probst 954aac5365 [sgen] Unify the two small object mark cases again.
The only difference between these two cases was that we used to
different heavy statistics counters.  We can do that within a single
case.
2014-11-26 10:38:40 -08:00
Mark Probst 3ddf2cc00c [sgen] Use MS_MARK_OBJECT_AND_ENQUEUE where we expanded it previously.
It's still the same code, so use the macro directly.
2014-11-26 10:38:40 -08:00
Mark Probst 2b826d3d50 [sgen] Always inline the optimized copy function.
This is a huge win for some benchmarks.
2014-11-26 10:38:40 -08:00
Mark Probst ecf0597302 [sgen] Never fall back to the old copy function. 2014-11-26 10:38:40 -08:00
Mark Probst c1c1ac59ce [sgen] Use scanning macro in optimized loop.
We expanded this macro previously, but it's still the same code, so
use the macro directly.
2014-11-26 10:38:40 -08:00
Mark Probst cf4a9878da [sgen] New SMALL_PTRFREE descriptor type for faster has_references checking.
We use 3 to denote SMALL_PTRFREE, and 7 for COMPLEX_PTRFREE, so we can
check for both simply with ((desc & 3) == 3).
2014-11-26 10:38:39 -08:00
Mark Probst 52537626d9 [sgen] Only enqueue objects with references. 2014-11-26 10:38:39 -08:00
Mark Probst 6cd4d4248a [sgen] Look at descriptor, not block, to see whether object has references. 2014-11-26 10:38:39 -08:00
Mark Probst 11d1a405d6 [sgen] Special descriptor encoding for strings.
The complex pointer-free type carries no additional information.  We use its
data to mark strings so we can determine object size quicker.
2014-11-26 10:38:39 -08:00
Mark Probst abeac5f741 [sgen] Faster generic large bitmap scanning if CTZ builtin is available. 2014-11-26 10:38:39 -08:00
Mark Probst 7a91fcd059 [sgen] Remove small bitmap descriptor type.
The reason for having a small bitmap was that we could encode the object
size in the descriptor.  The main attraction for having object size handy is that
we can quickly check whether an object is in the small object major heap or
in the LOS.  We solve this problem by always using complex descriptor types
for large objects, so now we can tell whether an object is small just by looking
at the descriptor type.
2014-11-26 10:38:38 -08:00
Mark Probst adb9dbc395 [sgen] Heavy statistics on copied object descriptors. 2014-11-26 10:38:38 -08:00
Mark Probst 23a9b55767 [sgen] Heavy statistic counter for scanning of no-ref objects. 2014-11-26 10:38:38 -08:00
Mark Probst 8c5c569bc2 [sgen] Use HANDLE_PTR in the fast-path, too.
We had just expanded the macro verbatim and never changed it, so
there's no point in not using it directly.
2014-11-26 10:38:38 -08:00
Mark Probst be12da27ef [sgen] Optional scanning without the small bitmap fast path.
To experiment with different optimization combinations.
2014-11-26 10:38:37 -08:00
Mark Probst 30afbb9164 [sgen] Fix heavy statistics in mark-scan loop. 2014-11-26 10:38:37 -08:00
Mark Probst 69458165e9 [sgen] Limit run-length descriptors to small object size, too.
To identify more small objects quicker.

Since we now use the runl-length descriptor types to indicate object
size as well, and strings can have any size, we can't use that type
for strings anymore, so we use the complex type which forces us to
look up its size to determine whether it's a small or large object.
2014-11-26 10:38:37 -08:00
Mark Probst c300c3de0c [sgen] Make mark on enqueue vs dequeue configurable.
So we can experiment with a variety of optimization configurations.
2014-11-26 10:38:37 -08:00
Mark Probst 5527def76c [sgen] Make block info in header optional.
So we can experiment with a variety of optimization configurations.
2014-11-26 10:38:37 -08:00
Mark Probst 512c9866ca [sgen] Tag cemented objects so we don't have to go through the hash.
We can do the cemented check faster by using the third vtable bit to
tag cemented objects (in addition to the pinned bit).  In workloads
that are heavy on cementing (like `lcscbench` or `perimeter`) this
significantly increases performance.
2014-11-26 10:38:36 -08:00
Mark Probst 23f12565d9 [sgen] Prefetch mark bits, not block start.
When prefetching, we calculate which mark bits we need and prefetch
those for writing.  The object itself we prefetch for reading.
2014-11-26 10:38:36 -08:00
Mark Probst 15f1597e89 [sgen] Put block info into blocks.
Another experiment: What if we put the whole block info into the block
itself, not just a pointer to it.  There's one less indirection we
need to do.  On the other hand, many of them will share the same cache
lines.  So do the pointers to the block infos, though.
2014-11-26 10:38:36 -08:00
Mark Probst 9883ecf2a0 [sgen] Bring mark-scan loop stats up to date. 2014-11-26 10:38:36 -08:00
Mark Probst 32d7a0a24c [sgen] Also prefetch the (potential) block header.
When we scan a small object in the major heap we have to read the
block header of its block.  It makes sense to prefetch that as well,
in addition to the object itself.
2014-11-26 10:38:36 -08:00
Mark Probst 44e806f6cb [sgen] Count scanned objects. 2014-11-26 10:38:35 -08:00
Mark Probst ab83e6316d [sgen] Mark on dequeue, not enqueue.
This is another experiment.

When marking on enqueue, what we need to do is look at the object
we're about to enqueue, to check whether it's a small or large object.
Then, when we dequeue to scan, we look at the object again, so we
essentially fetch each live object header twice.

With mark on dequeue, when we encounter a pointer we always enqueue
it, without even looking at the object.  Only when we dequeue do we
figure out whether it's marked yet, and thus whether we need to scan
it.
2014-11-26 10:38:35 -08:00
Mark Probst 91e7454c6c [sgen] Make enqueuing descriptors compile-time optional.
We want to test this in combination with other changes, so we make
each of them configurable.
2014-11-26 10:38:35 -08:00
Mark Probst 580f250a83 [sgen] Make prefetch queue compile-time optional.
We want to benchmark the prefetch queue in combination with other
changes, so we make each of them configurable.
2014-11-26 10:38:35 -08:00
Mark Probst ca8fe2c673 [sgen] Prefetch queue for optimized mark/scan loop.
We put a short FIFO between the gray stack and the actual scanning, to
be able to prefetch objects ahead of time, with an adjustable delay.
2014-11-26 10:38:34 -08:00
Mark Probst 6b8596eb32 [sgen] Optimized mark/scan loop for major collections.
The basic idea here is to make a loop that combines dequeuing from the
gray queue, scanning and marking/copying/enqueuing, with redundancies
removed and special-casing of the common case.

We make the small bitmap type descriptor only apply to small (as
opposed to LOS) objects so that we can quickly check in that case
whether an object is in the LOS or not without actually looking up its
size.

We disable evacuation and the split nursery because the code doesn't
support them yet.
2014-11-26 10:38:34 -08:00
Mark Probst a27ab44e35 [gc] Remove the new object count counter, because it's useless.
Without heavy statistics it counts almost no objects, and even with
heavy statistics turned on, it doesn't count everything.  SGen has an
accurate counter when heavy statistics are turned on.
2014-11-26 10:38:34 -08:00
Mark Probst 04adbae448 [sgen] Fix build with binary protocol. 2014-11-26 10:38:34 -08:00
Miguel de Icaza 055495c537 Merge pull request #1426 from ignacionr/webclient-delay-file-creation
Webclient delay file creation
2014-11-26 13:06:24 -05:00
Marek Safar 4d3f26e9f0 [corlib] Implement ExecutionContext flow for async infrastructure. Fixes #24757 2014-11-26 19:01:32 +01:00
Miguel de Icaza 4e9a0636c2 Merge pull request #1398 from jwestfall69/dgv-first_row_index
[MWF] DataGridView: ensure first_row_index will be valid after row removal
2014-11-26 13:02:16 -05:00
Miguel de Icaza 668fdf5e8a Merge pull request #1396 from jwestfall69/dgvrc-clear-speedup
[MWF] DataGridViewRowCollection Clear() speed up
2014-11-26 13:01:51 -05:00
Rodrigo Kumpera 92fbdbc591 Bump the version. 2014-11-26 11:20:45 -05:00
Marek Safar b0ef65e7ac Merge pull request #1429 from mono/fixProcessStartInfo2
Fix ProcessStartInfo null checking and replace with Length checks.
2014-11-26 13:43:20 +01:00
Ungureanu Marius d22bd32f04 Fix ProcessStartInfo null checking and replace with Length checks. 2014-11-26 14:18:12 +02:00
Jo Shields 9bdd77969a [msvc] duplicate 1d6b8a75fa for eglib 2014-11-26 11:42:31 +00:00
Marek Safar c092496335 Merge pull request #1428 from mono/fixProcessStartinfo
Update ProcessStartInfo to fix some inconsistency
2014-11-26 12:40:01 +01:00
Ungureanu Marius c9ff84dacb Shortcircuit ProcessStartInfo Verbs logic.
Let's not do IO operations except if needed.
2014-11-26 13:32:59 +02:00
Marius Ungureanu f494db3690 Update ProcessStartInfo to fix some inconsistency 2014-11-26 13:32:58 +02:00
Ungureanu Marius b1cae9a156 Introduce failing ProcessStartInfo tests. 2014-11-26 13:32:49 +02:00
Marcos Henrich d7efbfe509 ConsoleUi no longer breaks when the test runner returns null.
In case the test runner returns null we will no longer suffer a NullArgumentException and the collector exceptions will be printed.
The test runner was returning null because of an IOException "Too many open files" on NUnit side.
2014-11-26 10:12:01 +00:00
Zoltan Varga c181b54945 [jit] Resurrect the precise stack marking code. 2014-11-26 06:39:58 +01:00
Rodrigo Kumpera 27f20c510e [corlib] Improve a test failure to be more actionable. 2014-11-25 18:31:26 -05:00
Rolf Bjarne Kvinge 1163db5f07 [mono-api-html] Colorize html output.
* Add support for colorizing the HTML output. This can be turned off if desired.

* Some changes are now reported inline (using colors/underline/strikeout)
  instead of generating an removed/added pair. This makes the diff
  a lot easier to read.
2014-11-25 16:39:32 +01:00
Marek Safar 15cb0daaa0 [corlib] Replace few threading types from reference sources 2014-11-25 14:45:08 +01:00
Jo Shields 1d6b8a75fa [msvc] Allow cygwin "make" to be called after winsetup.bat
As-is, winsetup.bat replaces config.h with winconfig.h, which is needed for the MSVC compilation - but breaks all further use of cygwin's make (e.g. to build the class library, or run "make install").

This patch introduces a new cygconfig.h as a backup prior to squashing config.h (if it exists, so the runtime can still be built without cygwin ever being used), and makes winconfig.h use it on non-MSVC compilers (i.e. cygwin)
2014-11-25 12:49:26 +00:00
Jo Shields 9f6f6a9cce [msvc] Fix MONO_INTERNAL undefined in Boehm 2014-11-25 12:23:20 +00:00
Jo Shields dfc037f42a Fix "make dist" issue from MS.NET regex switchover 2014-11-25 10:14:20 +00:00
Marek Safar 5517c56afa [corlib] Add check for collection modification during ForEach. Fixes #24775 2014-11-25 10:33:34 +01:00
Rolf Bjarne Kvinge 1314cf9b87 Revert "[System] Ignore two tests which are failing due to external factors changing."
This reverts commit 597183658e.

According to the comments on the commit [1], this has already been fixed.

[1] https://github.com/mono/mono/commit/597183658e04260ba493495bcff2da28222b48b8
2014-11-25 09:38:06 +01:00
Rodrigo Kumpera 695a5278d6 Revert my last change to a submodule. ALL MY LOVE TO THOSE THAT INVENTED GIT SUBMODULES. <3 2014-11-24 17:10:21 -05:00
Rodrigo Kumpera 13db0d01c0 [System.Core] Make one test much less likely to fail. 2014-11-24 17:08:02 -05:00
Zoltan Varga 45213f7b25 [Microsoft.Build.Tasks] Fix a net 2.0 failure. 2014-11-24 16:40:08 -05:00
Marek Safar c7405e6ca0 [System.ComponentModel.DataAnnotations] Replace with .net implementation 2014-11-24 20:34:18 +01:00
Marek Safar 1007750608 Fixes build 2014-11-24 18:25:34 +01:00
irodriguez f1e329b299 [Fix] WebClient to delay downloaded file creation
Fixed unwanted spaces, changed for tabs.
2014-11-25 00:07:51 +07:00
irodriguez e234b3ce16 WebClient delay file creation until a response is obtained 2014-11-24 23:49:13 +07:00
Marcos Henrich 93b6e5fbee Update .csproj files to include .NET System.Text.RegularExpressions 2014-11-24 16:31:56 +00:00
Marek Safar 1e60e2868f Bring .NET implementation of concurrent collections 2014-11-24 17:25:56 +01:00
Marek Safar a21a2bbd57 [mcs] Add special-cased HostProtectionAttribute handling 2014-11-24 17:25:56 +01:00
Miguel de Icaza 1d563aceff Remove Mono's previous System.Text.RegularExpressions 2014-11-24 10:09:06 -05:00
Marek Safar 190df2239e Remove 2.0 profile csproj files 2014-11-24 12:15:55 +01:00
Marek Safar 02332b5ad2 [System.Core] Switch to common SR class 2014-11-24 12:15:55 +01:00
Marek Safar 76f6ead615 Simplify System.Data makefile 2014-11-24 12:15:54 +01:00
Jo Shields 37ae0c6550 Add SR.cs (for Reference Source regex implementation) to EXTRA_DIST 2014-11-24 10:59:40 +00:00
Jo Shields 996a3a73a4 Fix case error causing build failure on case-sensitive filesystems 2014-11-24 09:51:35 +00:00
Zoltan Varga 941865d7ff Remove net_2_0 reference from make dist. 2014-11-24 02:15:28 -05:00
Miguel de Icaza 9dda1417d8 [System] Bring tests for open bugs on RegularExpressions that have now been fixed 2014-11-23 23:16:39 -05:00
Miguel de Icaza 26fb3a8cab Add newline 2014-11-23 21:39:53 -05:00
Miguel de Icaza 74d0eeaf13 [System] Bring .NET implementation of System.Text.RegularExpressions
This patch brings .NET's implementation of the RegularExpressions
stack and brings some of the supporting infrastructure required to
build without resource files.

The build commands have been updated with two new defines to assist in
bringing .NET code: MONO (to indicate that the code is being compiled
as part of Mono) and a more granular DISABLE_CAS_USE that is used to
mark regions where Code Access Security is being used in the source
code, as Mono does not actually ship with a working CAS implementation.
2014-11-23 21:38:36 -05:00
Zoltan Varga 4342bce441 [jit] Move the SHARED_EXT define to mono-dl.h, rename it to MONO_SOLIB_EXT. 2014-11-23 21:17:49 -05:00
Zoltan Varga 5e7af8eda4 [runtime] Remove conditional logic from LL_SO_OPEN() macro. 2014-11-23 20:49:10 -05:00
Zoltan Varga 901f3c466a Fix the mcs-compileall test target. 2014-11-23 02:59:31 -05:00
Zoltan Varga afd52c893c Remove net 2.0 dependencies from mcs tests. 2014-11-23 02:59:31 -05:00
Zoltan Varga 937175849b Remove build system support for the net 2.0/3.5 profiles. 2014-11-23 02:59:31 -05:00
Zoltan Varga 2d1c6dd04b 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:13 -05:00
Alexander Köplinger 0ee2fc301c Remove --enable-nunit-tests option from build system
It isn't used anymore as the classlib tests are always enabled now during 'make check'.
2014-11-23 03:15:11 +01:00
Alexander Köplinger 5474ae596d Added missing newline to net_4_0_System.Core.dll.sources (fixes Linux build) 2014-11-22 15:43:20 +01:00
Marek Safar 05711a1b63 Build fix 2014-11-22 15:39:11 +01:00
Marek Safar bdd4bd1066 [system.core] Enable disabled test 2014-11-22 13:48:38 +01:00
Marek Safar 92a3aeada5 Fixes typo 2014-11-22 13:48:25 +01:00
Marek Safar 9425cb5055 [system.core] Replace PLINQ implementation with .net version 2014-11-22 13:36:41 +01:00
Zoltan Varga 033a7b4c4f [runtime] Add a wrapper around atexit () since it is missing on some android versions. 2014-11-22 00:08:04 -05:00
Zoltan Varga de7963ff5b [android] Avoid referencing SYS_fork which is not defined in some ndk versions. 2014-11-21 23:16:44 -05:00
Zoltan Varga 5ee92ecb76 [android] Add a workaround for ndk r10c defining RTLD_DEFAULT as 0 on 64 bit platforms. 2014-11-21 23:15:27 -05:00
Zoltan Varga 82f95843f4 [android] Disable the usage of tkill () on android/arm64, the tkill () function is no longer there. 2014-11-21 23:14:41 -05:00
Zoltan Varga b836476666 [runtime] Remove another getdtablesize () reference. 2014-11-21 20:39:49 -05:00
Zoltan Varga cd9f3b5859 [runtime] Remove a getdtablesize () reference from eglib too. 2014-11-21 20:31:36 -05:00
Zoltan Varga cb5c0f86f3 Merge pull request #1420 from directhex/define_ssize_max_on_windows
[msvc] Define SSIZE_MAX if not already defined (i.e. on Windows)
2014-11-21 19:00:29 -05:00
Zoltan Varga 6b29297dec [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 18:45:26 -05:00
Rodrigo Kumpera c9c40ee704 Merge pull request #1423 from directhex/sgen_on_msvc
[msvc] Get sgen building on MSVC
2014-11-21 14:49:11 -05:00
Marek Safar 73bb10fff3 [mcs] Add string type to the list of valid cast tokens 2014-11-21 16:51:39 +01:00
Marek Safar a0bda09ee0 [mcs] Remove 2.0 profile dependency from one test 2014-11-21 15:20:40 +01:00
Marek Safar 63145e602a [system.net.http] Allow use of absolute url paths without scheme in HttpRequestMessage 2014-11-21 14:33:11 +01:00
Jo Shields d2b8c8557b [msvc] Add _SGen Configurations to {eglib,libgc,genmdesc}.vcxproj
These configurations are needed to build a Debug_SGen version of mono.vcxproj, which is needed to build mono-sgen.exe
2014-11-21 12:44:37 +00:00
Marek Safar d03bed3ad7 [system.net.http] set-up cancellation before any WebRequest method is called. Fixes #24704 2014-11-21 12:57:48 +01:00
Jo Shields ab61b5c7ad [msvc] Add missing sgen source files to libmonoruntime.vcxproj 2014-11-21 10:42:55 +00:00
Jo Shields 0279e7dc28 [msvc] Refreshed .def files (needed for SGen to build) 2014-11-21 10:40:39 +00:00
Marek Safar 35472d4f84 [xbuild] Change default tools profile to still work with not yet removed 2.0 profile 2014-11-21 10:31:24 +01:00
Marek Safar 91ea62331c [linq] optimize Take(0) 2014-11-21 10:27:07 +01:00
Marek Safar 3c9e0f1a43 [system.data] Fixes DbEnumerator current property to clone read data. Fixes #24452 2014-11-21 10:27:07 +01:00
Jo Shields cf4d77d21d [msvc] Define SSIZE_MAX if not already defined (i.e. on Windows)
limits.h from MSVC does not include SIZE_MAX or SSIZE_MAX. We need the latter to build sgen, so define it.
2014-11-21 09:00:31 +00:00
Rodrigo Kumpera 1230a4046e [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:33:33 -05:00
Rodrigo Kumpera b511edee10 [jit] Don't sample threads that are not fully attached. 2014-11-20 18:32:53 -05:00
Rodrigo Kumpera a82848e48d [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 17:55:05 -05:00
Rodrigo Kumpera 1d6d5ed6bc [utils] Add foreach variant that supports filtering the list as you go. 2014-11-20 17:44:26 -05:00
Mark Probst 23c99f6e4e Merge pull request #1421 from BrzVlad/fix-monitor-resurrection
Fix monitor-resurrection test.
2014-11-20 11:12:27 -08:00
Vlad Brezae 9137e16bab Fix monitor-resurrection test.
Try to avoid the pinning of the object that needs to be finalized.
2014-11-20 10:57:00 -08:00
Zoltan Varga d66079267a Merge pull request #1419 from directhex/bump_msvc_VERSION
[msvc] Bump winconfig.h VERSION to match configure.ac
2014-11-20 12:56:41 -05:00
Jo Shields 67da1215f3 [msvc] Bump winconfig.h VERSION to match configure.ac
Unhelpfully, winconfig.h is used for building eglib, and it includes a hardcoded VERSION definition which needs to match configure.ac - otherwise msvc builds identify themselves as 2.11
2014-11-20 17:11:43 +00:00
Rodrigo Kumpera afa981edc8 Merge pull request #1416 from jbevain/token-wrapper-data
[jit] Use the proper function to resolve classes
2014-11-20 12:10:23 -05:00
Marcos Henrich 253b24588b Changed ConcurrentBagTests.Bug24213 () to reuse variable array. 2014-11-20 16:18:57 +00:00
Marek Safar de75999a8a Merge pull request #1418 from esdrubal/concurrentbag
Fixed CyclicDeque array growth.
2014-11-20 15:43:21 +01:00
Marcos Henrich 3a7a058e55 Fixed CyclicDeque array growth. Fixes 24213.
Changed CyclicDeque.PushBottom to resize the array when its size is equal to its length.
2014-11-20 14:22:58 +00:00
Marcos Henrich cb5bc3ffab Test ConcurrentBag growth. Covers #24213. 2014-11-20 14:19:42 +00:00
Miguel de Icaza 50fa153b29 Merge pull request #1417 from directhex/fix_msvc_build
[msvc] Add a definition for _WIN32_WINNT to MonoPosixHelper
2014-11-20 08:13:57 -05:00
Jo Shields 076e80f725 [msvc] Add a definition for _WIN32_WINNT to MonoPosixHelper
MonoPosixHelper fails to build in my testing, due to config.h bailing the
build out if it doesn't think the build platform is XP SP2 or higher.
Adding this define forces that minimum Windows version, allowing mono.sln
to build fully.
2014-11-20 13:05:10 +00:00
Marcos Henrich 873d616b2a Added missing projects files to corlib-net_4_5.csproj 2014-11-20 12:12:49 +00:00
Jb Evain 6d5c7fedab Test sizeof, mkrefany & refanyvalue in dynamic methods
They previously resulted in TypeLoadExceptions.
2014-11-20 12:59:53 +01:00
Jb Evain 7cbf11566f [jit] Use the proper function to get classes
For the opcodes sizeof, mkrefany and refanyval the jit
was resolving the operand tokens directly from the image.

In dynamic scenarios where the tokens are stored in the
wrapper data, this triggered TypeLoadExceptions.

This patch uses mini_get_class, as used everywhere else,
to resolve the operand tokens of those opcodes.
2014-11-20 12:59:40 +01:00
Zoltan Varga 8647ae45fc 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:45:44 -05:00
Zoltan Varga 3130eb18ce Fix a warning. 2014-11-20 00:06:03 -05:00
Zoltan Varga 9d3d8a5c53 Fix a warning. 2014-11-20 00:05:36 -05:00
Mauricio Faria de Oliveira 26e016f3ad Revert "PowerPC64 ELFv2 ABI: cases for in-register parameter passing, return values, and structs"
This reverts commit ba62bdf862.

Reverting as per discussion with Zoltan Varga (see PR 1409 [1]).
Some rework needed.

[1] https://github.com/mono/mono/pull/1409

Signed-off-by: Mauricio Faria de Oliveira <[email protected]>
2014-11-19 21:56:54 -05:00
Miguel de Icaza 716b78c578 Add referencesource submodule 2014-11-19 21:01:39 -05:00
Zoltan Varga 5644d157c8 Merge pull request #1411 from jbevain/sdb-frame-domain
[sdb] Expose the domain of the stack frames
2014-11-19 20:51:34 -05:00
Zoltan Varga 2c7265d6b9 [jit] Remove an unused interpeter file. 2014-11-19 19:20:02 -05:00
Zoltan Varga fb033c5301 [jit] Remove some unused defines. 2014-11-19 19:13:01 -05:00
Stephen McConnel c735753a3c Fix bugs in sizing TableLayoutPanel (Xamarin bug 18638)
Consider spans and absolute sizes in computing PreferredSize for
TableLayoutPanel.
Also fix bug in allocating unused width to SizeType.Absolute columns.

Change-Id: Ic5065b83ced8195d1c5be39087f33b0d632fc9a6
2014-11-19 14:53:12 -06:00
Mark Probst d1b51438d1 [sgen] Remove dead code. 2014-11-19 12:46:39 -08:00
Marcos Henrich 8cdb1c959e Added Symbolicate tool.
Symbolicate tool replaces stack frames "<filename unknown>:0" with correct file name and line.
2014-11-19 19:45:15 +00:00
Miguel de Icaza 014f882aea Merge pull request #1415 from ermshiperete/FixTruncatedButton
[MWF] Fix bug that truncates button text
2014-11-19 14:05:03 -05:00
Zoltan Varga b464556d05 Merge pull request #1414 from ExonyLimited/process-vmswap
Process.PagedMemorySize64 now returns value from /proc/PID/status
2014-11-19 13:58:25 -05:00
Eberhard Beilharz da058bf8a4 [MWF] Fix bug that truncates button text
A previous change (885b065e) accidentally calculated the text size
in some places without padding. This resulted in a slightly to small
text rectangle, causing the text to be truncated.
2014-11-19 19:48:27 +01:00
Marek Safar 87f59dce24 Fixes build 2014-11-19 18:07:52 +01:00
Marek Safar 4de9aa838b [corlib] Capture awaited task exception stack. First part of #18629 2014-11-19 17:41:52 +01:00
Craig Minihan 1cc51f63ee Process.PagedMemorySize64 now returns value from /proc/PID/status 2014-11-19 08:07:37 -08:00
Rolf Bjarne Kvinge fbf1077afd Fix typo, there is no profile called 'xammaci'. 2014-11-19 10:29:33 +01:00
Mark Probst 38d9679d82 Merge pull request #1413 from BrzVlad/bin-prot-io
System calls for binary protocol writing
2014-11-18 17:59:16 -08:00
Vlad Brezae 66acb4f3e1 [sgen] Don't use standard C API for binary protocol IO.
This prevents deadlocks from libc locks when interrupting.
2014-11-18 17:56:01 -08:00
Zoltan Varga fccff0d9bb [sdb] Avoid asserts on shutdown when the appdomain unload callbacks are called on the debugger thread during shutdown. Fixes #24342. 2014-11-18 20:54:12 -05:00
Vlad Brezae 3c1147121e [sgen] Fix binary protocol build 2014-11-18 17:36:50 -08:00
Zoltan Varga 672a02e177 [jit] Fix the calculation of the epilog size for EH info. Fixes #24577. 2014-11-18 16:53:26 -05:00
Rodrigo Kumpera 4f2e8dfddd [runtime] Replace mono_method_get_signature(_full) with the _checked variant. 2014-11-18 16:51:07 -05:00
Rodrigo Kumpera f8de60d964 [runtime] Introduce mono_method_get_signature_checked as the MonoError variant of mono_method_get_signature_full. 2014-11-18 16:51:06 -05:00
Rodrigo Kumpera d67dd77506 [runtime] Remove monodiet.c. 2014-11-18 16:51:06 -05:00
Zoltan Varga 9347782b8b [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:03:51 -05:00
Rodrigo Kumpera 939fa90ceb [jit] Use _checked variant of mono_field_from_token. 2014-11-18 14:04:10 -05:00
Rodrigo Kumpera e94e5e5ac1 [runtime] Use _checked variant of mono_field_from_token. 2014-11-18 14:04:10 -05:00
Rodrigo Kumpera 01f892bdb5 [jit] Use MonoError when possible for error handling. 2014-11-18 14:04:09 -05:00
Rodrigo Kumpera d1c8e68397 [jit] Add a JIT failure mode that uses MonoError. 2014-11-18 14:04:09 -05:00
Rodrigo Kumpera c544d330dd [runtime] more loader error cleanup. 2014-11-18 14:04:09 -05:00
Marcos Henrich b717961fb6 Added opcode il_seq_point.
il_seq_point has zero length and is used in release instead of the expensive seq_point opcode.
2014-11-18 18:04:26 +00:00
Marcos Henrich 3f259a1f95 Changed METHOD_EXIT_IL_OFFSET back to 0xffffff. The previous value was -2, that could introduce comparison issues. Added flag MONO_SEQ_POINT_FLAG_EXIT_IL that is used to encode the exit IL, this avoids a 4 byte IL offset delta. 2014-11-18 18:02:52 +00:00
Marcos Henrich ac5395bc05 Added out_buf parameter to encode_var_int and decode_var_int. 2014-11-18 18:02:52 +00:00
Marcos Henrich dda58dc6e3 Renamed seq_point_info_write_size to seq_point_info_get_write_size. 2014-11-18 18:02:51 +00:00
Marcos Henrich afb8ea6a96 MonoSeqPointInfo data is now compressed. Encode data MonoSeqPointInfo len, has_debug_data and alloc_data into a single variable int. 2014-11-18 18:02:50 +00:00
Marcos Henrich ca79ee98e4 MonoSeqPointInfo no longer uses a GByteArray. GByteArray requires too much memory, we still use GByteArray to build the buffer but when its done we store in MonoSeqPointInfo a copy. 2014-11-18 18:02:50 +00:00
Marcos Henrich d4644e78ca Merged SeqPoint.next_array with SeqPoint.array. 2014-11-18 18:02:49 +00:00
Marcos Henrich eb35cc1159 SeqPoint next array is no longer allocated by default. Next array will only be allocated if has_debug_data is true. 2014-11-18 18:02:48 +00:00
Marcos Henrich 79bd3278bb Added size of sequence points to mono jit stats. 2014-11-18 18:02:48 +00:00
Marcos Henrich c243c2447f Ignore seq points of entry and exit IL offsets. Those seq points are only required for debugging. 2014-11-18 18:02:47 +00:00
Marcos Henrich a73caf9930 Changed mini-exceptions functions to get IL offsets from seq point. mono_walk_stack_full and ves_icall_get_trace are now using find_prev_seq_point_for_native_offset to retrieve IL offsets. 2014-11-18 18:02:46 +00:00
Marcos Henrich ba11c1de28 Sequence points debug data is no longer store by default. Debug data is only stored when cfg->gen_seq_points_debug_data is true. 2014-11-18 18:02:46 +00:00
Marcos Henrich e47bad43de Sequence points are now generated by default. 2014-11-18 18:02:45 +00:00
Marcos Henrich 35f6f01ac2 Changed METHOD_EXIT_IL_OFFSET to -2 The new value produces lower deltas and does not overflow when using variable integer encoding. 2014-11-18 18:02:44 +00:00
Marcos Henrich e9d6024e62 aot-runtime and aot-compiler now use seq_point_info_read/write. 2014-11-18 18:02:43 +00:00
Marcos Henrich 4947481b1a Added methods to read and write MonoSeqPointInfo. 2014-11-18 18:02:43 +00:00
Marcos Henrich 2d14735141 SeqPoint are now kept in memory with a compact encoding. MonoSeqPointInfo has now a pointer to a buffer containing encoded sequence points, and to a buffer containing next values. As there is no longer an array of SeqPoint ready to be read, SeqPointIterator was added. 2014-11-18 18:02:42 +00:00
Marcos Henrich fee5465299 Moved sequence point logic to seq-points.h and seq-points.c 2014-11-18 18:02:41 +00:00
Marcos Henrich c64e105c69 Improved exception stack frame displayed data. Added stack frame method address display. 2014-11-18 18:02:41 +00:00
Marcos Henrich a5f2606a66 Added to StackFrame a field for the method address. Incremented MONO_CORLIB_VERSION. 2014-11-18 18:02:40 +00:00
Ludovic Henry c9c80ce2ce [runtime] Fix #24605 "counters not enabled" message in monodis and peverify 2014-11-18 11:51:43 -05:00
Marek Safar 383daff454 [eval] Don't assumen all captured types have storey assigned 2014-11-18 16:51:11 +01:00
Marek Safar 281934e127 [mcs] Remove primary constructors and declaration expressions from C#6 2014-11-18 14:44:16 +01:00
Jb Evain 567834db69 [Mono.Debugger.Soft] Add test for StackFrame.Domain
Assert that the property returns the proper domain for the stack frame.
2014-11-18 14:12:36 +01:00
Marek Safar 2cee8a135e [mcs] Fix error reporting for incomplete attribute target. Fixes #24537 2014-11-18 14:11:59 +01:00
Jb Evain 2729751fcf [Mono.Debugger.Soft] Implement StackFrame.Domain
This property uses the new CMD_STACK_FRAME_GET_DOMAIN command
to retrieve and cache the domain in which the stack frame
is executing.

Bump the protocol version to match the runtime.
2014-11-18 14:10:53 +01:00
Jb Evain f37be5d96b [sdb] Add command CMD_STACK_FRAME_GET_DOMAIN
This command returns the domain in which the stack frame is executing

Bump protocol version.
2014-11-18 14:09:15 +01:00
Marek Safar 20c5941b4c [mcs] Less cascading errors 2014-11-18 13:40:56 +01:00
Alistair Leslie-Hughes b3eccc8a79 Improved support for TimeZoneInfo under windows.
When cross compiling with gcc, LIBC is defined and
thus never checks the registry for the timezone information.

This change is released under the MIT license.
2014-11-18 20:46:15 +11:00
Marek Safar b9e6127506 [mcs] Makes flow analysis of goto/goto case significantly faster. Fixes #24511 2014-11-18 10:28:55 +01:00
Zoltan Varga df8abf4920 [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:44:35 -05:00
Zoltan Varga 6b7a11a77b [aot] Disable COM support in AOT code, the COM wrapper code doesn't play well with AOT. 2014-11-17 17:42:35 -05:00
Mark Probst 40c30b5288 Merge pull request #1406 from BrzVlad/monitor-resurrect
Keep the monitor link to the object active also in the resurrection case
2014-11-17 14:17:32 -08:00
Rodrigo Kumpera 3ad76e42b2 Merge pull request #1388 from schani/fix-23401
Fix 23401
2014-11-17 17:17:04 -05:00
Zoltan Varga b3e8e1fa20 [runtime] Avoid crashes when a non-runtime thread receives a SIGQUIT. 2014-11-17 17:03:41 -05:00
Sebastien Pouliot 59b80fb93b Merge pull request #1408 from brendanzagaeski/signed-xml-bug-7716
[System.Security] Fix SignedXml bug #7716 with tests
2014-11-17 16:32:54 -05:00
Zoltan Varga e52d20ed7d [arm] Applied patch from Richard Dunkley <[email protected]>. Fix complication problems with newer gcc versions. Fixes #24588. 2014-11-17 15:46:39 -05:00
Brendan Zagaeski c5375566d5 [System.Security] Fix SignedXml bug #7716 with tests
The underlying problem for bug 7716 [1] was that the Mono C14N XML
canonicalizer was not sorting the XML attributes in the same order as
Microsoft .NET's canonicalizer.

The C14N specification [2] states: "the attributes are sorted
lexicographically by attribute name (based on Unicode character code
points)." This wording suggests that the order of attributes should be
strictly ascending based on Unicode byte value. This commit changes the
attribute sort order to match the specification.

The new tests pass on Windows, fail on Mono before this change, and
succeed on Mono after this change.

[1] https://bugzilla.xamarin.com/show_bug.cgi?id=7716
[2] http://www.w3.org/TR/2000/WD-xml-c14n-20000119.html
2014-11-17 15:45:53 -05:00
Chris Hubbard b47c95d902 Fix crash when removing last item in ListView
When the VirtualListSize changes, the focus_item_index should
be reset (similar to how it currently resets the selected indices).

If the last item in a ListView has focus and it is removed by
an another action on the form (i.e. push a button to remove the
current item), then the focused_item_index is not updated when
the VirtualListSize changes, even though that item doesn't exist
anymore.  When the ListView receives focus again, it tries to
invalidate the current focused item which causes an
ArgumentOutOfRangeException.
2014-11-17 15:35:33 -05:00
Vlad Brezae 09edaaf4d4 Keep the monitor link to the object active also in the resurrection case.
The MonoThreadsSync data field contains a weak reference to the object that uses the structure, which should be a tracking one.
2014-11-17 12:23:32 -08:00
Rodrigo Kumpera c12c27a9a9 Merge pull request #1405 from mono/revert-1289-stackframe
Revert "Improved exception stack frame displayed data."
2014-11-17 14:39:43 -05:00
Rodrigo Kumpera 7e7fce7bf1 Revert "Improved exception stack frame displayed data." 2014-11-17 14:37:41 -05:00
Rodrigo Kumpera f256f515de Merge pull request #1289 from esdrubal/stackframe
Improved exception stack frame displayed data.
2014-11-17 12:44:35 -05:00
Marcos Henrich 937c7233d2 Changed METHOD_EXIT_IL_OFFSET back to 0xffffff.
The previous value was -2, that could introduce comparison issues.
Added flag MONO_SEQ_POINT_FLAG_EXIT_IL that is used to encode the exit IL, this avoids a 4 byte IL offset delta.
2014-11-17 20:47:43 +08:00
Marcos Henrich 8bf7d26eaa Added out_buf parameter to encode_var_int and decode_var_int. 2014-11-17 18:20:15 +08:00
Marcos Henrich c6fb27e6e9 Renamed seq_point_info_write_size to seq_point_info_get_write_size. 2014-11-17 17:54:51 +08:00
Marcos Henrich 0f2444e940 MonoSeqPointInfo data is now compressed.
Encode data MonoSeqPointInfo len, has_debug_data and alloc_data into a single variable int.
2014-11-17 17:54:50 +08:00
Marcos Henrich 698e12809f MonoSeqPointInfo no longer uses a GByteArray.
GByteArray requires too much memory, we still use GByteArray to build the buffer but when its done we store in MonoSeqPointInfo a copy.
2014-11-17 17:54:49 +08:00
Marcos Henrich 95b1a5bbf9 Merged SeqPoint.next_array with SeqPoint.array. 2014-11-17 17:54:49 +08:00
Marcos Henrich 63dce7b8e3 SeqPoint next array is no longer allocated by default.
Next array will only be allocated if has_debug_data is true.
2014-11-17 17:54:48 +08:00
Marcos Henrich ba7b9fc562 Added size of sequence points to mono jit stats. 2014-11-17 17:54:48 +08:00
Marcos Henrich 49b7ef4442 Ignore seq points of entry and exit IL offsets.
Those seq points are only required for debugging.
2014-11-17 17:54:47 +08:00
Marcos Henrich 6dea3629f7 Changed mini-exceptions functions to get IL offsets from seq point.
mono_walk_stack_full and ves_icall_get_trace are now using find_prev_seq_point_for_native_offset to retrieve IL offsets.
2014-11-17 17:54:46 +08:00
Marcos Henrich e8412d602f Sequence points debug data is no longer store by default.
Debug data is only stored when cfg->gen_seq_points_debug_data is true.
2014-11-17 17:54:45 +08:00
Marcos Henrich d55bb757b3 Sequence points are now generated by default. 2014-11-17 17:54:23 +08:00
Mauricio Faria de Oliveira 3953793f0c [ppc] Bump (more) instruction sizes after 51c454f6b0.
This fixes ~30 ppc-specific failures in mono/tests (e.g., appdomain), like this:
	wrong maximal instruction length of instruction atomic_add_i4 (expected 20, got 28)
	* Assertion: should not be reached at mini-ppc.c:5235

The commit 51c454f6b0 introduced 2 ppc_sync
instructions in OP_ATOMIC_CAS_I4/8 *and* OP_ATOMIC_ADD_NEW_I4/8 (mini-ppc64.c).

Accordingly, commit 83a34c40c6 updated the maxlength
(+8 bytes) of atomic_cas_i4/8 - *but not* atomic_add_new_i4/8 (cpu-ppc64.md).

Recently, commit b784b866da made atomic_add_new_i4/8
exercised (as 'atomic_add_i4/8') - with an incorrect/non-updated 20-byte maxlength,
which should actually be 28.

Thus:
	wrong maximal instruction length of instruction atomic_add_i4 (expected 20, got 28)

Signed-off-by: Mauricio Faria de Oliveira <[email protected]>
2014-11-17 02:34:13 +00:00
Bill Seurer ba62bdf862 PowerPC64 ELFv2 ABI: cases for in-register parameter passing, return values, and structs
The ELFv2 ABI specifies some particular cases for in-register parameter
passing, return values, float/double structs; e.g.,
- small struct returned via registers (2 doublewords)
- homogeneous float struct returned via registers (8 members)
- small float struct passed/returned via FR registers
- return via multiple registers

Author: Bill Seurer <[email protected]>
Origin: https://launchpad.net/ubuntu/+source/mono/3.2.8+dfsg-4ubuntu2
Changes: Mauricio Faria de Oliveira <[email protected]>

Signed-off-by: Mauricio Faria de Oliveira <[email protected]>
2014-11-17 02:34:12 +00:00
Michael Matz 5785fd898a Use ppc_r12 for some global call sequences
After the mechanical exchange of ppc_r11 and ppc_r12 we now can use
ppc_r12 for global calls to hold the callees address without clobbering
r11 (which potentially contains IMT_REG, VTABLE_REG and RGCTX_REG).
We don't need to change all indirect calls, only those potentially reaching
functions containing a TOC setup based on r12 (in particular functions
in shared libs).  As the instruction sequence patcher can only deal
with one destination register we also need to make some additional
calls use r12.  We probably should convert all calls that currently
use r0 to use r12 if no other conflicts arise but this is enough to build.

Author: Michael Matz <[email protected]>
Origin: https://build.opensuse.org/request/show/225490
Changes: Mauricio Faria de Oliveira <[email protected]>

Signed-off-by: Mauricio Faria de Oliveira <[email protected]>
2014-11-17 02:34:11 +00:00
Michael Matz 02cdf6abca Switch ppc_r11 with ppc_r12
This is a preliminary patch for ppc64le ELFv2 support.  That one requires
r12 to hold a functions address at calls to normal (global) C functions.
As is r12 is also used by mini for its IMT_REG, VTABLE_REG and RGCTX_REG
to pass around values to functions outside the normal argument registers
(ugh!), so there's a conflict.  This mechanical (by sed) patch simply switches
ppc_r11 and ppc_r12 everywhere, r11 doesn't have any special use in the ABI.

Author: Michael Matz <[email protected]>
Origin: https://build.opensuse.org/request/show/225490
Changes: Mauricio Faria de Oliveira <[email protected]>

Signed-off-by: Mauricio Faria de Oliveira <[email protected]>
2014-11-17 02:34:10 +00:00
Michael Matz d9a3c39a04 Basic ppc64le support
This adds initial support for ppc64le to the ppc64 port.  That is:
* little endian aware (also in strtod),
* and ELFv2 aware (not using function descriptors)
* adjust various block sizes to be multiple of 64k, the default
  pagesize on ppc64le.  The sources should have used the system function
  to ensure alignment on pagesize, so this is just a stop-gap

It also corrects the list of registers for the precise GC, but that isn't
used in mini at all on any architecture currently.

Author: Michael Matz <[email protected]>
Origin: https://build.opensuse.org/request/show/225490
Changes: Mauricio Faria de Oliveira <[email protected]>

Signed-off-by: Mauricio Faria de Oliveira <[email protected]>
2014-11-17 02:33:59 +00:00
Jim Westfall 24742dc038 [MWF] Fix off-by-one from 5a5c683
first_row_index needs to be <= RowsLeft - 1, since we are comparing a
row count vs an index.
2014-11-15 09:35:54 -08:00
Marcos Henrich 4c8d5ee138 Changed METHOD_EXIT_IL_OFFSET to -2
The new value produces lower deltas and does not overflow when using variable integer encoding.
2014-11-15 03:44:10 +08:00
Marcos Henrich 49c48add7b aot-runtime and aot-compiler now use seq_point_info_read/write. 2014-11-15 03:44:09 +08:00
Marcos Henrich eecf7a8ab5 Added methods to read and write MonoSeqPointInfo. 2014-11-15 03:44:09 +08:00
Marcos Henrich 09bd838116 SeqPoint are now kept in memory with a compact encoding.
MonoSeqPointInfo has now a pointer to a buffer containing encoded sequence points, and to a buffer containing next values.
As there is no longer an array of SeqPoint ready to be read, SeqPointIterator was added.
2014-11-15 03:44:08 +08:00
Marcos Henrich d07e74a3f1 Moved sequence point logic to seq-points.h and seq-points.c 2014-11-15 03:44:07 +08:00
Marcos Henrich afc92f22dc Improved exception stack frame displayed data.
Added stack frame method address display.
2014-11-15 03:43:54 +08:00
Marcos Henrich 20523739f8 Added to StackFrame a field for the method address.
Incremented MONO_CORLIB_VERSION.
2014-11-15 03:34:31 +08:00
Zoltan Varga 4f237e0ce1 [runtime] Fix the errors in edb931dfb9 so it actually works. 2014-11-13 22:26:14 -05:00
fquiroz01 d380ffbb48 Add IE9 and newer to Up level navigator
This line enable the ASP Javascript validators in IE9 and upper. the user agent the IE10 is "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)".
2014-11-13 22:05:39 -05:00
Mark Probst 06b8128992 [sgen] Add a FIXME. 2014-11-13 15:46:05 -08:00
Mark Probst 7bd3bd73d5 [sgen] Never mark from two threads at the same time.
We don't update mark bits atomically, so we can't have two threads
marking at the same time, which means we have to stop the concurrent
collector worker thread while we do work in the main GC thread.  That
includes nursery collections, because they also touch mark bits.

Also problematic are mod-union updates.  The worker threads can add
global remsets, which they do in the main cardtable.  This will conflict
with updating the mod-union table, so having the workers stopped also
applies there.
2014-11-13 15:46:01 -08:00
Mark Probst e12085b4c9 [sgen] Reorganize sgen_perform_collection for clarity. 2014-11-13 15:44:28 -08:00
Mark Probst 1624ec14c3 [sgen] Make check-mark-bits work again. 2014-11-13 15:44:28 -08:00
Mark Probst b87d9685bb [sgen] Scan the whole nursery in the finish mark pause.
Before we do all the major heap work in the finish mark pause of a
concurrent collection, we perform a nursery collection, for simplicity's
sake.

The nursery collection left pinned objects in the nursery, without
following their references into the major heap, so the major heap work
had to scan those objects again.  There was no special provisioning
for this—major mark would do the pinning again, and we would
automatically end up scanning the objects again.

The way we determine the stack end for the GC thread, however,
had the effect of making pinning non-deterministic.  We would
conservatively scan part of the GC thread's stack, which was
subject to change, to pinning again might result in less or more
objects pinned.

The proper solution would be to determine the stack end correctly,
but for now we will just the whole nursery.
2014-11-13 15:44:27 -08:00
Mark Probst 537665b54e [sgen] Only count cards for STW protocol if heavy is enabled. 2014-11-13 15:44:26 -08:00
Mark Probst 3639ee61f1 [sgen] Binary protocol entry for pin stage. 2014-11-13 15:44:15 -08:00
Mark Probst fbfe8518ce [sgen] Add missing volatile. 2014-11-13 15:44:14 -08:00
Rolf Bjarne Kvinge 597183658e [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:31:16 +01:00
Jonathan Pryor 6299445e81 [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 13:36:45 -05:00
Jonathan Pryor 09d16b7265 [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 13:36:45 -05:00
Marek Safar 3d293f5a71 [xbuild] Add 14.0 toolchain 2014-11-13 18:37:43 +01:00
Marek Safar 4697ef6e77 [mcs] More updates to auto-properties v6 implementation 2014-11-13 17:19:04 +01:00
Jim Westfall ad651ff43b [MWF] Add unit test for #24372 2014-11-12 19:50:32 -08:00
Zoltan Varga a32054ece9 [jit] Fix gshared and aot support for --debug=casts. 2014-11-12 20:12:44 -05:00
Zoltan Varga cdfb430b48 [jit] Fix --debug=casts support for casts in gshared methods. 2014-11-12 19:58:27 -05:00
Jonathan Pryor 789517f878 [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:34:21 -05:00
Rodrigo Kumpera b486e8372e [runtime] Fix a deadlock introduced in the last commit. 2014-11-12 16:49:30 -05:00
Rodrigo Kumpera 363e4bb2a6 [runtime] What MonoImage::ptr_cache with the image lock. Do optimistic locking here too. 2014-11-12 11:29:07 -05:00
Rodrigo Kumpera 2ef2b0d754 [runtime] Replace the loader lock when protecting the global module map. 2014-11-12 11:29:06 -05:00
Rodrigo Kumpera c6b845ea23 Add comment on one usage of the loader lock. 2014-11-12 11:29:06 -05:00
Rodrigo Kumpera 0526aa45e0 [runtime] Protect MonoImage::files with the image lock and make image loading optimistic. 2014-11-12 11:29:06 -05:00
Rodrigo Kumpera 4fe5a46e55 Change mono_class_from_generic_parameter to use the image lock.
We change the function to use the lock/validate pattern. This is both
more scalable and enables us to use the image lock, since the amount of
work done with it held is now trivial.
2014-11-12 11:29:06 -05:00
Rodrigo Kumpera 532420cc64 Reduce usage of the loader lock in method lookup.
The function mono_method_inflated_lookup no longer needs the loader lock to be held
as the hashtable is now protected by the imageset lock.

This means that mono_class_inflate_generic_method_full_checked doesn't need to take the
loader lock.

The function mono_method_set_generic_container uses mono_image_property_insert which takes
the image lock and not the loader lock. Adjust the locking comment.
2014-11-12 11:29:06 -05:00
Zoltan Varga 50e286b2e7 Fix the mobile build. 2014-11-11 20:11:45 -05:00
Zoltan Varga 60d83a46e7 [aot] Avoid an assert when AOTing a non-mobile mscorlib in a runtime with COM disabled. 2014-11-11 20:11:45 -05:00
Ludovic Henry 83fac07316 [perfcounters,proflog,mprof-report] Add support for Performance Counters sampling in the log profiler 2014-11-11 13:46:47 -05:00
Ludovic Henry 7b59f2dcf1 [counters,proflog] Add mono_counters_on_register/delete callbacks + Use them in proflog
This is used for counters that are defined after runtime initialization. It implies that TYPE_SAMPLE_COUNTERS_DESC can now be emitted at any time, and not only once.
2014-11-11 13:40:29 -05:00
Ludovic Henry 734b0e9d32 [counters] Make API thread safe 2014-11-11 13:40:28 -05:00
Ludovic Henry fcfb6c2935 [perf-counters] Fix return of the same counter even with different a counter parameter
The same counter instance would be returned if we use the "instance" parameter instead of the "counter"
parameter. Also it is the name of the counter that is stored in mono_perfcounter_create (mono-perfcounters.c:1488).
2014-11-11 13:40:27 -05:00
Ludovic Henry dc139819ea [perf-counters] Declare shared data header type directly after creation
Fix the following bug : shared_data_find_room return twice the same memory region because it was not marked as "in use" by setting the header.ftype value.
This bug is triggered when we want to create a new shared area (for example a new FTYPE_INSTANCE area) while creating another area (for example a new FTYPE_CATEGORY).
2014-11-11 13:40:27 -05:00
Ludovic Henry 38f2bff71d [perf-counters] Fix bug on SharedCounter decoding
The structure of the encoded SharedCounter is as follow :
 - compressed data type : 1 byte
 - index in the category : 1 byte
 - name of the counter : null terminated string
 - help of the counter : null terminated string
2014-11-11 13:40:26 -05:00
Marek Safar b82016bf29 [xbuild] Change default tools profile 2014-11-11 18:49:30 +01:00
Marek Safar eed64a2729 [corlib] Fix culture info error message. Fixes #24431 2014-11-11 15:53:04 +01:00
Marek Safar 9ddd46b890 [mcs] Extended pragma warning syntax 2014-11-11 15:42:05 +01:00
Marek Safar 31b2d60549 [mcs] Use same result bucket for extension method lookup in all types of using expression 2014-11-11 11:25:28 +01:00
Jim Westfall 5a5c683696 [MWF] DataGridView: ensure first_row_index will be valid after row removal
DataGridView keeps track of the first visible row in first_row_index.
DataGridViewRowCollection will notify DataGridView its about to delete 1 or
more rows via OnRowsPreRemovedInternal().  When this happens, we need to
ensure first_row_index will still fall within the number of rows that
will remain after the row removal.

This fixes https://bugzilla.xamarin.com/show_bug.cgi?id=24372 which I
reported.
2014-11-10 19:20:56 -08:00
Zoltan Varga c09cd684b4 Add a test for #24419. 2014-11-10 20:54:12 -05:00
Zoltan Varga 5dd3347588 [jit] Remove some special casing from LDTOKEN, it doesn't seem to be needed. Fixes #24419. 2014-11-10 20:49:21 -05:00
Rodrigo Kumpera 5a2ef1b76f [runtime] Remove the second signal used by profiling and now multiplex distribution and sampling with the same signal. 2014-11-10 18:42:05 -05:00
Rodrigo Kumpera e6c3ff7551 [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:41:25 -05:00
Rodrigo Kumpera 4d12ed3356 [profiler] Guard against null sbuff when serializing statistical data. 2014-11-10 18:41:20 -05:00
Rodrigo Kumpera a18dffad0d [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:41:15 -05:00
Rodrigo Kumpera 3aa7f41bed [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:41:11 -05:00
Rodrigo Kumpera 412ed8153a [runtime] Harden the profiler signal handlers against not fully attached threads and HP reentrancy. 2014-11-10 18:41:05 -05:00
Zoltan Varga 25e04fa019 Revert "Disable building the NET 2.0 profile by default."
This reverts commit 458c9456f0.

This still breaks the build.
2014-11-10 17:46:34 -05:00
Zoltan Varga 458c9456f0 Disable building the NET 2.0 profile by default. 2014-11-10 15:43:53 -05:00
Zoltan Varga a8c183ac63 [jit] Get rid of the mono_arch_sigctx_to_monoctx()/monoctx_to_sigctx () functions, use mono_sigctx_to_monoctx()/monoctx_to_sigctx() instead. 2014-11-10 14:31:29 -05:00
Zoltan Varga a87062a145 [jit] Use xmm5 as an fp scratch register on winx64. 2014-11-10 14:04:23 -05:00
Jonathan Pryor 7f0da57a65 Merge pull request #1393 from akoeplinger/refresh-mdoc-expected
[mdoc] Refreshed the en.expected.importecmadoc files to fix errors after the recent XML changes

Output was generated on .NET, and thus is canonical.
2014-11-10 13:52:11 -05:00
Marek Safar 7c024c1d5a [mcs] Encode more win32 version info attributes. Fixes #23981 2014-11-10 16:09:38 +01:00
Marek Safar b7a8bfc7ad Merge pull request #1334 from ztone/delegate
Fix PrepareEmit error when evaluating delegates
2014-11-10 12:03:23 +01:00
Zoltan Varga 7e056cd346 [jit] Move the ppc sigctx<->monoctx conversion code to mono-context.c. 2014-11-10 05:22:04 -05:00
Zoltan Varga 1af68a199e Remove some dead code. 2014-11-10 05:06:51 -05:00
Zoltan Varga 0d1555dbd5 Fix the android build. 2014-11-09 21:41:43 -05:00
Miguel de Icaza fb3468e61c Merge pull request #1390 from woodsb02/FreeBSDMacNetworkInterfaces
Freebsd to use Mac NetworkInterface code instead of Linux NetworkInterface code
2014-11-09 20:17:50 -05:00
Zoltan Varga ab1c14290f Merge pull request #1392 from ludovic-henry/pr34-proflog-counters-sample-shutdown
[proflog] Add counters sampling on profiler shutdown and startup
2014-11-09 18:30:15 -05:00
Jim Westfall 7d1b878fbf [MWF] DataGridViewRowCollection Clear() speed up
When issuing a Clear() to remove all rows, a ReIndex() was being called for
each row that was being removed.  This is extremely inefficient, instead
do a single ReIndex() after all rows have been removed.

Before doing a Clear() of 30k rows was taking 5.8 seconds.  With this patch
it now takes 670ms.
2014-11-08 16:37:33 -08:00
Zoltan Varga 690a646c5e Merge pull request #1395 from ludovic-henry/pr38-proflog-only-counters
[proflog] Add onlycounters parameters which disable event dumping
2014-11-08 13:27:28 -05:00
Ludovic Henry bbfb0e86f3 [proflog] Add countersonly parameters which disable event dumping
This is useful in the case of the benchmarking suite because we are only interested in the counters, and they represent a minimal part of the output file size.
2014-11-08 10:40:34 -05:00
Zoltan Varga a255b522cb Fix a uninitialized variable warning. 2014-11-07 18:50:26 -05:00
Zoltan Varga 7d319221f1 Fix a problem introduced by e19f539121. 2014-11-07 16:53:22 -05:00
Zoltan Varga e19f539121 [amd64] Make xmm6:xmm15 callee saved on winx64 as required by the ABI. 2014-11-07 15:33:57 -05:00
Mark Probst 730d0ccd6f Merge pull request #1385 from BrzVlad/fin-hash
[sgen] Use hash based on current address for finalization hashes.
2014-11-07 12:14:48 -08:00
Alexander Köplinger 0442cdbc19 [System] Fixed formatting of new ClientWebSocket test and disabled it
We need to have an implementation for HttpListenerContext.AcceptWebSocketAsync () first before it works.
2014-11-07 20:16:51 +01:00
Alexander Köplinger 59d2397abc Merge branch 'patch-1' of https://github.com/ReubenBond/mono into ReubenBond-patch-1 2014-11-07 20:14:29 +01:00
Miguel de Icaza c97100c88d Merge pull request #1394 from kjpou1/master
Fix GetUsing to output the using name instead of -> using Mono.CSharp.Na...
2014-11-07 12:20:29 -05:00
Kenneth Pouncey de3ff228dc Add space 2014-11-07 16:59:42 +01:00
Kenneth Pouncey 3664e4c5a7 Add space 2014-11-07 16:57:41 +01:00
Kenneth Pouncey db2381da04 Fix GetUsing to output the using name instead of -> using Mono.CSharp.NamespaceExpression; <- for every using statement that was set
+ Fix NRE when source_file or source_file.Usings is null. This will now return back an empty string or empty List
+ **Note** that we are returning the ToString() value of NamespaceExpression which is the full resolved namespace of "System.Drawing" instead of "Drawing".
+ Add ToString override for NamespaceExpression to return the full resolved name of the namespace.
2014-11-07 16:41:05 +01:00
Atsushi Eno 367d417207 [Mono.Posix] consider nano time info in UnixFileSystemInfo.Last*Time.
Before this change, those Last*Time properties returned only based on
seconds (truncated), which could cause inaccurate time comparison.
Consider code like this:

var fileUpdated = DateTime.Now;
...
File.WriteAllText (path, "foobar");
...
if (fileUpdated > new UnixFileInfo (path).LastWriteTime)
   OnUpdatedFile (path);

This could always result in raising update event, even if there was
no update after writing.

Last*Time With milliseconds makes it very unlikely to happen.
2014-11-07 20:42:25 +08:00
Alexander Köplinger e1900d6dc2 [mdoc] Refreshed the en.expected.importecmadoc files to fix errors after the recent XML changes
The XML work in 661430fd1f and bf39f5aec0 changed the whitespace handling, so the mdoc test suite failed.
Refreshing the files makes them identical to what MS.NET produces and fixes the mdoc tests.
2014-11-07 12:34:26 +01:00
Atsushi Eno bf39f5aec0 [xml] XmlElement.InnserXml seems to preserve whitespaces.
Fix for mdoc test regression (see commit comments on #661430f).
2014-11-07 15:35:40 +08:00
Zoltan Varga edb931dfb9 [runtime] Use a separate signal with the SA_RESTART flag set for suspending/resuming threads during debugging on android, since lots of android native code cannot handle the interruptions caused by the normal abort signal. Fixes #22968/#23987. 2014-11-06 19:44:57 -05:00
Ludovic Henry e41c4efed5 [proflog] Add counters sampling on runtime initialized 2014-11-06 15:25:04 -05:00
Ludovic Henry 8a1db154e1 [proflog] Add counters sampling on profiler shutdown 2014-11-06 15:17:17 -05:00
Ben Woods ba998de3c9 Freebsd to use Mac NetworkInterface code instead of Linux NetworkInterface code 2014-11-06 17:27:36 +08:00
Mark Probst b9061f8807 [sgen] When out of memory, finish concurrent with scanning whole nursery. Fixes #23401.
If we run out of memory during the nursery collection in the finishing collection pause,
there will be late-pinned objects in the nursery: pinned objects that were not pinned
from conservative roots (or cementing).  We need to scan those, too, so in that case
we just walk the nursery and scan all objects.
2014-11-05 16:27:02 -08:00
Mark Probst 9bf45cc5ba [sgen] Make check-mark-bits also scan nursery objects. 2014-11-05 16:27:02 -08:00
Mark Probst d69d4c2472 [sgen] Optional check that the concurrent collector doesn't update references. 2014-11-05 16:27:02 -08:00
Mark Probst 9ed222bd75 [sgen] Add assertions. 2014-11-05 16:27:02 -08:00
Mark Probst 2ba7fb3a36 [sgen] Move heap checks before pinning. 2014-11-05 16:27:01 -08:00
Mark Probst b479e83275 [sgen] Stop concurrent worker during concurrent update and nursery collections.
The two collectors stepped on each other's toes.  Specifically, updating the mod union
card table while the worker thread might mark cards in the card table will not work.

The simplest solution for now is to stop the worker thread during concurrent updates
and nursery collections.  In the future we can have the thread help with the nursery
collection.
2014-11-05 16:27:01 -08:00
Mark Probst 72bd6b96fb [sgen] Remove workers_marking - workers are always marking. 2014-11-05 16:27:01 -08:00
Mark Probst 5479dd7e38 [sgen] Implement a proper state machine for workers.
What we had previously was an impromptu state machine that was
badly implemented, hard to reason about, and not easily extensible.
2014-11-05 16:27:01 -08:00
Mark Probst ef8f07687d [sgen] Fix build with heavy binary protocol. 2014-11-05 16:27:00 -08:00
Mark Probst 47287a6784 [sgen] Fix cementing with concurrent M&S.
Cementing can happen during a concurrent collection when processing
the cardtable.  We use a separate cementing hash during concurrent
collections but we didn't pin objects from there.
2014-11-05 16:27:00 -08:00
Zoltan Varga 363302f71f Install Mono.Cecil in the net 4.5 profile. 2014-11-05 17:31:48 -05:00
Zoltan Varga ed65bc251d Revert "Disable building the NET 2.0 profile by default."
This reverts commit fe265502cc.

Revert this for now as it breaks too much stuff.
2014-11-05 16:57:00 -05:00
Marcos Henrich 570cb1a10a Changed script DateTime.Now_Test.sh to use the compiled csharp.exe. 2014-11-05 16:38:39 +00:00
Marcos Henrich b324cecd4f TZ display name changes no longer reset adjustment rules.
Reset of adjustment rules is mandatory when the base offset is changed because the rules are relative to the base offset.
Adjustment rules are now kept until the base offset changes.
2014-11-05 16:30:13 +00:00
Radek Doulik d8aad87c88 [linker] blacklist System.Net.Sockets.MulticastOption fields
- merge fix for https://bugzilla.xamarin.com/show_bug.cgi?id=21578
   the MulticastOption's 'private IPAddress local' field was
   removed by linker and the app crashed later at runtime.
 - when System.Net.Sockets.MulticastOption object
   is passed to System.Net.Sockets.Socket.SetSocketOption
   and thru it to System.Net.Sockets.Socket.SetSocketOption_internal
   it accesses passed object fields
   (thru few more native calls).
2014-11-05 13:00:37 +01:00
Zoltan Varga 1ea6921beb Merge pull request #1387 from akoeplinger/improve-bug652331_2
[System.ServiceModel] Fixed Bug652331_2 test that failed on Jenkins by increasing timeout
2014-11-04 23:18:11 -05:00
Zoltan Varga 2a11a2f11b [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:45:23 -05:00
Rodrigo Kumpera d51f34fd21 [profiler] Expose new profiling modes and allow sampling rate to be set when using signal-based sampling. 2014-11-04 19:30:02 -05:00
Rodrigo Kumpera 9522723493 [profiler] Add new profiler API mono_profiler_set_statistical_mode that gives control to statistical mode and sampling rate. 2014-11-04 19:30:02 -05:00
Rodrigo Kumpera 53cd89d23a [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-04 19:30:02 -05:00
Rodrigo Kumpera f34e6426f9 Make mono_threads_pthread_kill available to mach targets. 2014-11-04 19:30:01 -05:00
Zoltan Varga 82cfc3ea31 Make the build in docs/ uses the net 4.5 profile. 2014-11-04 18:24:27 -05:00
Zoltan Varga fe265502cc Disable building the NET 2.0 profile by default. 2014-11-04 17:49:18 -05:00
Zoltan Varga f6da6fa9ea Fix the loadable llvm build. 2014-11-04 16:44:39 -05:00
Zoltan Varga f812f43d2e [llvm] Add beginnings of support for emitting dwarf debug info for LLVM code. Not enabled yet, since it would clash with the dwarf info emitted by the AOT compiler for JITted code. 2014-11-04 16:20:05 -05:00
Alexander Köplinger d3ee9252da [System.ServiceModel] Fixed Bug652331_2 test that failed on Jenkins by increasing timeout
Looks like the test takes quite a while so 10 seconds was just too short. Increasing the timeout to 20s seems to fix it.
2014-11-04 21:17:26 +01:00
Jonathan Pryor c84d28ca73 [mscorlib] Marshal.GetExceptionForHR() takes an errorInfo parameter.
Parameter names are part of the ABI because of C#4 named parameter.
Consequently, they *must* be consistent with .NET, and .NET a
parameter name of "errorInfo", *not* "errorInfoPtr" [0]:

	public static Exception GetExceptionForHR(
		int errorCode,
		IntPtr errorInfo
	)

Change the parameter name from `errorCodeInfo` to `errorCode` so that
the parameter name is consistent with .NET.

[0]: http://msdn.microsoft.com/en-us/library/3xade62s(v=vs.100).aspx
2014-11-04 14:26:32 -05:00
Alexander Köplinger fc02486d6a Fix NET_2_0 build 2014-11-04 10:49:57 +01:00
Miguel de Icaza 9bb11ade6d Merge pull request #1363 from martinjt/AddMembershipPasswordAttribute
Added the MembershipPasswordAttribute class and associated unit tests
2014-11-04 12:51:53 -05:00
Vlad Brezae b160f1e3b7 [sgen] Use hash based on current address for finalization hashes.
Extend functionality of SgenPointerQueue.

The purpose of this commit is to avoid dependency between GC code and the obtaining of the hash from the object's synchronisation field, which might require additional processing.
2014-11-03 17:30:31 -08:00
Zoltan Varga 92c91d75f0 [jit] Factor out duplicate code from the castclass/unbox.any opcode implementation. 2014-11-03 17:53:21 -05:00
Martin Thwaites 1c6da6b912 Added the MembershipPasswordAttribute class and associated unit tests 2014-11-03 21:40:44 +00:00
Zoltan Varga 7b4bd74b4d [jit] Reenable the more efficient cast code in gshared methods. 2014-11-03 16:06:46 -05:00
Marcos Henrich e5fc5450dd Merge pull request #1185 from esdrubal/http-reuse
Allow stream reuse when InputStream has been disposed.
2014-11-03 11:41:13 +00:00
Miguel de Icaza 09308892bd Merge pull request #1347 from ermshiperete/ImproveEllipsisHandling
[MWF] Improve ellipsis handling
2014-11-02 12:36:49 -05:00
Alexander Köplinger 57feacab95 Add missing newline in .sources file, should fix build 2014-10-31 23:07:28 +01:00
Miguel de Icaza 716c7ad122 [asp.net] Implement the EventHandlerTaskAsyncHelper and HttpTaskAsyncHandler classes; Manually bring Pull Request 1365 from Kornel Pal 2014-11-01 21:23:15 -04:00
Miguel de Icaza 0afdce4e37 Merge pull request #1371 from martinjt/AddClientDisconnectedToken
Add ClientDisconnectedToken property to HttpResponseBase and Wrapper as ...
2014-11-01 20:50:48 -04:00
Miguel de Icaza 5c23f1e15d Set ReadEntityBodyMode default to Classic to force clients to use the old method
for reading the input stream.

According to the MSDN docs, if ReadEntityBodyMode returns "Classic" the code should use
the old method to read the input stream (HttpRequestBase.InputStream) which is fully
implemented in mono.

Manually applied patch from martinjt
2014-11-01 20:49:10 -04:00
Miguel de Icaza b11044a9a6 [asp.net] Implement the EventHandlerTaskAsyncHelper and HttpTaskAsyncHandler classes; Manually bring Pull Request 1365 from Kornel Pal 2014-11-01 20:48:12 -04:00
Miguel de Icaza e4d8f21cf6 Merge pull request #1163 from AerisG222/more_mvc_fixes
Add missing elements to allow MVC5.2 site to run
2014-11-01 20:36:49 -04:00
Atsushi Eno 661430fd1f [xml] XmlDocument.ReadNode() should not special case XmlTextReader.
Added test case that proves this change (by baulig).
2014-11-01 00:06:05 +08:00
Miguel de Icaza 3fd4901a23 Merge pull request #960 from ermshiperete/ShowHelp
[MWF] Partially implement Help.ShowHelp
2014-10-31 11:20:20 -04:00
João Matos 100ecb4f0f Merge pull request #1360 from madewokherd/winuncpath
File URI's without a host are not UNC paths on Windows.
2014-10-31 13:52:33 +00:00
Mark Probst 000c018169 [sgen] Add an explanatory comment about OOM. 2014-10-30 16:28:03 -07:00
Zoltan Varga f85a6bc77c [runtime] Fix the android build with ndk r10c. 2014-10-30 18:44:05 -04:00
Rodrigo Kumpera f05e658a2d Merge pull request #1381 from schani/fix-23401
Fix 23401
2014-10-30 18:43:36 -04:00
Zoltan Varga dbfee6a340 [aot] Remove some obsolete TODOs. 2014-10-30 17:56:19 -04:00
Zoltan Varga bf6fea51af [aot] Use the info->tramp_page_code_offsets array on arm as well. 2014-10-30 17:52:33 -04:00
Zoltan Varga 74d2172cd1 Fix a warning. 2014-10-30 17:28:31 -04:00
Zoltan Varga b40386d4f4 Add the -Qunused-arguments warning to CPPFLAGS too. 2014-10-30 17:28:22 -04:00
Zoltan Varga 7c162f952c [llvm] Remove the unused LLVM_MAJOR_VERSION/LLVM_MINOR_VERSION defines. 2014-10-30 17:23:18 -04:00
Alexander Köplinger 3c533de4a8 Add files that were forgotten in 6af7989628, which is the re-apply of 950d9c8a56 2014-10-30 22:16:35 +01:00
Mark Probst 5eec4d0c84 [sgen] Don't store pin queue addresses, only indexes. Fixes #24084.
The pin queue can get relocated as a side-effect of resizing when late
pinning happens, so we can't count on pointers into it to remain valid.
2014-10-30 13:34:44 -07:00
Mark Probst 45fc2e14fd [sgen] Fix crash in late pinning.
Our code assumed that late-pinned objects don't have a tag, but they
obviously have the pin tag, so use the safe function.
2014-10-30 13:30:26 -07:00
Mark Probst 03494c7387 [sgen] Don't loop endlessly when out of memory. 2014-10-30 13:30:26 -07:00
Ryan J. Melena ef13507552 Revert incorrect changes from commit 950d9c8a56
Correctly handle null value deserialization in non-generic Deserialize(string, Type) method.
2014-10-30 16:19:40 -04:00
Miguel de Icaza 6af7989628 Re-apply the patch, there isa fix for it 2014-10-30 16:19:07 -04:00
Zoltan Varga f269254917 [Mono.Data.Tds] Allow sending of text data longer than 4000 characters by using a different column type. Fixes #21172. 2014-10-30 14:39:44 -04:00
Miguel de Icaza 112079b844 Revert this patch, as it broke the test suite 2014-10-30 13:54:33 -04:00
Jonathan Pryor ac1dcc6ade [System.Core/Android] Update TimeZone database self test.
Add Makefile rules to automagically download the TimeZone database
from the Android target $(ADB_TARGET), and build the tzi.exe app.

	$ make android-dump-tzdata ADB_TARGET=-d
	# downloads timezone data into ./android/tzdb.
	# dumps timezone data into ./android/tzdata
	# builds ./tzi.exe

	# Show adjustment rules for a given timezone dump
	$ mono tzi.exe -i=tzdata/Asia/Amman

Add `tzi.exe -R` option to show the TimeZoneInfo.GetAdjustmentRules()
output for all encountered timezones.

Add `tzi.exe -o=PATH` option to dump the TimeZone data to disk for
interrogation.

Add `tzi.exe -i=PATH` option to read in the specified TimeZone data
file and dump the rules contained therein.

Update usage comments.
2014-10-30 12:42:37 -04:00
Zoltan Varga dacc3f8c5d Merge pull request #944 from ermshiperete/bug-novell-496138
Improve COM error handling
2014-10-29 19:06:05 -04:00
Zoltan Varga 6a738caa5a [corlib] Add some missing memory barriers to the ConcurrentQueue methods to order memory operations. Fixes #22788. 2014-10-29 17:14:10 -04:00
Zoltan Varga bd715a7c5e Merge pull request #1378 from DynamicDevices/ajl/warnings
[libgc] Eliminate warning about redefinition of GC_WIN32_THREADS
2014-10-29 15:03:31 -04:00
Miguel de Icaza c265540e76 Merge pull request #1337 from RyanMelenaNoesis/master
Additional JWT Security Token Support
2014-10-29 15:02:30 -04:00
Alexis Christoforides d585381555 Bump Mono version -> 3.12.1 2014-10-29 13:16:04 -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
Alex J Lennon 41981cdca1 [libgc] Eliminate warning about redefinition of GC_WIN32_THREADS
Makefile defines GC_WIN32_THREADS as 1 but gc_config_macros was
redefining as defined but with no value.

Signed-off-by: Alex J Lennon <[email protected]>
2014-10-29 14:27:01 +01: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
Martin Thwaites b7b94a8024 Add ClientDisconnectedToken property to HttpResponseBase and Wrapper as default None 2014-10-26 23:42:54 +00: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
Mike Morano d35449e99b Add/update missing bits in order to support MVC5.2. 2014-10-26 11:14:08 -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
Stone Gislason f1108aabba [eval] Fix delegate; add caching for PrepareEmit
The delegate class did not use the internal cache flag as other type definitions which caused the next evaluation to fail.
2014-10-26 01:15:37 +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
Eberhard Beilharz 5d869be794 [MWF] Improve ellipsis handling
- Don't subtract room for ellipsis. Ellipsis should be
  handled by the renderer so we shouldn't reserve space for it.
  Otherwise we end up not getting ellipsis (because the renderer
  thinks there is enough space available), or we don't use up the
  available space.
- Don't allow text to go below button if we want to show ellipsis.
2014-10-24 22:38:56 +02:00
Eberhard Beilharz ab361102db [MWF] Display visual feedback on pressed button (#23869)
When a button is pressed the image and the text needs to be rendered one
pixel to the right and to the bottom so that there is some visual
feedback of the button press. Previously this was only the case if
TextImageRelation was set to Overlay.
2014-10-24 22:26:59 +02: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
Vincent Povirk dd68e53636 File URI's without a host are not UNC paths on Windows.
NUnit breaks when these URI's are treated as UNC paths, so I have no way of
running the tests on Windows without this change to see if it broke anything.
Not all URI tests pass, but the ones that fail seem unrelated to my change.

On Unix, the tests all work, but of course on Unix this is a no-op.

This commit licensed as MIT/X11.
2014-10-23 16:12:30 -05: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
Ryan Melena 950d9c8a56 Additional JWT Security Token Support
Fix line endings.  Add test for JavaScriptSerializer.Deserialize(string input, Type targetType).
2014-10-20 16:00:16 -05: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
Jo Shields f600c130ef Add a third AOT location, alongside ~/.mono/aot-cache and the assembly dir
Unless running in on-demand AOT mode, the AOT runtime will look for an AOT cache alongside the assembly (e.g. /usr/lib/mono/4.5/mscorlib.dll.so).

This patch adds a second search path to the non-on-demand AOT loader, /usr/lib/mono/aot-cache/ARCHITECTURE/path/to/assembly.dll.so

This new structure makes it possible to have more than one Mono architecture on a system, sharing assemblies but not sharing AOT caches (for example, i386 and amd64 Mono on the same system, for different needs)
2014-10-13 09:24:07 +01: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
Stephen McConnel 82093256f4 Fix potential crash in ListView.ItemControl.ItemsMouseDown
This fixes Xamarin bug 23591.  Side-effects of internal processing of
ItemsMouseDown can cause ItemsMouseUp before ItemsMouseUp has finished.
2014-10-03 13:09:10 -05: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
Stephen McConnel b3214a4a42 Remove excessive shortcut key matching in ToolStrip
This fixes https://bugzilla.xamarin.com/show_bug.cgi?id=23532.
2014-10-01 15:04:39 -05: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
Neale Ferguson dbd022aba4 Enable build on RHEL and CentOS 2014-09-29 17:34:38 -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 30ec69fd50 Allow stream reuse when InputStream has been disposed.
If InputStream is disposed FlushInput now sets it to null so a new one can be created.
2014-09-23 18:44:49 +01:00
Marcos Henrich 6a249a5611 Test connection reuse. 2014-09-23 18:44:49 +01: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
Marcos Henrich 1852905c44 Test that wrong ISO8601 dates throw FormatException. 2014-09-05 21:31:53 +08: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
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
Rodrigo Kumpera 6bee6a7b18 [runtime] Remove the interpreter. 2014-09-01 13:27:03 -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
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
Reuben Bond eeac252404 Test ClientWebSocket.SendAsync EndOfMessage 2014-06-21 14:57:56 +10:00
Reuben Bond bbbe1e52d3 ClientWebSocket: SendAsync endOfMessage inverted.
endOfMessage should indicate whether or not additional message parts will follow the current one. Currently, the meaning in ClientWebSocket.cs is inverted: !endOfMessage indicates that no more parts will follow the current one.

See the WebSockets RFC, 'frame-fin' at the top of http://tools.ietf.org/html/rfc6455#page-31.
Also see the MSDN docs for SendAsync: http://msdn.microsoft.com/en-us/library/system.net.websockets.websocket.sendasync(v=vs.110).aspx
2014-06-20 16:48:36 +10:00
MarkS 707051b342 [MWF] Partially implement Help.ShowHelp 2014-03-17 12:30:16 +01:00
Eberhard Beilharz 2d420bfb7a Set ErrorInfo in Marshal.GetHRForException
Marshal.GetHRForException had a MonoTODO because it needs to set
the errorinfo object so that exceptions get properly passed to
unmanaged code. Since not all managed exceptions have a corresponding
HR value but we might need to get to the original thrown exception
we implement a ManagedErrorInfo helper class that implements the
IErrorInfo interface but also stores the exception.

In GetExceptionForHR we check if the errorinfo we get is a
ManagedErrorInfo. If it is we return the exception stored in there
(if it converts to the same error code), otherwise we construct a new
exception.
2014-03-13 18:55:39 +01:00
Eberhard Beilharz 554d6abf4c Properly convert COM error codes to C# exceptions
Also use additional information provided by IErrorInfo to fill in
exception details.

To make use of IErrorInfo on Linux a suitable implementation has to be
provided, e.g. by including libcom plus adding a mapping from
oleauth32.dll to the shared library that provides the implementation.

This completes mono bug 496138
(https://bugzilla.novell.com/show_bug.cgi?id=496138)
2014-03-13 18:53:57 +01:00
2705 changed files with 45589 additions and 279393 deletions

No files matched your search

+1
View File
@@ -69,6 +69,7 @@ config.status
config.sub
configure
configure.scan
cygconfig.h
depcomp
install-sh
libtool
+8
View File
@@ -16,6 +16,7 @@
[submodule "external/rx"]
path = external/rx
url = git://github.com/mono/rx.git
branch = rx-oss-v2.2
[submodule "external/ikvm"]
path = external/ikvm
url = git://github.com/mono/ikvm-fork.git
@@ -25,3 +26,10 @@
[submodule "external/ikdasm"]
path = external/ikdasm
url = git://github.com/mono/ikdasm.git
[submodule "external/referencesource"]
path = external/referencesource
url = git://github.com/mono/referencesource
branch = mono
[submodule "external/reference-assemblies"]
path = external/reference-assemblies
url = git://github.com/mono/reference-assemblies.git
+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
+3 -3
View File
@@ -8,7 +8,7 @@ if CROSS_COMPILING
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
# Keep in sync with SUBDIRS
## 'tools' is not normally built
DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
else
if ONLY_MONOTOUCH
SUBDIRS = $(MONOTOUCH_SUBDIRS) runtime
@@ -19,7 +19,7 @@ else
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
# Keep in sync with SUBDIRS
## 'tools' is not normally built
DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
endif
endif
endif
@@ -52,7 +52,7 @@ dist-hook:
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
rm -rf `find $(top_distdir)/external -path '*\.git'`
rm -f `find $(top_distdir)/external -path '*\.exe'`
rm -f `find $(top_distdir)/external -path '*\.dll'`
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/reference-assemblies/v4\.0*'`
cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
# Disable this for now because it is very slow and causes wrench to timeout:
+122 -247
View File
@@ -1,152 +1,61 @@
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.
It is an open source implementation of Microsoft's .NET Framework based on the ECMA standards for C# and the Common Language Runtime.
[![Build Status](http://jenkins.mono-project.com/job/test-mono-mainline/badge/icon/)](http://jenkins.mono-project.com/job/test-mono-mainline/)
1. [Installation](#compilation-and-installation)
1. [Compilation and Installation](#compilation-and-installation)
2. [Using Mono](#using-mono)
3. [Directory Roadmap](#directory-roadmap)
4. [Contributing to Mono] (#contributing-to-mono)
5. [Git submodules maintenance](#git-submodules-maintenance)
6. [Reporting bugs](#reporting-bugs)
4. [Contributing to Mono](#contributing-to-mono)
5. [Reporting bugs](#reporting-bugs)
6. [Configuration Options](#configuration-options)
**Build Status**
| debian-amd64 | debian-i386 | centos-s390x | windows-amd64 |
|:------------:|:-----------:|:------------:|:-------------:|
| [![debian-amd64](http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/badge/icon)](http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/) | [![debian-i386](http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/badge/icon)](http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/) | [![centos-s390x](http://jenkins.mono-project.com/job/test-mono-mainline/label=centos-s390x/badge/icon)](http://jenkins.mono-project.com/job/test-mono-mainline/label=centos-s390x/) | [![windows-amd64](https://ci.appveyor.com/api/projects/status/1e61ebdfpbiei58v/branch/master?svg=true)](https://ci.appveyor.com/project/ajlennon/mono-817/branch/master) |
Compilation and Installation
============================
a. Build Requirements
Building the Software
---------------------
* On Itanium, you must obtain libunwind: http://www.hpl.hp.com/research/linux/libunwind/download.php4
Please see our guides for building Mono on
[Mac OS X](http://www.mono-project.com/docs/compiling-mono/mac/),
[Linux](http://www.mono-project.com/docs/compiling-mono/linux/) and
[Windows](http://www.mono-project.com/docs/compiling-mono/windows/).
* On Solaris
1. Make sure that you used GNU tar to unpack this package, as
Solaris tar will not unpack this correctly, and you will get strange errors.
2. Make sure that you use the GNU toolchain to build the software.
3. Optional dependencies
* libgdiplus - Required for System.Drawing. This library in turn requires glib and pkg-config
* pkg-config - Available at: http://www.freedesktop.org/Software/pkgconfig
* glib 2.4 - Available at: http://www.gtk.org/
* libzlib - This library and the development headers are required for compression
file support in the 2.0 profile.
4. Mono is required to build Mono. Use a system package or monolite (explained further below)
5. If you have a system Mono (not monolite), you will need to read this: http://mono-project.com/Parallel_Mono_Environments#Setting_up_a_Build_Environment
b. Building the Software
------------------------
If you obtained this package as an officially released tarball,
this is very simple, use configure and make:
`./configure --prefix=/usr/local ; make ; make install`
Mono supports a JIT engine on x86, SPARC, SPARCv9, S/390,
S/390x, AMD64, ARM and PowerPC systems.
If you obtained this as a snapshot, you will need an existing
Mono installation. To upgrade your installation, unpack both
mono and mcs:
tar xzf mcs-XXXX.tar.gz
tar xzf mono-XXXX.tar.gz
mv mono-XXX mono
mv mcs-XXX mcs
cd mono
./autogen.sh --prefix=/usr/local
make
The Mono build system is silent for most compilation commands.
To enable a more verbose compile (for example, to pinpoint
problems in your makefiles or your system) pass the V=1 flag to make, like this:
` make V=1`
c. Building the software from GIT
---------------------------------
If you are building the software from GIT, make sure that you
have up-to-date mcs and mono sources:
* If you are an anonymous user: `git clone git://github.com/mono/mono.git`
* If you are a Mono contributor with read/write privileges: `git clone [email protected]:mono/mono.git`
Then, go into the mono directory, and configure:
cd mono
./autogen.sh --prefix=/usr/local
make
For people with non-standard installations of the auto* utils and of
pkg-config (common on misconfigured OSX and windows boxes), you could get
an error like this:
./configure: line 19176: syntax error near unexpected token 'PKG_CHECK_MODULES(BASE_DEPENDENCIES,' ...
This means that you need to set the ACLOCAL_FLAGS environment variable
when invoking autogen.sh, like this:
ACLOCAL_FLAGS="-I $acprefix/share/aclocal" ./autogen.sh --prefix=/usr/local
where $acprefix is the prefix where aclocal has been installed.
This will automatically go into the mcs/ tree and build the
binaries there.
This assumes that you have a working mono installation, and that
there's a C# compiler named 'mcs', and a corresponding IL
runtime called 'mono'. You can use two make variables
EXTERNAL_MCS and EXTERNAL_RUNTIME to override these. e.g., you
can say:
make EXTERNAL_MCS=/foo/bar/mcs EXTERNAL_RUNTIME=/somewhere/else/mono
Note that building from Git assumes that you already have Mono installed,
so please download and [install the latest Mono release](http://www.mono-project.com/download/)
before trying to build from Git. This is required because the Mono build
relies on a working Mono C# compiler to compile itself
(also known as [bootstrapping](http://en.wikipedia.org/wiki/Bootstrapping_(compilers))).
If you don't have a working Mono installation
---------------------------------------------
If you don't have a working Mono installation, an obvious choice
is to install the latest released packages of 'mono' for your
distribution and running `autogen.sh; make; make install` in the
mono module directory.
If you don't have a working Mono installation, you can try a slightly
more risky approach: getting the latest version of the 'monolite' distribution,
which contains just enough to run the 'mcs' compiler. You do this with:
You can also try a slightly more risky approach: this may not work,
so start from the released tarball as detailed above.
# Run the following line after ./autogen.sh
make get-monolite-latest
This works by first getting the latest version of the 'monolite'
distribution, which contains just enough to run the 'mcs'
compiler. You do this with:
This will download and place the files appropriately so that you can then
just run:
# Run the following line after ./autogen.sh
make get-monolite-latest
make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/basic.exe
This will download and automatically gunzip and untar the
tarball, and place the files appropriately so that you can then
just run: `make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/gmcs.exe`
That will use the files downloaded by 'make get-monolite-latest.
The build will then use the files downloaded by `make get-monolite-latest`.
Testing and Installation
------------------------
You can run *(part of)* the mono and mcs test suites with the command: `make check`.
All tests should pass.
If you want more *extensive* tests, including those that test the
class libraries, you need to re-run 'configure' with the
'--enable-nunit-tests' flag, and try: `make -k check`
You can run the mono and mcs test suites with the command: `make check`.
Expect to find a few test suite failures. As a sanity check, you
can compare the failures you got with
https://wrench.mono-project.com/Wrench/
can compare the failures you got with [https://wrench.mono-project.com/Wrench/](https://wrench.mono-project.com/Wrench/)
and [http://jenkins.mono-project.com/](http://jenkins.mono-project.com/).
You can now install mono with: `make install`
@@ -154,8 +63,86 @@ You can verify your installation by using the mono-test-install
script, it can diagnose some common problems with Mono's install.
Failure to follow these steps may result in a broken installation.
d. Configuration Options
------------------------
Using Mono
==========
Once you have installed the software, you can run a few programs:
* `mono program.exe` runtime engine
* `mcs program.cs` C# compiler
* `monodis program.exe` CIL Disassembler
See the man pages for mono(1), mcs(1) and monodis(1) for further details.
Directory Roadmap
=================
* `data/` - Configuration files installed as part of the Mono runtime.
* `docs/` - Technical documents about the Mono runtime.
* `external/` - Git submodules for external libraries (Newtonsoft.Json, ikvm, etc).
* `man/` - Manual pages for the various Mono commands and programs.
* `mcs/` - The class libraries, compiler and tools
* `class/` - The class libraries (like System.*, Microsoft.Build, etc.)
* `mcs/` - The Mono C# compiler written in C#
* `tools/` - Tools like gacutil, ikdasm, mdoc, etc.
* `mono/` - The core of the Mono Runtime.
* `arch/` - Architecture specific portions.
* `cil/` - Common Intermediate Representation, XML
definition of the CIL bytecodes.
* `dis/` - CIL executable Disassembler
* `io-layer/` - The I/O layer and system abstraction for
emulating the .NET IO model.
* `metadata/` - The object system and metadata reader.
* `mini/` - The Just in Time Compiler.
* `runtime/` - A directory that contains the Makefiles that link the
mono/ and mcs/ build systems.
* `samples/` -Some simple sample programs on uses of the Mono
runtime as an embedded library.
* `scripts/` - Scripts used to invoke Mono and the corresponding program.
* `../olive/` - Incubation code from [Olive](https://github.com/mono/olive).
* If the directory ../olive is present (as an
independent checkout) from the Mono module, that
directory is automatically configured to share the
same prefix than this module gets.
Contributing to Mono
====================
Before submitting changes to Mono, please review the [contribution guidelines](http://www.mono-project.com/community/contributing/).
Please pay particular attention to the [Important Rules](http://www.mono-project.com/community/contributing/#important-rules) section.
Reporting bugs
==============
To submit bug reports, please use [Xamarin's Bugzilla](https://bugzilla.xamarin.com/)
Please use the search facility to ensure the same bug hasn't already
been submitted and follow our [guidelines](http://www.mono-project.com/community/bugs/make-a-good-bug-report/)
on how to make a good bug report.
Configuration Options
=====================
The following are the configuration options that someone
building Mono might want to use:
@@ -164,17 +151,16 @@ building Mono might want to use:
compilation of a Mono runtime with the SGen garbage collector.
* On platforms that support it, after building Mono, you will have
both a mono binary and a mono-sgen binary. Mono uses Boehm, while
mono-sgen uses the Simple Generational GC.
both a `mono` binary and a `mono-sgen` binary. `mono` uses Boehm, while
`mono-sgen` uses the Simple Generational GC.
* `--with-gc=[boehm, included, sgen, none]` - Selects the default Boehm garbage
* `--with-gc=[included, boehm, none]` - Selects the default Boehm garbage
collector engine to use.
* *included*: (*slighty modified Boehm GC*)
This is the default value, and its
the most feature complete, it will allow Mono
to use typed allocations and support the
debugger.
This is the default value for the Boehm GC, and it's
the most feature complete, it will allow Mono
to use typed allocations and support the debugger.
* *boehm*:
This is used to use a system-install Boehm GC,
@@ -267,30 +253,6 @@ and runtime.
* This defaults to `yes`.
* `--with-moonlight=yes,no`
* Whether you want to generate the Silverlight/Moonlight
libraries and toolchain in addition to the default
(1.1 and 2.0 APIs).
* This will produce the `smcs` compiler which will reference
the Silverlight modified assemblies (mscorlib.dll,
System.dll, System.Code.dll and System.Xml.Core.dll) and turn
on the LINQ extensions for the compiler.
* `--with-moon-gc=boehm,sgen` - Select the GC to use for Moonlight.
* *boehm*:
Selects the Boehm Garbage Collector, with the same flags
as the regular Mono build. This is the default.
* *sgen*:
Selects the new SGen Garbage Collector, which provides
Generational GC support, using the same flags as the
mono-sgen build.
* This defaults to `boehm`.
* `--with-libgdiplus=installed,sibling,<path>` - Configure where Mono
searches for libgdiplus when running System.Drawing tests.
@@ -298,7 +260,7 @@ searches for libgdiplus when running System.Drawing tests.
library is available to Mono through the regular
system setup.
* `sibling' can be used to specify that a libgdiplus
* `sibling` can be used to specify that a libgdiplus
that resides as a sibling of this directory (mono)
should be used.
@@ -405,13 +367,13 @@ for Mono. The LLVM code generator and optimizer will be
used instead of Mono's built-in code generator for both
Just in Time and Ahead of Time compilations.
* See the http://www.mono-project.com/Mono_LLVM for the
* See http://www.mono-project.com/docs/advanced/mono-llvm/ for the
full details and up-to-date information on this feature.
* You will need to have an LLVM built that Mono can link
against.
* The --enable-loadedllvm variant will make the LLVM backend
* The `--enable-loadedllvm` variant will make the LLVM backend
into a runtime-loadable module instead of linking it directly
into the main mono binary.
@@ -445,7 +407,6 @@ not done much testing with Mono.
runtime that contains DTrace probes and can
participate in the system profiling using DTrace.
* `--disable-dev-random`
* Mono uses /dev/random to obtain good random data for
@@ -464,89 +425,3 @@ http://code.google.com/p/nativeclient/
* Currently this is used with Mono's AOT engine as
Native Client does not support JIT engines yet.
Using Mono
==========
Once you have installed the software, you can run a few programs:
* `mono program.exe` runtime engine
* `mcs program.cs` C# compiler
* `monodis program.exe` CIL Disassembler
See the man pages for mono(1), mint(1), monodis(1) and mcs(2)
for further details.
Directory Roadmap
=================
* `docs/` - Technical documents about the Mono runtime.
* `data/` - Configuration files installed as part of the Mono runtime.
* `mono/` - The core of the Mono Runtime.
* `metadata/` - The object system and metadata reader.
* `mini/` - The Just in Time Compiler.
* `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.
* `samples/` -Some simple sample programs on uses of the Mono
runtime as an embedded library.
* `scripts/` - Scripts used to invoke Mono and the corresponding program.
* `runtime/` - A directory that contains the Makefiles that link the
mono/ and mcs/ build systems.
* `../olive/`
* If the directory ../olive is present (as an
independent checkout) from the Mono module, that
directory is automatically configured to share the
same prefix than this module gets.
Contributing to Mono
====================
Before submitting changes to Mono, please review the contribution guidelines at http://mono-project.com/Contributing. Please pay particular attention to the [Important Rules](http://mono-project.com/Contributing#Important_Rules) section.
Git submodules maintenance
==========================
Read documentation at http://mono-project.com/Git_Submodule_Maintenance
Maintainer
==========
Mono is maintained by miguel@xamarin.com
Reporting bugs
==============
To submit bug reports, please use Xamarin's Bugzilla:
https://bugzilla.xamarin.com/
Please use the search facility to ensure the same bug hasn't already
been submitted and follow our guidelines on how to make a good bug
report:
http://mono-project.com/Bugs#How_to_make_a_good_bug_report
+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
+40 -80
View File
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
#AC_PREREQ([2.62])
AC_INIT(mono, [3.10.1],
AC_INIT(mono, [3.99.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=
@@ -578,6 +578,7 @@ else
fi
CFLAGS="$CFLAGS -g $WARN"
CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -g"
CPPFLAGS="$CPPFLAGS -g $WARN"
# Where's the 'mcs' source tree?
if test -d $srcdir/mcs; then
@@ -767,7 +768,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'"
@@ -941,6 +942,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)
@@ -1194,7 +1200,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)
@@ -1213,6 +1219,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)
@@ -2282,6 +2289,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
@@ -2291,9 +2299,6 @@ fi
AC_ARG_ENABLE(bcl-opt, [ --disable-bcl-opt BCL is compiled with no optimizations (allows accurate BCL debugging)], test_bcl_opt=$enableval, test_bcl_opt=yes)
AC_ARG_ENABLE(nunit-tests, [ --enable-nunit-tests Run the nunit tests of the class library on 'make check'])
AM_CONDITIONAL(ENABLE_NUNIT_TESTS, [test x$enable_nunit_tests = xyes])
AC_MSG_CHECKING([if big-arrays are to be enabled])
AC_ARG_ENABLE(big-arrays, [ --enable-big-arrays Enable the allocation and indexing of arrays greater than Int32.MaxValue], enable_big_arrays=$enableval, enable_big_arrays=no)
if test "x$enable_big_arrays" = "xyes" ; then
@@ -2452,8 +2457,6 @@ if test "x$enable_llvm" = "xyes"; then
# Should be something like '2.6' or '2.7svn'
llvm_version=`$LLVM_CONFIG --version`
major_version=`echo $llvm_version | cut -c 1`
minor_version=`echo $llvm_version | cut -c 3`
llvm_api_version=`$LLVM_CONFIG --mono-api-version 2>/dev/null`
AC_MSG_CHECKING(LLVM version)
AC_MSG_RESULT($llvm_version)
@@ -2474,14 +2477,8 @@ if test "x$enable_llvm" = "xyes"; then
AC_MSG_ERROR([Compiling with stock LLVM is not supported, please use the Mono LLVM repo at https://github.com/mono/llvm, with the GIT branch which matches this version of mono, i.e. 'mono-2-10' for Mono 2.10.])
fi
AC_DEFINE_UNQUOTED(LLVM_MAJOR_VERSION, $major_version, [Major version of LLVM libraries])
AC_DEFINE_UNQUOTED(LLVM_MINOR_VERSION, $minor_version, [Minor version of LLVM libraries])
AC_DEFINE_UNQUOTED(LLVM_VERSION, "$llvm_version", [Full version of LLVM libraties])
# Have to pass these on the command line since mini-llvm-cpp.h already includes
# llvm's config.h
LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_MAJOR_VERSION=$major_version -DLLVM_MINOR_VERSION=$minor_version"
AC_SUBST(LLVM_CFLAGS)
AC_SUBST(LLVM_CXXFLAGS)
AC_SUBST(LLVM_LIBS)
@@ -2498,8 +2495,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"
@@ -2512,7 +2507,6 @@ XINERAMA="libXinerama.so.1"
sizeof_register="SIZEOF_VOID_P"
jit_wanted=true
interp_wanted=false
sgen_supported=false
boehm_supported=true
case "$host" in
@@ -2521,7 +2515,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([],[
@@ -2539,7 +2532,6 @@ case "$host" in
i*86-*-*)
TARGET=X86;
arch_target=x86;
JIT_SUPPORTED=yes
case $host_os in
solaris*)
LIBC="libc.so"
@@ -2585,7 +2577,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
@@ -2617,7 +2608,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)])
@@ -2630,7 +2620,6 @@ case "$host" in
TARGET=SPARC
fi
arch_target=sparc;
JIT_SUPPORTED=yes
ACCESS_UNALIGNED="no"
case $host_os in
linux*) ;;
@@ -2663,7 +2652,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
@@ -2674,7 +2662,6 @@ case "$host" in
TARGET=ARM;
arch_target=arm;
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
sgen_supported=true
;;
@@ -2682,7 +2669,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__"
@@ -2692,7 +2678,6 @@ case "$host" in
# TARGET=ARM;
# arch_target=arm;
# ACCESS_UNALIGNED="no"
# JIT_SUPPORTED=yes
# sgen_supported=true
# AOT_SUPPORTED="no"
# ;;
@@ -2700,7 +2685,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
;;
@@ -2708,7 +2692,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"
;;
@@ -2724,9 +2707,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
@@ -2764,7 +2745,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__ \
@@ -2774,7 +2754,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
@@ -2791,9 +2770,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
@@ -2808,10 +2785,31 @@ 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*-linux-*)
TARGET=ARM64;
arch_target=arm64;
AC_DEFINE(TARGET_ARM64, 1, [...])
AC_DEFINE(TARGET_ANDROID, 1, [...])
CPPFLAGS="$CPPFLAGS"
# 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])
@@ -2934,27 +2932,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"
@@ -3229,8 +3207,6 @@ case "x$libgc" in
;;
esac
AC_ARG_WITH(profile2, [ --with-profile2=yes,no If you want to install the 2.0/3.5 FX (defaults to yes)], [], [with_profile2=yes])
AC_ARG_WITH(profile4, [ --with-profile4=yes,no If you want to install the 4.0 FX (defaults to yes)], [], [with_profile4=yes])
AC_ARG_WITH(profile4_5,[ --with-profile4_5=yes,no If you want to install the 4.5 FX (defaults to yes)], [], [with_profile4_5=yes])
AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=no])
AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no,only If you want to build the MonoTouch assemblies (defaults to no)], [], [with_monotouch=no])
@@ -3265,7 +3241,7 @@ AC_ARG_WITH(mcs_docs,[ --with-mcs-docs=yes,no If you want to build the
DISABLE_MCS_DOCS=yes
fi
])
if test x$with_profile4 != xyes; then
if test x$with_profile4_5 != xyes; then
DISABLE_MCS_DOCS=yes
fi
@@ -3305,8 +3281,6 @@ dnl Consistency settings
dnl
if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then
DISABLE_MCS_DOCS=yes
with_profile2=no
with_profile4=no
with_profile4_5=no
with_monodroid=no
with_monotouch=no
@@ -3329,8 +3303,6 @@ AC_SUBST(OPROFILE_LIBS)
libmono_ldflags="$libmono_ldflags $LIBS"
AM_CONDITIONAL(INSTALL_2_0, [test "x$with_profile2" = xyes])
AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes])
AM_CONDITIONAL(INSTALL_4_5, [test "x$with_profile4_5" = xyes])
AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" != "xno"])
AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" != "xno"])
@@ -3357,8 +3329,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)
@@ -3378,11 +3348,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
@@ -3579,7 +3545,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
@@ -3720,10 +3685,7 @@ fi
echo "EXTENSION_MODULE = 1" >> $srcdir/$mcsdir/build/config.make
fi
default_profile=net_2_0
if test -z "$INSTALL_4_0_TRUE"; then :
default_profile=net_4_0
fi
default_profile=net_4_5
if test -z "$INSTALL_MONODROID_TRUE"; then :
default_profile=monodroid
fi
@@ -3781,8 +3743,6 @@ echo "
LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm)
Libraries:
.NET 2.0/3.5: $with_profile2
.NET 4.0: $with_profile4
.NET 4.5: $with_profile4_5
MonoDroid: $with_monodroid
MonoTouch: $with_monotouch
+1 -14
View File
@@ -1,8 +1,4 @@
SUBDIRS = net_2_0
if INSTALL_4_0
SUBDIRS += net_4_0 net_4_5
endif
SUBDIRS = net_2_0 net_4_0 net_4_5
monodir = $(sysconfdir)/mono
@@ -26,17 +22,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"/>
+3 -3
View File
@@ -99,14 +99,14 @@ mono-file-formats.tree: $(srcdir)/docs.make $(srcdir)/Makefile.am $(srcdir)/depl
deploy/.stamp: convert.exe Makefile.am
$(mkdir_p) html
runtimedir=`cd ../runtime && pwd`; export runtimedir; \
MONO_PATH=../mcs/class/lib/net_2_0 perl $(srcdir)/exdoc -h $(srcdir) -t . $(srcdir)/../mono/*/*.c
MONO_PATH=../mcs/class/lib/net_4_5 perl $(srcdir)/exdoc -h $(srcdir) -t . $(srcdir)/../mono/*/*.c
touch $@
extract: deploy/.stamp
convert.exe: convert.cs AgilityPack.dll
$(TOOL_MAKE) PROFILE=net_2_0 convert.exe
$(TOOL_MAKE) PROFILE=net_4_5 convert.exe
AgilityPack.dll:
$(TOOL_MAKE) PROFILE=net_2_0 AgilityPack.dll
$(TOOL_MAKE) PROFILE=net_4_5 AgilityPack.dll
+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)
-8
View File
@@ -57,14 +57,6 @@ typedef struct {
Slot *slot;
} Iter;
size_t
mono_eg_hashtable_get_memory_size (GHashTable *hashtable)
{
return sizeof (GHashTable) +
hashtable->in_use * sizeof (Slot) +
hashtable->table_size * sizeof (Slot*);
}
static const guint prime_tbl[] = {
11, 19, 37, 73, 109, 163, 251, 367, 557, 823, 1237,
1861, 2777, 4177, 6247, 9371, 14057, 21089, 31627,
-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);
@@ -467,8 +466,6 @@ guint g_spaced_primes_closest (guint x);
#define g_hash_table_insert(h,k,v) g_hash_table_insert_replace ((h),(k),(v),FALSE)
#define g_hash_table_replace(h,k,v) g_hash_table_insert_replace ((h),(k),(v),TRUE)
size_t mono_eg_hashtable_get_memory_size (GHashTable *hashtable);
gboolean g_direct_equal (gconstpointer v1, gconstpointer v2);
guint g_direct_hash (gconstpointer v1);
gboolean g_int_equal (gconstpointer v1, gconstpointer v2);
+1 -1
View File
@@ -176,7 +176,7 @@ default_stderr_handler (const gchar *message)
}
#elif MONOTOUCH
#elif defined(HOST_IOS)
#include <asl.h>
static int
+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);
}
+5
View File
@@ -1,6 +1,10 @@
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
#ifndef _MSC_VER
#include "cygconfig.h"
#else
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
@@ -74,3 +78,4 @@
#define VERSION "0.1"
#define HAVE_STRTOK_R 1
#endif
Vendored Submodule
+1
Submodule external/referencesource added at 7dc4e513ea.
Vendored
+1 -1
Submodule external/rx updated: 00c1aadf14...b29a4b0fda.
+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*)
+1 -1
View File
@@ -32,7 +32,7 @@
# define GC_LINUX_THREADS
#endif
#if defined(WIN32_THREADS)
# define GC_WIN32_THREADS
# define GC_WIN32_THREADS 1
#endif
#if defined(USE_LD_WRAP)
# define GC_USE_LD_WRAP
+10 -13
View File
@@ -119,6 +119,7 @@ If specified, forces the generated AOT files to be bound to the
runtime version of the compiling Mono. This will prevent the AOT
files from being consumed by a different Mono runtime.
.I full
.Sp
This is currently an experimental feature as it is not complete.
This instructs Mono to precompile code that has historically not been
precompiled with AOT.
@@ -1075,19 +1076,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
@@ -1266,6 +1258,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
+6 -6
View File
@@ -6,16 +6,16 @@ SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs
basic_SUBDIRS := build jay mcs class
build_SUBDIRS := build class mcs class/aot-compiler tools
net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors docs
monodroid_SUBDIRS := build class
monotouch_SUBDIRS := build class
monotouch_runtime_SUBDIRS := build class
xammac_SUBDIRS := build class
mobile_SUBDIRS := build class
net_3_5_SUBDIRS := build class tools/xbuild
mobile_static_SUBDIRS := build class
net_4_0_SUBDIRS := build class
net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
xbuild_12_SUBDIRS := build class tools/xbuild
xbuild_14_SUBDIRS := build class tools/xbuild
# List of test subdirs that should pass 100%
centum_tests := \
@@ -86,7 +86,7 @@ dir-check:
# fun specialty targets
PROFILES = net_2_0 net_3_5 net_4_0 net_4_5 xbuild_12
PROFILES = net_4_5 net_4_0 xbuild_12 xbuild_14
.PHONY: all-profiles $(STD_TARGETS:=-profiles)
all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -105,16 +105,16 @@ profiles-do--run-test:
# Orchestrate the bootstrap here.
_boot_ = all clean install
$(_boot_:%=profile-do--xbuild_14--%): profile-do--xbuild_14--%: profile-do--net_4_5--%
$(_boot_:%=profile-do--xbuild_12--%): profile-do--xbuild_12--%: profile-do--net_4_5--%
$(_boot_:%=profile-do--net_4_5--%): profile-do--net_4_5--%: profile-do--build--%
$(_boot_:%=profile-do--net_4_0--%): profile-do--net_4_0--%: profile-do--build--%
$(_boot_:%=profile-do--net_3_5--%): profile-do--net_3_5--%: profile-do--net_2_0--%
$(_boot_:%=profile-do--net_4_5--%): profile-do--net_4_5--%: profile-do--build--%
$(_boot_:%=profile-do--monodroid--%): profile-do--monodroid--%: profile-do--build--%
$(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%: profile-do--build--%
$(_boot_:%=profile-do--monotouch_runtime--%): profile-do--monotouch_runtime--%: profile-do--build--%
$(_boot_:%=profile-do--xammac--%): profile-do--xammac--%: profile-do--build--%
$(_boot_:%=profile-do--mobile--%): profile-do--mobile--%: profile-do--build--%
$(_boot_:%=profile-do--net_2_0--%): profile-do--net_2_0--%: profile-do--build--%
$(_boot_:%=profile-do--mobile_static--%): profile-do--mobile_static--%: profile-do--build--%
$(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--%
testcorlib:
+5 -5
View File
@@ -18,17 +18,17 @@ PLATFORMS = darwin linux win32
PROFILES = \
basic \
build \
net_2_0 \
net_3_5 \
net_4_0 \
net_4_0 \
net_4_5 \
xbuild_12
xbuild_12 \
xbuild_14
COMMON_SRCS = \
Consts.cs.in \
Locale.cs \
MonoTODOAttribute.cs \
basic-profile-check.cs
basic-profile-check.cs \
SR.cs
DISTFILES = \
README.makefiles \
+4 -21
View File
@@ -52,28 +52,13 @@ static class Consts
public const string VsVersion = "0.0.0.0"; // Useless ?
public const string VsFileVersion = "11.0.0.0"; // TODO:
#elif NET_4_0
public const string FxVersion = "4.0.0.0";
public const string FxFileVersion = "4.0.30319.1";
public const string VsVersion = "0.0.0.0"; // Useless ?
public const string VsFileVersion = "10.0.0.0"; // TODO:
#error Profile NET_4_0 is not supported.
#elif NET_3_5
// Versions of .NET Framework 3.5 RTM
public const string FxVersion = "3.5.0.0";
public const string FxFileVersion = "3.5.21022.8";
public const string VsVersion = "0.0.0.0"; // Useless ?
#error Profile NET_3_5 is not supported.
#elif NET_3_0
public const string FxVersion = "3.0.0.0";
public const string VsVersion = "8.0.0.0";
public const string FxFileVersion = "3.0.4506.648";
public const string VsFileVersion = "6.0.6001.17014";
#error Profile NET_3_0 is not supported.
#elif NET_2_0
// Versions of .NET Framework 2.0 RTM
public const string FxVersion = "2.0.0.0";
public const string VsVersion = "8.0.0.0";
public const string FxFileVersion = "2.0.50727.1433";
public const string VsFileVersion = "8.0.50727.1433";
#error Profile NET_2_0 is not supported.
#elif NET_1_1
#error Profile NET_1_1 is not supported.
#elif NET_1_0
@@ -124,7 +109,5 @@ static class Consts
public const string AssemblySystemServiceModel_3_0 = "System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
#elif NET_2_1
public const string AssemblySystem_Core = "System.Core, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
#elif NET_2_0
public const string AssemblySystem_Core = "System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
#endif
}
+46
View File
@@ -0,0 +1,46 @@
using System.Globalization;
static class AssemblyRef
{
// FIXME
internal const string SystemConfiguration = "System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
internal const string System = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
public const string EcmaPublicKey = "b77a5c561934e089";
public const string MicrosoftPublicKey = "b03f5f7f11d50a3a";
public const string SystemDesign = Consts.AssemblySystem_Design;
public const string SystemDrawing = Consts.AssemblySystem_Drawing;
public const string SystemWeb = Consts.AssemblySystem_Web;
public const string SystemWebExtensions = "System.Web.Extensions, Version=" + Consts.FxVersion + ", Culture=neutral, PublicKeyToken=31bf3856ad364e35";
public const string SystemWindowsForms = Consts.AssemblySystem_Windows_Forms;
}
static partial class SR
{
internal static string GetString(string name, params object[] args)
{
return GetString (CultureInfo.InvariantCulture, name, args);
}
internal static string GetString(CultureInfo culture, string name, params object[] args)
{
return string.Format (culture, name, args);
}
internal static string GetString(string name)
{
return name;
}
internal static string GetString(CultureInfo culture, string name)
{
return name;
}
}
namespace System.Runtime.CompilerServices
{
class FriendAccessAllowed : Attribute
{ }
}
+17
View File
@@ -1,3 +1,5 @@
using System;
class X {
// Check installed compiler
static void Generic<T> ()
@@ -20,6 +22,21 @@ class X {
if (o == null)
return 1;
var consts = o.GetType ().Assembly.GetType ("Consts");
if (consts == null)
return 2;
var field = consts.GetField ("MonoVersion");
if (field == null)
return 3;
Version version;
if (!Version.TryParse (field.GetValue (null) as string, out version))
return 4;
if (version < new Version (3, 2))
return 5;
return 0;
}
}
+1 -1
View File
@@ -9,7 +9,7 @@ PLATFORM_RUNTIME = $(RUNTIME)
PLATFORM_CORLIB = mscorlib.dll
PLATFORM_TEST_HARNESS_EXCLUDES = NotOnMac,
EXTERNAL_MCS = gmcs
EXTERNAL_MCS = mcs
EXTERNAL_MBAS = mbas
EXTERNAL_RUNTIME = mono
#ILDISASM = monodis
+1 -1
View File
@@ -9,7 +9,7 @@ PLATFORM_RUNTIME = $(RUNTIME)
PLATFORM_CORLIB = mscorlib.dll
PLATFORM_TEST_HARNESS_EXCLUDES =
EXTERNAL_MCS = gmcs
EXTERNAL_MCS = mcs
EXTERNAL_MBAS = mbas
EXTERNAL_RUNTIME = mono
#ILDISASM = monodis
+1 -1
View File
@@ -9,7 +9,7 @@ PLATFORM_RUNTIME =
PLATFORM_CORLIB = mscorlib.dll
PLATFORM_TEST_HARNESS_EXCLUDES =
EXTERNAL_MCS = gmcs
EXTERNAL_MCS = mcs
EXTERNAL_MBAS = vbc.exe
EXTERNAL_RUNTIME =
+4 -3
View File
@@ -18,11 +18,11 @@ endif
MCS = $(with_mono_path) $(INTERNAL_GMCS)
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:BOOTSTRAP_BASIC -nowarn:1699
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:BOOTSTRAP_BASIC -nowarn:1699 -d:DISABLE_CAS_USE
NO_SIGN_ASSEMBLY = yes
NO_TEST = yes
NO_INSTALL = yes
FRAMEWORK_VERSION = 2.0
FRAMEWORK_VERSION = 4.0
# Compiler all using same bootstrap compiler
LIBRARY_COMPILE = $(BOOT_COMPILE)
@@ -65,8 +65,9 @@ do-profile-check: $(depsdir)/.stamp
$(MAKE) -s do-profile-check-monolite ; \
else \
echo "*** The compiler '$(BOOTSTRAP_MCS)' doesn't appear to be usable." 1>&2; \
echo "*** You need Mono version 2.10 or better installed to build MCS" 1>&2 ; \
echo "*** You need Mono version 3.2 or better installed to build MCS" 1>&2 ; \
echo "*** Check mono README for information on how to bootstrap a Mono installation." 1>&2 ; \
echo "*** The version of '$(BOOTSTRAP_MCS)' is: `$(BOOTSTRAP_MCS) --version`." 1>&2 ; \
exit 1; fi; fi
+2 -2
View File
@@ -13,10 +13,10 @@ profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
NO_SIGN_ASSEMBLY = yes
NO_TEST = yes
NO_INSTALL = yes
FRAMEWORK_VERSION = 4.0
FRAMEWORK_VERSION = 4.5
+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: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 \
-d:MONO \
-d:DISABLE_CAS_USE \
-nowarn:1699 \
-nostdlib \
-lib:$(topdir)/class/lib/$(PROFILE) \
$(DEFAULT_REFERENCES) \
$(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.1
NO_INSTALL = yes
+20 -1
View File
@@ -12,7 +12,26 @@ 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:MONO \
-d:DISABLE_CAS_USE \
-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
+20 -1
View File
@@ -12,7 +12,26 @@ 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:MONO \
-d:DISABLE_CAS_USE \
-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
+22 -2
View File
@@ -12,9 +12,29 @@ 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:MONO \
-d:DISABLE_CAS_USE \
-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
+1 -1
View File
@@ -14,7 +14,7 @@ profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONOTOUCH -D:DISABLE_REMOTING -d:DISABLE_COM -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -d:MOBILE -d:MONOTOUCH -D:DISABLE_REMOTING -d:DISABLE_COM -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.1
-16
View File
@@ -1,16 +0,0 @@
# -*- makefile -*-
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
# nuttzing!
profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.0
XBUILD_VERSION = 2.0
-20
View File
@@ -1,20 +0,0 @@
# -*- makefile -*-
BOOTSTRAP_PROFILE = build
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
# nuttzing!
profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) -lib:$(topdir)/class/lib/net_2_0 $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 3.5
XBUILD_VERSION = 3.5
TEST_HARNESS = $(topdir)/class/lib/net_2_0/nunit-console.exe
TEST_MONO_PATH = $(topdir)/class/lib/net_2_0
+1 -11
View File
@@ -1,22 +1,12 @@
# -*- makefile -*-
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
# nuttzing!
profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
FRAMEWORK_VERSION = 4.0
XBUILD_VERSION = 4.0
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
# 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_BUILD = yes
NO_TEST = yes
+1 -1
View File
@@ -11,7 +11,7 @@ profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 4.5
XBUILD_VERSION = 4.0
+2
View File
@@ -18,6 +18,8 @@ PROFILE_MCS_FLAGS = \
-d:NET_3_5 \
-d:NET_4_0 \
-d:NET_4_5 \
-d:MONO \
-d:DISABLE_CAS_USE \
-d:MOBILE \
-d:MOBILE_DYNAMIC \
-d:XAMMAC \
+1 -1
View File
@@ -2,6 +2,6 @@
include $(topdir)/build/profiles/net_4_5.make
PROFILE_MCS_FLAGS := $(PROFILE_MCS_FLAGS) -d:XBUILD_12 -lib:$(topdir)/class/lib/net_4_5
PROFILE_MCS_FLAGS := $(PROFILE_MCS_FLAGS) -d:XBUILD_12 -d:MONO -d:DISABLE_CAS_USE -lib:$(topdir)/class/lib/net_4_5
XBUILD_VERSION = 12.0
+7
View File
@@ -0,0 +1,7 @@
# -*- makefile -*-
include $(topdir)/build/profiles/net_4_5.make
PROFILE_MCS_FLAGS := $(PROFILE_MCS_FLAGS) -d:XBUILD_12 -d:XBUILD_14 -d:MONO -d:DISABLE_CAS_USE -lib:$(topdir)/class/lib/net_4_5
XBUILD_VERSION = 14.0
@@ -1,79 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{43A23ADA-35D9-4A48-BCE5-C21C081C6676}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>Accessibility</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="Accessibility\IAccessible.cs" />
<Compile Include="Accessibility\IAccessibleHandler.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,79 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0978E130-1E7B-4627-A9CC-7489DB17BFF1}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>Accessibility</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="Accessibility\IAccessible.cs" />
<Compile Include="Accessibility\IAccessibleHandler.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,128 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{2B2412A6-4397-4DA7-94A6-D1AFEBCFA563}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>Commons.Xml.Relaxng</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="..\..\build\common\Locale.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlBuiltInValidationProvider.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlCompileContext.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlConfig.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlException.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlFilteredXmlReader.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlReader.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlRelaxngSupport.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlSimplified.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlStructures.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlValidatingReader.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlValidationProvider.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlValidator.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlXsdSupport.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpContentType.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpNameClasses.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpObjects.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpPatterns.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\Util.cs" />
<Compile Include="Commons.Xml.Relaxng.Inference\RelaxngInference.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\RncTokenizer.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\RncWriter.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\XmlChar.cs" />
<Compile Include="Commons.Xml.Relaxng\Misc.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngDatatype.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngDatatypeProvider.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngDefaultDatatypes.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngException.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngGrammar.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngMergedProvider.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngNameClass.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngPattern.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngPatternType.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngReader.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />
<Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />
<Compile Include="Commons.Xml\XmlDefaultReader.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_2_0-2.csproj">
<Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
<Name>System\System-net_2_0-2</Name>
</ProjectReference>
<ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">
<Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>
<Name>System.XML\System.Xml-net_2_0-1</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="resources/relaxng.rng">
<LogicalName>relaxng.rng</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
@@ -1,128 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{4381A633-26BF-430E-B03B-A83DC8146BF9}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>Commons.Xml.Relaxng</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="..\..\build\common\Locale.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlBuiltInValidationProvider.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlCompileContext.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlConfig.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlException.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlFilteredXmlReader.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlReader.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlRelaxngSupport.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlSimplified.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlStructures.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlValidatingReader.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlValidationProvider.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlValidator.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlXsdSupport.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpContentType.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpNameClasses.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpObjects.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpPatterns.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\Util.cs" />
<Compile Include="Commons.Xml.Relaxng.Inference\RelaxngInference.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\RncTokenizer.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\RncWriter.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\XmlChar.cs" />
<Compile Include="Commons.Xml.Relaxng\Misc.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngDatatype.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngDatatypeProvider.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngDefaultDatatypes.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngException.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngGrammar.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngMergedProvider.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngNameClass.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngPattern.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngPatternType.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngReader.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />
<Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />
<Compile Include="Commons.Xml\XmlDefaultReader.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_4_0-2.csproj">
<Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>
<Name>System\System-net_4_0-2</Name>
</ProjectReference>
<ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">
<Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>
<Name>System.XML\System.Xml-net_4_0-1</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="resources/relaxng.rng">
<LogicalName>relaxng.rng</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
@@ -1,101 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0CCD9F77-53C4-4E1A-92C5-0A237C034C00}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699,618,219,169</NoWarn>
<OutputPath>bin\Debug\Commons.Xml.Relaxng-tests-net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>False</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>Commons.Xml.Relaxng_test_net_2_0</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699,618,219,169</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699,618,219,169</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Test\NvdlValidatingReaderTests.cs" />
<Compile Include="Test\RdpPatternTests.cs" />
<Compile Include="Test\RelaxngDatatypeProviderTests.cs" />
<Compile Include="Test\RelaxngReaderTests.cs" />
<Compile Include="Test\RelaxngValidatingReaderTests.cs" />
<Compile Include="Test\RncTests.cs" />
<Compile Include="Test\XsdDatatypeTests.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="..\lib\net_2_0\nunit.framework.dll" />
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_2_0.csproj">
<Project>{2B2412A6-4397-4DA7-94A6-D1AFEBCFA563}</Project>
<Name>Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_2_0-2.csproj">
<Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
<Name>System\System-net_2_0-2</Name>
</ProjectReference>
<ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">
<Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>
<Name>System.XML\System.Xml-net_2_0-1</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="resources/relaxng.rng">
<LogicalName>relaxng.rng</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
@@ -1,101 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{75496501-CA6D-4C97-952E-95DC6F77C523}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699,618,219,169</NoWarn>
<OutputPath>bin\Debug\Commons.Xml.Relaxng-tests-net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>False</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>Commons.Xml.Relaxng_test_net_4_0</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699,618,219,169</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699,618,219,169</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Test\NvdlValidatingReaderTests.cs" />
<Compile Include="Test\RdpPatternTests.cs" />
<Compile Include="Test\RelaxngDatatypeProviderTests.cs" />
<Compile Include="Test\RelaxngReaderTests.cs" />
<Compile Include="Test\RelaxngValidatingReaderTests.cs" />
<Compile Include="Test\RncTests.cs" />
<Compile Include="Test\XsdDatatypeTests.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="..\lib\net_4_0\nunit.framework.dll" />
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_4_0.csproj">
<Project>{4381A633-26BF-430E-B03B-A83DC8146BF9}</Project>
<Name>Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_4_0-2.csproj">
<Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>
<Name>System\System-net_4_0-2</Name>
</ProjectReference>
<ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">
<Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>
<Name>System.XML\System.Xml-net_4_0-1</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="resources/relaxng.rng">
<LogicalName>relaxng.rng</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
@@ -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
@@ -1,121 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{8F572B12-CBD2-48F8-8234-41A876C57364}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/compat/net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>ICSharpCode.SharpZipLib</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include=".\ICSharpCode.SharpZipLib\AssemblyInfo.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\BZip2\BZip2.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\BZip2\BZip2Constants.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\BZip2\BZip2InputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\BZip2\BZip2OutputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Checksums\Adler32.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Checksums\Crc32.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Checksums\IChecksum.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Checksums\StrangeCrc.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\GZip\GZipConstants.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\GZip\GZipInputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\GZip\GZipOutputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Tar\InvalidHeaderException.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarArchive.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarBuffer.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarEntry.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarHeader.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarInputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarOutputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Deflater.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\DeflaterConstants.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\DeflaterEngine.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\DeflaterHuffman.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\DeflaterPending.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Inflater.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\InflaterDynHeader.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\PendingBuffer.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Streams\OutputWindow.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipConstants.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipEntry.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipFile.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipInputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipOutputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\ZipException.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_2_0-2.csproj">
<Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
<Name>System\System-net_2_0-2</Name>
</ProjectReference>
<ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">
<Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>
<Name>System.XML\System.Xml-net_2_0-1</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,86 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{C010783F-1EAC-480C-B1D4-A289426D3F8F}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>cscompmgd</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="..\..\build\common\Locale.cs" />
<Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="Microsoft.CSharp\Compiler.cs" />
<Compile Include="Microsoft.CSharp\CompilerError.cs" />
<Compile Include="Microsoft.CSharp\ErrorLevel.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_2_0-2.csproj">
<Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
<Name>System\System-net_2_0-2</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,86 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{B26893EC-D295-40B7-8AE6-60B3D0F5CBA6}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>cscompmgd</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="..\..\build\common\Locale.cs" />
<Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="Microsoft.CSharp\Compiler.cs" />
<Compile Include="Microsoft.CSharp\CompilerError.cs" />
<Compile Include="Microsoft.CSharp\ErrorLevel.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_4_0-2.csproj">
<Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>
<Name>System\System-net_4_0-2</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,85 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{B3E7EE0C-3AB6-4578-844E-FF72C5807953}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699,618,219,169</NoWarn>
<OutputPath>bin\Debug\Cscompmgd-tests-net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>False</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>Cscompmgd_test_net_2_0</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699,618,219,169</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699,618,219,169</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Test\Microsoft.CSharp\CompilerTest.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="..\lib\net_2_0\nunit.framework.dll" />
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\Cscompmgd\Cscompmgd-net_2_0.csproj">
<Project>{C010783F-1EAC-480C-B1D4-A289426D3F8F}</Project>
<Name>Cscompmgd\Cscompmgd-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_2_0-2.csproj">
<Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
<Name>System\System-net_2_0-2</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,85 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0CD2EF3C-6E4A-4FC5-9D8C-B0CB5E4EE3BF}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699,618,219,169</NoWarn>
<OutputPath>bin\Debug\Cscompmgd-tests-net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>False</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>Cscompmgd_test_net_4_0</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699,618,219,169</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699,618,219,169</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Test\Microsoft.CSharp\CompilerTest.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="..\lib\net_4_0\nunit.framework.dll" />
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\Cscompmgd\Cscompmgd-net_4_0.csproj">
<Project>{B26893EC-D295-40B7-8AE6-60B3D0F5CBA6}</Project>
<Name>Cscompmgd\Cscompmgd-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_4_0-2.csproj">
<Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>
<Name>System\System-net_4_0-2</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,87 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{81062FC0-B86A-4707-9BC3-F67FDFB47AF4}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>CustomMarshalers</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="..\..\build\common\Locale.cs" />
<Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
<Compile Include=".\Assembly\AssemblyInfo.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumerableToDispatchMarshaler.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumeratorToEnumVariantMarshaler.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\ExpandoToDispatchExMarshaler.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\TypeToTypeInfoMarshaler.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_2_0-2.csproj">
<Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
<Name>System\System-net_2_0-2</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,87 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{73865D3C-DCFC-4C7A-8AB5-D8C3CA6DBB42}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>CustomMarshalers</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="..\..\build\common\Locale.cs" />
<Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
<Compile Include=".\Assembly\AssemblyInfo.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumerableToDispatchMarshaler.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumeratorToEnumVariantMarshaler.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\ExpandoToDispatchExMarshaler.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\TypeToTypeInfoMarshaler.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_4_0-2.csproj">
<Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>
<Name>System\System-net_4_0-2</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -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))]
-110
View File
@@ -1,110 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{9C753AD5-56C6-46F8-976E-3AD3A4481626}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.CJK</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="CodeTable.cs" />
<Compile Include="CP51932.cs" />
<Compile Include="CP932.cs" />
<Compile Include="CP936.cs" />
<Compile Include="CP949.cs" />
<Compile Include="CP950.cs" />
<Compile Include="DbcsConvert.cs" />
<Compile Include="DbcsEncoding.cs" />
<Compile Include="GB18030Encoding.cs" />
<Compile Include="GB18030Source.cs" />
<Compile Include="ISO2022JP.cs" />
<Compile Include="JISConvert.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">
<Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>
<Name>Common\I18N-net_2_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="big5.table">
<LogicalName>big5.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="gb2312.table">
<LogicalName>gb2312.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="jis.table">
<LogicalName>jis.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="ks.table">
<LogicalName>ks.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="gb18030.table">
<LogicalName>gb18030.table</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
-110
View File
@@ -1,110 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{500EF496-DB58-4EB4-B123-BC09DACE2012}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.CJK</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="CodeTable.cs" />
<Compile Include="CP51932.cs" />
<Compile Include="CP932.cs" />
<Compile Include="CP936.cs" />
<Compile Include="CP949.cs" />
<Compile Include="CP950.cs" />
<Compile Include="DbcsConvert.cs" />
<Compile Include="DbcsEncoding.cs" />
<Compile Include="GB18030Encoding.cs" />
<Compile Include="GB18030Source.cs" />
<Compile Include="ISO2022JP.cs" />
<Compile Include="JISConvert.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">
<Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>
<Name>Common\I18N-net_4_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="big5.table">
<LogicalName>big5.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="gb2312.table">
<LogicalName>gb2312.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="jis.table">
<LogicalName>jis.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="ks.table">
<LogicalName>ks.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="gb18030.table">
<LogicalName>gb18030.table</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
@@ -1,102 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{53F4354D-AEFA-4AB8-AF76-89012BB8FEB3}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>bin\Debug\I18N.CJK-tests-net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>False</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.CJK_test_net_2_0</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Test\I18N.CJK.Test.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="..\lib\net_2_0\nunit.framework.dll" />
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">
<Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>
<Name>Common\I18N-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\CJK\I18N.CJK-net_2_0.csproj">
<Project>{9C753AD5-56C6-46F8-976E-3AD3A4481626}</Project>
<Name>CJK\I18N.CJK-net_2_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="big5.table">
<LogicalName>big5.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="gb2312.table">
<LogicalName>gb2312.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="jis.table">
<LogicalName>jis.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="ks.table">
<LogicalName>ks.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="gb18030.table">
<LogicalName>gb18030.table</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
@@ -1,102 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{7D404BC0-DF57-4817-8F9A-A6B91AE6EAE6}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>bin\Debug\I18N.CJK-tests-net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>False</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.CJK_test_net_4_0</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Test\I18N.CJK.Test.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="..\lib\net_4_0\nunit.framework.dll" />
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">
<Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>
<Name>Common\I18N-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\CJK\I18N.CJK-net_4_0.csproj">
<Project>{500EF496-DB58-4EB4-B123-BC09DACE2012}</Project>
<Name>CJK\I18N.CJK-net_4_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="big5.table">
<LogicalName>big5.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="gb2312.table">
<LogicalName>gb2312.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="jis.table">
<LogicalName>jis.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="ks.table">
<LogicalName>ks.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="gb18030.table">
<LogicalName>gb18030.table</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
-84
View File
@@ -1,84 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="ByteEncoding.cs" />
<Compile Include="ByteSafeEncoding.cs" />
<Compile Include="Handlers.cs" />
<Compile Include="Manager.cs" />
<Compile Include="MonoEncoding.cs" />
<Compile Include="MonoSafeEncoding.cs" />
<Compile Include="Strings.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
-84
View File
@@ -1,84 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="ByteEncoding.cs" />
<Compile Include="ByteSafeEncoding.cs" />
<Compile Include="Handlers.cs" />
<Compile Include="Manager.cs" />
<Compile Include="MonoEncoding.cs" />
<Compile Include="MonoSafeEncoding.cs" />
<Compile Include="Strings.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,88 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{81E84AE7-FF9C-499B-9CA1-02E438C233C6}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.MidEast</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="CP1254.cs" />
<Compile Include="CP1255.cs" />
<Compile Include="CP1256.cs" />
<Compile Include="CP28596.cs" />
<Compile Include="CP28598.cs" />
<Compile Include="CP28599.cs" />
<Compile Include="CP38598.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">
<Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>
<Name>Common\I18N-net_2_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,88 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BF6B8C9E-ADAA-4682-BA1D-F01EAE06BA6F}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.MidEast</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="CP1254.cs" />
<Compile Include="CP1255.cs" />
<Compile Include="CP1256.cs" />
<Compile Include="CP28596.cs" />
<Compile Include="CP28598.cs" />
<Compile Include="CP28599.cs" />
<Compile Include="CP38598.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">
<Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>
<Name>Common\I18N-net_4_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,85 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{6BC73CD0-ADAF-461D-B190-F1458D439314}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>bin\Debug\I18N.MidEast-tests-net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>False</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.MidEast_test_net_2_0</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Test\I18N.MidEast.Test.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="..\lib\net_2_0\nunit.framework.dll" />
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">
<Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>
<Name>Common\I18N-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\MidEast\I18N.MidEast-net_2_0.csproj">
<Project>{81E84AE7-FF9C-499B-9CA1-02E438C233C6}</Project>
<Name>MidEast\I18N.MidEast-net_2_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,85 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{476F5ACC-F7DF-4EA1-8566-E97D4C839E04}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>bin\Debug\I18N.MidEast-tests-net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>False</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.MidEast_test_net_4_0</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Test\I18N.MidEast.Test.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="..\lib\net_4_0\nunit.framework.dll" />
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">
<Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>
<Name>Common\I18N-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\MidEast\I18N.MidEast-net_4_0.csproj">
<Project>{BF6B8C9E-ADAA-4682-BA1D-F01EAE06BA6F}</Project>
<Name>MidEast\I18N.MidEast-net_4_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,90 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F77F18AA-4F63-456F-8FC4-6A2DFD8F9D54}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.Other</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="CP1251.cs" />
<Compile Include="CP1257.cs" />
<Compile Include="CP1258.cs" />
<Compile Include="CP20866.cs" />
<Compile Include="CP21866.cs" />
<Compile Include="CP28594.cs" />
<Compile Include="CP28595.cs" />
<Compile Include="CP57002.cs" />
<Compile Include="CP874.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">
<Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>
<Name>Common\I18N-net_2_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,90 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{CC8BF0F1-8799-4639-AFAF-83A89F73E8B9}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.Other</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="CP1251.cs" />
<Compile Include="CP1257.cs" />
<Compile Include="CP1258.cs" />
<Compile Include="CP20866.cs" />
<Compile Include="CP21866.cs" />
<Compile Include="CP28594.cs" />
<Compile Include="CP28595.cs" />
<Compile Include="CP57002.cs" />
<Compile Include="CP874.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">
<Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>
<Name>Common\I18N-net_4_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,118 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{83015125-AD39-4160-B723-677CB4F1EF3D}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.Rare</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="CP1026.cs" />
<Compile Include="CP1047.cs" />
<Compile Include="CP1140.cs" />
<Compile Include="CP1141.cs" />
<Compile Include="CP1142.cs" />
<Compile Include="CP1143.cs" />
<Compile Include="CP1144.cs" />
<Compile Include="CP1145.cs" />
<Compile Include="CP1146.cs" />
<Compile Include="CP1147.cs" />
<Compile Include="CP1148.cs" />
<Compile Include="CP1149.cs" />
<Compile Include="CP20273.cs" />
<Compile Include="CP20277.cs" />
<Compile Include="CP20278.cs" />
<Compile Include="CP20280.cs" />
<Compile Include="CP20284.cs" />
<Compile Include="CP20285.cs" />
<Compile Include="CP20290.cs" />
<Compile Include="CP20297.cs" />
<Compile Include="CP20420.cs" />
<Compile Include="CP20424.cs" />
<Compile Include="CP20871.cs" />
<Compile Include="CP21025.cs" />
<Compile Include="CP37.cs" />
<Compile Include="CP500.cs" />
<Compile Include="CP708.cs" />
<Compile Include="CP852.cs" />
<Compile Include="CP855.cs" />
<Compile Include="CP857.cs" />
<Compile Include="CP858.cs" />
<Compile Include="CP862.cs" />
<Compile Include="CP864.cs" />
<Compile Include="CP866.cs" />
<Compile Include="CP869.cs" />
<Compile Include="CP870.cs" />
<Compile Include="CP875.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">
<Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>
<Name>Common\I18N-net_2_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,118 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{94F03A2C-5E8D-4FEC-B936-BCF99F97C2DF}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.Rare</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="CP1026.cs" />
<Compile Include="CP1047.cs" />
<Compile Include="CP1140.cs" />
<Compile Include="CP1141.cs" />
<Compile Include="CP1142.cs" />
<Compile Include="CP1143.cs" />
<Compile Include="CP1144.cs" />
<Compile Include="CP1145.cs" />
<Compile Include="CP1146.cs" />
<Compile Include="CP1147.cs" />
<Compile Include="CP1148.cs" />
<Compile Include="CP1149.cs" />
<Compile Include="CP20273.cs" />
<Compile Include="CP20277.cs" />
<Compile Include="CP20278.cs" />
<Compile Include="CP20280.cs" />
<Compile Include="CP20284.cs" />
<Compile Include="CP20285.cs" />
<Compile Include="CP20290.cs" />
<Compile Include="CP20297.cs" />
<Compile Include="CP20420.cs" />
<Compile Include="CP20424.cs" />
<Compile Include="CP20871.cs" />
<Compile Include="CP21025.cs" />
<Compile Include="CP37.cs" />
<Compile Include="CP500.cs" />
<Compile Include="CP708.cs" />
<Compile Include="CP852.cs" />
<Compile Include="CP855.cs" />
<Compile Include="CP857.cs" />
<Compile Include="CP858.cs" />
<Compile Include="CP862.cs" />
<Compile Include="CP864.cs" />
<Compile Include="CP866.cs" />
<Compile Include="CP869.cs" />
<Compile Include="CP870.cs" />
<Compile Include="CP875.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">
<Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>
<Name>Common\I18N-net_4_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,96 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{AA988ADC-FBBB-4168-B8E4-83B6C6D543EC}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.West</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="CP10000.cs" />
<Compile Include="CP10079.cs" />
<Compile Include="CP1250.cs" />
<Compile Include="CP1252.cs" />
<Compile Include="CP1253.cs" />
<Compile Include="CP28592.cs" />
<Compile Include="CP28593.cs" />
<Compile Include="CP28597.cs" />
<Compile Include="CP28605.cs" />
<Compile Include="CP437.cs" />
<Compile Include="CP850.cs" />
<Compile Include="CP860.cs" />
<Compile Include="CP861.cs" />
<Compile Include="CP863.cs" />
<Compile Include="CP865.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">
<Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>
<Name>Common\I18N-net_2_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,96 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{455087AC-2DB8-46F3-A9CA-35732C90D233}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.West</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="CP10000.cs" />
<Compile Include="CP10079.cs" />
<Compile Include="CP1250.cs" />
<Compile Include="CP1252.cs" />
<Compile Include="CP1253.cs" />
<Compile Include="CP28592.cs" />
<Compile Include="CP28593.cs" />
<Compile Include="CP28597.cs" />
<Compile Include="CP28605.cs" />
<Compile Include="CP437.cs" />
<Compile Include="CP850.cs" />
<Compile Include="CP860.cs" />
<Compile Include="CP861.cs" />
<Compile Include="CP863.cs" />
<Compile Include="CP865.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">
<Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>
<Name>Common\I18N-net_4_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,85 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{C1E0F01D-878A-4343-A283-8864D7D8956E}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>bin\Debug\I18N.West-tests-net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>False</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.West_test_net_2_0</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Test\I18N.West.Test.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="..\lib\net_2_0\nunit.framework.dll" />
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_2_0.csproj">
<Project>{90D1493C-4092-4A53-BBC1-5E79DFEF9AD1}</Project>
<Name>Common\I18N-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\West\I18N.West-net_2_0.csproj">
<Project>{AA988ADC-FBBB-4168-B8E4-83B6C6D543EC}</Project>
<Name>West\I18N.West-net_2_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,85 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{73503F84-B247-40EB-B6BA-58CFEE72F735}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>bin\Debug\I18N.West-tests-net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>False</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>I18N.West_test_net_4_0</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Test\I18N.West.Test.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="..\lib\net_4_0\nunit.framework.dll" />
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\Common\I18N-net_4_0.csproj">
<Project>{1EBB84BA-DA98-4DE8-B0E5-8F476F3A732E}</Project>
<Name>Common\I18N-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\I18N\West\I18N.West-net_4_0.csproj">
<Project>{455087AC-2DB8-46F3-A9CA-35732C90D233}</Project>
<Name>West\I18N.West-net_4_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,112 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{47BD9179-658F-4881-85D3-4883B11BCE12}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>IBM.Data.DB2</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include=".\Assembly\AssemblyInfo.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ClientUtils.cs" />
<Compile Include=".\IBM.Data.DB2\DB2CLIWrapper.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Command.cs" />
<Compile Include=".\IBM.Data.DB2\DB2CommandBuilder.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Connection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ConnectionPool.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ConnectionSettings.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Constants.cs" />
<Compile Include=".\IBM.Data.DB2\DB2DataAdapter.cs" />
<Compile Include=".\IBM.Data.DB2\DB2DataReader.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Environment.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Error.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ErrorCollection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Exception.cs" />
<Compile Include=".\IBM.Data.DB2\DB2InfoMessageEventHandler.cs" />
<Compile Include=".\IBM.Data.DB2\DB2OpenConnection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Parameter.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ParameterCollection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventArgs.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventHandler.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventArgs.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventHandler.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Transaction.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Type.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_2_0-2.csproj">
<Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
<Name>System\System-net_2_0-2</Name>
</ProjectReference>
<ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">
<Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>
<Name>System.XML\System.Xml-net_2_0-1</Name>
</ProjectReference>
<ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">
<Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>
<Name>System.Data\System.Data-net_2_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,112 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{4D194635-F673-40DD-811D-EB0B84F0B44B}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>IBM.Data.DB2</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include=".\Assembly\AssemblyInfo.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ClientUtils.cs" />
<Compile Include=".\IBM.Data.DB2\DB2CLIWrapper.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Command.cs" />
<Compile Include=".\IBM.Data.DB2\DB2CommandBuilder.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Connection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ConnectionPool.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ConnectionSettings.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Constants.cs" />
<Compile Include=".\IBM.Data.DB2\DB2DataAdapter.cs" />
<Compile Include=".\IBM.Data.DB2\DB2DataReader.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Environment.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Error.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ErrorCollection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Exception.cs" />
<Compile Include=".\IBM.Data.DB2\DB2InfoMessageEventHandler.cs" />
<Compile Include=".\IBM.Data.DB2\DB2OpenConnection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Parameter.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ParameterCollection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventArgs.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventHandler.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventArgs.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventHandler.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Transaction.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Type.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_4_0-2.csproj">
<Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>
<Name>System\System-net_4_0-2</Name>
</ProjectReference>
<ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">
<Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>
<Name>System.XML\System.Xml-net_4_0-1</Name>
</ProjectReference>
<ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">
<Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>
<Name>System.Data\System.Data-net_4_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,133 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{9E123979-3457-435B-A081-8432EEBA134A}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>ICSharpCode.SharpZipLib</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="ICSharpCode.SharpZipLib\AssemblyInfo.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2Constants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2Exception.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2InputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2OutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\Adler32.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\CRC32.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\IChecksum.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\StrangeCRC.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\FileSystemScanner.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\INameTransform.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\NameFilter.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\PathFilter.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Encryption\PkzipClassic.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GZIPConstants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GZipException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GzipInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GzipOutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Main.cs" />
<Compile Include="ICSharpCode.SharpZipLib\SharpZipBaseException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\InvalidHeaderException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarArchive.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarBuffer.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarEntry.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarHeader.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarOutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Deflater.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterConstants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterEngine.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterHuffman.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterPending.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Inflater.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\InflaterDynHeader.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\PendingBuffer.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\OutputWindow.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\FastZip.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipConstants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipEntry.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipFile.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipNameTransform.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipOutputStream.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_2_0-2.csproj">
<Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
<Name>System\System-net_2_0-2</Name>
</ProjectReference>
<ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">
<Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>
<Name>System.XML\System.Xml-net_2_0-1</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -1,133 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D7EC98B8-2158-4304-9E84-D19D50CE16E8}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>ICSharpCode.SharpZipLib</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="ICSharpCode.SharpZipLib\AssemblyInfo.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2Constants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2Exception.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2InputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2OutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\Adler32.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\CRC32.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\IChecksum.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\StrangeCRC.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\FileSystemScanner.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\INameTransform.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\NameFilter.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\PathFilter.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Encryption\PkzipClassic.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GZIPConstants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GZipException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GzipInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GzipOutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Main.cs" />
<Compile Include="ICSharpCode.SharpZipLib\SharpZipBaseException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\InvalidHeaderException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarArchive.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarBuffer.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarEntry.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarHeader.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarOutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Deflater.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterConstants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterEngine.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterHuffman.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterPending.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Inflater.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\InflaterDynHeader.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\PendingBuffer.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\OutputWindow.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\FastZip.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipConstants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipEntry.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipFile.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipNameTransform.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipOutputStream.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_4_0-2.csproj">
<Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>
<Name>System\System-net_4_0-2</Name>
</ProjectReference>
<ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">
<Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>
<Name>System.XML\System.Xml-net_4_0-1</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
+28 -30
View File
@@ -33,6 +33,7 @@ net_2_0_dirs := \
System.EnterpriseServices \
Mono.Data.Tds \
System.Data \
System.ComponentModel.DataAnnotations \
Accessibility \
Mono.WebBrowser \
System.Runtime.Serialization.Formatters.Soap \
@@ -81,9 +82,7 @@ net_2_0_dirs := \
System.ServiceModel \
System.Web.Extensions \
System.Web.Extensions.Design \
System.ComponentModel.DataAnnotations \
System.Web.DynamicData \
System.Web.Mvc2 \
Mono.C5 \
Mono.Management \
Mono.Options \
@@ -102,11 +101,10 @@ net_2_0_only_dirs := \
System.ServiceModel.Web \
System.Data.Services.Client \
System.Data.Services \
System.Web.Mvc \
pcl_facade_dirs := Facades
mobile_dirs := \
mobile_common_dirs := \
corlib \
System \
System.Core \
@@ -134,19 +132,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 \
@@ -155,11 +161,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 \
@@ -189,11 +190,9 @@ net_4_0_dirs := \
System.Data.Services.Client \
System.Data.Services \
System.Json.Microsoft \
System.Data.Entity \
monodoc
net_4_0_only_dirs := \
System.ComponentModel.Composition
net_4_5_dirs := \
System.Threading.Tasks.Dataflow \
System.ComponentModel.Composition.4.5 \
@@ -228,23 +227,22 @@ xbuild_4_0_dirs := \
$(xbuild_2_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)
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)
mobile_static_SUBDIRS := $(mobile_static_dirs)
mobile_SUBDIRS := $(mobile_dynamic_dirs)
xammac_SUBDIRS := $(xammac_dirs)
net_4_0_SUBDIRS := reference-assemblies
net_4_5_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
xbuild_14_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_5_dirs)
DIST_ONLY_SUBDIRS = dlr aot-compiler $(xbuild_4_0_dirs)
DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs)
# No new makefiles for: System.Messaging, System.Web.Mobile,
# System.ServiceProcess
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
@@ -1,312 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{4A3A8DC3-F8A2-47E9-96F5-1C8F7E4C3D77}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699,618,612</NoWarn>
<OutputPath>bin\Debug\System.Windows.Forms-tests-net_2_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>False</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>System.Windows.Forms_test_net_2_0</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699,618,612</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699,618,612</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="Test\System.Resources\CompatTest.cs" />
<Compile Include="Test\System.Resources\CultureTest.cs" />
<Compile Include="Test\System.Resources\HelperClasses_ITRS.cs" />
<Compile Include="Test\System.Resources\HelperClasses_Resources.cs" />
<Compile Include="Test\System.Resources\ResourcesTestHelper.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeAliasTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeByteArrayTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeFileRefGetValueTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeFileRefGetValueTypeNameTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeSerialisedGetValueTypeNameTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeSerializedGetValueTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeTest.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeTypeConverterGetValueTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeTypeConverterGetValueTypeNameTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeWriteBehavior.cs" />
<Compile Include="Test\System.Resources\ResXFileRefTest.cs" />
<Compile Include="Test\System.Resources\ResXResourceReaderTest.cs" />
<Compile Include="Test\System.Resources\WriterTest.cs" />
<Compile Include="Test\System.Windows.Forms.Layout\ArrangedElementCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms.Layout\TableLayoutSettingsTypeConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\ApplicationContextTest.cs" />
<Compile Include="Test\System.Windows.Forms\ApplicationTest.cs" />
<Compile Include="Test\System.Windows.Forms\AutoCompleteStringCollectionTest.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\BindingsCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingSourceTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingTest.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\ClipboardTest.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\ControlPaintTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlPropertyEventsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\CurrencyManagerTest.cs" />
<Compile Include="Test\System.Windows.Forms\CursorTest.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\DataGridViewImageCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewLinkCellTest.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\EventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\EventLogger.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\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\ListBindingHelperTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListBoxEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewCollectionsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewGroupCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewGroupTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewTest.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\MenuItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\MenuStripTest.cs" />
<Compile Include="Test\System.Windows.Forms\MenuTest.cs" />
<Compile Include="Test\System.Windows.Forms\MessageTest.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\PaddingConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\PaddingTest.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\RichTextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\RowStyleTest.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\SplitContainerTests.cs" />
<Compile Include="Test\System.Windows.Forms\SplitterTest.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\ToolBarButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolBarTest.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\ToolStripDropDownItemTest.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\TreeViewEventsTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewHitTestInfoTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewImageIndexConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewImageKeyConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewTest.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" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="..\lib\net_2_0\nunit.framework.dll" />
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
<Name>corlib\corlib-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">
<Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>
<Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\System.Data\System.Data-net_2_0.csproj">
<Project>{69458D09-40A2-48AD-8C0F-0E437CF5FE6D}</Project>
<Name>System.Data\System.Data-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\System.Drawing\System.Drawing-net_2_0.csproj">
<Project>{458980DE-3D7C-4BBA-BA18-673EDC030AFE}</Project>
<Name>System.Drawing\System.Drawing-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\Accessibility\Accessibility-net_2_0.csproj">
<Project>{43A23ADA-35D9-4A48-BCE5-C21C081C6676}</Project>
<Name>Accessibility\Accessibility-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_2_0-2.csproj">
<Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
<Name>System\System-net_2_0-2</Name>
</ProjectReference>
<ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">
<Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>
<Name>System.XML\System.Xml-net_2_0-1</Name>
</ProjectReference>
<ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0.csproj">
<Project>{8313B5D9-A1BE-4E62-90E7-FA002548D650}</Project>
<Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_2_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Test/resources/a.cur">
<LogicalName>a.cur</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Test/resources/32x32.ico">
<LogicalName>32x32.ico</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
@@ -1,312 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D2C4D760-69DE-45C3-B255-DFF26EC4A99B}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699,618,612</NoWarn>
<OutputPath>bin\Debug\System.Windows.Forms-tests-net_4_0</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>False</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>System.Windows.Forms_test_net_4_0</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699,618,612</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699,618,612</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="Test\System.Resources\CompatTest.cs" />
<Compile Include="Test\System.Resources\CultureTest.cs" />
<Compile Include="Test\System.Resources\HelperClasses_ITRS.cs" />
<Compile Include="Test\System.Resources\HelperClasses_Resources.cs" />
<Compile Include="Test\System.Resources\ResourcesTestHelper.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeAliasTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeByteArrayTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeFileRefGetValueTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeFileRefGetValueTypeNameTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeSerialisedGetValueTypeNameTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeSerializedGetValueTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeTest.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeTypeConverterGetValueTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeTypeConverterGetValueTypeNameTests.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeWriteBehavior.cs" />
<Compile Include="Test\System.Resources\ResXFileRefTest.cs" />
<Compile Include="Test\System.Resources\ResXResourceReaderTest.cs" />
<Compile Include="Test\System.Resources\WriterTest.cs" />
<Compile Include="Test\System.Windows.Forms.Layout\ArrangedElementCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms.Layout\TableLayoutSettingsTypeConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\ApplicationContextTest.cs" />
<Compile Include="Test\System.Windows.Forms\ApplicationTest.cs" />
<Compile Include="Test\System.Windows.Forms\AutoCompleteStringCollectionTest.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\BindingsCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingSourceTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingTest.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\ClipboardTest.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\ControlPaintTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlPropertyEventsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\CurrencyManagerTest.cs" />
<Compile Include="Test\System.Windows.Forms\CursorTest.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\DataGridViewImageCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewLinkCellTest.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\EventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\EventLogger.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\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\ListBindingHelperTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListBoxEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewCollectionsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewGroupCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewGroupTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewTest.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\MenuItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\MenuStripTest.cs" />
<Compile Include="Test\System.Windows.Forms\MenuTest.cs" />
<Compile Include="Test\System.Windows.Forms\MessageTest.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\PaddingConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\PaddingTest.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\RichTextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\RowStyleTest.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\SplitContainerTests.cs" />
<Compile Include="Test\System.Windows.Forms\SplitterTest.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\ToolBarButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolBarTest.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\ToolStripDropDownItemTest.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\TreeViewEventsTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewHitTestInfoTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewImageIndexConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewImageKeyConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewTest.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" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="..\lib\net_4_0\nunit.framework.dll" />
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
<Name>corlib\corlib-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_0.csproj">
<Project>{0A54FEB2-B90B-42CA-AB24-744302ABCB3E}</Project>
<Name>Managed.Windows.Forms\System.Windows.Forms-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\System.Data\System.Data-net_4_0.csproj">
<Project>{0ADBE502-5524-4312-81B0-8456328C367C}</Project>
<Name>System.Data\System.Data-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\System.Drawing\System.Drawing-net_4_0.csproj">
<Project>{01A426C8-6E24-4DCF-B6BE-177FF4FBD4BC}</Project>
<Name>System.Drawing\System.Drawing-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\Accessibility\Accessibility-net_4_0.csproj">
<Project>{0978E130-1E7B-4627-A9CC-7489DB17BFF1}</Project>
<Name>Accessibility\Accessibility-net_4_0</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_4_0-2.csproj">
<Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>
<Name>System\System-net_4_0-2</Name>
</ProjectReference>
<ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">
<Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>
<Name>System.XML\System.Xml-net_4_0-1</Name>
</ProjectReference>
<ProjectReference Include="..\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0.csproj">
<Project>{2FDBA71E-A6EC-4247-B0BD-BF7A618C0747}</Project>
<Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_0</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Test/resources/a.cur">
<LogicalName>a.cur</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Test/resources/32x32.ico">
<LogicalName>32x32.ico</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
@@ -368,7 +368,20 @@ namespace System.Windows.Forms.Layout
}
if (total_width > 0)
panel.column_widths[col_styles.Count - 1] += total_width;
{
// Find the last column that isn't an Absolute SizeType, and give it
// all this free space. (Absolute sized columns need to retain their
// absolute width if at all possible!)
int col = col_styles.Count - 1;
for (; col >= 0; --col)
{
if (col_styles[col].SizeType != SizeType.Absolute)
break;
}
if (col < 0)
col = col_styles.Count - 1;
panel.column_widths[col] += total_width;
}
// Figure up all the row heights
int total_height = parentDisplayRectangle.Height - (border_width * (rows + 1));
@@ -464,7 +477,20 @@ namespace System.Windows.Forms.Layout
}
if (total_height > 0)
panel.row_heights[row_styles.Count - 1] += total_height;
{
// Find the last row that isn't an Absolute SizeType, and give it
// all this free space. (Absolute sized rows need to retain their
// absolute height if at all possible!)
int row = row_styles.Count - 1;
for (; row >= 0; --row)
{
if (row_styles[row].SizeType != SizeType.Absolute)
break;
}
if (row < 0)
row = row_styles.Count - 1;
panel.row_heights[row] += total_height;
}
}
private void LayoutControls (TableLayoutPanel panel)
@@ -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)
@@ -5133,7 +5133,17 @@ namespace System.Windows.Forms {
SetSelectedRowCore (rowIndex, false);
}
if (Rows.Count - e.RowCount <= 0) {
int RowsLeft = Rows.Count - e.RowCount;
if (RowsLeft < 0)
RowsLeft = 0;
if (first_row_index > RowsLeft - 1)
first_row_index = RowsLeft - 1;
if (first_row_index < 0)
first_row_index = 0;
if (RowsLeft == 0) {
MoveCurrentCell (-1, -1, true, false, false, true);
hover_cell = null;
} else if (Columns.Count == 0) {
@@ -5141,8 +5151,8 @@ namespace System.Windows.Forms {
hover_cell = null;
} else if (currentCell != null && currentCell.RowIndex == e.RowIndex) {
int nextRowIndex = e.RowIndex;
if (nextRowIndex >= Rows.Count - e.RowCount)
nextRowIndex = Rows.Count - 1 - e.RowCount;
if (nextRowIndex >= RowsLeft)
nextRowIndex = RowsLeft - 1;
MoveCurrentCell (currentCell != null ? currentCell.ColumnIndex : 0, nextRowIndex,
true, false, false, true);
if (hover_cell != null && hover_cell.RowIndex >= e.RowIndex)
@@ -261,14 +261,14 @@ namespace System.Windows.Forms
for (int i = 0; i < total; i++) {
DataGridViewRow row = (DataGridViewRow)list[0];
row.SetIndex(0);
// We can exit because the NewRow is always last
if (row.IsNewRow)
break;
row.SetDataGridView (null);
list.Remove (row);
ReIndex ();
}
DataGridView.OnRowsPostRemovedInternal (new DataGridViewRowsRemovedEventArgs (0, total));
@@ -28,9 +28,14 @@
using System;
using System.Drawing;
using System.Diagnostics;
using System.IO;
namespace System.Windows.Forms
{
/// <summary>
/// http://msdn.microsoft.com/en-us/library/System.Windows.Forms.Help(v=vs.110).aspx
/// </summary>
public class Help
{
#region Constructor
@@ -42,7 +47,7 @@ namespace System.Windows.Forms
#region Public Static Methods
public static void ShowHelp (Control parent, string url)
{
ShowHelp(parent, url, HelpNavigator.TableOfContents, null);
ShowHelp (parent, url, null);
}
public static void ShowHelp (Control parent, string url, HelpNavigator navigator)
@@ -57,9 +62,7 @@ namespace System.Windows.Forms
public static void ShowHelp (Control parent, string url, string keyword)
{
if (keyword == null || keyword == String.Empty)
ShowHelp (parent, url, HelpNavigator.TableOfContents, null);
ShowHelp (parent, url, HelpNavigator.Topic, keyword);
ShowHelpTopic (url, keyword);
}
public static void ShowHelpIndex (Control parent, string url)
@@ -72,5 +75,55 @@ namespace System.Windows.Forms
{
}
#endregion // Public Static Methods
/// <summary>
/// Show a help file and topic using a help viewer
/// </summary>
/// <param name="helpFile">path to a .chm help file</param>
/// <param name="helpTopic">path to a topic in helpFile, or null</param>
private static void ShowHelpTopic (string helpFile, string helpTopic)
{
if (helpFile == null)
throw new ArgumentNullException ();
if (helpFile == String.Empty)
throw new ArgumentException ();
// Use forward slashes in helpFile path if needed
helpFile = helpFile.Replace (@"\", Path.DirectorySeparatorChar.ToString ());
string helpViewer = Environment.GetEnvironmentVariable ("MONO_HELP_VIEWER") ?? "chmsee";
string arguments = String.Format ("\"{0}\"", helpFile);
if (!String.IsNullOrEmpty (helpTopic)) {
if (!helpTopic.StartsWith ("/"))
helpTopic = "/" + helpTopic;
helpTopic = helpTopic.TrimEnd (' ');
arguments = String.Format ("\"{0}::{1}\"", helpFile, helpTopic);
}
try {
RunNonblockingProcess (helpViewer, arguments);
} catch (Exception e) {
// Don't crash if the help viewer couldn't be launched. There
// won't be an exception thrown if the help viewer can't find
// the help file; it's up to the help viewer to display such an error.
string message = String.Format ("The help viewer could not load. Maybe you don't have {0} installed or haven't set MONO_HELP_VIEWER. The specific error message was: {1}", helpViewer, e.Message);
Console.Error.WriteLine (message);
MessageBox.Show (message);
}
}
/// <remarks>
/// throws exception from Process.Start() if there was a problem starting
/// </remarks>
private static void RunNonblockingProcess (string command, string arguments)
{
using (Process process = new Process ()) {
process.StartInfo.FileName = command;
process.StartInfo.Arguments = arguments;
process.StartInfo.UseShellExecute = false;
process.Start ();
}
}
}
}
@@ -1031,6 +1031,7 @@ namespace System.Windows.Forms
virtual_list_size = value;
if (virtual_mode) {
focused_item_index = -1;
selected_indices.Reset ();
Redraw (true);
}
@@ -2670,6 +2671,12 @@ namespace System.Windows.Forms
clicked_item.Selected = true;
}
// Side-effects of changing the selection can possibly result in ItemsMouseUp() being called and
// and clicked_item being set to null. (See Xamarin bug 23591.) In such a case, assume
// that there's nothing more we can do here.
if (clicked_item == null)
return;
if (owner.VirtualMode && changed) {
// Broken event - It's not fired from Item.Selected also
ListViewVirtualItemsSelectionRangeChangedEventArgs args =
@@ -3663,7 +3670,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);
}
@@ -817,6 +817,12 @@ namespace System.Windows.Forms {
else
SelectedIndex = (SelectedIndex + TabCount - 1) % TabCount;
ke.Handled = true;
} else if (ke.KeyCode == Keys.PageUp && (ke.KeyData & Keys.Control) != 0) {
SelectedIndex = (SelectedIndex + TabCount - 1) % TabCount;
ke.Handled = true;
} else if (ke.KeyCode == Keys.PageDown && (ke.KeyData & Keys.Control) != 0) {
SelectedIndex = (SelectedIndex + 1) % TabCount;
ke.Handled = true;
} else if (ke.KeyCode == Keys.Home) {
SelectedIndex = 0;
ke.Handled = true;
@@ -28,6 +28,7 @@
using System;
using System.Drawing;
using System.Collections.Generic;
using System.ComponentModel;
using System.Runtime.InteropServices;
using System.Windows.Forms.Layout;
@@ -514,29 +515,67 @@ namespace System.Windows.Forms
int actual_cols = actual_positions.GetLength (0);
int actual_rows = actual_positions.GetLength (1);
// Find the largest column-span/row-span values. A table entry that spans more than one
// column (row) should not be treated as though it's width (height) all belongs to the
// first column (row), but should be spread out across all the columns (rows) that are
// spanned. So we need to keep track of the widths (heights) of spans as well as
// individual columns (rows).
int max_colspan = 1, max_rowspan = 1;
foreach (Control c in Controls)
{
max_colspan = Math.Max(max_colspan, GetColumnSpan(c));
max_rowspan = Math.Max(max_rowspan, GetRowSpan(c));
}
// Figure out how wide the owner needs to be
int[] column_widths = new int[actual_cols];
// Keep track of widths for spans as well as columns. column_span_widths[i,j] stores
// the maximum width for items column i than have a span of j+1 (ie, covers columns
// i through i+j).
int[,] column_span_widths = new int[actual_cols, max_colspan];
int[] biggest = new int[max_colspan];
float total_column_percentage = 0f;
// Figure out how tall each column wants to be
// Figure out how wide each column wants to be
for (int i = 0; i < actual_cols; i++) {
if (i < ColumnStyles.Count && ColumnStyles[i].SizeType == SizeType.Percent)
total_column_percentage += ColumnStyles[i].Width;
int biggest = 0;
int absolute_width = -1;
if (i < ColumnStyles.Count && ColumnStyles[i].SizeType == SizeType.Absolute)
absolute_width = (int)ColumnStyles[i].Width; // use the absolute width if it's absolute!
for (int s = 0; s < max_colspan; ++s)
biggest[s] = 0;
for (int j = 0; j < actual_rows; j++) {
Control c = actual_positions[i, j];
if (c != null) {
if (!c.AutoSize)
biggest = Math.Max (biggest, c.ExplicitBounds.Width + c.Margin.Horizontal + Padding.Horizontal);
int colspan = GetColumnSpan (c);
if (colspan == 0)
continue;
if (colspan == 1 && absolute_width > -1)
biggest[0] = absolute_width; // use the absolute width if the column has absolute width assigned!
else if (!c.AutoSize)
biggest[colspan-1] = Math.Max (biggest[colspan-1], c.ExplicitBounds.Width + c.Margin.Horizontal + Padding.Horizontal);
else
biggest = Math.Max (biggest, c.PreferredSize.Width + c.Margin.Horizontal + Padding.Horizontal);
biggest[colspan-1] = Math.Max (biggest[colspan-1], c.PreferredSize.Width + c.Margin.Horizontal + Padding.Horizontal);
}
else if (absolute_width > -1) {
biggest[0] = absolute_width;
}
}
column_widths[i] = biggest;
for (int s = 0; s < max_colspan; ++s)
column_span_widths[i,s] = biggest[s];
}
for (int i = 0; i < actual_cols; ++i) {
for (int s = 1; s < max_colspan; ++s) {
if (column_span_widths[i,s] > 0)
AdjustWidthsForSpans (column_span_widths, i, s);
}
column_widths[i] = column_span_widths[i,0];
}
// Because percentage based rows divy up the remaining space,
@@ -552,30 +591,55 @@ namespace System.Windows.Forms
non_percent_total_width += column_widths[i];
}
int border_width = GetCellBorderWidth (CellBorderStyle);
int needed_width = non_percent_total_width + percent_total_width + (border_width * (actual_cols + 1));
// Figure out how tall the owner needs to be
int[] row_heights = new int[actual_rows];
int[,] row_span_heights = new int[actual_rows, max_rowspan];
biggest = new int[max_rowspan];
float total_row_percentage = 0f;
// Figure out how tall each row wants to be
for (int j = 0; j < actual_rows; j++) {
if (j < RowStyles.Count && RowStyles[j].SizeType == SizeType.Percent)
total_row_percentage += RowStyles[j].Height;
int absolute_height = -1;
if (j < RowStyles.Count && RowStyles[j].SizeType == SizeType.Absolute)
absolute_height = (int)RowStyles[j].Height; // use the absolute height if it's absolute!
int biggest = 0;
for (int s = 0; s < max_rowspan; ++s)
biggest[s] = 0;
for (int i = 0; i < actual_cols; i++) {
Control c = actual_positions[i, j];
if (c != null) {
if (!c.AutoSize)
biggest = Math.Max (biggest, c.ExplicitBounds.Height + c.Margin.Vertical + Padding.Vertical);
int rowspan = GetRowSpan (c);
if (rowspan == 0)
continue;
if (rowspan == 1 && absolute_height > -1)
biggest[0] = absolute_height; // use the absolute height if the row has absolute height assigned!
else if (!c.AutoSize)
biggest[rowspan-1] = Math.Max (biggest[rowspan-1], c.ExplicitBounds.Height + c.Margin.Vertical + Padding.Vertical);
else
biggest = Math.Max (biggest, c.PreferredSize.Height + c.Margin.Vertical + Padding.Vertical);
biggest[rowspan-1] = Math.Max (biggest[rowspan-1], c.PreferredSize.Height + c.Margin.Vertical + Padding.Vertical);
}
else if (absolute_height > -1) {
biggest[0] = absolute_height;
}
}
row_heights[j] = biggest;
for (int s = 0; s < max_rowspan; ++s)
row_span_heights[j,s] = biggest[s];
}
for (int j = 0; j < actual_rows; ++j) {
for (int s = 1; s < max_rowspan; ++s) {
if (row_span_heights[j,s] > 0)
AdjustHeightsForSpans (row_span_heights, j, s);
}
row_heights[j] = row_span_heights[j,0];
}
// Because percentage based rows divy up the remaining space,
@@ -591,8 +655,111 @@ namespace System.Windows.Forms
non_percent_total_height += row_heights[j];
}
int border_width = GetCellBorderWidth (CellBorderStyle);
return new Size (non_percent_total_width + percent_total_width + (border_width * (actual_cols + 1)), non_percent_total_height + percent_total_height + (border_width * (actual_rows + 1)));
int needed_height = non_percent_total_height + percent_total_height + (border_width * (actual_rows + 1));
return new Size (needed_width, needed_height);
}
/// <summary>
/// Adjust the widths of the columns underlying a span if necessary.
/// </summary>
private void AdjustWidthsForSpans (int[,] widths, int col, int span)
{
// Get the combined width of the columns underlying the span.
int existing_width = 0;
for (int i = col; i <= col+span; ++i)
existing_width += widths[i,0];
if (widths[col,span] > existing_width)
{
// We need to expand one or more of the underlying columns to fit the span,
// preferably ones that are not Absolute style.
int excess = widths[col,span] - existing_width;
int remaining = excess;
List<int> adjusting = new List<int>();
List<float> adjusting_widths = new List<float>();
for (int i = col; i <= col+span; ++i) {
if (i < ColumnStyles.Count && ColumnStyles[i].SizeType != SizeType.Absolute) {
adjusting.Add(i);
adjusting_widths.Add((float)widths[i,0]);
}
}
if (adjusting.Count == 0) {
// if every column is Absolute, spread the gain across every column
for (int i = col; i <= col+span; ++i) {
adjusting.Add(i);
adjusting_widths.Add((float)widths[i,0]);
}
}
float original_total = 0f;
foreach (var w in adjusting_widths)
original_total += w;
// Divide up the needed additional width proportionally.
for (int i = 0; i < adjusting.Count; ++i) {
var idx = adjusting[i];
var percent = adjusting_widths[i] / original_total;
var adjust = (int)(percent * excess);
widths[idx,0] += adjust;
remaining -= adjust;
}
// Any remaining fragment (1 or 2 pixels?) is divided evenly.
while (remaining > 0) {
for (int i = 0; i < adjusting.Count && remaining > 0; ++i) {
++widths[adjusting[i],0];
--remaining;
}
}
}
}
/// <summary>
/// Adjust the heights of the rows underlying a span if necessary.
/// </summary>
private void AdjustHeightsForSpans (int[,] heights, int row, int span)
{
// Get the combined height of the rows underlying the span.
int existing_height = 0;
for (int i = row; i <= row+span; ++i)
existing_height += heights[i,0];
if (heights[row,span] > existing_height)
{
// We need to expand one or more of the underlying rows to fit the span,
// preferably ones that are not Absolute style.
int excess = heights[row,span] - existing_height;
int remaining = excess;
List<int> adjusting = new List<int>();
List<float> adjusting_heights = new List<float>();
for (int i = row; i <= row+span; ++i) {
if (i < RowStyles.Count && RowStyles[i].SizeType != SizeType.Absolute) {
adjusting.Add(i);
adjusting_heights.Add((float)heights[i,0]);
}
}
if (adjusting.Count == 0) {
// if every row is Absolute, spread the gain across every row
for (int i = row; i <= row+span; ++i) {
adjusting.Add(i);
adjusting_heights.Add((float)heights[i,0]);
}
}
float original_total = 0f;
foreach (var w in adjusting_heights)
original_total += w;
// Divide up the needed additional height proportionally.
for (int i = 0; i < adjusting.Count; ++i) {
var idx = adjusting[i];
var percent = adjusting_heights[i] / original_total;
var adjust = (int)(percent * excess);
heights[idx,0] += adjust;
remaining -= adjust;
}
// Any remaining fragment (1 or 2 pixels?) is divided evenly.
while (remaining > 0) {
for (int i = 0; i < adjusting.Count && remaining > 0; ++i) {
++heights[adjusting[i],0];
--remaining;
}
}
}
}
#endregion
@@ -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;
@@ -484,9 +492,6 @@ namespace System.Windows.Forms
r.X += 2;
r.Width -= 2;
}
if ((flags & TextFormatFlags.WordEllipsis) == TextFormatFlags.WordEllipsis || (flags & TextFormatFlags.EndEllipsis) == TextFormatFlags.EndEllipsis || (flags & TextFormatFlags.WordBreak) == TextFormatFlags.WordBreak) {
r.Width -= 4;
}
if ((flags & TextFormatFlags.VerticalCenter) == TextFormatFlags.VerticalCenter && XplatUI.RunningOnUnix) {
r.Y -= 1;
}
Loaded 100 of 2705 files, more files were not shown because too many files have changed in this diff. Show more