Compare commits

..
Author SHA1 Message Date
Rodrigo Kumpera bcc380d6ba [runtime] Instrument mono_domain_alloc 2014-09-16 18:16:47 -04:00
Rodrigo Kumpera 8516f578ee [runtime] Instrument image and image set mempool allocation. 2014-09-16 16:58:17 -04:00
Rodrigo Kumpera feaa6e19fb [runtime] Implement runtime valloc reporting. 2014-09-08 19:24:31 -04:00
Rodrigo Kumpera e8953e705c Properly name all sgen_alloc_os_memory. 2014-09-08 17:12:58 -04:00
Rodrigo Kumpera 130f08e943 Add reporting to jitinfo. 2014-09-08 17:11:11 -04:00
Rodrigo Kumpera 89558be055 [runtime] Finish metadata reporting. 2014-09-08 16:55:45 -04:00
Rodrigo Kumpera f2c8417122 [runtime] Proposed implementation of the memory profiler.
To get a small taste of it in action run the following program with it:

sing System;
using System.Net;
using System.Runtime.InteropServices;
using System.Linq;

public class Test
{
	[DllImport ("__Internal")]
	public static extern void mono_memprof_dump ();

	static int MethodThatDoesLinq () {
		int[] x = new[] { 1,2,3,4};
		var k = x.Where (_ => _ <= 100).Select (_ => _ + 1);
		int r = 0;
		foreach (var v in k)
			r += v;
		return r;
	}
	public static void Main ()
	{
		mono_memprof_dump ();
		MethodThatDoesLinq ();
		Console.WriteLine ("----------------------");
		mono_memprof_dump ();
	}
}
2014-09-08 02:27:09 -04:00
Zoltan Varga 4b6a2c8f89 Fix a warning. 2014-09-05 20:07:13 -04:00
Zoltan Varga 729bbe4041 [jit] Store the epilog length in MonoArchEHJitInfo instead of encoding it in jinfo->unwind_desc, since the latter can overflow for methods with large epilogs. Fixes #22685. 2014-09-05 18:07:42 -04:00
Zoltan Varga 3795639a4a Fix the linux build. 2014-09-05 17:18:18 -04:00
Zoltan Varga c8c4bd9a78 [runtime] Fix the linux build. 2014-09-05 15:46:19 -04:00
Martin Baulig 24fbaedcd2 [WCF]: Actually fix #22179 to allow concurrent requests.
Pass the 'OperationContext' around in a parameter instead of storing it
in an instance field to make this thread-safe.
2014-09-05 18:59:21 +02:00
Zoltan Varga 385f84f18c [aot] Emit aot logging information to a per-assembly file when using the AOT cache. Cache aot failures. 2014-09-04 23:31:50 -04:00
Zoltan Varga 4f916f178b [aot] Print error messages to the aot logfile as well, avoid exiting the process on failures. 2014-09-04 20:06:53 -04:00
Zoltan Varga 39c87f6f69 [aot] Allow the redirection of output messages from the AOT compiler to a logfile. 2014-09-04 19:11:30 -04:00
Zoltan Varga d84d1a94a0 Fix the build. 2014-09-04 17:38:16 -04:00
Zoltan Varga ad8236ebb8 [runtime] Get rid of the Makefile.am.in->Makefile.am change in metadata/, its not needed. 2014-09-04 17:34:36 -04:00
Marek Safar 2b88d02356 [mcs] recursive pattern with named arguments 2014-09-04 15:12:21 +02:00
Marek Safar 806b95d844 [mcs] recursive pattern matching 2014-09-04 10:37:50 +02:00
Marek Safar e83f4a2ab3 Merge pull request #1254 from vkargov/master
[corlib] Take daylight change info for the current year in TimeZoneTest.cs
2014-09-03 20:30:38 -09:00
Alexis Christoforides 5d80954463 Bump Mono version -> 3.10.1 2014-09-04 00:15:40 -04:00
Zoltan Varga c7b3d5c3ba Revert "[build] Include mono/utils into the extensions module."
This reverts commit b760456501.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Use __android_log_write() instead of __android_log_vprint().

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

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

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

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

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

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

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

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

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

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

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

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

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

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

No files matched your search

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

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.Framework.Test", "Microsoft.Build.Framework.Test.csproj", "{1D0190A3-E345-45EC-9DCD-7B12BB6A7CC9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1D0190A3-E345-45EC-9DCD-7B12BB6A7CC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D0190A3-E345-45EC-9DCD-7B12BB6A7CC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D0190A3-E345-45EC-9DCD-7B12BB6A7CC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1D0190A3-E345-45EC-9DCD-7B12BB6A7CC9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -83,6 +83,11 @@ namespace Microsoft.Build.Framework
get {
return message;
}
#if NET_4_0
protected set {
message = value;
}
#endif
}
public string SenderName {
@@ -26,12 +26,12 @@ namespace Microsoft.Build.Framework
{
}
public BuildEventContext (int nodeId, int projectInstanceId, int targetId, int projectContextId, int taskId)
: this (rnd.Next (), nodeId, projectInstanceId, targetId, projectContextId, taskId)
public BuildEventContext (int nodeId, int projectInstanceId, int projectContextId, int targetId, int taskId)
: this (rnd.Next (), nodeId, projectInstanceId, projectContextId, targetId, taskId)
{
}
public BuildEventContext (int submissionId, int nodeId, int projectInstanceId, int targetId, int projectContextId, int taskId)
public BuildEventContext (int submissionId, int nodeId, int projectInstanceId, int projectContextId, int targetId, int taskId)
{
SubmissionId = submissionId;
NodeId = nodeId;
@@ -56,9 +56,9 @@ namespace Microsoft.Build.Framework
public int TaskId { get; private set; }
// MSDN document says "true if the references are equal, false otherwise." but that doesn't make sense.
public override bool Equals (object other)
public override bool Equals (object obj)
{
var o = other as BuildEventContext;
var o = obj as BuildEventContext;
return (object) o != null &&
o.NodeId == NodeId &&
o.ProjectContextId == ProjectContextId &&
@@ -32,7 +32,7 @@ using System;
namespace Microsoft.Build.Framework
{
[Serializable]
public abstract class LazyFormattedBuildEventArgs : BuildEventArgs {
public class LazyFormattedBuildEventArgs : BuildEventArgs {
string message, format;
object[] args;
@@ -3,8 +3,8 @@ namespace Microsoft.Build.Framework
{
public enum RegisteredTaskObjectLifetime
{
AppDomain,
Build
Build,
AppDomain
}
}
#endif
@@ -1,76 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{01D4DF2C-F88B-43F1-B935-25CC0EE900C7}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Build.Tasks.Test</RootNamespace>
<AssemblyName>Microsoft.Build.Tasks.Test</AssemblyName>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>False</Optimize>
<OutputPath>./</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<OutputType>Library</OutputType>
<AssemblyName>Microsoft.Build.Tasks.Test</AssemblyName>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>True</Optimize>
<OutputPath>./bin/Release/</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<OutputType>Library</OutputType>
<AssemblyName>Microsoft.Build.Tasks.Test</AssemblyName>
<DebugSymbols>True</DebugSymbols>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<Compile Include="Test\Microsoft.Build.Tasks\ALTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\Consts.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\CreateItemTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\CreatePropertyTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\CscTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\ErrorTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\GetFrameworkPathTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\GetFrameworkSdkPathTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\MakeDirTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\ManagedCompilerTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\MessageTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\RemoveDirTest.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\TestEngine.cs" />
<Compile Include="Test\Microsoft.Build.Tasks\WarningTest.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.Build.Engine" />
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Microsoft.Build.Tasks" />
<Reference Include="Microsoft.Build.Utilities" />
<Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
</Project>
@@ -1,20 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C# Express 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.Tasks.Test", "Microsoft.Build.Tasks.Test.csproj", "{01D4DF2C-F88B-43F1-B935-25CC0EE900C7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{01D4DF2C-F88B-43F1-B935-25CC0EE900C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{01D4DF2C-F88B-43F1-B935-25CC0EE900C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{01D4DF2C-F88B-43F1-B935-25CC0EE900C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{01D4DF2C-F88B-43F1-B935-25CC0EE900C7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -41,7 +41,7 @@ using System.Collections.Specialized;
namespace Microsoft.Build.Tasks
{
public class CodeTaskFactory : ITaskFactory2
public class CodeTaskFactory : ITaskFactory
{
public CodeTaskFactory ()
{
@@ -51,11 +51,12 @@ namespace Microsoft.Build.Tasks
public void CleanupTask (ITask task)
{
}
public ITask CreateTask (IBuildEngine taskFactoryLoggingHost)
public ITask CreateTask (IBuildEngine loggingHost)
{
return CreateTask (taskFactoryLoggingHost, null);
return CreateTask (loggingHost, null);
}
public ITask CreateTask (IBuildEngine taskFactoryLoggingHost, IDictionary<string, string> taskIdentityParameters)
ITask CreateTask (IBuildEngine taskFactoryLoggingHost, IDictionary<string, string> taskIdentityParameters)
{
if (assembly == null)
return null;
@@ -66,11 +67,11 @@ namespace Microsoft.Build.Tasks
{
return parameter_group != null ? parameter_group.Values.ToArray () : new TaskPropertyInfo [0];
}
public bool Initialize (string taskName, IDictionary<string, TaskPropertyInfo> parameterGroup, string taskBody, IBuildEngine taskFactoryLoggingHost)
public bool Initialize (string taskName, IDictionary<string, TaskPropertyInfo> taskParameters, string taskElementContents, IBuildEngine taskFactoryLoggingHost)
{
return Initialize (taskName, null, parameterGroup, taskBody, taskFactoryLoggingHost);
return Initialize (taskName, null, taskParameters, taskElementContents, taskFactoryLoggingHost);
}
public bool Initialize (string taskName, IDictionary<string, string> factoryIdentityParameters, IDictionary<string, TaskPropertyInfo> parameterGroup, string taskBody, IBuildEngine taskFactoryLoggingHost)
bool Initialize (string taskName, IDictionary<string, string> factoryIdentityParameters, IDictionary<string, TaskPropertyInfo> parameterGroup, string taskBody, IBuildEngine taskFactoryLoggingHost)
{
task_name = taskName;
if (parameterGroup != null)
@@ -122,7 +122,7 @@ namespace Microsoft.Build.Tasks {
protected abstract string CreateManifestName (string fileName,
string linkFileName,
string rootNamespace,
string rootNamespaceName,
string dependentUponFileName,
Stream binaryStream);
@@ -26,7 +26,7 @@
///// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/////
#if NET_2_0
#if !NET_4_0
using System;
using Microsoft.Build.Framework;
@@ -25,8 +25,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#if NET_2_0
using System;
using System.IO;
using Microsoft.Build.Framework;
@@ -102,12 +100,12 @@ namespace Microsoft.Build.Tasks {
//
if (References != null)
foreach (ITaskItem item in References) {
string aliases = item.GetMetadata ("Aliases") ?? String.Empty;
aliases = aliases.Trim ();
if (aliases.Length > 0)
commandLine.AppendSwitchIfNotNull ("/reference:" + aliases + "=", item.ItemSpec);
else
string aliases = item.GetMetadata ("Aliases");
if (!string.IsNullOrEmpty (aliases)) {
AddAliasesReference (commandLine, aliases, item.ItemSpec);
} else {
commandLine.AppendSwitchIfNotNull ("/reference:", item.ItemSpec);
}
}
if (ResponseFiles != null)
@@ -125,6 +123,21 @@ namespace Microsoft.Build.Tasks {
commandLine.AppendSwitchIfNotNull ("/win32res:", Win32Resource);
}
static void AddAliasesReference (CommandLineBuilderExtension commandLine, string aliases, string reference)
{
foreach (var alias in aliases.Split (',')) {
var a = alias.Trim ();
if (a.Length == null)
continue;
var r = "/reference:";
if (!string.Equals (a, "global", StringComparison.OrdinalIgnoreCase))
r += a + "=";
commandLine.AppendSwitchIfNotNull (r, reference);
}
}
[MonoTODO]
protected override bool CallHostObjectToExecute ()
{
@@ -232,4 +245,3 @@ namespace Microsoft.Build.Tasks {
}
}
#endif
@@ -122,13 +122,13 @@ namespace Microsoft.Build.Tasks {
Log.LogMessage (MessageImportance.Normal, "Executing: " + command);
}
protected override void LogEventsFromTextOutput (string singleLine, MessageImportance importance)
protected override void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
{
#if NET_4_0
if (IgnoreStandardErrorWarningFormat ||
(!errorMatcher (singleLine) && !warningMatcher (singleLine)))
#endif
Log.LogMessage (importance, singleLine);
Log.LogMessage (messageImportance, singleLine);
}
#if NET_4_0
@@ -36,7 +36,7 @@ using Microsoft.Build.Utilities;
namespace Microsoft.Build.Tasks {
//FIXME: This should be in v3.5 only
public sealed class FindAppConfigFile : TaskExtension {
public class FindAppConfigFile : TaskExtension {
public FindAppConfigFile ()
{
@@ -222,7 +222,6 @@ namespace Microsoft.Build.Tasks
"It should have either 2 or 3 comma separated components.", moniker_literal);
}
[Required]
public string TargetFrameworkMoniker { get; set; }
public string RootPath { get; set; }
@@ -233,10 +232,10 @@ namespace Microsoft.Build.Tasks
public string TargetFrameworkMonikerDisplayName { get; set; }
[Output]
public string[] ReferenceAssemblyPaths { get; set; }
public string[] ReferenceAssemblyPaths { get; private set; }
[Output]
public string[] FullFrameworkReferenceAssemblyPaths { get; set; }
public string[] FullFrameworkReferenceAssemblyPaths { get; private set; }
static string DefaultFrameworksBasePath {
get {
@@ -53,7 +53,6 @@ namespace Microsoft.Build.Tasks {
bool findRelatedFiles;
bool findSatellites;
bool findSerializationAssemblies;
string[] installedAssemblyTables;
ITaskItem[] relatedFiles;
ITaskItem[] resolvedDependencyFiles;
ITaskItem[] resolvedFiles;
@@ -156,6 +155,9 @@ namespace Microsoft.Build.Tasks {
LogWithPrecedingNewLine (MessageImportance.Low, "Primary Reference {0}", item.ItemSpec);
ResolvedReference resolved_ref = ResolveReference (item, searchPaths, true);
if (resolved_ref == null)
resolved_ref = ResolveWithAlternateName (item, allowedAssemblyExtensions ?? default_assembly_extensions);
if (resolved_ref == null) {
Log.LogWarning ("Reference '{0}' not resolved", item.ItemSpec);
assembly_resolver.LogSearchLoggerMessages (MessageImportance.Normal);
@@ -182,6 +184,19 @@ namespace Microsoft.Build.Tasks {
}
}
ResolvedReference ResolveWithAlternateName (ITaskItem item, string[] extensions)
{
foreach (string extn in extensions) {
if (item.ItemSpec.EndsWith (extn)) {
ITaskItem altitem = new TaskItem (item.ItemSpec.Substring (0, item.ItemSpec.Length - extn.Length));
item.CopyMetadataTo (altitem);
return ResolveReference (altitem, searchPaths, true);
}
}
return null;
}
// Use @search_paths to resolve the reference
ResolvedReference ResolveReference (ITaskItem item, IEnumerable<string> search_paths, bool set_copy_local)
{
@@ -610,12 +625,15 @@ namespace Microsoft.Build.Tasks {
get { return findSerializationAssemblies; }
set { findSerializationAssemblies = value; }
}
public string[] InstalledAssemblyTables {
get { return installedAssemblyTables; }
set { installedAssemblyTables = value; }
}
public
#if NET_4_0
ITaskItem[]
#else
string[]
#endif
InstalledAssemblyTables { get; set; }
[Output]
public ITaskItem[] RelatedFiles {
get { return relatedFiles; }
@@ -1,5 +1,5 @@
//
// UpdateManifest.cs
// VCBuild.cs
//
// Author:
// Leszek Ciesielski <[email protected]>
@@ -26,7 +26,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
#if !NET_4_0
using System;
using System.Collections.Specialized;
@@ -158,7 +158,7 @@ namespace Microsoft.Build.Tasks {
return true;
}
protected override void LogEventsFromTextOutput (string singleLine, MessageImportance importance)
protected override void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
{
singleLine = singleLine.Trim ();
if (singleLine.Length == 0)
@@ -173,7 +173,7 @@ namespace Microsoft.Build.Tasks {
Match match = ErrorRegex.Match (singleLine);
if (!match.Success) {
Log.LogMessage (importance, singleLine);
Log.LogMessage (messageImportance, singleLine);
return;
}
@@ -198,7 +198,7 @@ namespace Microsoft.Build.Tasks {
Log.LogError (null, code, null, filename, lineNumber, columnNumber, -1,
-1, text, null);
} else {
Log.LogMessage (importance, singleLine);
Log.LogMessage (messageImportance, singleLine);
}
}
@@ -433,6 +433,24 @@ namespace MonoTests.Microsoft.Build.Tasks {
Assert.AreEqual (String.Empty, c2.ToString (), "A2");
}
[Test]
public void TestReferencesAlias ()
{
CscExtended csc = new CscExtended ();
CommandLineBuilderExtension c1 = new CommandLineBuilderExtension ();
CommandLineBuilderExtension c2 = new CommandLineBuilderExtension ();
TaskItem ti1 = new TaskItem ("A");
ti1.SetMetadata ("Aliases", "r1,global,r2");
csc.References = new ITaskItem[2] { ti1, new TaskItem ("B") };
csc.ARFC (c1);
csc.ACLC (c2);
Assert.AreEqual ("/reference:r1=A /reference:A /reference:r2=A /reference:B", c1.ToString (), "A1");
Assert.AreEqual (String.Empty, c2.ToString (), "A2");
}
[Test]
public void TestResponseFiles ()
{
@@ -227,6 +227,52 @@ namespace MonoTests.Microsoft.Build.Tasks {
";
}
[Test]
public void TestSystemDll ()
{
var gacDir = GetGacDir ();
if (gacDir == null || !System.IO.Directory.Exists (gacDir))
Assert.Ignore ("GAC not found.");
string documentString = @"
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<ItemGroup>
<Reference Include='System.dll' />
</ItemGroup>
<PropertyGroup>
<SearchPaths>
{CandidateAssemblyFiles};
$(ReferencePath);
{HintPathFromItem};
{TargetFrameworkDirectory};
{AssemblyFolders};
{GAC};
{RawFileName};
$(OutputPath)
</SearchPaths>
</PropertyGroup>
<Target Name='A'>
<ResolveAssemblyReference
Assemblies='@(Reference)'
SearchPaths='$(SearchPaths)'
>
<Output TaskParameter='ResolvedFiles' ItemName='ResolvedFiles'/>
</ResolveAssemblyReference>
</Target>
</Project>
";
engine = new Engine (Consts.BinPath);
project = engine.CreateNewProject ();
project.LoadXml (documentString);
Assert.IsTrue (project.Build ("A"), "A1");
big = project.GetEvaluatedItemsByName ("ResolvedFiles");
Assert.AreEqual (1, big.Count, "A2");
Assert.IsTrue (big [0].Include.EndsWith (".dll"), "A3");
}
string GetGacDir ()
{
// copied from mcs/tools/gacutil/driver.cs
@@ -1,56 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{DC97F667-4341-4764-8F35-E1E0B2705A51}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Build.Utilities.Test</RootNamespace>
<AssemblyName>Microsoft.Build.Utilities.Test</AssemblyName>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>.\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Microsoft.Build.Utilities" />
<Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Test\Microsoft.Build.Utilities\CommandLineBuilderTest.cs" />
<Compile Include="Test\Microsoft.Build.Utilities\LoggerTest.cs" />
<Compile Include="Test\Microsoft.Build.Utilities\TaskItemTest.cs" />
<Compile Include="Test\Microsoft.Build.Utilities\TaskLoggingHelperTest.cs" />
<Compile Include="Test\Microsoft.Build.Utilities\ToolTaskTest.cs" />
</ItemGroup>
</Project>
@@ -1,20 +0,0 @@

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

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

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