Compare commits

...
789 Commits
Author SHA1 Message Date
Rodrigo Kumpera 32b3b31f74 Make sure we keep a root for the delegates when calling them.
* method-to-ir.c (mono_emit_method_call_full): Make sure
	we keep a root for delegates when calling them using the
	fast delegate dispatch.

	Fixes #667921
2011-02-17 22:58:12 +01:00
Marek Safar 1be427d6d3 Fix repl using declaration after type declaration 2011-02-17 21:06:35 +00:00
Marek Safar 862e1a20d2 Load default references after user references so they can rely on corlib 2011-02-17 20:58:17 +00:00
Marek Safar 4c1bc31c53 Even more 4.0 profile mcs update 2011-02-17 19:28:20 +00:00
Marek Safar 89c1c938ec Cleanup repl from most of static stuff and fix many hidden issues 2011-02-17 19:22:18 +00:00
Marek Habersack d91cebb747 [asp.net,mvc3] Fix for bug #668655. Implemented a few more NameValueCollection method overloads. 2011-02-17 19:36:04 +01:00
Marek Safar 089b4086dc Don't use runtime flag for basic compiler (it still lives in old world) 2011-02-17 18:34:32 +00:00
Jeffrey Stedfast 16435bd037 Fixed exception string (spaces between words = good) 2011-02-17 13:00:50 -05:00
Marek Habersack 5cdeff4846 [mcs] Fix builds which use full file paths on the command line
Passing /tmp/source.cs to mcs would result in "error CS2007: Unrecognized command-line option: /tmp/source.cs"
this patch fixes it.
2011-02-17 17:50:10 +01:00
Marek Safar cc72712e4e Set correct runtime version for corlib now when mcs defaults to 4. 2011-02-17 16:39:35 +00:00
Marek Safar f4326c0bce Correctly set underlying type of reduced side-effect constant expression 2011-02-17 16:39:35 +00:00
Jérémie Laval c5e37f197d Allow people to optionally fallback to the old scheduler with an environment variable 2011-02-17 15:36:27 +00:00
Jérémie Laval 1bf1f268f2 Remove ctors in TpScheduler
This also remove the capping of the ThreadPool, problem needs to be fixed in the pool itself.
2011-02-17 15:35:32 +00:00
Jérémie Laval dd79962df7 Make TryExecuteTaskInline a bit smarter 2011-02-17 15:35:02 +00:00
Jérémie Laval 5ede770a67 Refactor common code block of TpScheduler and SyncContextScheduler in SchedulerProxy 2011-02-17 15:34:11 +00:00
Jérémie Laval 238a65fbfe Kill old IScheduler interface.
We still use the ParticipateUntil facility of IScheduler internally and provide a default implementation for pure TaskScheduler
2011-02-17 15:07:05 +00:00
Jérémie Laval 17317ee088 When finding best worker number in Parallel loops use current TaskScheduler instead of default TaskScheduler 2011-02-17 15:06:14 +00:00
Jérémie Laval 71259e744e Adapt TpScheduler to the new API in TaskScheduler 2011-02-17 15:06:14 +00:00
Jérémie Laval 928550dff2 Cache callback delegate in TpScheduler when passing Task to QueueUserWorkItem 2011-02-17 15:06:14 +00:00
Jérémie Laval cdadec93c0 Don't create a new lambda everytime when queuing Task via ThreadPool QueueUserWorkItem 2011-02-17 15:06:13 +00:00
Jérémie Laval 430d01adef Try to execute task inline when they are ready to run and we wait on them with no timeout 2011-02-17 15:06:13 +00:00
Jérémie Laval 53e5b292ab Threadpool Task scheduler 2011-02-17 15:06:13 +00:00
Marek Safar 1d8dbddfd1 Merge few more changes from MD 2011-02-17 14:45:24 +00:00
Marek Safar f286a4278d Remove install hack from mcs/mcs 2011-02-17 14:00:43 +00:00
Marek Safar 3595d1d20e Fix Location to have reasonable limits when running under MD 2011-02-17 13:53:35 +00:00
Rodrigo Kumpera 79132ee417 Handle gsharing and marshal by ref.
* method-to-ir.c (mono_emit_method_call_full): Non virtual
	marshal by ref methods with gsharing context must always
	be called using indirect calls.

	Fixes #665893
2011-02-17 14:46:21 +01:00
Atsushi Eno 5b4dfe2800 get out from NET_4_0. 2011-02-17 22:20:15 +09:00
Atsushi Eno 21157e91e0 Couple of corcompare fixes. 2011-02-17 21:07:13 +09:00
Atsushi Eno 3137e2c0c6 Only use non-null values in ServiceAuthorizationBehavior. 2011-02-17 21:06:12 +09:00
Atsushi Eno e2af590bc6 Fill a couple of missing ServiceAuthorizationElement implementation. 2011-02-17 21:05:32 +09:00
Atsushi Eno 1fe37c584d HTTP authentication in HttpListener had dropped during refactoring. Now it's back. 2011-02-17 21:04:34 +09:00
Jérémie Laval 9869f11cb4 Return a new object in ObjectPool when too much time is spent spinning in Take 2011-02-17 11:33:30 +00:00
Marek Safar b81988637e Remove duplicate Mono.Softdebugger 2011-02-17 09:30:42 +00:00
Marek Safar cd40af130d Fix full path file names parsing 2011-02-17 09:30:42 +00:00
Geoff Norton 3c1a805c6d Fix ARCH_STORE_REGS on arm to save r0->r12 properly 2011-02-16 16:10:11 -05:00
Geoff Norton 19d8b7e3de Remove dead code 2011-02-16 15:05:22 -05:00
Marek Safar ac9d0c11ab Another make dist fix 2011-02-16 19:08:55 +00:00
Atsushi Eno 8753386e4b MakXsdDataContractExporter refactoring to generally use SerializationMap.XmlName.
Fixed bug #670539.
2011-02-17 00:55:15 +09:00
Jb Evain 7da86f1edf fix the mobile build 2011-02-16 16:38:23 +01:00
Marek Safar 7b207f9f4b Keep monolite in line with mono 2.4 corlib as I cannot handle two different versions 2011-02-16 15:31:05 +00:00
Marek Safar cc8b19c1a1 Fix mcs exit code for informative arguments 2011-02-16 14:48:00 +00:00
Marek Safar 40b3c2f288 Make all arrays module specific 2011-02-16 14:48:00 +00:00
Hib Eris 98b048cbc4 Decorate _image_base__ with __MINGW_LSYMBOL
This fix is needed in compiling for x86_x64.
2011-02-16 15:22:08 +01:00
Jérémie Laval 5d757ea7df Track what task is currently executed by a ThreadWorker and add the case for "parent waiting on children task it created" in CheckTaskFitness predicate.
This fixup PLinq processing when it's launched from a Task.
2011-02-16 13:14:14 +00:00
Jérémie Laval cdd12cb801 Create PLinq query tasks attached to their eventual task parent by default 2011-02-16 13:14:14 +00:00
Jérémie Laval f1ce13ae04 When choosing the number of Task to create for a PLinq query, check if we are already in a running Task 2011-02-16 13:14:13 +00:00
Jérémie Laval 985b888796 Implement properly TaskScheduler's FromCurrentSynchronizationContext 2011-02-16 13:14:13 +00:00
Marek Safar f1b86e38b3 Less static is good for my health 2011-02-16 12:24:35 +00:00
Atsushi Eno 463d8ebf82 Don't reject serialization map for existing different (but same-purpose) type. 2011-02-16 18:48:06 +09:00
Atsushi Eno 7cca5459f9 To header seems mandatory in April2005, so fill it. 2011-02-16 18:17:09 +09:00
Atsushi Eno a5fe143613 April2005 AppSequence needs default constructor for deserialization. 2011-02-16 18:15:53 +09:00
Atsushi Eno 1d62f3e9e5 xsi:type parsing is wrong in default namespace resolution.
Fixed case #3 in bug #652331.
2011-02-16 18:02:28 +09:00
Atsushi Eno 86977acb58 Operation interface methods also have ServiceKnownType attributes. 2011-02-16 17:14:05 +09:00
Atsushi Eno f4dfb13cc7 KnownTypeCollection; recursively registered type was not added to the collection while it is "registered" state. 2011-02-16 16:04:15 +09:00
Gonzalo Paniagua Javier acc0384e01 Fixes 2011-02-15 20:23:14 -05:00
Gonzalo Paniagua Javier 59fcb4f8d3 Remove a bunch of warnings. 2011-02-15 19:58:26 -05:00
Martin Baulig 2c9f304f50 Make pdb2mdb work with files in other directories.
Also added a public static method, so we can also use this as a library.
2011-02-16 00:41:53 +01:00
Andrew Jorgensen 798d03b364 Mono.Debugger.Soft.dll is installed for 4.0 also. 2011-02-15 12:17:50 -07:00
Ankit Jain 198e553ae4 [xbuild] Fix bug #671700, resource naming in presence of "Link".
AssignTargetPath.cs: If 'Link' metadata is present, then use that
as the target path.

Add relevant test.
2011-02-15 20:16:33 +05:30
Marek Safar 28d33683a2 New test 2011-02-15 14:30:28 +00:00
Marek Safar fa34f80319 [671878] Fixes IKVM ordering of catch clauses 2011-02-15 14:30:28 +00:00
Marek Safar 1f7d8637e5 Fix few warnings 2011-02-15 14:30:27 +00:00
Atsushi Eno b8ecb21ef2 Async MessageContract pattern needs more sophisticated contract validity check.
It totally killed discovery.
2011-02-15 23:24:01 +09:00
Atsushi Eno 3aaf87fe84 Message headers are now serialized and deserialized for MessageHeaderDescription. 2011-02-15 23:14:27 +09:00
Sebastien Pouliot 3dbfe75434 Fix parameters names inside System.Net.dll for 2.1 profile
* System.Net/System.Net.Sockets/SocketException_2_1.cs:
* System.Net/System.Net/WebClient_2_1.cs:
* System.Net/System.Net/WebRequest_2_1.cs:
* System/System.Net.Sockets/Socket_2_1.cs:
* System/System.Net/Cookie.cs:
* System/System.Net/DnsEndPoint.cs:
* System/System.Net/EndPoint.cs:
* System/System.Net/IPAddress.cs:
* System/System.Net/IPEndPoint.cs:
* System/System.Net/SocketAddress.cs:
	Remove all red ! from corcompare in System.Net.dll (Silverlight
	4 profile) to make it easier to pinpoint other errors/warnings.
2011-02-15 08:38:06 -05:00
Atsushi Eno 2de488bf5d ServiceDescription.cs does not exist in moonlight, so move TypeExtension. 2011-02-15 22:37:28 +09:00
Jérémie Laval 766db2eadf Fix test failure in SplitOrderedList 2011-02-15 13:36:27 +00:00
Jérémie Laval 3c19080f53 Implement TaskFactory.FromAsync 2011-02-15 13:26:02 +00:00
Marek Safar f8b219931c Hide boostrap compiler for people looking for mcs.exe 2011-02-15 13:17:24 +00:00
Marek Safar 4fa12b94b0 Update mcs translations 2011-02-15 13:17:24 +00:00
Marek Safar 2685ac100c Fix monolite make dist 2011-02-15 13:17:24 +00:00
Atsushi Eno bac5d7a27f MessageHeaderDescription were not filled in message contract. Reject wrong contracts. 2011-02-15 22:11:22 +09:00
Atsushi Eno 5fe1e8df35 implement some ServiceHostBase public methods that already existed internally. 2011-02-15 22:10:09 +09:00
Marek Safar 3f3f13ef21 Add Mono.Debugger.Soft.dll to spec 2011-02-15 12:11:28 +00:00
Marek Safar 7c911b67e7 Build monolite from correct location 2011-02-15 12:09:10 +00:00
Marek Safar 93fd158296 Merge some useful changes from MD 2011-02-15 12:09:10 +00:00
Gonzalo Paniagua Javier eae45fd704 [HttpListener] Close idle connections on Stop()
Idle connections that never received any data or had ever been
	associated to a listener are properly closed now when the endpoint is
	closed or the last listener they used is closed.
	Fixes a bunch of tests in System.ServiceModel.
2011-02-15 01:52:50 -05:00
Atsushi Eno d4ec12dbaa When the callback contract type is the same as the contract, do not block replies. 2011-02-15 15:47:46 +09:00
Atsushi Eno fee0b115fd EndpointAddress could be empty on opening the factory. 2011-02-15 15:47:22 +09:00
Atsushi Eno 7570eef1b6 PeeDuplex ChannelFactory must be opened in prior to create channels. 2011-02-15 15:46:41 +09:00
Atsushi Eno 39a5c7f6d4 add private setter for message serialization.
Not sure if it is hack or required-to-do though.
2011-02-15 15:45:58 +09:00
Neale Ferguson 679be0d28f Merge branch 'master' of github.com:mono/mono 2011-02-14 15:17:07 -05:00
Veerapuram Varadhan 1239b13d1a [bugfix]667855 - Fix handling of oracle raw data types sanely. 2011-02-15 01:30:56 +05:30
Gonzalo Paniagua Javier 6450a342e5 [HttpWebRequest] EndGetResponse already does this. 2011-02-14 14:36:14 -05:00
Gonzalo Paniagua Javier c033e6dea6 [HttpListener] UserHostName includes the port. 2011-02-14 14:35:06 -05:00
Jérémie Laval 325580a101 Correctly add ObjectPool to the build 2011-02-14 18:16:51 +00:00
Jérémie Laval 5dbf63ae30 Use ObjectPool in SplitOrderedList 2011-02-14 18:12:42 +00:00
Jérémie Laval d25f6ac751 Fix wrong CAS check in SplitOrderedList 2011-02-14 18:12:42 +00:00
Jérémie Laval 7b07f2b024 Use ObjectPool in ConcurrentStack 2011-02-14 18:12:41 +00:00
Jérémie Laval 8390e2da1e Use ObjectPool in ConcurrentQueue 2011-02-14 18:12:41 +00:00
Jérémie Laval 62b6eb2540 Add concurrent implementation of an ObjectPool to reuse small objects like Node instances 2011-02-14 18:12:41 +00:00
Gonzalo Paniagua Javier 274c05b8a6 [HttpListener] These lines were not supposed to be there. 2011-02-14 12:30:13 -05:00
Atsushi Eno 9930a95a1a support UdpTranspoerSettings.MulticastInterfaceId. This should fix bug #669328. 2011-02-15 01:54:13 +09:00
Carsten Schlote 2392c6a50d Extended CloneCopy() test with ReadOnly field
- It is recommended to set auto-increment fields to ReadOnly. When
  calling Copy() the check for ReadOnly must be omitted, otherwise
  you get an exception.
  The RadOnly attribute is set for the parent "Id" field to test
  proper handling of read-only fields.
- Source reindention and cleanups.

Signed-off-by: Carsten Schlote <[email protected]>
2011-02-14 10:52:22 -05:00
Carsten Schlote 6afc6ea42f Fixes for broken RO check
- When calling GetChanges() the ReadOnly check for DataCalumns must be
  turned off, as otherwise data of readonly columns can't be cloned
  into new rows for the new created DataSet/dataTable

Signed-off-by: Carsten Schlote <[email protected]>
2011-02-14 10:51:40 -05:00
Miguel de Icaza a5f2fa7186 Remove 2011-02-14 10:03:45 -05:00
Miguel de Icaza b4e0414776 [670974] Use the underlying BaseStream to read bytes instead of trying to peek a character.
Peeking a character as it turns out is a really bad idea as it involves the encoder
to pull characters.   If the PeekChar happens to read a byte that is part of a
UTF8 string that needs more characters to process we would end up with the reported
crash.

Atsushi Enomoto tracked this down, and the fix is to use the binaryreader.BaseStream
to directly call into ReadByte and Read without ever probing with PeekChar ().   It
is not really possible to use BinaryReader.ReadByte since this one can throw on
end-of-buffer conditions instead of returning -1
2011-02-14 09:38:02 -05:00
Neale Ferguson 7bbda0750f Merge branch 'master' of github.com:mono/mono 2011-02-14 09:31:38 -05:00
Neale Ferguson 29b419d427 Add unwind support to s390x and fix stack unwinding so that exception17 now passes 2011-02-14 09:31:00 -05:00
Marek Safar 95dcd2ad9b New test 2011-02-14 13:20:50 +00:00
Marek Safar 04c7aea04f [671552] Use correct emit method for stobj type 2011-02-14 13:20:49 +00:00
Miguel de Icaza 44bf6d5a50 Do not build in parallel 2011-02-14 08:17:34 -05:00
Marek Safar 8cfe56d80c Update to the latest IKVM 2011-02-14 12:18:58 +00:00
Gonzalo Paniagua Javier 665cf6c6e6 Comment out test that does not work on linux. 2011-02-13 19:51:23 -05:00
Gonzalo Paniagua Javier 2fa2ca3565 [HttpWebRequest] Use the timeout in GetResponse()
The timeout was not being used in GetResponse.
	Fixes bug #603794.
2011-02-13 15:01:29 -05:00
Gonzalo Paniagua Javier e940d4fa30 [HttpWebRequest] Avoid nullref on empty cookie header.
If the Set-Cookie header is empty, the cookie instance is not created.
	Fixes bug #670189.
2011-02-13 14:53:59 -05:00
Rodrigo Kumpera 81a76ad07e Don't assert on broken DM names.
* reflection.c (reflection_methodbuilder_to_mono_method):
	Avoid asserting if the method name has invalid surrogates.

	Fixes #643372.
2011-02-13 19:52:02 +01:00
Rodrigo Kumpera 78a40c59be Add bad string resistent utf16-utf8 conversions.
* object.c: Add _ignore versions of the mono_string_to_utf8
	family of functions that work with broken strings by
	encoding them on a best effort basis.
2011-02-13 19:50:28 +01:00
Rodrigo Kumpera 16ebb08ee2 Avoid an infinite loop on broken utf16.
* gutf8.c (g_utf16_to_utf8): Increase the input counter
	when encountering broken surrogates head or tails to
	make sure we don't end in an infinite loop.
2011-02-13 19:48:01 +01:00
Rodrigo Kumpera 5f7a56d356 Make Int32.Parse respect current culture.
* Int32.cs (Parse): Repect current culture for
	positive and negative signs.

	Fixes #586085
2011-02-13 19:46:10 +01:00
Alexandre Mutel 991bedc101 Fix sizeof(T) in non-gshared code. Fixes #580189. 2011-02-13 16:16:57 +01:00
Mark Probst 3664f9db8f Merge branch 'bugfix-main-thread-root' 2011-02-13 16:10:10 +01:00
Zoltan Varga 7ef058f135 Add an assembly version to Mono.Debugger.Soft. Fixes #671536. 2011-02-13 16:04:52 +01:00
Gonzalo Paniagua Javier b061ae7569 [HttpListener] Small improvements
Less allocations in managed and unmanaged code.
2011-02-13 08:18:57 -05:00
Gonzalo Paniagua Javier a9de626f74 [HttpListenre] Avoid multiple calls to Close()
HttpListenerResponse could be calling HttpConnection.Close() more than
	once.
2011-02-13 07:06:55 -05:00
Zoltan Varga 15742c6ea9 Fix reading of cattr arguments of type Type[]. Fixes #670331. 2011-02-13 04:23:49 +01:00
Miguel de Icaza 38253abf8c Add solution files 2011-02-12 22:09:49 -05:00
Miguel de Icaza 97e585b5ec Various updates 2011-02-12 22:07:05 -05:00
Miguel de Icaza 7bcc94629d Pass warnings 2011-02-12 16:30:28 -05:00
Miguel de Icaza 31dd8c91be Visual Studio build support: updated the scripts that generate csproj files.
With the new C# compiler, the build complexity is vastly reduced, the new setup
is able to produce many of the csproj files.

The next step is to generate a couple of solutions:

	* BootstrapSolution: to build the basic assemblies used to
	  build the rest of Mono from a set of basic assemblies.

	  This should be run to prepare a tree.

	* 2.0 solution: builds the various 2.0 libraries and executables

	* 4.0 solution: builds the various 4.0 libraries and executables

Installation: where should the resulting assemblies go once they are built?

Where should the assemblies go after the build is complete?

How do we turn a build into an redistributable package?
2011-02-12 16:30:28 -05:00
Gonzalo Paniagua Javier 64a750eff3 [gzip] Allow partial flush
When Flush() is called explicitly, do a Z_PARTIAL_FLUSH to force gzip
	into giving us whatever is available. Less efficient, but compatible
	with MS.
2011-02-12 00:05:15 -05:00
Miguel de Icaza c365c9a8f2 Update the csproj generator targets 2011-02-11 18:50:13 -05:00
Gonzalo Paniagua Javier bda2b7dc1b [Socket] Fix invalid cast
Fix invalid cast when canceling pending operations due to socket.Close.
2011-02-11 18:36:23 -05:00
Thomas Goldstein 28a47b5d39 TabControlPainter.cs: Move up the Text / Image of the selected tab, matching .NET. 2011-02-12 00:20:26 +01:00
Thomas Goldstein 4571528f8f TabControlPainter.cs: Horizontally center Text and Image when SizeMode = Fixed. 2011-02-12 00:20:03 +01:00
Zoltan Varga ede1365668 Fix token generation for TypeBuilder's in another assembly. Fixes #671245. 2011-02-12 00:15:47 +01:00
Miguel de Icaza d833c08b45 [fix] changing Form.Enabled sometimes can change the list of OpenForms, fixes 671098 2011-02-11 17:34:34 -05:00
Andrius Bentkus 0317e5e5ed Check filename of assemblies before installing with gacutil.
gacutil just used the filename (which can be different compared to
the assembly name) in order to install assemblies, though afterwards
entirely relied on the filename to be equal to the assembly name.
In other words, installing assemblies where the filename differed
from the assembly name resulted in an incorrect install: the
files were not visible in the GAC.

Example: gacutil -i mysql.data.dll
Wouldn't return any errors, but the assembly (which is called MySql.Data)
still couldn't be reached.

This patch will check for filename compliance and return an error
if it does not comply, which will look like this:
Failure adding assembly v4/mysql.data.dll to the cache: the filename "mysql.data.dll" doesn't match the assembly name "MySql.Data"

A warning is not sufficient, since it will be impossible to remove
the installed junk with gacutil.
2011-02-11 17:23:09 -05:00
Zoltan Varga 2714556067 Add Mono.XBuild.Utilities/MSBuildUtils.cs to the build. 2011-02-11 21:57:25 +01:00
Zoltan Varga 0eba8d0a5b Pretty print MonoString* too in xdb. 2011-02-11 21:49:26 +01:00
Sebastien Pouliot 5505faf960 Continue X509Chain processing even if the local machine directory does not exists
* corlib/Mono.Security.X509/X509Store.cs:
* Mono.Security/Mono.Security.X509/X509Store.cs:
	Fix key pair persistence to load key pairs from the same location
	(machine or user) as the requested certificate. This avoids an
	internal exception (on missing local machine directory) that stop
	the evaluation of the certificate validity (i.e. no user store
	check)
* System/System.Security.Cryptography.X509Certificates/X509Chain.cs:
Ensure that a missing local machine directory does not result in a NRE
while loading CRL (which would fail the certificate being validated)
2011-02-11 13:10:21 -05:00
Hib Eris 44cb0e4def Earlier undefine HAVE_GETPROCESSID when cross compiling 2011-02-11 15:42:14 +01:00
Zoltan Varga 8a95d5a5a6 Avoid a boehm dependency in driver.c. 2011-02-11 15:25:36 +01:00
Rodrigo Kumpera fee645b660 Make maxStackSize behavior compatible with MS.
* Thread.cs (.ctor): Check if maxStackSize is negative
	and raise and AOORE. Silently use a saner minimum size
	of 128k as mono can't really run with much less than that.
2011-02-11 14:56:58 +01:00
Marek Safar bf8270de10 Fix repl not to accumulate every evaluated expression 2011-02-11 12:02:24 +00:00
Zoltan Varga 78925eeebf Make the wait in the finalizer thread alertable to fix sdb on windows. Fixes #670619. 2011-02-11 05:50:42 +01:00
Zoltan Varga bb2e1d1d5e Fix sdb tests on the 4.0 profile. 2011-02-11 03:37:25 +01:00
Zoltan Varga a9374ea1ba Change some Sleep(0)'s to Sleep(1) in the soft-debugger code to avoid 100% cpu utilization on windows. 2011-02-11 01:32:54 +01:00
Zoltan Varga e23bf4799a Add a MONO_ prefix to the PROCESSOR_ARCHITECTURE_ constants to fix the mirriad warnings on windows. 2011-02-11 01:28:53 +01:00
Miguel de Icaza 76638d26cd [bugfix: 664695] Calling Dispose on ToolStrip emit events. Doesn't on .NET 2011-02-10 18:55:52 -05:00
Miguel de Icaza 82a3eedf58 [bugfix: 664695] Calling Dispose on ToolStrip emit events. Doesn't on .NET 2011-02-10 18:55:50 -05:00
Miguel de Icaza 10289b6604 [bugfix: 665233] ToolStrip Menus Keeping Keyboard Capture after hovering over SubMenu 2011-02-10 18:55:49 -05:00
Zoltan Varga 075c339228 Merge branch 'mips-vm-fixes' of https://github.com/ztzg/mono into ztzg-mips-vm-fixes 2011-02-11 00:34:45 +01:00
Zoltan Varga 81b38e3b33 Include malloc.h under windows for alloca in glib.h. 2011-02-11 00:33:19 +01:00
Damien Diederen 1163a2f579 MIPS: Ignore float->int overflow behaviour, as on PPC, ARM, and SPARC
From the comment:

$TARGET handles overflow by clipping, but this test assumes no overflow
handling.  According to ECMA the result of float->int conversion is undefined
if overflow occurs, so both behaviours are valid.

Commit contributed under the MIT/X11 license.
2011-02-11 00:08:13 +01:00
Damien Diederen 69948672b2 MIPS: Do not generate superfluous "load_const" in IMT thunks
1. Only three of the four branches need 'load_const's, so let's move
    them down there;

 2. The fourth one already contains its own 'load_const'; the new code
    avoids a duplicate load before each binary search test.

Commit contributed under the MIT/X11 license.
2011-02-11 00:08:01 +01:00
Damien Diederen c9376a26e0 MIPS: Fix IMT binary search code generation in backend
Imt_emit_ir, in object.c, generates binary search code for sequences
longer than three elements.  It saves the key of the mid item, then
recursively calls itself on the two halves of the segment:

    item->key = sorted_array [middle]->key;
    ...
    imt_emit_ir (sorted_array, start, middle, out_array);
    item->check_target_idx = imt_emit_ir (sorted_array, middle, end, out_array);

Note how the mid item itself is included in the second half: it is to
be handled as part of that subsequence, whose code starts at index
'check_target_index'.

Given such a piece of binary search IR, the MIPS backend currently
generates:

    load_const (temp, item->key);
    slt (temp, temp, IMT_REG);      ; temp = key < searched_for;
    bne (temp, zero, 0);            ; if (temp) jump_target_index ();

This is broken because no jump happens if (key == searched_for).  The
target method won't be found in the first subtree, so the runtime will
end up jumping to its last method instead of the correct one!

This patch causes the following sequence to be emitted:

    load_const (temp, item->key);
    slt (temp, IMT_REG, temp);      ; temp = searched_for < key;
    beq (temp, zero, 0);            ; if (!temp) jump_target_index ();

Commit contributed under the MIT/X11 license.
2011-02-11 00:07:50 +01:00
Damien Diederen 8110b6b179 MIPS: Fix unboxing trampolines for functions returning value types
Generated methods always place 'this' in a0, but unboxing trampolines
currently bump a1 for functions returning value types (the register
assignments for 'this' and return area pointers probably got swapped
at some point, but the trampoline generator was not updated).

Fix that by always bumping a0.

Commit contributed under the MIT/X11 license.
2011-02-11 00:07:37 +01:00
Damien Diederen 49b35c4b9b MIPS: Use SLTU to implement COND_EXC_LE_UN (Exception when <= unsigned)
The current code generator uses a SUBU/BLEZ combination, but this
breaks for non-zero-based arrays.  Given a lower bound 'b', length
'l', and an index 'i', Mini generates:

  real_i = i - b;
  COND_EXC_LE_UN(l, real_i);

Without this patch, the backend generates for e.g. b=42, l=1 and i=0:

  SUBU real_i, 0, 42     => -42
  SUBU at, 1, real_i     => 43 (U only means "no trap.")
  BLEZ at, throw         => No throw because at is positive!

This causes the following sequence to be used instead:

  SUBU real_i, 0, 42     => -42
  SLTU at, real_i, 1     => 0 (Unsigned '<'; real_i is a large value)
  BEQ  at, zero, throw   => Throw.

Commit contributed under the MIT/X11 license.
2011-02-11 00:07:24 +01:00
Damien Diederen 83bc684f2d MIPS: Throw OverflowException if Int32.MinValue is divided by -1
Without this, the code throws the more general ArithmeticException
when the divisor is -1, independently of the dividend.  The check is
necessary because -Int32.MinValue does not fit into a 32-bit two's
complement integer.

Commit contributed under the MIT/X11 license.
2011-02-11 00:07:04 +01:00
Zoltan Varga ff54c98812 Remove unused mono_arch_has_unwind_info () function. 2011-02-10 23:43:27 +01:00
Gonzalo Paniagua Javier b1248b22e4 [HttpWebRequest] Can't ignore erros here 2011-02-10 17:25:15 -05:00
Gonzalo Paniagua Javier b92b165ddb [HttpWebRequest] Error handling for POST/PUT
When we get an error from the server before writing an entire
	unbuffered response, the server might close the connection leading to
	write errors. Ignore those and return the actual HTTP status code from
	the original server error.
2011-02-10 17:25:15 -05:00
Ankit Jain 6493ec7731 [xbuild] Update Utilities.FromMSBuildPath from monodevelop.
Updating FromMSBuildPath also fixes a bug on windows.

* Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Utilities.cs:
Move to..
* Microsoft.Build.Utilities/Mono.XBuild.Utilities/MSBuildUtils.cs:
.. this. Also, update FromMSBuildPath from monodevelop.
* Update Engine/* and Tasks/* to track the new api.
2011-02-11 02:51:35 +05:30
Rodrigo Kumpera a99608d830 Handle ConstructorBuilders on other assemblies.
* reflection.c (mono_image_get_ctorbuilder_token):
	Handle non generic CtorBuilder on another assembly.

	Fixes #670949
2011-02-10 21:45:48 +01:00
Rodrigo Kumpera b508d87299 Revert "Don't use io layer semaphores for object monitors."
This reverts commit 7d0e224a7a.

This is causing severe regressions on OSX.
2011-02-10 21:44:58 +01:00
Rodrigo Kumpera 7d0e224a7a Don't use io layer semaphores for object monitors.
* monitor.c: Use a system semaphone instead of io-layer
	semaphores as it has a much lower overhead.
2011-02-10 20:10:13 +01:00
Rodrigo Kumpera 8e7f14ecd6 Add regression test for #668506 2011-02-10 20:10:13 +01:00
Marek Safar 3fe558adb8 Another .net 4 update 2011-02-10 19:04:53 +00:00
Marek Safar 7a69dca123 Remove more csharp2 references 2011-02-10 19:04:53 +00:00
Zoltan Varga 4efd718bc0 Fix a warning. 2011-02-10 16:17:44 +01:00
Marek Safar 3204e13673 Make all evaluator created type public 2011-02-10 13:36:36 +00:00
Marek Safar 24b33b7617 Add mscorlib as mcs aot dependency 2011-02-10 13:36:36 +00:00
Atsushi Eno 30e3a346e0 Fix a couple of addressing namespace fixes (found in April2005 version). 2011-02-10 22:06:17 +09:00
Atsushi Eno 61e42aed24 Fix wrong async completion handling in UDP channel receive.
After AsyncWaitHandle.Set(), order of filling results and WaitOne() are
undefined.
2011-02-10 21:16:17 +09:00
Marek Safar b6513d2047 Fixes build 2011-02-10 09:22:04 +00:00
Marek Safar 62f459cdca Enable eval statements 2011-02-10 08:59:09 +00:00
Marek Safar 046b5f13cf Drop csharp2 2011-02-10 08:59:09 +00:00
Marek Safar a2d588d433 Fix wrong module context 2011-02-10 08:59:09 +00:00
Marek Safar 0bc2c5b8a4 Cleanup IMemberContext properties 2011-02-10 08:59:08 +00:00
Marek Safar 7bb97fcd64 Fix restore typo 2011-02-10 08:59:08 +00:00
Zoltan Varga 9bc886aed7 Remove glib libs from the get-cygwin-deps.sh script. 2011-02-10 00:53:11 +01:00
Miguel de Icaza d352810dff Do not throw if we get a RunAndCollect 2011-02-09 18:33:05 -05:00
Miguel de Icaza 1afdb2bead Style 2011-02-09 18:25:17 -05:00
Gonzalo Paniagua Javier d84abdc22a Move some code into their own methods. 2011-02-09 18:09:03 -05:00
Gonzalo Paniagua Javier f9a2bab548 [Thread] Avoid using BinarySerialization
Whenever possible (Generic(Principal|Identity)), do not use
	BinarySerialization for the 'principal'.
2011-02-09 17:16:28 -05:00
Marek Habersack b956f6dc78 [asp.net] Fix for bug #669048. Fix up virtual precompiled app virtual paths with the virtual root of the current app 2011-02-09 21:59:00 +01:00
Gonzalo Paniagua Javier df5d05c37f Attempt 1 2011-02-09 12:04:56 -05:00
Gonzalo Paniagua Javier 2364636375 Add files to .gitignore 2011-02-09 11:01:27 -05:00
Rodrigo Kumpera bae9eb37ca Handle assignment check of variant type and its gtd.
* clas.c (mono_class_is_variant_compatible): Return
	FALSE if checking a variant type and its gtd instead
	of crashing.

	Fixes #668506
2011-02-09 16:31:28 +01:00
Zoltan Varga 5de92f8563 Install Mono.Debugger.Soft in the 4.0 profile as well. 2011-02-09 16:19:03 +01:00
Marek Safar 507973ab5a Fix corlib test 2011-02-09 14:27:06 +00:00
Marek Safar 46dd06e61e Fix few more mcs locations 2011-02-09 14:16:04 +00:00
Marek Safar 11ef57f0f6 Few mcs property accessors tweaks 2011-02-09 14:11:44 +00:00
Marek Safar b1436dd4bb Don't emit static data when running as evaluator 2011-02-09 14:11:44 +00:00
Rolf Bjarne Kvinge 8fa5360efd Add MonoCQItem to the moonlight build, otherwise we abort 2011-02-09 13:01:41 +01:00
Atsushi Eno 24d225dd5b Recent ContractDescription fix uncovered wrong contracts in discovery. 2011-02-09 20:04:00 +09:00
Rodrigo Kumpera 95641fcca1 Merge branch 'master' of github.com:mono/mono 2011-02-09 11:36:58 +01:00
Rodrigo Kumpera a7158d99cd Cleanup the reference queue on domain unload.
* gc.c (finalize_domain_objects): Clear reference
	queues on domain unload after running all finalizers.
2011-02-09 11:20:37 +01:00
Atsushi Eno 58a7b75bd8 Support ServiceKnownTypes. Fixed another case on bug #652331. 2011-02-09 15:42:40 +09:00
Jonathan Pobst a9082416b0 Fix msvc build for threadpool changes. 2011-02-08 23:35:22 -06:00
Zoltan Varga 83b91243c1 Disable OP_INEG cfolding on 32 bit arches, as it breaks the LNEG decomposition. The previous special casing didn't work as the spill pass could insert a store between the ineg and the adc_imm. Fixes #670479. 2011-02-09 05:12:12 +01:00
Gonzalo Paniagua Javier c649da58f9 [SmtpClient] Don't send empty display name.
If there's no display name, don't send '""'.
	Fixes bug #670475.
2011-02-08 21:01:59 -05:00
Marek Habersack f42c415b09 [build] Added runtime/_tmpinst/mcs script to unbreak system.web tests for 2.0
Also made gmcs force -sdk=2 since -sdk=4 is now the default. _tmpinst/mcs is needed because
the CSharp CodeDOM provider invokes it and without the script in place it will launch the
first mcs available in the path.
2011-02-09 02:36:00 +01:00
Marek Habersack be07f04c62 [asp.net] Be more careful with errors collection when compilation fails. 2011-02-09 01:24:16 +01:00
Marek Habersack 1171cacd8d [asp.net] Implemented CustomErrorsRedirectMode 2011-02-09 01:24:16 +01:00
Gonzalo Paniagua Javier 22794e9c8f Just need 1 instance of the generic principal. 2011-02-08 19:12:28 -05:00
Gonzalo Paniagua Javier 2670761ee7 [threadpool] Added dynamic concurrent queue implementation
Replace the big lock around the list+array used to queue work items
	with a dynamic concurrent queue to reduce contention.
2011-02-08 17:28:53 -05:00
Mark Probst b8f9fee496 [sgen] Two carefully placed prefetches.
Prefetch an object's vtable word when it's put on the gray stack,
because it's likely to be scanned soon.

Also prefetch it right before calling the mark/copy function in the
dynamic heap M&S to win a few cycles on the load.  Don't do it for the
fixed heap because there it's unlikely we'll need the vtable anyway,
so the cache can be put to good use elsewhere.
2011-02-08 22:24:44 +01:00
Mark Probst 77c53b9b18 [sgen] Only load an object's vtable word if absolutely necessary in M&S.
Until now we always loaded the vtable word in the mark/copy function.
It is not necessary in most cases for the fixed heap collector,
however.  If the object is on the small object major heap and its
block size is not evacuated we don't need to load it.
2011-02-08 22:24:44 +01:00
Mark Probst 6ae889bd4f [sgen] Fix some debug functions. 2011-02-08 22:24:44 +01:00
Mark Probst d4ff53c6ad [sgen] Keep statistics on slots allocated in vain in parallel M&S. 2011-02-08 22:24:43 +01:00
Mark Probst ac358ae161 [sgen] Make SGen compile with heavy statistics enabled. 2011-02-08 22:24:43 +01:00
Miguel de Icaza 8abe2f6c49 Add new test 2011-02-08 16:01:29 -05:00
Miguel de Icaza 8d2b210632 Fix Enum.HasValue, previous version crashed with negative values 2011-02-08 15:48:35 -05:00
Miguel de Icaza c71944e2bb Update docs 2011-02-08 15:48:34 -05:00
Miguel de Icaza df5e0831fa Add prototype to .h file 2011-02-08 15:48:34 -05:00
Lucas Meijer dc27dd4c02 implement mono_set_assemblies_path for platforms that cannot set MONO_PATH environment variable. 2011-02-08 15:48:33 -05:00
Rodrigo Kumpera 13ff58f9ae Avoid allocating memory for the handles.
* threads.c (ves_icall_System_Threading_WaitHandle_WaitAny_internal):
	Store the handles on stack memory.
2011-02-08 20:48:57 +01:00
Rodrigo Kumpera f93d21ce8b Avoid allocating memory.
* wait.c (WaitForMultipleObjectsEx): Use a stack allocated
	array and detect duplicated by sorting and doing a linear
	search.
2011-02-08 20:48:56 +01:00
Marek Habersack a8362f1a14 [cross-compilation] Added some flexibility regarding the location of development packages
The script now supports an extra cross-compilation directory in which you can unpack the
library and development packages necessary for the build to succeed (glib, zlib etc). Also
supported now is specifying the location at which Mono will be installed on Windows.
Replaced SVN and GIT-SVN version checks with git checks.
2011-02-08 20:44:25 +01:00
Marek Habersack 90f74ba8f2 [aot compiler] runtime_dep uses the correct path when cross-compiling 2011-02-08 20:44:25 +01:00
Marek Safar 4ad5f42e11 Fix Mono.CSharp vs solution 2011-02-08 17:34:30 +00:00
Marek Safar 2e1216beab Allow both predefined and custom values for mcs -skd option 2011-02-08 17:34:30 +00:00
Rodrigo Kumpera 2a5d9080c0 Fix reference queue under boehm.
* gc.c (finalizer_thread): Clean reference queues
	after finalizers are called to give boehm a chance
	to resurrect it.
2011-02-08 18:23:44 +01:00
Hib Eris 1e936ba574 Fix build-mingw32.sh for CROSS_PKG_CONFIG_DIR without *.pc files 2011-02-08 15:00:33 +01:00
Hib Eris f83c5cf581 No longer include glib binaries in build-mingw32.sh builds.
By default, Mono now uses an embedded glib implementation, so there
is no need to ship external glib libraries anymore.
2011-02-08 15:00:33 +01:00
Hib Eris d214c8e133 Let build-mingw32.sh script also work on dist tarballs 2011-02-08 15:00:33 +01:00
Marek Safar 0bed23d764 Optimize Enumerable::ToArray 2011-02-08 13:56:22 +00:00
Hib Eris 581d84c140 Use winternl.h instead of ddk (when available)
These changes are nescessary for compiling with a mingw-w64 compiler.
2011-02-08 14:44:31 +01:00
Hib Eris 8fd7a9abf0 Remove implementation details from public header io-layer.h
The macro HAVE_GETPROCESSID is defined in config.h and should not be
exposed in public headers.
2011-02-08 14:44:30 +01:00
Marek Safar f3bba38d86 [657099] Fix cloning of remapped blocks 2011-02-08 12:52:00 +00:00
Atsushi Eno 0d4ad4e387 Simple content restriction was not validated when it is in further reference.
Fixed bug #595947. It was complexType [base]-> complexType [base]-> simpleType.
2011-02-08 20:52:20 +09:00
Rolf Bjarne Kvinge 8b3782ad4d Moonlight build: we need to create the deps dir 2011-02-08 12:36:36 +01:00
Marek Safar 8dd4acf57a New test. 2011-02-08 11:22:14 +00:00
Marek Safar fcd39a34a4 Fix remapping of cloned block parent when already in cloned context 2011-02-08 11:22:14 +00:00
Marek Safar 7e3c6f434f Disable vs hosting 2011-02-08 11:22:14 +00:00
Atsushi Eno b1be7755df For complexType simpleContent restriction, fill attributes from base type.
Part of bugfix #595947.
2011-02-08 18:31:49 +09:00
Atsushi Eno 8e916dc39c There's a tricky namespace-mismatching deserialization in .NET implementation.
Fixed bug #666333.
2011-02-08 17:09:26 +09:00
Zoltan Varga 0bc4795214 Make the 4.0 profile the default if no is given on the make line in mcs/. 2011-02-08 01:58:03 +01:00
Rolf Bjarne Kvinge b36f4c2dd9 Moonlight build: use system tools to compile. This means we don't need a bootstrapping profile either 2011-02-08 01:08:09 +01:00
Hib Eris f25db7a794 Do not distribute eglib-config.h
The file eglib-config.h is generated when running configure.
Distributing eglib-config.h in tarballs causes errors when building
out of the source tree.
2011-02-08 01:01:09 +01:00
Hib Eris bef5178b89 Use _vscprintf() for mingw-w64 compilers
The mingw-w64 compilers implement a vsnprintf() function that do not
conform to the C99 standard (just like MSVC).
2011-02-08 01:01:08 +01:00
Marek Habersack 997394024f [crypto] Added missing 4.0 algorithm names 2011-02-08 00:32:41 +01:00
Hib Eris 18438b44ac Include config.h in mono-profiler-aot.c
This change is nescessary for compiling with a mingw-w64 compiler.
2011-02-07 23:40:53 +01:00
Zoltan Varga 9e9f11f160 Cast the result of MONO_CONTEXT_GET_SP () to an int to fix the windows build. 2011-02-07 23:35:57 +01:00
Zoltan Varga 2008975524 Include sys/types.h for pid_t on mingw. Fixes #670076. 2011-02-07 23:32:44 +01:00
Jonathan Pobst 6aac6da3d1 Move variable declaration to top of function for msvc. 2011-02-07 16:06:19 -06:00
Marek Safar a352bb2f72 moonlight build fix 2011-02-07 17:19:41 +00:00
Larry Ewing a7e40bc796 Pinvoke symbols according to the new moonlight naming convention. 2011-02-07 10:56:50 -06:00
Rodrigo Kumpera 274c891972 Handle patching with shared opt enabled.
* mini-trampilines.c (common_call_trampoline): With
	shared optimization enabled code patching doesn't work
	if we are running a non root domain.c
2011-02-07 17:06:54 +01:00
Zoltan Varga fa6166183d Use mono_method_get_vtable_slot () instead of accessing method->slot directly. Fixes #669808. 2011-02-07 16:10:33 +01:00
Atsushi Eno cae51172f8 Open and close client/service runtime channels in chains. Fixed bug #663278. 2011-02-07 23:15:22 +09:00
Atsushi Eno 0351f32bb8 handle IsTerminating. 2011-02-07 23:14:53 +09:00
Zoltan Varga 5eca8e1a22 Fix a warning. 2011-02-06 22:25:32 +01:00
Zoltan Varga 8ac8f73fc3 Remove a duplicate call to mini_gc_init (). 2011-02-06 20:41:47 +01:00
Zoltan Varga f443dbf4fa Fix a warning/bug. 2011-02-06 20:27:02 +01:00
Zoltan Varga 5959975e9e Really fix the ia64 build. 2011-02-06 15:54:39 +01:00
Zoltan Varga d8aea7ac70 Fix the ia64 build. 2011-02-06 00:07:47 +01:00
Rodrigo Kumpera 1be9686bd4 Add regression test to #666008 2011-02-05 13:38:07 +01:00
Rodrigo Kumpera 8a4ece04d3 Fixes ldfnt to ldvtftn conversion.
* mini-trampolines.c (mono_delegate_trampoline): The ldftn
	to ldvtftn conversion must check if the method is abstract,
	otherwise it breaks delegate to base classes.

	Fixes #666008
2011-02-05 13:30:45 +01:00
Zoltan Varga 21ffd44a42 Applied small changes/reorganizations from the unity repo. 2011-02-04 19:44:28 +01:00
Zoltan Varga 8eeb1a34e8 Print a normal stack trace even if a hard stack overflow happens in unmanaged code. 2011-02-04 12:55:12 +01:00
Atsushi Eno cb09118840 Duplex client has its own listener loop, so special care on reply is needed. 2011-02-04 12:51:02 +09:00
Atsushi Eno e0a3b79880 Callback contract should be distinguished from others for DispatchOperation. 2011-02-04 12:50:25 +09:00
Zoltan Varga b9de2e7293 Print a normal stack trace on a hard stack overflow. 2011-02-03 23:03:42 +01:00
Zoltan Varga fadf1103d8 Fix the handling of CompareExchange icalls in AOT, we were using the 'object' versions for everything, which broke with 64 bit types on 32 bit platforms. 2011-02-03 21:57:08 +01:00
Ankit Jain 736d225d76 [webservices] Extensions can be unknown XmlElements also, fix.
* class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs:
Extensions can be XmlElement or ServiceDescriptionFormatExtension.
* class/System.Web.Services/System.Web.Services.Description/ServiceDescription.cs:
(AddExtensionNamespaces): Likewise. Also, ignore namespaces from
XmlElement, as we retain and write them out as-is.
(WriteExtension): Emit the XmlElement as-is.
* class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionTest.cs:
Update to write out the wsdl also.
2011-02-04 01:02:09 +05:30
Zoltan Varga a6da6fd3c4 Enable system AOT on arm. 2011-02-03 19:45:32 +01:00
Marek Habersack cd72a7bcb5 [xml] XmlReaderSettings.{DtdProcessing,MaxCharactersFromEntities,MaxCharactersInDocument} are present in 3.5+
With the exception of DtdProcessing, the properties are part of .NET 3.5+. DtdProcessing appeared in 4.0.
2011-02-03 17:40:00 +01:00
Marek Habersack 886240dea0 [asp.net] HttpRuntimeSection.RequestPathInvalidCharacters default value is different 2011-02-03 17:34:28 +01:00
Zoltan Varga 24f3f8167a Detect VFP support automatically on arm. 2011-02-03 17:19:27 +01:00
Rodrigo Kumpera af6e1f8cd7 Avoid calling time(NULL) when not needed.
* handles.c (_wapi_handle_ref): Avoid calling
	time(NULL) for the private case. Some systems implement
	it using a syscall.

	* handles.c (_wapi_handle_new_from_offset): Ditto.
2011-02-03 16:42:53 +01:00
Rodrigo Kumpera 8c005a8302 Avoid padding in some cases.
* mini-x86.c (emit_call): nether AOT or icall wrappers
	needs padding.
2011-02-03 16:42:52 +01:00
Marek Safar acb031c92c Fix importing of private types under dynamic context 2011-02-03 15:13:50 +00:00
Zoltan Varga 76a0076e97 Fix the passing of vtype arguments for methods which return floats in soft-float mode. Fixes #668905. 2011-02-03 16:05:30 +01:00
Zoltan Varga 5f04c544fb Fix a warning. 2011-02-03 16:05:30 +01:00
Marek Safar 5ba4cb0b55 Add new test 2011-02-03 13:53:41 +00:00
Marek Safar e6c74ffbd1 Allow any expression to be used in where clause. Some custom linq implementations use non-predicate version of where 2011-02-03 13:37:41 +00:00
Marek Safar 8ceb2172dd Removed unused files 2011-02-03 12:22:41 +00:00
Marek Safar 93fcc4a3a7 New test 2011-02-03 12:22:12 +00:00
Marek Safar c1e53ceb4a Don't even try to import type when its context is wrong 2011-02-03 12:12:48 +00:00
Marek Safar 657c0588c0 Set null object for default timer 2011-02-03 12:03:50 +00:00
Marek Safar a227dbd93e Add method into type container as soon the header is ready 2011-02-03 11:42:02 +00:00
Marek Safar e1b4ccf163 Fix error message text 2011-02-03 11:08:57 +00:00
Marek Safar c197b470f8 Need three valued bool logic for CLSAttribute value 2011-02-03 10:27:17 +00:00
Marek Habersack 805da076e0 [reflection] Default binder's AdjustArguments method treats ParamArray parameters which are already arrays properly
Such parameters are not adjusted as it would lead to an InvalidCastException whenever an attempt to set an array
index's value would be made.
2011-02-03 02:22:31 +01:00
Zoltan Varga b96746a946 Add support for --debug=casts to Array:SetValue (). Fixes #668851. 2011-02-03 00:26:34 +01:00
Rodrigo Kumpera 24642f04ac Avoid the loader lock in the common path.
* class.c (mono_generic_class_get_class): Don't take
	the loader lock to check if cached_class was created.
	Use full memory barriers to make sure proper visibility.
2011-02-02 21:46:20 +01:00
Rodrigo Kumpera 49427a1b28 Fix dynamic method cleanup at shutdown.
* gc.c (mono_gc_cleanup): Cleanup all reference
	queues after regular finalization.

	* reflection.c: The dynamic method ref queue is finalized
	by the runtime itself.

	* runtime.c: Ditto.
2011-02-02 19:33:57 +01:00
Miguel de Icaza cf2b1d58af [csharp] Change the signature for print 2011-02-02 13:05:27 -05:00
Marek Safar 9109d38e09 New test 2011-02-02 17:24:03 +00:00
Marek Safar b67c0980c3 Better log details for CS0281 2011-02-02 17:24:03 +00:00
Marek Safar 9d2a548321 Implement support for implicit user conversion for DefaultParameterValue (very odd) 2011-02-02 17:24:03 +00:00
Jérémie Laval 1f930bb19d Steal more agressively once we have found a potential available worker 2011-02-02 17:08:40 +00:00
Jérémie Laval fde2f884b5 Move call to Set a bit higher to avoid calling them to repeatdly in ThreadWorker 2011-02-02 17:08:40 +00:00
Jérémie Laval 7c508d9ce0 Adjust some ThreadWorker constants 2011-02-02 17:08:40 +00:00
Jérémie Laval 1e9a82634d Don't reset ThreadWorker event when it's not needed 2011-02-02 17:08:39 +00:00
Jérémie Laval 30cc982eb8 Avoid wrapping task body given as Action into Action<object> 2011-02-02 17:08:39 +00:00
Atsushi Eno a2f1b9fb76 Now operations are collected per corresponding ContractDescription.
This fixes naming of MessageDescription Action URI from its type.
2011-02-03 01:07:44 +09:00
Zoltan Varga 96e617e7ac Rebuild mscorlib/mcs AOT images if the runtime changes. 2011-02-02 16:20:43 +01:00
Lucas Meijer 6e2b9d3da4 make mono_print_thread_dump output to the visualstudio debugger window, for better debugger experience 2011-02-02 16:20:43 +01:00
Jérémie Laval bb29e352e0 Also check directly Task.IsCompleted when we are waiting 2011-02-02 15:07:45 +00:00
Jérémie Laval f81cd730a0 Avoid possible races in ManualResetEventSlim in case handle was already created but not with correct value 2011-02-02 15:07:45 +00:00
Jérémie Laval faf1b2c8c1 Cache ChildWorkAdder delegate object in ThreadWorker 2011-02-02 15:07:45 +00:00
Jérémie Laval d588d7ffee Lazy creation of the continuation queue in Task 2011-02-02 15:07:45 +00:00
Jérémie Laval e96c335c73 Inline read and write calls in CyclicDeque 2011-02-02 15:07:45 +00:00
Jérémie Laval 6e1a729b71 Make some CyclicDeque operation faster 2011-02-02 15:07:45 +00:00
Ankit Jain 133db04626 [xbuild] Warn for unknown toolsVersion only on build.
Emit warning for unknown toolsversion only on a build, and
*not* everytime the project file is parsed.

* class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
(GetToolsVersionToUse): Add a 'emitWarning' bool param.
(Build): Call GetToolsVersionToUse () to ensure that a warning is
emitted in case of a unknown tools version.
2011-02-02 18:10:33 +05:30
Marek Safar 049a51aa06 Update error tests 2011-02-02 12:39:10 +00:00
Marek Safar b70344fdd5 Update mono.spec with new mcs.exe location 2011-02-02 12:39:09 +00:00
Marek Safar d976580bd0 Compile&Run runtime tests with 4.0 corlib 2011-02-02 12:39:09 +00:00
Marek Safar f9c8a5c71c Move DynamicContext class into a new file 2011-02-02 12:39:09 +00:00
Marek Safar d44879348f Add handling of broken Convert callsite from Orchard Project 2011-02-02 12:39:08 +00:00
Rodrigo Kumpera 83586e4900 Align call instructions to make code patching SMP safe.
* mini-x86.c (emit_call): Align call instructions on
	3 mod 4 so the address is 4 bytes aligned and can't span
	two cache lines. This is required for proper SMP support
	as CAS is not atomic across cache lines.

	Fixes one of the crashes due to #667921.
2011-02-02 12:53:01 +01:00
Marek Safar 3f21f9037a Another attempt to build resgen correctly 2011-02-02 11:07:50 +00:00
Marek Safar 00641d503d New test 2011-02-02 11:07:42 +00:00
Marek Safar f735f6d9a1 Update to the latest mcs 2011-02-02 10:01:51 +00:00
Marek Safar 652eff2162 Update resgen header 2011-02-02 09:44:36 +00:00
Marek Safar 8fce8113a0 Update to the latest mcs 2011-02-02 09:44:35 +00:00
Marek Safar 43df638bac Make resgen build profile specific 2011-02-02 09:44:35 +00:00
Marek Safar b5b5e51559 Clean up resource files 2011-02-02 09:44:35 +00:00
Atsushi Eno 23a7a0b657 Implement XamlReader.ReadSubtree(). 2011-02-02 18:18:02 +09:00
Atsushi Eno 9f92cc615e Add missing test files. 2011-02-02 18:14:24 +09:00
Atsushi Eno d7ad74f11f Implement GetInheritedContracts(), towards bugfix #668089. 2011-02-02 16:11:58 +09:00
Geoff Norton dccae3c382 Avoid a stack overflow when deactivating a window 2011-02-01 23:54:36 -05:00
Michael Hutchinson 6f1cb10490 [Sdb] Pass out assigned port from VirtualMachineManager.BeginListen 2011-02-01 23:00:42 -05:00
Rolf Bjarne Kvinge 140f7b72d9 Updated .gitignore 2011-02-01 20:06:53 +01:00
Rodrigo Kumpera b9d5892425 Add test for dynamic method resurrection. 2011-02-01 18:08:57 +01:00
Marek Safar 7c47d212cc security was missing in 4.0 profile 2011-02-01 17:00:32 +00:00
Zoltan Varga 6911e05b2d Make caching in mono_marshal_get_virtual_stelemref () thread-safe. Fixes #668489. 2011-02-01 17:09:34 +01:00
Rodrigo Kumpera 89d1455a80 Don't use finalization to cleanup dynamic methods.
* reflection.c: Use a reference queue to cleanup
	dynamic methods instead of finalization.

	* runtime.c: Shutdown the dynamic method queue
	before runtime cleanup begins.

	* DynamicMethod.cs: No longer finalizable.

	* icall-def.h: Remove unused dynamic method icall.

	Fixes #660422
2011-02-01 16:52:43 +01:00
Rodrigo Kumpera 8eb1189099 Implement a reference queue API.
* gc.c: A reference queue allows one to queue
	callbcks for when objects are collected.
	It allows for safe cleanup of objects that can
	only be done when it is effectively collected.
	The major difference with regular finalization
	is that the collector makes sure the object
	was collected - and can't be resurrected.

	* gc-internal.h: Export entrypoints for the
	new API.
2011-02-01 16:52:43 +01:00
Marek Safar 7424fef442 Fix culevel execution path 2011-02-01 15:06:10 +00:00
Marek Safar 8fb3773a2e Add gacutil to perprofile build 2011-02-01 15:06:09 +00:00
joncham 122fb8dd72 Disable finally_guard test on Windows. 2011-02-01 09:57:16 -05:00
Marek Safar f95563a476 Fix resgen profile path 2011-02-01 14:27:23 +00:00
Marek Safar 6a5e36d799 Fix empty cast conversion from dynamic type object type argument 2011-02-01 14:27:23 +00:00
Marek Safar 5e261c905b Default mcs sdk version is now 4 2011-02-01 14:27:23 +00:00
Jérémie Laval 0e5106e896 Adapt Parallel.For stealing to all processor flavors 2011-02-01 13:19:58 +00:00
Marek Safar 5e5b296eae Make mcs.exe .net4 application 2011-02-01 12:53:22 +00:00
Marek Safar ef49ad4708 Remove unused file 2011-02-01 12:53:21 +00:00
Atsushi Eno 051d9bd0de Make sure to clear compiled items. Fixes regressions appeared in WCF land. 2011-02-01 21:23:44 +09:00
Atsushi Eno e2059c1ca4 standard endpoint and protocol mapping support were lacking at client side.
Turned out that they had nothing to do with #668089..
2011-02-01 20:25:40 +09:00
Marek Habersack 620d6afed1 [asp.net] FormsAuthenticationTicket.FromByteArray stops early if it is passed a null parameter 2011-02-01 09:18:21 +01:00
Marek Habersack bb4e4e1a00 [runtime] AddWatcher icall must look up the path in an IOMAP-aware way 2011-02-01 09:17:17 +01:00
Atsushi Eno ab2cc9fed9 Members in the base type in different namespace are serialized in base ns.
When the serializer serializes a Type B which is derived from A, it used to
serialize member M in A as in namespace_of_B, not in namespace_of_A.

This should fix bug #652331.
2011-02-01 15:53:05 +09:00
Atsushi Eno b15dcd8943 quick build workaround. 2011-02-01 12:59:44 +09:00
Atsushi Eno c71ee51faf in NET_4_0, remove types that went into System.Xaml.dll. Change build order. 2011-02-01 10:56:07 +09:00
Bit Diff 64ecfe59e7 Fixes #527447 whereby it was not possible to pass additional arguments to mono-service2 (if your executable required command-line arguments of it's own). 2011-01-31 17:57:19 -05:00
Zoltan Varga 4604fe76e2 Remove some duplicate code from mono_arch_find_jit_info (). 2011-01-31 22:44:13 +01:00
Zoltan Varga 224abec3da Fix stack walks on sparc. 2011-01-31 22:39:52 +01:00
Gonzalo Paniagua Javier cd038bf2c8 Handle wrapped ThreadAbortException
Third party ProcessRequest() like the one from Razor can wrap a
	ThreadAbortException originated from response.Redirect().
2011-01-31 16:36:53 -05:00
Jonathan Pryor 40c3113d8f Fix the basic-profile build. 2011-01-31 15:17:46 -05:00
Jonathan Pryor d49ecf5a4d [monodroid] Fix System.TimeZoneInfo.
Most System.TimeZoneInfo members weren't be included in the build.
2011-01-31 14:08:41 -05:00
Gonzalo Paniagua Javier f4c13c06c7 Allow forcing HTTP protocol version
If the version is manually set, ignore the version from the service
	point when set.

	Fixes bug #668199.
2011-01-31 10:48:37 -05:00
Lluis Sanchez 3d2caadfb5 Handle possible exceptions thrown by Socket.Close 2011-01-31 16:35:35 +01:00
Marek Habersack 63a9a149c4 [asp.net] Implemented 4.0 types System.Web.Security.{MachineKey,MachineKeyProtection} plus tests 2011-01-31 15:19:25 +01:00
Jb Evain fa036727ae unbreak the build 2011-01-31 15:02:53 +01:00
Marek Safar 732f1c617e Add more details to mcs time tracing 2011-01-31 13:53:55 +00:00
Levi Bard 08f00f0d02 [Fix] Cleanup per github comments.
* io-layer/processes.c:
 * io-layer/process-private.h:
  Cleanup per github comments.

License: MIT/X11
2011-01-31 14:06:05 +01:00
Tak 060c61e08f [Fix] Fix process scanning on OSX.
* io-layer/process-private.h: Generalize PID masking.
* io-layer/processes.c: Fix process scanning on OSX.

License: MIT/X11
2011-01-31 14:05:55 +01:00
Zoltan Varga c3a038e2cb When using xdebug, allocate all code from the code manager of the root domain. Hopefully fixes #666152. 2011-01-31 11:46:21 +01:00
Marek Habersack ecce3f42e4 [asp.net] Ignore directories that don't exist instead of throwing. 2011-01-31 11:06:41 +01:00
Atsushi Eno 3df62f0850 Fix bug #661400 - fix complicated namespace resolution issue.
Namespaces in nested external schemas have to be validated against
immediately-containing schema. If there is a schema A with urn:x
targetNamespace imports a schema B with urn:y targetNamespace which
in turn includes another schema C, then C must be validated its namespace
against B, not A.
2011-01-31 18:02:09 +09:00
Marek Habersack 14f4fbe9ee [runtime] Use IOAMP-aware method of looking for domain configuration file 2011-01-31 09:29:47 +01:00
Jo Shields f93bb42f7c Really fix sgen on PowerPC Linux. Assembler on Linux requires that register names are just bare numbers, unlike OSX, i.e. "r0" must be "0" on Linux. 2011-01-31 07:46:28 +01:00
Atsushi Eno 9021910845 Do not return DocumentFragment from AppendChild() etc. Fixed bug #666249. 2011-01-31 13:27:46 +09:00
Atsushi Eno c410acbb5b Fixed bug #666872; XElement.Changed and .Changing were not triggered.
Patch almost by Cambell Prince.
2011-01-31 12:09:06 +09:00
Atsushi Eno 696c528ac5 add public NetTcpSecurity .ctor() and close #667429. 2011-01-31 11:49:22 +09:00
Miguel de Icaza 360f833e48 [repl] Fix running specified scripts from command line, allow #! syntax, add print command
We were calling the Reset () method after we had initialized the driver
with the new command line arguments, clearing the list of files to execute
before we executed them.

Added support for #! in the csharp repl, and added the print() command to
the InteractiveBase

Add a better way of dealing with -e, without adding hacks to the core that wont work
in the future
2011-01-30 17:44:01 -05:00
Miguel de Icaza 1b8d34db5f [repl] Fix running specified scripts from command line, allow #! syntax, add print command
We were calling the Reset () method after we had initialized the driver
with the new command line arguments, clearing the list of files to execute
before we executed them.

Added support for #! in the csharp repl, and added the print() command to
the InteractiveBase
2011-01-30 17:44:01 -05:00
Veerapuram Varadhan 1012ab0bbc Fixes 667236 - Handle numeric types appropriately 2011-01-31 01:15:55 +05:30
Miguel de Icaza d8520bf769 [repl] Add support for -e EXPRESSION to the csharp command 2011-01-30 12:06:24 -05:00
Miguel de Icaza cd6a584860 Document csharp #! support 2011-01-30 11:40:59 -05:00
Veerapuram Varadhan a7bfa16bd9 Added schema file to fix test break 2011-01-30 14:19:29 +05:30
Veerapuram Varadhan e2e8734262 Don't run the test. Fixes test break. 2011-01-30 14:19:29 +05:30
Zoltan Varga e5f3169d70 Mark a newly added test as !FULLAOT. 2011-01-30 09:12:08 +01:00
Zoltan Varga b84968161f Fix some quadratic behavior in the AOT compiler. 2011-01-30 09:10:30 +01:00
Zoltan Varga 94d9671ac6 Improve hashing of MONO_PATCH_INFO_TYPE_FROM_HANDLE. 2011-01-30 09:10:09 +01:00
Zoltan Varga 02a65349e1 Don't crash when inlining static methods called using callvirt. Fixes #668170. 2011-01-30 06:59:42 +01:00
Zoltan Varga 08cdfb5d1e Clear the 'need_rgctx_tramp' flag when creating a synchronized wrapper. Fixes 2011-01-29 20:52:08 +01:00
Geoff Norton d05387a0bd Typo 2011-01-29 11:37:17 -05:00
Thomas Goldstein ea9864ac6c Remove .NET 1.1 internal class: System.Windows.Forms.IDeviceContext 2011-01-29 10:28:32 +01:00
Geoff Norton 64cb57088a Avoid a crash when shutting down jit attached threads 2011-01-28 19:06:45 -05:00
Zoltan Varga 7903b30fd9 Remove unused --with-glib/--with-jit/--with-interp options. 2011-01-28 17:33:19 +01:00
Zoltan Varga 70225f154f Add an AtLeast version to sdb's VersionInfo class. 2011-01-28 17:33:19 +01:00
Geoff Norton fb081e88fd Ensure we setup the vtable before accessing it 2011-01-28 01:08:19 -05:00
Geoff Norton cb1d4d7241 Bump SDB protocol so MonoDevelop can guard IL inspection of dynamic methods 2011-01-28 00:25:57 -05:00
Geoff Norton ddecc53e23 Dont leak loader errors in the aot compiler, as it could cause later methods to not get compiled erroneously 2011-01-27 23:23:15 -05:00
Gonzalo Paniagua Javier a554acdc4f [HttpListener] Set each cookie in its own header
Send a Set-Cookie header per cookie instead of a Set-Cookie2 with
	multiple cookies.

	Fixes bug #667550.
2011-01-27 15:46:15 -05:00
Zoltan Varga 7b7562d0e9 Fix AOT support for types in the EXPORTEDTYPE table. 2011-01-27 19:28:04 +01:00
Jérémie Laval f831cfdf27 Workaround stealing failure by disabling it in 32bits 2011-01-27 17:54:56 +00:00
Zoltan Varga 447fa3f0e8 Increase an aot buffer size again. 2011-01-27 17:24:57 +01:00
Marek Habersack 81b8a39b9c [asp.net] DefaultVirtualPathProvider cosmetics.
Use String.IsNullOrEmpty instead of comparing against ""
2011-01-27 15:35:06 +01:00
Marek Habersack f775654495 [asp.net] A bunch of fixes related to the default VirtualPathProvider (needed for Orchard)
* DefaultVirtualDirectory is now more careful when snipping off parts of the path passed to
  its constructor. Before removing the file part it checks whether the file indeed exists.
  Also sealed the class and made it use generic List instead of ArrayList
* HttpRequest does not normalize mapped paths when converting them to absolute ones. This is
  to avoid errors when path like "~/bin/../../file.txt" is passed to MapPath.
* VirtualPathUtility.ToAbsolute overload with normalize parameter really doesn't normalize
  the resulting path now.
2011-01-27 15:35:06 +01:00
Marek Habersack 42e2e27e05 [machine.config] Added the <system.transactions> section definition 2011-01-27 15:35:05 +01:00
Zoltan Varga 7a0ebccfaa Applied patch from Burkhard Linke <[email protected]>. Add support for newer boehm-gc versions. 2011-01-27 15:34:36 +01:00
Jérémie Laval 1c28d8d27f Leave db connection opened until requested to close it and add more unit tests 2011-01-27 13:16:42 +00:00
Alan McGovern 652e71d6e9 Revert "[Build] Ensure the profiler module is built in the moon profile."
This reverts commit 2975432969. This breaks
the moon build currently.
2011-01-27 12:57:22 +00:00
Alan McGovern 2975432969 [Build] Ensure the profiler module is built in the moon profile. 2011-01-27 11:17:55 +00:00
Zoltan Varga 734fef0a91 Improve an AOT error message. 2011-01-27 11:49:27 +01:00
Zoltan Varga 6c92b5d5cc Fix up aot-ing of mscorlib/mcs by AOTing mcs in the basic/2.0 profiles, installing it in 2.0. 2011-01-27 11:48:21 +01:00
Zoltan Varga e51049ee3b Fix compilation of tests/assemblyresolve with newer mcs-es. 2011-01-27 11:05:32 +01:00
Marek Safar be2b05b3d3 New test 2011-01-27 09:05:10 +00:00
Marek Safar 76f606e495 Fix a warning 2011-01-27 09:05:10 +00:00
Marek Safar 1e0428889f Tests update 2011-01-27 09:05:09 +00:00
Marek Safar 4423ad060b [667261] Fixes overload resolution of an optional parameter followed by a params parameter of the same type 2011-01-27 09:05:09 +00:00
Marek Safar cda8353f0c Don't allocate anonymous method container when importing event fields 2011-01-27 09:05:09 +00:00
Zoltan Varga 8048982713 Fix dist issues in Mono.Debugger.Soft. 2011-01-27 07:15:11 +01:00
Gonzalo Paniagua Javier 2fc89c1557 Prevent abort
When cleaning up the sockets we no longer have access to Tls.
2011-01-26 23:08:52 -05:00
Zoltan Varga 92a01903df Fix name of CASTCLASS wrappers. 2011-01-27 01:45:08 +01:00
Zoltan Varga e228282412 Add AOT support for castclass_with_cache wrappers. 2011-01-27 01:42:58 +01:00
Kyle Ambroff 0dfe460dc6 version tolerant serialization fails with missing primitive members
Modifies ObjectReader so that when it encounters a primitive typed member in
an object stream which has no corresponding member in the app domain, it will
read the value anyway and throw it away. That way it can read the next block
from the stream.

Added a unit test which passes with the changes to ObjectReader.

Fixes bug #641821.
2011-01-26 18:07:31 -05:00
Kenneth Bell 6cb0994257 Implement RawSecurityDescriptor.
* Marshals to/from SDDL and binary form.

 * Supports 'Common' ACEs and 'Object' ACEs
2011-01-26 18:00:29 -05:00
Kenneth Bell c47765e4a2 Implement SecurityIdentifier and improve NTAccount.
* Only translates between SecurityIdentifier and NTAccount for
    well-known accounts.

  * NTAccount changed to not upper-case values to match behaviour
    observed in Microsoft's .NET (see also unit tests)

  * Add unit tests for both classes
2011-01-26 17:59:52 -05:00
Ankit Jain 77fabf1209 Process.Start: Show native error message in Win32Exception.
mcs/class/System/System.Diagnostics/Process.cs (Start_noshell):
If the process execution fails, then add the error message for
the native error code in the Win32Exception thrown.
2011-01-27 04:03:46 +05:30
Antoine Cailliau 053cc05107 Implements System.ComponentModel.DataAnnotations.RegularExpressionAttribute 2011-01-26 17:29:56 -05:00
Jérémie Laval beddbef60a Fix overflow checking in PLinq Range operator 2011-01-26 17:50:09 +00:00
Geoff Norton 54d50f2656 Include operands when emitting the IL stream to sdb clients 2011-01-26 12:35:00 -05:00
Geoff Norton 567512bd8f Ensure we properly align the stack before resuming from breakpoint signal handlers 2011-01-26 12:13:41 -05:00
Andrew Jorgensen fb75a201a3 Add 2.0 and 4.0 S.D.S.C 2011-01-26 09:49:01 -07:00
Geoff Norton ae2d6d1f7d Dynamic methods are classes already here 2011-01-26 11:25:05 -05:00
Marek Safar d6fdad900c Remove unused very expensive registered_signals field 2011-01-26 13:29:11 +00:00
Marek Safar a5ee4f3b76 Remove wrong key from System.Data.Services.Client 2011-01-26 13:29:11 +00:00
Marek Safar 145d6be351 Avoid linear scan in GetEncoding and make the initialization lazy 2011-01-26 13:29:11 +00:00
Marek Safar a9be3295ac Revert broken ikvm change 2011-01-26 13:29:10 +00:00
Marek Safar 9ce569a853 Cache MonoUtil::IsUnix value 2011-01-26 13:29:10 +00:00
Rodrigo Kumpera d7e670c0c7 Fix freeing of delegate wrappers.
* marshal.c (mono_marshal_get_delegate_invoke): If
	the target is a static method with first arg bound
	and it belongs to a different assembly than the delegate
	we might end up with a freed signature in the hashtable.

	Fix a moonlight crash.
2011-01-26 11:37:05 +01:00
Marek Safar 237ac7c68b New test 2011-01-26 08:59:12 +00:00
Marek Safar 73b624bb2d Update to the latest IKVM 2011-01-26 08:59:12 +00:00
Marek Safar 86b3d1371f Optimized constructor readonly access has to be inside same declarting type 2011-01-26 08:59:11 +00:00
Marek Safar b87d4ad402 Improve compatibility of BinaryReader with non-default encoder when reading large strings 2011-01-26 08:59:11 +00:00
Marek Safar 72a7dcbc53 Improve FileStream block reading performance little bit 2011-01-26 08:59:11 +00:00
Geoff Norton ce9afaf47f MonoTouch doesnt support SRE, so we need to disable this code on MT 2011-01-25 22:56:17 -05:00
Zoltan Varga eb8be6f651 Add a 'suspend-on-unhandled' MONO_DEBUG option to help track down the random build failures on ia64. 2011-01-26 04:16:50 +01:00
Geoff Norton 16d4fd790b Further .NET 4.0 ification of the mobile profile 2011-01-25 20:10:54 -05:00
Ankit Jain 78dbed369d [xbuild] Improve error messages for condition evaluation.
Also, add new ExpressionEvaluationException class.
Wrap Expression*Exceptions in InvalidProjectFileException with
info about the full condition being evaluated.
2011-01-26 04:53:12 +05:30
Ankit Jain a3cf6d4379 [xbuild] Support short-circuiting in conditions. 2011-01-26 04:53:12 +05:30
Jb Evain e508315f87 Add test for Reverse over arrays 2011-01-26 00:08:41 +01:00
Jb Evain cb3f41ca57 [linq] Fix Reverse for IList implementors 2011-01-26 00:08:11 +01:00
Jb Evain bce7739486 [linq] Fix overflow check for Count 2011-01-25 23:47:58 +01:00
Jb Evain 96ee0a8380 Add test for Enumeerable.Range high boundaries 2011-01-25 23:46:22 +01:00
Jb Evain f224ec361f [linq] fix Range extreme boundaries 2011-01-25 23:45:44 +01:00
Geoff Norton 6fe8e00cee Fix the mobile build 2011-01-25 14:16:28 -05:00
Zoltan Varga 0765c50516 Print OP_TAILCALL as a call. 2011-01-25 16:34:30 +01:00
Zoltan Varga 76c9d06873 Fix up CAS tests a bit. 2011-01-25 16:34:29 +01:00
Marek Habersack 773e8b4d03 [corlib,crypto] RandomNumberGenerator implements IDisposable in 4.0 2011-01-25 15:47:13 +01:00
Marek Habersack 0f51fe59c2 [system] SmtpClient implements IDisposable on 4.0 (a no-op for now) 2011-01-25 15:46:24 +01:00
Marek Habersack 4fb24e90fc [wcf] Install the System.Data.Services.Client properly. 2011-01-25 15:45:42 +01:00
Marek Safar a4c64b0def New test 2011-01-25 10:44:20 +00:00
Marek Safar dd4b543381 Degrade wrong override member to virtual instead of non-virtual 2011-01-25 10:44:19 +00:00
Marek Safar 58e173c891 Fix caching of missing assemblies 2011-01-25 10:44:19 +00:00
Marek Safar b6daf66fa0 Evaluate preprocessor conditions also in unreachable context 2011-01-25 10:44:19 +00:00
Marek Safar 926585d833 Implicitly typed array cannot have multiple dimensions 2011-01-25 10:44:18 +00:00
Marek Safar e9ff4409d4 Turn 2 errors into warnings, mcs can now compile methods with no implementation 2011-01-25 10:44:18 +00:00
Geoff Norton 83e999b7d7 Add pfx to the mobile profile 2011-01-25 01:51:17 -05:00
Geoff Norton 7f2d20a0a8 Work around a full-aot issue for monotouch System.Json 2011-01-25 01:50:57 -05:00
joncham d6a2891a00 Use correct allocator for marshalled memory. 2011-01-24 20:57:51 -05:00
joncham 03933195e5 Use mono_marshal_free rather than g_free for deallocating marshalled memory. Use correct string icall for MONO_MARSHAL_CONV_LPSTR_STR and MONO_MARSHAL_CONV_LPTSTR_STR. 2011-01-24 20:57:50 -05:00
joncham 669674a166 Fix invalid IL code for marhsalling safe arrays. 2011-01-24 20:57:48 -05:00
Andrew Jorgensen ee84564501 Add WebMatrix.Data to spec 2011-01-24 15:16:24 -07:00
Mark Probst e097a64432 Merge branch 'sgen-android'
Conflicts:
	mono/metadata/sgen-gc.c
2011-01-24 22:26:45 +01:00
Tomasz Kubacki e9d51317d8 [Mono.CSharp] Improve error reporting 2011-01-24 15:23:19 -05:00
Jérémie Laval 02d7955fa4 Add a quirk for Parallel.For stealing 2011-01-24 18:19:56 +00:00
Jérémie Laval a90b8c070d Revert stealing changes in ListPartitioner, too much mess 2011-01-24 18:19:56 +00:00
Jérémie Laval 96a671fba6 Fix range in ListPartitioner when initial division was giving a legitimate 1 2011-01-24 18:19:56 +00:00
Jérémie Laval ffe59cfe9d Track the end of the underlying enumerator in EnumerablePartitioner 2011-01-24 18:19:55 +00:00
Geoff Norton 42becb825f Avoid leaking the vmmap allocated by the kernel for the thread_act_array_t 2011-01-24 12:07:39 -05:00
Geoff Norton 0840a96eee Fix a mach port leak 2011-01-24 11:39:01 -05:00
Jérémie Laval f91a01c747 Sanitize parent-child relation in continuations 2011-01-24 14:26:17 +00:00
Jérémie Laval 6f84c66659 Don't put back stuff in the shared work pool when walking our own deque 2011-01-24 14:26:17 +00:00
Jérémie Laval 1ea727aa74 Don't execute self task so ravenously when waiting 2011-01-24 14:26:17 +00:00
Jérémie Laval 5ba9f7a270 Make sure a synchronous continuation get executed synchronously in all cases 2011-01-24 14:26:17 +00:00
Marek Habersack 4b084b4966 [asp.net] Global.asax assembly must be passed as reference when compiling. BuildManager.GetType improvements.
When user has their own global application class (global.asax is present) the assembly produced from it must
be passed as reference to the compiler.
BuildManager.GetType now supports fully-qualified type names for 'typeName' and searches for the type in the
top-level assemblies, the global.asax assembly and in the assemblies specified in as references in web.config.

All of this fixes certain MVC3+Razor applications.
2011-01-24 15:18:07 +01:00
Marek Safar 32be083d89 Update to the latest IKVM 2011-01-24 13:58:12 +00:00
Marek Safar 0169babb49 Guard against invalid predefined assembly attributes 2011-01-24 13:58:11 +00:00
Marek Safar faabb845d8 Reduced conditional expression requires both sides to be constant 2011-01-24 13:58:11 +00:00
Marek Safar 4e09a1c56d Don't crash when call site type cannot be created (unlikely) 2011-01-24 13:58:10 +00:00
Marek Safar 357546f6ed Report better error message for literal conversion using user operators 2011-01-24 13:58:10 +00:00
Marek Safar f2bc22cbf0 [666476] Use correct parameter count when checking ambiguous params methods 2011-01-24 13:58:10 +00:00
Marek Safar f88963b09d Update C5 to version 1.1.1 2011-01-24 13:58:10 +00:00
Marek Safar 2c12dad9b1 Report better error message when conversion between types of same name fails 2011-01-24 13:58:09 +00:00
Marek Safar 66ceeeebae Optimize reading of base interfaces 2011-01-24 13:58:09 +00:00
Marek Safar 567f2f507e [666376] Implement compiler option fullpaths 2011-01-24 13:58:09 +00:00
Marek Habersack e60769f5d6 [asp.net] Fixed formatting of exception message. It doesn't swallow newlines now 2011-01-24 12:19:53 +01:00
Zoltan Varga 699c32cae6 Dist finally_guard.cs. 2011-01-24 04:14:14 +01:00
Marek Habersack 1465bf891a [ASP.NET] Templated exception reporting and a new look for the Yellow Screen Of Death
This commit implements the base template code along with the default Mono theme for exception/error
reporting in ASP.NET applications. Means for user to implement their own templates will be provided
at a later date.
2011-01-24 03:15:14 +01:00
Gonzalo Paniagua Javier a9d2a48766 Fix Dispose() 2011-01-22 13:29:49 -05:00
Rodrigo Kumpera 402313372c Fix corlib compilation 2011-01-22 14:29:23 +01:00
Marek Habersack d66b7f5543 [asp.net,routing] Fix for bug #651966. Regular expression constraints must be treated as absolute regexps. 2011-01-22 12:43:14 +01:00
Mark Probst 144632ec7c [sgen] Start concurrent sweep thread on GC init.
Starting the concurrent sweep thread only the first time it is needed
is potentially harmful because it happens when the world is stopped
and pthread_create() is not necessarily thread-safe.

Now we start the sweep thread on GC init which is always safe.
2011-01-22 12:03:21 +01:00
Zoltan Varga 4a812850f8 Fix sgen build on PPC linux. 2011-01-22 07:11:36 +01:00
Gonzalo Paniagua Javier b688d53ce7 [HttpListener] Fix incorrect 411 error
Don't send a 411 for unknown methods without content length.
	No need to assign input_stream until requested.

	Fixes bug #666251.
2011-01-21 23:53:05 -05:00
Jérémie Laval 7a505099cf Add unit test for Database 2011-01-22 02:55:15 +00:00
Zoltan Varga bd10f1c50a Force a build. 2011-01-22 03:20:27 +01:00
Jérémie Laval 3a820d87a6 Add unit tests for DynamicRecord 2011-01-22 02:14:23 +00:00
Jérémie Laval b17767ef12 Just fixup comment 2011-01-22 02:14:21 +00:00
Zoltan Varga 6a0cd05f65 Fix an assert which happens when a call is made to Nullable.Unbox from gshared code in AOT. 2011-01-22 03:08:11 +01:00
Bassam Tabbara 585c0ad5ba Fix for 666225 2011-01-21 21:00:29 -05:00
Miguel de Icaza 325a483d42 [getline] Fix history search in the cmdline editor 2011-01-21 20:51:33 -05:00
Jérémie Laval 0b04a18b5c Add GetLastInsertId 2011-01-22 01:21:18 +00:00
Jérémie Laval 175bf44280 Foobar trigger connection 2011-01-22 01:21:18 +00:00
Jérémie Laval e72f9fb0a0 Add Close method 2011-01-22 01:21:17 +00:00
Jérémie Laval 408b7c2c49 Add ConnectionOpened event to Database 2011-01-22 01:21:16 +00:00
Jérémie Laval b4b7fbbd37 Fix up compilation of Database and DynamicRecord 2011-01-22 01:21:16 +00:00
Jérémie Laval bf0339ea2b Add Dispose calls to Database 2011-01-22 01:21:15 +00:00
Jérémie Laval aa0a9518f1 Add Database type 2011-01-22 01:21:14 +00:00
Jérémie Laval 29cba278a0 Complete base DynamicRecord API 2011-01-22 01:21:13 +00:00
Jérémie Laval b6dcc8e3af Stub DynamicRecord 2011-01-22 01:21:12 +00:00
Jérémie Laval 104510d8e2 Add WebMatrix.Data assembly skeleton 2011-01-22 01:21:11 +00:00
Miguel de Icaza 717e88dd0c [Mono.CSharp] Fix bug where overwriting variables cleared the wrong value
This fixes #641910
2011-01-21 20:14:57 -05:00
Miguel de Icaza 9aa6670554 [csharp] repl using statement fix + support for --fatal
Fixes #638585 which kept reporting the same error on the using statements over and over
Added support for the --fatal flag to the REPL
2011-01-21 19:55:30 -05:00
Zoltan Varga 564162304b Force a build. 2011-01-22 00:34:39 +01:00
Marek Safar c0ea39424d Fix broken v4 metadata setting 2011-01-21 21:58:21 +00:00
Zoltan Varga d5cdff0243 Transition non perf-critical users of klass->has_finalize over to mono_class_has_finalizer (). 2011-01-21 22:30:36 +01:00
Zoltan Varga 3e324cc18e Initialize klass->has_finalizer lazily. This allows us to remove the find_method_in_metadata () optimization without a perf cost which is broken in the presence of overrides. Fixes #665769. 2011-01-21 21:52:54 +01:00
Zoltan Varga f01e132493 Obsolete VirtualMachine.GetNextEvent () as it is impossible to determine when to resume after an event, since the debuggee suspends only once per event-set. 2011-01-21 21:52:54 +01:00
Marek Safar c74e30f6ac New test 2011-01-21 20:25:01 +00:00
Marek Safar e278b5edc2 Use byte array as underlying storage for AttributeEncoder 2011-01-21 20:25:01 +00:00
Andrew Jorgensen 48936b2dc6 Oops, Microsoft.Web.Infrastructure, not System. 2011-01-21 12:52:54 -07:00
Andrew Jorgensen 95ce92b57f Add Microsoft.Web.Infrastructure and Mono.Parrallel to spec 2011-01-21 11:15:19 -07:00
Jonathan Pobst ae8a8ff0b2 Fix for building with csc. All fields in a struct must be set before the constructor can return. 2011-01-21 11:52:10 -06:00
Atsushi Eno 3fe5cb1897 Manage opened proxy channels and close them when ChannelFactory is closed. 2011-01-22 00:23:03 +09:00
Marek Safar 165c64a38b [321020] Implemented compilation of forwarded type references 2011-01-21 15:18:24 +00:00
Marek Safar 3b24253962 Fix monodroid build 2011-01-21 15:18:23 +00:00
Marek Safar 7cbc385772 Make type creation the first step in the pipeline to deal with forward referencing types 2011-01-21 15:18:23 +00:00
Marek Safar 6bafe0d2d0 Update to the latest ikvm.reflection 2011-01-21 15:18:23 +00:00
Atsushi Eno 7bbd3a3ec9 Implemented a couple of async methods in InstanceContext as well as disposing. 2011-01-21 23:37:45 +09:00
Jérémie Laval 14ccd823df Restore test to its original state 2011-01-21 12:48:10 +00:00
Jérémie Laval 122b56052b Add a last resort mode to ThreadWorker participative waiting to prevent some deadlock for now 2011-01-21 12:48:09 +00:00
Jérémie Laval 2fd30cbfbe Allow multiple invocation of Task Execute method to allow short-circuiting without breaking deque ordering 2011-01-21 12:48:09 +00:00
Jérémie Laval 1b406592e1 Throw when trying to ExecuteSynchronously a task that is already scheduled/completed 2011-01-21 12:48:09 +00:00
Atsushi Eno 0b2d2e17cd Avoid possible list modification error during close process. 2011-01-21 20:25:23 +09:00
Atsushi Eno f4d59f294f Make sure to close session once the client opened one. 2011-01-21 20:24:58 +09:00
Atsushi Eno 91074e3475 Fix regression, avoid null key. 2011-01-21 20:24:30 +09:00
Jérémie Laval c4cc62d42d Make NestedFuture test faster 2011-01-21 10:52:17 +00:00
Thomas Goldstein 0d732b13a0 MWF: Remove #if NET_2_0 and #if ONLY_1_1 conditions (part 13). 2011-01-21 08:23:48 +01:00
Atsushi Eno b2802fa2d5 And rename source file name. 2011-01-21 16:20:23 +09:00
Atsushi Eno 3691992579 Rename InstanceBhavior, too ambiguous among IXxxBehavior interfaces. 2011-01-21 16:18:54 +09:00
Atsushi Eno feec98f870 Sessions should not be keyed by MessageId but be done by channel SessionId. 2011-01-21 16:17:59 +09:00
Zoltan Varga 531147d772 Add NET 4.0 Assembly.UnsafeLoadFrom () method. 2011-01-21 07:26:56 +01:00
Zoltan Varga 65a304bd30 Fix the previous aot fix. 2011-01-21 05:58:09 +01:00
Miguel de Icaza 68bbc4c2d7 Do not build the Socket passing on Mobile systems 2011-01-20 22:44:27 -05:00
Atsushi Eno 7a0f8f89a0 Fix bogus encoding detection in JavaScriptObjectDeserializer. 2011-01-21 12:09:42 +09:00
Gonzalo Paniagua Javier a2ed4f6fc2 [System.Web] Razor works now (modulo DB) 2011-01-20 21:58:59 -05:00
Zoltan Varga 9ab0344df9 Add a test for infinite generic recursion + AOT. 2011-01-21 02:07:24 +01:00
Zoltan Varga b9cdc5ad7f Only add imt items whose is_equal flag is set to the array passed to the full-aot imt thunk. 2011-01-21 02:06:03 +01:00
Zoltan Varga 6d17a89132 Avoid emitting .note.GNU-stack on arm. 2011-01-21 01:51:19 +01:00
Zoltan Varga 697955e768 Detect inifinite generic recursion differently in the AOT compiler. 2011-01-21 01:50:08 +01:00
Zoltan Varga 8bc4226e75 Fix misaligned loads when loading small structures on ARM. 2011-01-21 01:50:08 +01:00
Zoltan Varga c53dcf0463 Fix the DISABLE_JIT build. 2011-01-21 01:50:07 +01:00
Rodrigo Kumpera 4a8b716e0b Speedup LOS scanning.
* sgen-cardtable.c (sgen_cardtable_scan_object): Speedup
	card scanning doing it a word at a time. When scanning
	arrays of references, do a nursery check before calling
	into major.

	This speeds up ms-biology some tests by 3% while lowering
	cardtable scanning time by 1/3.
2011-01-20 23:54:08 +01:00
Rodrigo Kumpera 4f384ab0fc Better cardtable stats.
* sgen-cardtable.c: Add separate timing for major and
	los scanning. Added some counters to better understand
	wb behavior.
2011-01-20 23:54:08 +01:00
Rodrigo Kumpera e92d099435 Fix typo in error message 2011-01-20 23:54:08 +01:00
Rodrigo Kumpera 0f37296695 Fix thread-exit race under sgen.
* threads.c (mono_threads_set_shutting_down): Clean the current
	domain before calling ExitThread otherwise sgen asserts.
2011-01-20 23:54:07 +01:00
Marek Habersack 1a9d2e5148 [asp.net] Don't throw NREX when a cache item to be removed is null 2011-01-20 23:38:27 +01:00
Sebastien Pouliot 37b80b8e29 Add an helper function to deal with NULL MonoMethod pointers
* security-core-clr.c: Use new helper function to get the method names
or, when NULL, a not found string.
2011-01-20 17:10:01 -05:00
Marek Safar 82360af0ca Fix Mono.CSharp dist build 2011-01-20 22:31:12 +00:00
Miguel de Icaza 5b065d9878 [sockets] Implement DuplicateAndClose and Socket (SocketInformation) constructor for in-process socket passing (AppDomains) 2011-01-20 16:53:41 -05:00
Ankit Jain 8a362ef7e6 [xbuild] Correctly set CscToolExe if TargetFrameworkVersion is not set.
* tools/xbuild/xbuild/Microsoft.CSharp.targets: $(CscToolExe)
is set depending on the value of $(TargetFrameworkVersion).
Since, $(TargetFrameworkVersion)'s default value is set
by MS.Common.targets, set $(CscToolExe) *after* importing
MS.Common.targets .
2011-01-21 02:53:19 +05:30
Jérémie Laval 8f13c9cee5 Backport stealing fixups to Parallel.For 2011-01-20 16:49:23 +00:00
Jérémie Laval f125c17b1a [ListPartitioner] Borrow stealing algorithm from Parallel.For and distribute indexes more evenly 2011-01-20 16:49:23 +00:00
Marek Safar d2b89d8151 Put back accidentally removed PROGRAM_COMPILE 2011-01-20 15:57:12 +00:00
Jb Evain 34b2c955cf [bug] Prevent a GetMethodBody call on a dynamic method. Fixes 665788 2011-01-20 16:37:21 +01:00
Jb Evain 4e4e92f4fa Add test for bug 665788 2011-01-20 16:36:37 +01:00
Jb Evain d6ceea638c [linker] fix reading of symbols for assemblies loaded with -a 2011-01-20 16:22:53 +01:00
Marek Habersack f4d9b0ef94 [asp.net] Avoid passing duplicate assemblies on mcs command line. 2011-01-20 14:31:20 +01:00
Marek Habersack d8aaac8baa [asp.net,mvc] Make unobtrustive request validation in MVC v3 possible
Validation is enabled early in the pipeline during request. ValidationUtility makes sure that validation is indeed enabled and
replaces the default form and query string collections with a lazy version which will validate values only when an existing key
is found and requested.
2011-01-20 14:31:20 +01:00
Marek Habersack 90f8bf7ffd [asp.net] Do not throw NREX when firstError is null in ErrorMessage getter 2011-01-20 14:31:20 +01:00
Marek Safar 91286f14ae Fix errors dist 2011-01-20 13:26:40 +00:00
Marek Safar 53467adcb7 Fix mcs dist 2011-01-20 13:13:30 +00:00
Marek Safar 5975fd2bb7 Remove SMCS define and related files 2011-01-20 12:40:55 +00:00
Marek Safar 743508b1f0 Remove unused ?mcs files 2011-01-20 12:09:49 +00:00
Marek Safar d382b36521 Allow referencing multiple versions of same framework assembly 2011-01-20 11:43:17 +00:00
Marek Safar cc3be8ed58 Fix CodeDom mcs path 2011-01-20 11:38:50 +00:00
Marek Safar 79d0cfc7a8 Updated IKVM to the latest version 2011-01-20 11:28:25 +00:00
Marek Safar 1244cd3ac6 CSharpCodeCompiler NET_2_0 cleanup 2011-01-20 11:27:48 +00:00
Marek Safar 63f3a0c93f Remove more *mcs.exe references 2011-01-20 09:30:40 +00:00
Atsushi Eno 5c44482089 Implement XamlMemberInvoker.UnknownInvoker too. 2011-01-20 18:28:19 +09:00
Atsushi Eno fb121b6809 Implement XamlTypeInvoker.UnknownInvoker. 2011-01-20 18:20:08 +09:00
Atsushi Eno 6bfb5c3644 Implement some XamlTypeInvoker methods (mostly unused yet). 2011-01-20 17:55:53 +09:00
Marek Safar e52514e1a1 Update mcs location 2011-01-20 08:31:50 +00:00
Atsushi Eno 21026ad130 Support IXamlLineInfo in XamlNodeQueue. 2011-01-20 17:21:11 +09:00
Atsushi Eno bdef99df34 finish XamlType.BaseType implementation. 2011-01-20 16:59:05 +09:00
Atsushi Eno 4a5f7c742c Contract-based type must ensure that the base type is also contract-based.
Fixed bug #661987 on WCF side.
2011-01-20 16:16:56 +09:00
Atsushi Eno 2464cfc869 Read body content if required. Fixed all issues in bug #656020.
Now it considers message content format and IsWrapped[Request|Response] to
retrieve XmlObjectSerializer.
2011-01-20 15:32:33 +09:00
Ankit Jain 192bc3e85b [xbuild] Fix bug #665637.
Pass $(WarningsNotAsErrors) to Csc task.
2011-01-20 11:00:22 +05:30
Zoltan Varga 00e05147a5 Clean up the ARM generic trampoline. 2011-01-20 06:20:02 +01:00
Zoltan Varga c46e5f9ece Properly align the stack in the arm generic trampoline. 2011-01-20 05:35:44 +01:00
Zoltan Varga c188c7abd3 Add a TID field to ThreadMirror which returns the system thread id. 2011-01-20 02:13:35 +01:00
Thomas Goldstein da16ca5a32 BindingSourceTest.cs: Add FIXME comment (erroneous test). 2011-01-19 23:49:56 +01:00
Thomas Goldstein 19532cd5be BindingSourceTest.cs: Add unit test for bug 664833. 2011-01-19 23:49:24 +01:00
Clinton Volzke 2a3952e27e BindingSource.cs: Fix DataSource setter which could reset the DataMember. Fixes bug 664833. 2011-01-19 23:49:06 +01:00
Andrew Jorgensen f4dd4e067a Dist more files needed by MSVC build 2011-01-19 15:41:35 -07:00
Marek Safar 19f259840c Unify the way the interfaces are checked for shadowing 2011-01-19 19:49:16 +00:00
Marek Safar a4d66b17da [665333] Encode Length of Public Key correctly 2011-01-19 17:58:05 +00:00
Marek Safar e3157bf62d Fix CS0108 for interfaces with multiple methods of same name 2011-01-19 17:58:05 +00:00
Marek Safar fbbbdf8ef1 Clean up resolving of DefaultCharSetAttribute 2011-01-19 17:58:05 +00:00
Marek Safar 5564f2cdab Removed SetCorlibTypeBuilders call 2011-01-19 17:58:04 +00:00
Marek Safar 54c0b5c422 Removed hack for compilation of enums inside corlib 2011-01-19 17:58:04 +00:00
Jérémie Laval 2482aedbb8 Update Mono.Parallel docs with new properties 2011-01-19 14:30:13 +00:00
Rodrigo Kumpera 2fc97ad932 Document precise marking 2011-01-19 14:55:25 +01:00
Rodrigo Kumpera a091409334 Fix mono manpage header 2011-01-19 14:55:25 +01:00
Atsushi Eno 997a5664a9 Enable duplicate "UriMatched" error check, with couple of FIXMEs.
.NET is very unclear about those UriTemplate behavior. Too minor to mind.
2011-01-19 20:22:45 +09:00
Atsushi Eno 7d5b5a1b7f Fix template match logic to first check HTTP-method-matching ones.
Part of the fix for bug #656020.
2011-01-19 19:01:49 +09:00
Ankit Jain 6af5e953e7 [xbuild] Fix bug #665004. Honor /nologo option.
* tools/xbuild/Parameters.cs (DisplayVersion): Remove, not required.
2011-01-19 14:14:31 +05:30
Marek Safar ba3b8be8be Stop building *mcs.exe compilers 2011-01-19 08:24:40 +00:00
Marek Safar 956e8bc42d Update IKVM sources 2011-01-19 08:24:40 +00:00
Marek Safar 01ca29caf8 Update mcs error to test against mcs compiler 2011-01-19 08:24:40 +00:00
Marek Safar c4cc8b4b65 update test results 2011-01-19 08:24:40 +00:00
Marek Safar e7732645c3 Update test target to check mcs compiler 2011-01-19 08:24:39 +00:00
Atsushi Eno e96fbeb319 Serialize non-mapped message parameter as body content. Part of bug #656020 fix. 2011-01-19 17:05:07 +09:00
Gonzalo Paniagua Javier 0501df25ef Happy new year. 2011-01-18 22:43:38 -05:00
Rodrigo Kumpera 667cf394f0 Properly clear weak refs that don't track resurrection.
* sgen-gc.c (finish_gray_stack): We must clear
	weak refs that don't track resurrection before
	processing finalizable objects otherwise we'll
	copy/mark them and the weak ref won't be cleared
	until after finalization.

	Fixes #657408
2011-01-19 01:32:16 +01:00
Gonzalo Paniagua Javier c6b1dd9db3 [HttpWebRequest] New 4.0 AddRange overloads. 2011-01-18 18:56:32 -05:00
Neale Ferguson 8027402817 Cast result of s390x_emit16/32 to eliminate lots of warning messages
Check for wrapper-managed-to-native when assessing call parameters and have emit_prolog use native_size when processing those parameters
Signed-off-by: Neale Ferguson <[email protected]>
2011-01-18 18:21:43 -05:00
Thomas Goldstein 3feb4e7f7f MWF: Remove #if NET_2_0 and #if ONLY_1_1 conditions (part 12). 2011-01-19 00:13:54 +01:00
Thomas Goldstein ca2a9ec584 MWF: Remove #if NET_2_0 and #if ONLY_1_1 conditions (part 11). 2011-01-19 00:11:50 +01:00
Thomas Goldstein 1f6bdc7f36 MWF: Remove #if NET_2_0 and #if ONLY_1_1 conditions (part 10). 2011-01-19 00:10:06 +01:00
Thomas Goldstein 68b93c5ec1 MWF: Remove #if NET_2_0 and #if ONLY_1_1 conditions (part 9). 2011-01-19 00:09:06 +01:00
Gonzalo Paniagua Javier fb13ef43ce [HttpWebRequest] Support 4.0 Date property. 2011-01-18 16:44:12 -05:00
Thomas Goldstein 1b95c9e7aa MWF: Remove #if NET_2_0 and #if ONLY_1_1 conditions (part 8). 2011-01-18 22:26:25 +01:00
Thomas Goldstein d47d06a19c MWF: Remove #if NET_2_0 and #if ONLY_1_1 conditions (part 7). 2011-01-18 22:22:30 +01:00
Thomas Goldstein 839d595e2b MWF: Remove #if NET_2_0 and #if ONLY_1_1 conditions (part 6). 2011-01-18 22:19:21 +01:00
Thomas Goldstein 082589b0f7 MWF: Remove #if NET_2_0 and #if ONLY_1_1 conditions (part 5). 2011-01-18 22:16:06 +01:00
Jérémie Laval 7f146f9f07 Expose ThreadWorker fields 2011-01-18 19:22:18 +00:00
Gonzalo Paniagua Javier 9ae3d21c17 [HttpWebRequest] Support 4.0 Host property. 2011-01-18 12:52:58 -05:00
Marek Safar 11bf89d6d4 Build declared interface based on full type hierarchy 2011-01-18 17:34:56 +00:00
Zoltan Varga b81c4662c2 Make the stacks of aot image non-executable. 2011-01-18 18:11:31 +01:00
Marek Safar 86190c96d0 Checking skd path for is not enough, add check for mscorlib as well 2011-01-18 17:08:33 +00:00
Marek Safar e6d7773566 Fix loading of same assembly when used with different reference aliases 2011-01-18 17:08:33 +00:00
Marek Safar bacdafc90b Remove unused type 2011-01-18 17:08:33 +00:00
Zoltan Varga ee83bdd1f6 Disable some of the FastCopy fast paths since they are racy. 2011-01-18 17:17:16 +01:00
Jérémie Laval 27bef54a6f Fix Task.Wait timeout regression 2011-01-18 16:00:05 +00:00
Jérémie Laval 4383deb009 Expose ThreadWorker in Mono.Parallel 2011-01-18 16:00:05 +00:00
Jérémie Laval 89ef327cd5 Add doc for IMonoTaskScheduler extra behavior 2011-01-18 16:00:04 +00:00
Jérémie Laval 1e9c83e031 Update MonoTaskExtensions doc 2011-01-18 16:00:04 +00:00
Jérémie Laval 772d9cb780 Further checks of ParticipateUntil mashalling 2011-01-18 16:00:04 +00:00
Zoltan Varga 6c271d651c Allow only primitive types/enums in RuntimeHelpers.InitializeArray (). 2011-01-18 16:41:37 +01:00
Marek Safar 3c06aa3b92 Remove devirtualization for Type members 2011-01-18 13:30:51 +00:00
Marek Safar dfe4190650 Simplify base type interface check 2011-01-18 13:17:27 +00:00
Marek Safar 84c53cecc2 Update to the latest IKVM which now has support for missing types 2011-01-18 12:50:42 +00:00
Jérémie Laval ef6a07d9d1 Add support for external ParticipateUntil method call in user-made TaskScheduler 2011-01-18 11:28:35 +00:00
Jérémie Laval 70df5f5a3d Use static initializer for internal Execute binding 2011-01-18 11:28:35 +00:00
Atsushi Eno b7f41b092a XamlObjectReader does not return non-writable members. Fix Skip() to work with GetObject. 2011-01-18 19:16:25 +09:00
Marek Habersack 9926e923d7 [asp.net] Removed the /noconfig comment - it turns out this is what is supposed to be done 2011-01-18 09:40:23 +01:00
Thomas Goldstein 694d59471f MWF: Remove #if NET_2_0 and #if ONLY_1_1 conditions (part 4). 2011-01-18 08:46:13 +01:00
Thomas Goldstein c63efd57c4 MWF: Remove #if NET_2_0 and #if ONLY_1_1 conditions (part 3). 2011-01-18 08:43:26 +01:00
Thomas Goldstein 7f89bd25f1 MWF: Remove #if NET_2_0 and #if ONLY_1_1 conditions (part 2). 2011-01-18 08:41:06 +01:00
Thomas Goldstein 9557c417b8 MWF: Remove #if NET_2_0 and #if ONLY_1_1 conditions (part 1). 2011-01-18 08:38:07 +01:00
Atsushi Eno 13cc149429 Do no t try to instantiate abstract types. 2011-01-18 16:23:38 +09:00
Tom Hindle 63c991322f Fix and unit test for bug #664647. 2011-01-17 19:31:04 -07:00
Marek Safar dbd3938763 Fallback to corlib location when sdk path cannot be found 2011-01-17 22:30:51 +00:00
Marek Safar 7476fb6eee Make *mcs compiler aliases differ in sdk version only 2011-01-17 22:30:51 +00:00
Zoltan Varga 357c8a8503 Make runtime invoke wrappers use cdecl cconv on windows. 2011-01-17 23:17:42 +01:00
Zoltan Varga b8d211bccf Applied patch from KISHIMOTO, Makoto <[email protected]>. Fix freebsd/amd64 build. 2011-01-17 22:58:56 +01:00
Zoltan Varga 6c02c15153 OP_LCOMPARE_IM has type 'L', not 'I'. Fixes #664630. 2011-01-17 22:44:13 +01:00
Rodrigo Kumpera cb59d308ff Don't check for brokeness when verifying contraints.
* verify.c (is_valid_generic_instantiation): Don't
	check if any argument is broken during constraint check
	as an instance should be valid, but not realizable, even
	if it has broken arguments.

	Fixes one of the issues with #664612
2011-01-17 18:54:17 +01:00
Rodrigo Kumpera 77f622799e Fix verifier test suite to build on OSX as well 2011-01-17 18:54:12 +01:00
Marek Safar cec87bd861 Add new mcs -sdk option 2011-01-17 17:21:07 +00:00
Zoltan Varga 26009f71a0 Fix a warning. 2011-01-17 18:06:42 +01:00
Zoltan Varga acc565bfea Avoid another case of infinite recursion in AOT. 2011-01-17 16:14:54 +01:00
Atsushi Eno a966f0bdae Fix XamlValueConverter; sometimes ConverterType exists but lacks default constructor. 2011-01-18 00:03:28 +09:00
Jb Evain a138175b8f Fix pdb2mdb when a pdb has a method with no seq points.
Patch by Thad Thompson <[email protected]>
2011-01-17 15:54:02 +01:00
Marek Safar 659a007604 Turn X509Certificate2UI into static class for 4.0 2011-01-17 14:08:36 +00:00
Marek Habersack 3e62637623 [asp.net] ValidationUtility implementation 2011-01-17 14:47:08 +01:00
Marek Habersack cd511eafd2 [asp.net] Introduced unvalidated versions of Form and QueryString properties for MVC3 2011-01-17 14:47:07 +01:00
Marek Habersack aa2ad86f6d [asp.net] Implemented dynamic HTTP module registration 2011-01-17 14:47:07 +01:00
Marek Habersack d18d08622c [asp.net] Implemented BuildManager.GetObjectFactory
This method is not used by Mono internally but is called by MVC v3.
2011-01-17 14:47:07 +01:00
Marek Habersack 1d5e3d4350 [asp.net] Added internal property InputValidationEnabled to report whether the user enabled validation for current request. 2011-01-17 14:47:07 +01:00
Marek Habersack 0582257db3 [asp.net] System.Web and Microsoft.Web.Infrastructure are now friends 2011-01-17 14:47:07 +01:00
Marek Habersack c372ab7518 [asp.net] Added the Microsoft.Web.Infrastructure assembly 2011-01-17 14:47:07 +01:00
Marek Safar 8dab9d20d4 [664618] Correctly encode public key length 2011-01-17 13:28:44 +00:00
Marek Habersack 9affd715fb [asp.net] (4.0) Validate the form data in Form getter 2011-01-17 14:01:31 +01:00
Zoltan Varga 4bc6806eb8 Fix the previous marshalling change so it only applies to chars, not structures which contain char fields. 2011-01-17 00:08:46 +01:00
Zoltan Varga 669d9a664d Pass the string encoding to emit_struct_conv () so marshalling of char arrays works on big-ending machines like s390/ppc64. 2011-01-16 21:10:29 +01:00
Zoltan Varga ea617d2555 Fix a warning. 2011-01-16 20:05:39 +01:00
barkerm 0f7a69d568 Add missing files for connection pool changes 2011-01-16 12:07:06 -05:00
barkerm 2b516ade6d - Refactoring, code clean-up and reduced garbage - Introduce connection pooling for improved performance 2011-01-16 12:06:56 -05:00
Zoltan Varga 8566c056b2 Remove GLIB: line from configure output. 2011-01-16 16:44:20 +01:00
Thomas Goldstein e9267b1f21 NumericUpDown.cs: Use base 16 to convert hex string to numeric value. Fixes part of bug 661996. 2011-01-16 11:32:00 +01:00
Marek Habersack c85558427d [asp.net] Pass /noconfig to mcs so that page builds succeed 2011-01-15 01:52:31 +01:00
Zoltan Varga 6c34e3ab54 Make OP_CHECK_THIS do a byte load on arm, since the source argument might point to a vtype if a vtype method is inlined. 2011-01-14 22:29:15 +01:00
Marek Habersack d3a5fe689a [asp.net] Make StopRoutingHandler actually stop the routing instead of throwing an exception
Patch from Damir Simunic <[email protected]>, thanks!
2011-01-14 21:30:11 +01:00
Zoltan Varga 8bafdbd612 Revert "Avoid defining boehm/sgen defines when compiling files in mini/." 2011-01-14 20:59:23 +01:00
Jérémie Laval 674699abef Add MonoTaskExtensions to Mono.Parallel (with test and doc). 2011-01-14 17:21:23 +00:00
Jérémie Laval a4078aa9a9 Update namespaces 2011-01-14 17:21:23 +00:00
Zoltan Varga 83db413a2a Error out instead of crashing when using sgen+pthread. 2011-01-14 14:58:59 +01:00
Zoltan Varga 2daab2feda Fix a warning. 2011-01-14 14:58:58 +01:00
Marek Safar 728847d662 Disable unification into current assembly, it's not fully implemented yet 2011-01-14 13:10:35 +00:00
Marek Safar ee9454fc50 Add weak name as allowed identity comparison result 2011-01-14 12:42:15 +00:00
Zoltan Varga 33947a674f Fix AOT. 2011-01-14 13:40:09 +01:00
Jérémie Laval a47c2f51f4 Make use of the wait changes in the internal TaskScheduler -> IScheduler proxy. 2011-01-14 10:37:01 +00:00
Jérémie Laval e524cfd9e1 Internal ThreadWorker deque creation is now delegated to the scheduler.
Looking into exporting ThreadWorker to Mono.Parallel
2011-01-14 10:37:01 +00:00
Ankit Jain 2fb5ad4bba [xbuild] Update Novell copyright. 2011-01-14 14:51:40 +05:30
Ankit Jain 397b54e8b5 [xbuild] Error out, if no target is found in a project. 2011-01-14 14:51:39 +05:30
Marek Safar ffdb957cf2 Update ikvm sources 2011-01-14 08:26:13 +00:00
Marek Safar a494244e06 Register also default assemblies in loaded files list 2011-01-14 08:26:13 +00:00
Marek Safar ed50eda10f Fix System.Data.Services.Client public key 2011-01-14 08:26:12 +00:00
Zoltan Varga 1e030b8a96 Decrease the length of the dyn_call opcode on arm to fix a warning. 2011-01-14 03:27:43 +01:00
Zoltan Varga 262fe52fbf Avoid defining boehm/sgen defines when compiling files in mini/. 2011-01-14 00:46:10 +01:00
Zoltan Varga b9ec9f676d Add some more functions to gc-internal.h to help remove all HAVE_SGEN_GC defines
from mini/.
2011-01-14 00:46:09 +01:00
Zoltan Varga 16b911500e Fix a warning. 2011-01-14 00:46:09 +01:00
Gonzalo Paniagua Javier 891af303aa [Socket] Implemented TCP keep alive support
Implemented SetTcpKeepAlive for ServicePoint*.
2011-01-13 18:28:16 -05:00
Andrew Jorgensen afd0bc3f79 Add vcxproj files for msbuild 2011-01-13 15:56:16 -07:00
Andrew Jorgensen 965dff7832 2.11 2011-01-13 15:55:25 -07:00
Rodrigo Kumpera b6dc6e1077 Add test for #660685 2011-01-13 23:46:03 +01:00
Rodrigo Kumpera d68c6c9361 Handle one more case of constraint compatibility.
* verify.c (mono_generic_param_is_constraint_compatible):
	Handle the case when a variable has a class constraints
	and the target has reference constraint. For example:

	C : string
	T : class

	On the above case, C can satisfy the T constraint.

	Fixes #660685
2011-01-13 23:46:03 +01:00
Zoltan Varga 4b304dc8c6 Remove an unneccesary HAVE_SGEN_GC. 2011-01-13 23:22:29 +01:00
Ankit Jain bf5c6494a8 [xbuild] Use the backing field directly to avoid evaluating again.
* Microsoft.Build.BuildEngine.Project.cs (InitializeProperties): Use
evaluatedProperties field instead of EvaluatedProperties property,
to avoid invoking a Reevaluate, since it is already in progress.
2011-01-14 03:29:34 +05:30
Ankit Jain 6258fab1c4 [xbuild] Fix bug #664349 .
* Microsoft.Build.BuildEngine/Project.cs (BuildInternal): Set needToReevaluate to
false, when reevaluating.
2011-01-14 03:25:19 +05:30
Ankit Jain e11aa526d2 [xbuild] Add $(TargetDir) property.
Add $(TargetDir) and set TargetPath only if its not set already.
2011-01-14 02:20:07 +05:30
Ankit Jain 8d04b0aabd [xbuild] Clear the built targets cache on project unload.
Remove the entries for a project from the built targets cache, on
project unload.

* Microsoft.Build.BuildEngine/Engine.cs (ClearBuiltTargetsForProject): New.
* Microsoft.Build.BuildEngine/Project.cs (BuiltTargetKeys): Remove.
(RemoveBuiltTargets): Use Engine.ClearBuiltTargetsForProject .
* Microsoft.Build.BuildEngine/Target.cs: Track api changes.
*
2011-01-14 02:20:06 +05:30
Marek Habersack 8a407a87f7 [data-annotations] Added some missing 4.0 members 2011-01-13 20:11:15 +01:00
Marek Habersack 11161ffcfb [asp.net] Implemented the 4.0 type, FileLevelMasterPageControlBuilder 2011-01-13 20:11:15 +01:00
Zoltan Varga 2fdd06c04b Emit all AOT symbols to 4 bytes on apple. 2011-01-13 19:03:43 +01:00
Zoltan Varga e0072cdcfa Add null check to stelem_ref_check () jit icall. Fixes #664297. 2011-01-13 18:41:55 +01:00
Marek Safar 046d0678a5 update ikvm 2011-01-13 16:26:47 +00:00
Marek Safar 0c85cec10b Tests update 2011-01-13 16:26:30 +00:00
Marek Safar a105464971 Recover from invalid constraint syntax 2011-01-13 16:24:26 +00:00
Marek Safar 1a0dda70bc New file 2011-01-13 15:55:03 +00:00
Marek Safar f9d2682cc0 Revert test makefile change 2011-01-13 15:53:53 +00:00
Marek Safar 147580e6cc Implement assembly name unification for imported references 2011-01-13 15:41:12 +00:00
Jérémie Laval 50834de0dd Add CyclicDeque and doc 2011-01-13 15:38:43 +00:00
Jérémie Laval 46b3891b74 Finish ReaderWriterLockSlimmer documentation 2011-01-13 15:38:43 +00:00
Jérémie Laval 2b17a5fa81 Protect RwlSlimmer and add Try equivalent 2011-01-13 15:38:43 +00:00
Jérémie Laval 8ff4c9d487 Add missing documentation files 2011-01-13 15:38:43 +00:00
Jérémie Laval bc16216a6b Adding ReaderWriterLockSlimmer to the build. 2011-01-13 15:38:43 +00:00
Jérémie Laval 88ca4d4c06 Doc for AtomicBoolean(Value) 2011-01-13 15:38:42 +00:00
Jérémie Laval f1b9a15708 Refactor CSnzi node to not expose too much stuff 2011-01-13 15:38:42 +00:00
Jérémie Laval 8d27c2b992 Use correct doc dialect for true and false 2011-01-13 15:38:42 +00:00
Jérémie Laval 74b8f910e1 Finish docs of non-obvious methods in Mono.Collections.Concurrent 2011-01-13 15:38:42 +00:00
Jérémie Laval 3f56bd1df7 Use comparer directly in ConcurrentSkipList rather than wrapped in a lambda. 2011-01-13 15:38:42 +00:00
Jérémie Laval f9aec637ac Make ConcurrentSkipList implements IEnumerable and ICollection instead of IProducerConsummerCollection 2011-01-13 15:38:42 +00:00
Jérémie Laval 4f58465978 Make ConcurrentOrderedList implements IEnumerable and ICollection 2011-01-13 15:38:41 +00:00
Jérémie Laval 579665f7ba Rename namespaces and update docs 2011-01-13 15:38:41 +00:00
Jérémie Laval 10d26a8ad8 Add Mono.Parallel documentation to global documentation compilation step 2011-01-13 15:38:41 +00:00
Jérémie Laval 32bd1f9b70 Move documentation to the right place 2011-01-13 15:38:41 +00:00
Jérémie Laval e74e993f69 More doc for ConcurrentOrderedList 2011-01-13 15:38:41 +00:00
Jérémie Laval 58b0cad7f5 Add Comparer property to ConcurrentOrderedList 2011-01-13 15:38:41 +00:00
Jérémie Laval b22b764ba7 Add mdoc documentation 2011-01-13 15:38:41 +00:00
Jérémie Laval 87d61bce7f Rename QueryReturn to CSnziQueryReturn 2011-01-13 15:38:40 +00:00
Jérémie Laval 398bdfe46a Use proper configuration of MCS extra flags 2011-01-13 15:38:40 +00:00
Jérémie Laval fe3539c36b Plug Mono.Parallel into main build 2011-01-13 15:38:40 +00:00
Jérémie Laval a1d84d7a67 First drop of a new Mono.Parallel assembly 2011-01-13 15:38:40 +00:00
Jérémie Laval 4091f624db Rework internal wait mechanism in thread workers participation code 2011-01-13 15:27:40 +00:00
Jérémie Laval 6b7b757403 Use more modern method in older Task code path 2011-01-13 14:38:59 +00:00
Jérémie Laval f495fea71a Update Watch to a struct 2011-01-13 14:38:59 +00:00
Jérémie Laval 9f3ce4b1e5 Fix continuation not being scheduled because of too early and too greedy disposing. 2011-01-13 14:38:59 +00:00
Jb Evain a50440aef7 Fix marking of default constructor constraint 2011-01-13 14:30:48 +01:00
Atsushi Eno 4a33efa191 Implemented event support. 2011-01-13 21:12:41 +09:00
Rodrigo Kumpera 47fa78c28e Better document how remapping works 2011-01-13 11:43:47 +01:00
Rodrigo Kumpera ee3b72364a Fix 2.0 remapping of System.Transations to 2.0 and not 3.5. 2011-01-13 11:37:42 +01:00
Marek Safar fdda65364f Add more checks for ambiguous assembly references 2011-01-13 09:02:55 +00:00
Zoltan Varga cc80f06487 Document more AOT options. 2011-01-13 01:58:12 +01:00
Zoltan Varga afa06e35df Applied patch from Alexander Stohr <[email protected]>. Add a help argument to --aot. 2011-01-13 01:48:22 +01:00
Rodrigo Kumpera 1a16bb1813 Fix array assignability to one of its generic interfaces.
* verify.c: mono_class_is_assignable_from can't handle
	IList<GTD<T>> x GTD[] since GTD[] won't have the right
	iface slots set. This isn't a problem for the runtime
	since GTD[] will never happen as it's an unrealizable type.

	Fixes #663815
2011-01-12 17:50:54 +01:00
Rodrigo Kumpera 72ebf494e2 Handle more cases of gtd encoded as ginst over itself.
* verify.c (mono_type_is_valid_type_in_context_full):
	The trick of encoding the GTD as an instantiation over its
	own arguments is also valid for component types such as GTD[]
	GTD[,] and Foo<GTD>.
2011-01-12 17:50:53 +01:00
Marek Safar 327d01dc97 Test update 2011-01-12 15:32:01 +00:00
Marek Safar 7b66d53d46 Deal with missing nested type as well 2011-01-12 15:32:01 +00:00
Marek Safar c2042b7835 Report full type name for missing type references 2011-01-12 15:32:00 +00:00
Atsushi Eno abba1c3446 Fix cygwin build. 2011-01-12 19:47:00 +09:00
Marek Safar 64ec934b0e All C# compiler scripts point to mcs.exe now 2011-01-12 09:25:19 +00:00
Marek Safar 0bbf0a2abb [375182] Check AssemblyFileVersion version value 2011-01-12 09:25:18 +00:00
Marek Safar b51e078d37 Report better error for recursive type reference 2011-01-12 09:25:18 +00:00
Atsushi Eno 2e2337e80a Implement XamlBackgroundReader. 2011-01-12 16:49:38 +09:00
Christian Hergert 3fe8ea7fcd Fix broken g_int_hash/g_int_equal semantics
Both g_int_hash and g_int_equal used the semantics that an
integer is stored directly in the pointer. This is incorrect
as the pointer actually points to a location containing an
integer.

For those wanting the previous (incorrect) implementation,
they should look at g_direct_hash and g_direct_equal.
2011-01-11 19:40:41 -05:00
Marek Habersack 5d3c9886fe [asp.net] Fix for bug #662918. Do not create the HtmlTitle child control for HtmlHead if <title> wasn't used in the page code. 2011-01-11 23:19:57 +01:00
Mark Probst f85a022ad0 [sgen] Don't register objects for finalization if the domain is being unloaded.
This fixes a crash in the appdomain unloading test.
2011-01-11 22:50:42 +01:00
Geoff Norton 556f15f6eb Fix the win32 build 2011-01-11 16:42:20 -05:00
Geoff Norton 2cb680cddf Fix win32 build 2011-01-11 16:34:31 -05:00
Mark Probst f272e3663d [sgen] Make binary protocol work again. 2011-01-11 22:10:15 +01:00
Zoltan Varga fd981e67cb Disable system AOT when using the loaded llvm, as it seems to cause crashes on the x86 buildbot. 2011-01-11 20:55:01 +01:00
Ankit Jain 61d56a7148 [xbuild] Copy metadata from Project items to target outputs.
Copy metadata from Project items to the corresponding target
outputs in MSBuild task.

Fix the corresponding test also.
2011-01-11 23:42:47 +05:30
Ankit Jain 009dfc4d52 [xbuild] Ensure trailing slash on some properties.
Ensure trailing slash on $(BaseIntermediateOutputPath) and
$(IntermediateOutputPath).
2011-01-11 23:42:46 +05:30
Atsushi Eno 99ac282cf3 Implement XamlNodeQueue, and add couple of missing files. 2011-01-12 02:03:24 +09:00
Geoff Norton 6b5ab67b05 Fix AOT on OSX/x86 2011-01-11 11:37:43 -05:00
Marek Safar fbe5b6a90b Install new ikvm based C# compiler as mcs 2011-01-11 15:46:04 +00:00
Marek Safar 1b0acda60e Update copyright years 2011-01-11 15:46:03 +00:00
Sebastien Pouliot 25280a542d Allow RSACryptoServiceProvider.SignHash to work with SHA-2 family
* System.Security.Cryptography/CryptoConfig.cs: Add OID for RIPEMD160
* System.Security.Cryptography/RSACryptoServiceProvider.cs: Update
GetHashNameFromOID to include SHA2-family OIDs. Remove historical
comments about 1.x FX behavior.

* Test/System.Security.Cryptography/CryptoConfigTest.cs: Add test cases
wrt RIPEMD160 OID
* Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs: Add
test case for SignHash with all FX-provided hash implementations (all
working except RIPEMD160). Remove some NET_2_0/NET_1_1 defines.
* Test/System.Security.Cryptography/RSAPKCS1SignatureFormatterTest.cs:
Remove hacks that were needed for running the tests under FX 1.x. Remove
some NET_2_0/NET_1_1 defines.
2011-01-11 10:01:56 -05:00
Zoltan Varga f4b5acc984 Dump the AOT log upon a failure. 2011-01-11 14:51:00 +01:00
Ankit Jain eecee98e4e [xbuild] ConsoleLogger - Correctly indent multi-line messages.
Split and correctly indent multi-line messages in ConsoleLogger.
2011-01-11 18:58:28 +05:30
Marek Safar bebd88b14b Check namespace of build-in base types 2011-01-11 12:37:23 +00:00
Marek Safar 57078fc3bb [662222] Import dynamic attribute using attribute type reader 2011-01-11 12:29:03 +00:00
Marek Safar 6f47ef4a71 Use base type parameters to extract params modifier of virtual method 2011-01-11 11:55:29 +00:00
Rodrigo Kumpera 9ea6bba25e Fix parent instantantiation verification.
* verify.c (mono_verifier_verify_class): Don't verify
	the parent instantiation of generic instances as those are
	allowed to have free variables. Use the right context for
	GTD too.

	Fixes build breakage.
2011-01-11 12:38:02 +01:00
Rodrigo Kumpera e169505e2c Method loading can fail without setting the loader error.
* metadata-verify.c (mono_verifier_verify_methodimpl_row):
	In some cases, a method won't load and the loader error
	won't be set, so properly check for both.

	Fixes #562009
2011-01-11 11:29:59 +01:00
Rodrigo Kumpera aa30274379 Make sure a class's parent is a valid generic instance.
* verify.c (mono_verifier_verify_class): Check if parent
	is valid in the context of the current class.

	Fixes #562150
2011-01-11 10:58:41 +01:00
Jb Evain 8a9521a1ce Remove custom ResolutionException now that Cecil is providing one 2011-01-11 10:38:25 +01:00
Marek Safar 094ec3a24a Update to head IKVM 2011-01-11 09:05:45 +00:00
Geoff Norton bfd4d16e12 Fixed loadedllvm on OSX
The default build of libmono-llvm.dylib includes libmono and all its dependencies,
but our statically compiled mono binary does as well.  OSX can actually load both
into its process space, and get confused as to which symbol it should call, leading
to non-deterministic crashes.  We'll remove all the mono dependencies, and use
-undefined suppress to mitigate this on OSX.
2011-01-11 00:55:58 -05:00
Jonathan Pryor 4dc67cf08a [monodoc/osx] Look for docs in additional directories.
Fixes #663182.

OSX allows multiple framework versions to be installed side-by-side,
and the current version is available through
/Library/Frameworks/Mono.framework/Versions/Current.

However, documentation installed into /L/F/M.f/V/C/lib/monodoc/sources
is specific for that Mono version; upgrade Mono.framework, and the
documentation is "lost," not visible to the newly installed version.

To fix this, we're creating an *unversioned* directory to contain
documentation, which will thus be persistent across Mono.framework
upgrades: /Library/Frameworks/Mono.framework/External/monodoc

This will allow Mono.framework to be upgraded without "losing" the
documentation visible within monodoc.
2011-01-10 20:54:43 -05:00
Marek Habersack 606cbfde03 [asp.net] Fix for bug #659078. AsyncPostBackTrigger must react to events from sub-controls.
Sub-control IDs can be separated using both '$' and '_'.
2011-01-11 01:56:17 +01:00
Marek Habersack f54988c03b [asp.net] Use 'protected internal' only when compiling for System.Web, 'protected' otherwise 2011-01-11 01:56:17 +01:00
Zoltan Varga b953dfd9dc Fix a regression introduced by db4299a1. 2011-01-11 01:08:46 +01:00
Ankit Jain 8dd9fd9092 [xbuild] Update man page, new search paths for extensions and .pc files. 2011-01-11 05:06:19 +05:30
Jb Evain cc881c63a5 Update cecil from upstream 2011-01-11 00:12:13 +01:00
Jb Evain 262e68086c Fix output of local variable names in debugging symbols 2011-01-11 00:10:33 +01:00
1764 changed files with 82230 additions and 69177 deletions

No files matched your search

+10 -1
View File
@@ -19,7 +19,16 @@ DIST_SUBDIRS = po libgc eglib mono ikvm-native support data runtime scripts man
endif
endif
EXTRA_DIST= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in build-mingw32.sh LICENSE mkinstalldirs autogen.sh
EXTRA_DIST= \
LICENSE \
autogen.sh \
build-mingw32.sh \
mkinstalldirs \
mono-uninstalled.pc.in \
nls.m4 \
po.m4 \
progtest.m4 \
winconfig.h
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
+106 -43
View File
@@ -2,7 +2,7 @@
CURDIR="`pwd`"
MINGW=i386-mingw32msvc
CROSS_DIR=/opt/cross/$MINGW
COPY_DLLS="libgio*.dll libglib*.dll libgmodule*.dll libgthread*.dll libgobject*.dll"
EXTRA_CROSS_DIR=
INSTALL_DESTDIR="$CURDIR/mono-win32"
PROFILES="default net_2_0 net_3_5 net_4_0 moonlight"
TEMPORARY_PKG_CONFIG_DIR=/tmp/$RANDOM-pkg-config-$RANDOM
@@ -17,62 +17,119 @@ function cleanup ()
fi
}
function check_pkg_config_dir ()
{
local DIR="$1"
local DIR_PREFIX="$2"
if [ ! -d "$DIR" ]; then
return
fi
install -d -m 755 "$TEMPORARY_PKG_CONFIG_DIR"
for pc in "$DIR"/*.pc; do
if [ -f $pc ]; then
pcname="`basename $pc`"
sed -e "s;^prefix=.*;prefix=$DIR_PREFIX;g" < $pc > "$TEMPORARY_PKG_CONFIG_DIR"/$pcname
fi;
done
if [ -z "$CROSS_PKG_CONFIG_DIR" ]; then
CROSS_PKG_CONFIG_DIR="$TEMPORARY_PKG_CONFIG_DIR"
fi
}
function show_build_info ()
{
cat <<EOF
Installation prefix: $MONO_PREFIX
CPPFLAGS: ${CPPFLAGS:=not set}
LDFLAGS: ${LDFLAGS:=not set}
MONO_PATH: ${MONO_PATH:=not set}
EOF
}
function setup ()
{
local pcname
CROSS_BIN_DIR="$CROSS_DIR/bin"
CROSS_DLL_DIR="$CROSS_DIR/bin"
CROSS_PKG_CONFIG_DIR=$CROSS_DIR/lib/pkgconfig
PATH=$CROSS_BIN_DIR:$PATH
export PATH
if [ -d ./.git/svn ]; then
SVN_INFO='git svn info'
elif [ -d ./.svn ]; then
SVN_INFO='svn info'
else
SVN_INFO=""
fi
if [ -n "$SVN_INFO" ]; then
MONO_SVN_REVISION=`$SVN_INFO | grep Revision | sed 's/.*: //'`
MONO_BRANCH=`$SVN_INFO | grep URL | sed -e 's;.*source/;;g' -e 's;/mono;;g'`
else
MONO_SVN_REVISION="rUNKNOWN"
MONO_BRANCH="tarball"
fi
MONO_VERSION=`grep AM_INIT_AUTOMAKE configure.in | cut -d ',' -f 2|tr -d '\)'`
MONO_RELEASE="$MONO_VERSION-$MONO_BRANCH-r$MONO_SVN_REVISION"
MONO_PREFIX="/mono-$MONO_RELEASE"
if [ -d ./.git ]; then
MONO_GIT_COMMIT="`git log -1 --format=format:%t`"
MONO_GIT_BRANCH="`git branch|grep '\*'|cut -d ' ' -f 2`"
MONO_RELEASE="$MONO_VERSION-$MONO_GIT_BRANCH-$MONO_GIT_COMMIT"
else
MONO_RELEASE="$MONO_VERSION"
fi
MONO_PREFIX="$MONO_PREFIX/mono-$MONO_RELEASE"
NOCONFIGURE=yes
export NOCONFIGURE
if [ -d "$CROSS_PKG_CONFIG_DIR" ]; then
install -d -m 755 "$TEMPORARY_PKG_CONFIG_DIR"
for pc in "$CROSS_PKG_CONFIG_DIR"/*.pc; do
pcname="`basename $pc`"
sed -e "s;^prefix=.*;prefix=$CROSS_DIR;g" < $pc > "$TEMPORARY_PKG_CONFIG_DIR"/$pcname
done
CROSS_PKG_CONFIG_DIR="$TEMPORARY_PKG_CONFIG_DIR"
fi
check_pkg_config_dir "$CROSS_DIR/lib/pkgconfig" "$CROSS_DIR"
echo Mono Win32 installation prefix: $MONO_PREFIX
if [ -n "$EXTRA_CROSS_DIR" -a -d "$EXTRA_CROSS_DIR" ]; then
if [ -d "$EXTRA_CROSS_DIR/bin" ]; then
PATH="$EXTRA_CROSS_DIR/bin":$PATH
fi
check_pkg_config_dir "$EXTRA_CROSS_DIR/lib/pkgconfig" "$EXTRA_CROSS_DIR"
if [ -d "$EXTRA_CROSS_DIR/include" ]; then
if [ -z "$CPPFLAGS" ]; then
CPPFLAGS="-I \"$EXTRA_CROSS_DIR/include\""
else
CPPFLAGS="-I \"$EXTRA_CROSS_DIR/include\" $CFLAGS"
fi
fi
if [ -d "$EXTRA_CROSS_DIR/lib" ]; then
if [ -z "$LDFLAGS" ]; then
LDFLAGS="-I \"$EXTRA_CROSS_DIR/lib\""
else
LDFLAGS="-I \"$EXTRA_CROSS_DIR/lib\" $LDFLAGS"
fi
fi
if [ -d "$EXTRA_CROSS_DIR/share/aclocal" ]; then
if [ -z "$MONO_PATH" ]; then
MONO_PATH="\"$EXTRA_CROSS_DIR\""
else
MONO_PATH="\"$EXTRA_CROSS_DIR\":$MONO_PATH"
fi
fi
fi
export PATH MONO_PATH CPPFLAGS
show_build_info
}
function build ()
{
if [ -f ./Makefile ]; then
make distclean
fi
if [ -d ./autom4te.cache ]; then
rm -rf ./autom4te.cache
fi
if [ -f ./config.status ]; then
for f in `find -name config.status -type f`; do
rm $f
done
fi
./autogen.sh
BUILD="`./config.guess`"
if [ -f ./Makefile ]; then
make distclean
rm -rf autom4te.cache
fi
if [ ! -d "$CURDIR/build-cross-windows" ]; then
mkdir "$CURDIR/build-cross-windows"
fi
@@ -105,27 +162,28 @@ function doinstall ()
cd "$CURDIR/build-cross-windows"
make DESTDIR="$INSTALL_DESTDIR" USE_BATCH_FILES=yes install
cd "$CURDIR/../mcs/mcs"
if test -d $CURDIR/mcs; then
mcsdir=$CURDIR/mcs
else
mcsdir=$CURDIR/../mcs
fi
cd "$mcsdir/mcs"
for p in $PROFILES; do
make DESTDIR="$INSTALL_DESTDIR" PROFILE=$p install || echo "mcs profile $p installation failed"
done
cd "$CURDIR/../mcs/class"
cd "$mcsdir/class"
for p in $PROFILES; do
make DESTDIR="$INSTALL_DESTDIR" PROFILE=$p install || echo "class library profile $p installation failed"
done
cd "$CURDIR/../mcs/tools"
cd "$mcsdir/tools"
for p in $PROFILES; do
make DESTDIR="$INSTALL_DESTDIR" PROFILE=$p install || echo "tools profile $p installation failed"
done
cd "$CURDIR/mono-win32"
for dll in $COPY_DLLS; do
cp -ap "$CROSS_DLL_DIR"/$dll "$INSTALL_DESTDIR/$MONO_PREFIX/bin"
done
rm -f "$CURDIR/mono-win32-$MONO_RELEASE".zip
zip -9r "$CURDIR/mono-win32-$MONO_RELEASE".zip .
@@ -139,7 +197,9 @@ Usage: build-mingw32.sh [OPTIONS]
where OPTIONS are:
-d DIR Sets the location of directory where MINGW is installed [$CROSS_DIR]
-e DIR Sets the location of directory where additional cross develoment packages are installed [${EXTRA_CROSS_DIR:=none}]
-m MINGW Sets the MINGW target name to be passed to configure [$MINGW]
-p PREFIX Prefix at which Mono is to be installed. Build will append the 'mono-X.Y' string to that path
EOF
exit 1
@@ -149,10 +209,12 @@ trap cleanup 0
pushd . > /dev/null
while getopts "d:m:h" opt; do
while getopts "d:m:e:p:" opt; do
case "$opt" in
d) CROSS_DIR="$OPTARG" ;;
m) MINGW="$OPTARG" ;;
e) EXTRA_CROSS_DIR="$OPTARG" ;;
p) MONO_PREFIX="$OPTARG" ;;
*) usage ;;
esac
done
@@ -160,5 +222,6 @@ done
setup
build
doinstall
show_build_info
popd > /dev/null
+42 -53
View File
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(mono,2.9)
AM_INIT_AUTOMAKE(mono,2.11)
AM_MAINTAINER_MODE
API_VER=2.0
@@ -561,28 +561,15 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Chan
fi
)
AC_ARG_WITH([glib],
[ --with-glib=embedded|system Choose glib API: system or embedded (default to embedded)],
[], [with_glib=embedded])
ac_configure_args="$ac_configure_args \"CPPFLAGS_FOR_EGLIB=$EGLIB_CPPFLAGS\" \"CFLAGS_FOR_EGLIB=$CFLAGS_FOR_EGLIB\""
AC_CONFIG_SUBDIRS(eglib)
case $with_glib in
embedded)
GLIB_CFLAGS='-I$(top_srcdir)/eglib/src -I$(top_builddir)/eglib/src'
GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm'
BUILD_GLIB_CFLAGS="$GLIB_CFLAGS"
BUILD_GLIB_LIBS="$GLIB_LIBS"
GMODULE_CFLAGS="$GLIB_CFLAGS"
GMODULE_LIBS="$GLIB_LIBS"
;;
system)
AC_MSG_ERROR([--with-glib=system is no longer supported as of Mono 2.8])
;;
*)
AC_MSG_ERROR([Invalid argument to --with-glib.])
esac
GLIB_CFLAGS='-I$(top_srcdir)/eglib/src -I$(top_builddir)/eglib/src'
GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm'
BUILD_GLIB_CFLAGS="$GLIB_CFLAGS"
BUILD_GLIB_LIBS="$GLIB_LIBS"
GMODULE_CFLAGS="$GLIB_CFLAGS"
GMODULE_LIBS="$GLIB_LIBS"
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
@@ -851,6 +838,14 @@ case "x$gc" in
if test "x$found_gc_enable" = "xyes"; then
BOEHM_DEFINES="-DHAVE_GC_ENABLE $BOEHM_DEFINES"
fi
# check whether we need to explicitly allow
# thread registering
AC_CHECK_LIB(gc, GC_allow_register_threads, found_allow_register_threads="yes",,$libdl)
if test "x$found_allow_register_threads" = "xyes"; then
AC_DEFINE(HAVE_GC_ALLOW_REGISTER_THREADS, 1, [GC requires thread registration])
fi
;;
xincluded)
@@ -1746,6 +1741,11 @@ if test x$target_win32 = xno; then
dnl * on xp+
AC_DEFINE(HAVE_GETPROCESSID, 1, [Define if GetProcessId is available])
else
dnl *********************************
dnl *** Checks for Windows compilation ***
dnl *********************************
AC_CHECK_HEADERS(winternl.h)
jdk_headers_found=no
AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?))
AC_CHECK_LIB(psapi, main, LIBS="$LIBS -lpsapi", AC_ERROR(bad mingw install?))
@@ -2066,7 +2066,7 @@ X11="libX11.so"
sizeof_register="SIZEOF_VOID_P"
jit_wanted=false
jit_wanted=true
interp_wanted=false
sgen_supported=false
case "$host" in
@@ -2079,7 +2079,6 @@ case "$host" in
arch_target=mips;
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
jit_wanted=true
AC_MSG_CHECKING(for mips n32)
AC_TRY_COMPILE([], [
@@ -2099,7 +2098,6 @@ case "$host" in
TARGET=X86;
arch_target=x86;
JIT_SUPPORTED=yes
jit_wanted=true
case $host_os in
solaris*)
LIBC="libc.so"
@@ -2140,7 +2138,6 @@ case "$host" in
TARGET=AMD64;
arch_target=amd64;
JIT_SUPPORTED=yes
jit_wanted=true
case $host_os in
linux*)
sgen_supported=true
@@ -2162,7 +2159,6 @@ case "$host" in
arch_target=ia64
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
jit_wanted=true
LIBC="libc.so.6.1"
INTL="libc.so.6.1"
AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)])
@@ -2183,7 +2179,6 @@ case "$host" in
LIBC="libc.so"
INTL="libintl.so"
esac
jit_wanted=true
if test x"$GCC" = xyes; then
# We don't support v8 cpus
CFLAGS="$CFLAGS -Wno-cast-align -mcpu=v9"
@@ -2196,7 +2191,6 @@ case "$host" in
TARGET=ALPHA;
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
jit_wanted=true
arch_target=alpha;
CFLAGS="$CFLAGS -mieee -O0"
case $host_os in
@@ -2223,7 +2217,6 @@ case "$host" in
arch_target=hppa;
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
jit_wanted=true
;;
macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \
powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* | powerpc-*-freebsd* )
@@ -2237,7 +2230,6 @@ case "$host" in
fi
arch_target=ppc;
JIT_SUPPORTED=yes
jit_wanted=true
case $host_os in
linux*|darwin*)
sgen_supported=true
@@ -2250,7 +2242,6 @@ case "$host" in
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1"
jit_wanted=true
sgen_supported=true
;;
arm*-linux*)
@@ -2258,15 +2249,14 @@ case "$host" in
arch_target=arm;
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
jit_wanted=true
sgen_supported=true
AOT_SUPPORTED="yes"
;;
s390-*-linux*)
TARGET=S390;
arch_target=s390;
ACCESS_UNALIGNED="yes"
JIT_SUPPORTED=yes
jit_wanted=true
sgen_supported=true
# Required CFLAGS for s390[x]. USE_STRING_INLINES is automatic with gcc 4.1
CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES"
@@ -2276,7 +2266,6 @@ case "$host" in
arch_target=s390x;
ACCESS_UNALIGNED="yes"
JIT_SUPPORTED=yes
jit_wanted=true
sgen_supported=true
CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES"
;;
@@ -2338,6 +2327,9 @@ POWERPC64)
AC_DEFINE(TARGET_POWERPC, 1, [...])
AC_DEFINE(TARGET_POWERPC64, 1, [...])
;;
S390x)
AC_DEFINE(TARGET_S390X, 1, [...])
;;
esac
if test "x$sizeof_register" = "x4"; then
@@ -2386,22 +2378,6 @@ fi
AC_SUBST(SGEN_DEFINES)
AM_CONDITIONAL(SUPPORT_SGEN, test x$buildsgen = xyes)
AC_ARG_WITH(jit, [ --with-jit=yes,no If you want to build scripts that default to the JIT (defaults to no)],[
if test x$withval = xyes; then
jit_wanted=true
else
jit_wanted=false
fi
])
AC_ARG_WITH(interp, [ --with-interp=yes,no If you want to build scripts that default to the interpreter (defaults to no)],[
if test x$withval = xyes; then
interp_wanted=true
else
interp_wanted=false
fi
])
USEJIT=false
if test x$JIT_SUPPORTED = xyes; then
if $jit_wanted; then
@@ -2541,9 +2517,18 @@ if test ${TARGET} = ARM && test x$cross_compiling = xno && test x$enable_mcs_bui
dnl ******************************************
AC_MSG_CHECKING(which FPU to use)
AC_TRY_COMPILE([], [
__asm__ ("ldfd f0, [r0]");
], fpu=FPA, fpu=NONE)
ORIG_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -mfpu=vfp -mfloat-abi=softfp"
AC_TRY_RUN([
int main () { __asm__ ("faddd d7, d6, d7"); return 0; }
], fpu=VFP, fpu=NONE)
CFLAGS=$ORIG_CFLAGS
if test x$fpu = xNONE; then
AC_TRY_COMPILE([], [
__asm__ ("ldfd f0, [r0]");
], fpu=FPA, fpu=NONE)
fi
AC_MSG_RESULT($fpu)
CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
@@ -2964,6 +2949,11 @@ fi
enable_system_aot=yes
fi
if test "x$enable_loadedllvm" = "xyes"; then
# This seems to fail on the x86 buildbots
enable_system_aot=no
fi
if test x$host_win32 = xno -a x$platform_darwin != xyes -a x$enable_system_aot = xyes; then
echo "ENABLE_AOT = 1" >> $mcs_topdir/build/config.make
fi
@@ -3004,7 +2994,6 @@ echo "
Engine:
GC: $gc_msg
GLIB: $with_glib
TLS: $with_tls
SIGALTSTACK: $with_sigaltstack
Engine: $jit_status
+2
View File
@@ -288,6 +288,8 @@ def lookup_pretty_printer(val):
return ObjectPrinter (val)
if t == "string":
return StringPrinter (val)
if t == "MonoString *":
return StringPrinter (val)
if t == "MonoMethod *":
return MonoMethodPrinter (val)
if t == "MonoClass *":
+4
View File
@@ -84,6 +84,10 @@
<section name="serviceHostingEnvironment" type="System.ServiceModel.Configuration.ServiceHostingEnvironmentSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="services" type="System.ServiceModel.Configuration.ServicesSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</sectionGroup>
<sectionGroup name="system.transactions" type="System.Transactions.Configuration.TransactionsSectionGroup, System.Transactions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null">
<section name="defaultSettings" type="System.Transactions.Configuration.DefaultSettingsSection, System.Transactions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null"/>
<section name="machineSettings" type="System.Transactions.Configuration.MachineSettingsSection, System.Transactions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null" allowDefinition="MachineOnly" allowExeDefinition="MachineOnly"/>
</sectionGroup>
<section name="system.webServer" type="System.Configuration.IgnoreSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</configSections>
+4
View File
@@ -98,6 +98,10 @@
<section name="routing" type="System.ServiceModel.Routing.Configuration.RoutingSection, System.ServiceModel.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<section name="protocolMapping" type="System.ServiceModel.Configuration.ProtocolMappingSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
</sectionGroup>
<sectionGroup name="system.transactions" type="System.Transactions.Configuration.TransactionsSectionGroup, System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null">
<section name="defaultSettings" type="System.Transactions.Configuration.DefaultSettingsSection, System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null"/>
<section name="machineSettings" type="System.Transactions.Configuration.MachineSettingsSection, System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null" allowDefinition="MachineOnly" allowExeDefinition="MachineOnly"/>
</sectionGroup>
<section name="system.webServer" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="uri" type="System.Configuration.UriSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<sectionGroup name="system.runtime.caching" type="System.Runtime.Caching.Configuration.CachingSectionGroup, System.Runtime.Caching, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+1 -1
View File
@@ -126,7 +126,7 @@ if test "x$have_iso_varargs" = "xyes"; then
fi
AC_SUBST(G_HAVE_ISO_VARARGS)
AC_CHECK_HEADERS(getopt.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h)
AC_CHECK_HEADERS(getopt.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h)
AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0])
AC_SUBST(HAVE_ALLOCA_H)
-1
View File
@@ -24,7 +24,6 @@ os_files = $(unix_files)
endif
libeglib_la_SOURCES = \
eglib-config.h \
eglib-remap.h \
sort.frag.h \
glib.h \
+2 -2
View File
@@ -579,13 +579,13 @@ g_direct_hash (gconstpointer v1)
gboolean
g_int_equal (gconstpointer v1, gconstpointer v2)
{
return GPOINTER_TO_INT (v1) == GPOINTER_TO_INT (v2);
return *(gint *)v1 == *(gint *)v2;
}
guint
g_int_hash (gconstpointer v1)
{
return GPOINTER_TO_UINT(v1);
return *(guint *)v1;
}
gboolean
+9
View File
@@ -16,6 +16,10 @@
/* For pid_t */
#ifndef WIN32
#include <unistd.h>
#else
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#endif
#endif
@@ -28,6 +32,11 @@
#include <alloca.h>
#endif
#ifdef WIN32
/* For alloca */
#include <malloc.h>
#endif
#ifndef offsetof
# define offsetof(s_name,n_name) (size_t)(char *)&(((s_name*)0)->m_name)
#endif
+2
View File
@@ -338,6 +338,7 @@ g_utf16_to_utf8 (const gunichar2 *str, glong len, glong *items_read, glong *item
} else {
surrogate = 0;
/* invalid surrogate pair */
++in_pos;
continue;
}
} else {
@@ -354,6 +355,7 @@ g_utf16_to_utf8 (const gunichar2 *str, glong len, glong *items_read, glong *item
else if (ch >= 0xD800 && ch <= 0xDBFF)
surrogate = ch;
else if (ch >= 0xDC00 && ch <= 0xDFFF) {
++in_pos;
/* invalid surrogate pair */
continue;
}
+1 -1
View File
@@ -9,7 +9,7 @@ int vasprintf(char **ret, const char *fmt, va_list ap)
size_t buflen;
va_list ap2;
#ifdef _MSC_VER
#if defined(_MSC_VER) || defined(__MINGW64_VERSION_MAJOR)
ap2 = ap;
len = _vscprintf(fmt, ap2); // NOTE MS specific extension ( :-( )
#else
+9 -9
View File
@@ -423,8 +423,8 @@ void GC_print_callers GC_PROTO((struct callinfo info[NFRAMES]));
# else
# if defined(GC_SOLARIS_THREADS) || defined(GC_WIN32_THREADS) \
|| defined(GC_PTHREADS)
void GC_stop_world();
void GC_start_world();
void GC_stop_world(void);
void GC_start_world(void);
# define STOP_WORLD() GC_stop_world()
# define START_WORLD() GC_start_world()
# else
@@ -1840,7 +1840,7 @@ void GC_dump GC_PROTO((void));
# ifdef __DMC__
GC_API void GC_noop(...);
# else
GC_API void GC_noop();
GC_API void GC_noop(void*,...);
# endif
# endif
@@ -1929,17 +1929,17 @@ void GC_err_puts GC_PROTO((GC_CONST char *s));
/* GC_notify_all_builder() is called when GC_fl_builder_count */
/* reaches 0. */
extern void GC_acquire_mark_lock();
extern void GC_release_mark_lock();
extern void GC_notify_all_builder();
extern void GC_acquire_mark_lock(void);
extern void GC_release_mark_lock(void);
extern void GC_notify_all_builder(void);
/* extern void GC_wait_builder(); */
extern void GC_wait_for_reclaim();
extern void GC_wait_for_reclaim(void);
extern word GC_fl_builder_count; /* Protected by mark lock. */
# endif /* PARALLEL_MARK || THREAD_LOCAL_ALLOC */
# ifdef PARALLEL_MARK
extern void GC_notify_all_marker();
extern void GC_wait_marker();
extern void GC_notify_all_marker(void);
extern void GC_wait_marker(void);
extern word GC_mark_no; /* Protected by mark lock. */
extern void GC_help_marker(word my_mark_no);
+1 -1
View File
@@ -2480,7 +2480,7 @@
extern void *ps3_get_mem (size_t size);
# define GET_MEM(bytes) (struct hblk*) ps3_get_mem (bytes)
# else
extern ptr_t GC_unix_get_mem();
extern ptr_t GC_unix_get_mem(word size);
# define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes)
#endif
# endif
+1 -1
View File
@@ -102,7 +102,7 @@ GC_thread GC_lookup_thread(pthread_t id);
void GC_thread_deregister_foreign (void *data);
void GC_stop_init();
void GC_stop_init(void);
extern GC_bool GC_in_thread_creation;
/* We may currently be in thread creation or destruction. */
+1 -1
View File
@@ -28,7 +28,7 @@
#ifdef __WATCOMC__
void GC_noop(void *p, ...) {}
#else
void GC_noop() {}
void GC_noop(void *p, ...) {}
#endif
/* Single argument version, robust against whole program analysis. */
+19 -1
View File
@@ -6,7 +6,7 @@
.SH NAME
csharp, gsharp \- Interactive C# Shell
.SH SYNOPSIS
.B csharp [--attach PID] [file1 [file2]]
.B csharp [--attach PID] [-e EXPRESSION] [file1 [file2]]
[options]
.P
.B gsharp [file1 [file2]]
@@ -29,7 +29,22 @@ target process.
.PP
Files specified in the command line will be loaded and executed as
scripts.
.PP
Starting with Mono 2.10, the
.I csharp
command can be used as an interpreter executed by executables flagged
with the Unix execute attribute. To do this, make the first line of
your C# source code look like this:
.nf
"#!/usr/bin/csharp"
Console.WriteLine ("Hello, World");
.fi
.SH OPTIONS
The commands accept all of the commands that are available to the
.I mcs
command, so you can reference assemblies, specify paths, language
level and so on from the command line. In addition, the following
command line options are supported:
.TP
.I "\-\-attach"
This is an advanced option and should only be used if you have a deep
@@ -42,6 +57,9 @@ special measures to avoid crashing the target application while using
it. For example, you might have to take the proper locks before
issuing any commands that might affect the target process state, or
sending commands through a method dispatcher.
.TP
.I "\-e" EXPRESSION
This will evaluate the specified C# EXPRESSION and exit
.SH OPERATION
Once you launch the csharp command, you will be greeted with the
interactive prompt:
+23 -34
View File
@@ -4,7 +4,7 @@
..
.TH mcs 1 "6 January 2001"
.SH NAME
mcs, gmcs, smcs \- Mono C# Compiler (1.0, 2.0, Moonlight)
mcs \- Mono C# Compiler
.SH SYNOPSIS
.B mcs
[option] [source-files]
@@ -17,23 +17,8 @@ prepending the @ symbol to the response file name.
.PP
The
.I mcs
compiler is used to compile against the 1.x profile and implements
C# 1.0 and parts of C# 2.0 and C# 3.0 specification which do not depend
on generics.
.PP
The
.I gmcs
compiler is used to compile against the 2.0 profile and implements
the complete C# 3.0 specification.
.PP
The
.I smcs
compiler is used to compile against the Silverlight/Moonlight profile.
This profile is designed to be used for creating Silverlight/Moonlight
applications that will run on a web browser. The API exposed by this
profile is a small subset of the 3.5 API (even if it is commonly
referred as the 2.1 API, this API is a small subset of 2.0 with a few
extensions).
compiler is used to compile against the latest Mono Base Class Library
version and fully implements C# 1.0, 2.0, 3.0 and 4.0 specifications.
.PP
See the section on packages for more information.
.PP
@@ -148,6 +133,11 @@ generate an exception that can be caught by a debugger.
This flag is ignored by Mono's C# compiler and is present only to
allow MCS to be used as a CSC replacement for msbuild/xbuild.
.TP
.I \-fullpaths
Any source code error or warning issued by the compiler includes file
name only by default. This option causes compiler to issue absolute file
path instead.
.TP
.I \-keyfile:KEYFILE
Strongname (sign) the output assembly using the key pair present in
the specified strong name key file (snk). A full key pair is required
@@ -190,13 +180,12 @@ Restrict the compiler to use only the features available in C# 3.0
(a superset of ISO-1 and ISO-2).
.TP
.I "future"
Enables features from upcoming versions of the language. As of
May 2009 this includes support for C# 4 as released in Visual Studio 2010 beta 1.
Enables unstable features from upcoming versions of the language.
.PP
Notice that this flag only controls the language features available to
the programmer, it does not control the kind of assemblies produced.
Programs compiled with mcs will reference the 1.1 APIs, Programs
compiled with gmcs reference the 2.0 APIs.
Notice that this flag only restricts the language features available to
the programmer. A version of produced assemblies can be controled using
.I SDK
option.
.ne
.RE
.TP
@@ -262,11 +251,7 @@ libraries).
.TP
.I \-pkg:silver
References the assemblies for creating Moonlight/Silverlight
applications. This is automatically used when using the
.I smcs
compiler, but it is here when developers want to use it with the
.I gmcs
compiler.
applications.
.TP
.I \-pkg:silverdesktop
Use this option to create Moonlight/Silverlight applications that
@@ -351,6 +336,14 @@ shell will perform globbing, so you might want to use it like this:
$ mcs -recurse:'*.cs'
.fi
.TP
.I \-sdk:VERSION
Used to specify the version of Base Class Library assemblies used for
compilation. Following predefined values are valid: 2, 4 (default) as
well as any custom value. The predefined version number means which
.NET version should the produced assembly be compatible with. When
custom value is specified mcs will try to find Base Class Libraries
in the mono installed location PREFIX/lib/mono/<value>.
.TP
.I \-\-shell
Starts up the compiler in interactive mode, providing a C# shell for
statements and expressions. A shortcut is to use the
@@ -413,10 +406,6 @@ current directory, the compiler base directory and if the assembly is
not found in any of those places in the directories specified as
arguments to the -lib: command argument.
.PP
Depending on the invocation for the C# compiler (mcs, gmcs, or smcs)
you will get a default set of libraries and versions of those
libraries that are referenced.
.PP
The compiler uses the library path to locate libraries, and is able to
reference libraries from a particular package if that directory is
used. To simplify the use of packages, the C# compiler includes the
@@ -539,7 +528,7 @@ the MIT X11. Please read the accompanying `COPYING' file for details.
Alternative licensing for the compiler is available from Novell.
.PP
.SH SEE ALSO
csharp(1), mdb(1), mono(1), mopen(1), mint(1), pkg-config(1),sn(1)
csharp(1), mdb(1), mono(1), mopen(1), pkg-config(1), sn(1)
.PP
.SH BUGS
To report bugs in the compiler, you must file them on our bug tracking
+35 -8
View File
@@ -1,11 +1,11 @@
.\"
.\" mono manual page.
.\" Copyright 2003 Ximian, Inc.
.\" Copyright 2004-2009 Novell, Inc.
.\" Copyright 2004-2011 Novell, Inc.
.\" Author:
.\" Miguel de Icaza ([email protected])
.\"
.TH Mono "Mono 2.5"
.TH Mono "Mono 2.11"
.SH NAME
mono \- Mono's ECMA-CLI native code generator (Just-in-Time and Ahead-of-Time)
.SH SYNOPSIS
@@ -163,11 +163,11 @@ hardware configurations like the cell phones and video gaming
consoles).
.TP
.I static
Create an ELF object file (.o) which can be statically linked into an executable
when embedding the mono runtime. When this option is used, the object file needs to
be registered with the embedded runtime using the mono_aot_register_module function
which takes as its argument the mono_aot_module_<ASSEMBLY NAME>_info global symbol
from the object file:
Create an ELF object file (.o) or .s file which can be statically linked into an
executable when embedding the mono runtime. When this option is used, the object file
needs to be registered with the embedded runtime using the mono_aot_register_module
function which takes as its argument the mono_aot_module_<ASSEMBLY NAME>_info global
symbol from the object file:
.nf
extern void *mono_aot_module_hello_info;
@@ -175,6 +175,23 @@ extern void *mono_aot_module_hello_info;
mono_aot_register_module (mono_aot_module_hello_info);
.fi
.ne
.TP
.I mtriple=<TRIPLE>
Use the GNU style target triple <TRIPLE> to determine some code generation options, i.e.
--mtriple=armv7-linux-gnueabi will generate code that targets ARMv7. This is currently
only supported by the ARM backend. In LLVM mode, this triple is passed on to the LLVM
llc compiler.
.TP
.I tool-prefix=<PREFIX>
Prepends <PREFIX> to the name of tools ran by the AOT compiler, i.e. 'as'/'ld'. For
example, --tool=prefix=arm-linux-gnueabi- will make the AOT compiler run
'arm-linux-gnueabi-as' instead of 'as'.
.TP
.I llvm-path=<PREFIX>
Same for the llvm tools 'opt' and 'llc'.
.TP
.I stats
Print various stats collected during AOT compilation.
.PP
For more information about AOT, see: http://www.mono-project.com/AOT
@@ -1021,6 +1038,16 @@ Enables or disables concurrent sweep for the Mark&Sweep collector. If
enabled, the sweep phase of the garbage collection is done in a thread
concurrently with the application. Concurrent sweep is disabled by
default.
.TP
\fBstack-mark=\fImark-mode\fR
Specifies how application threads should be scanned. Options are
`precise` and `conservative`. Precise marking allow the collector
to know what values on stack are references and what are not.
Conservative marking threats all values as potentially references
and leave them untouched. Precise marking reduces floating garbage
and can speed up nursery collection and allocation rate, it has
the downside of requiring a significant extra memory per compiled
method. The right option, unfortunately, requires experimentation.
.ne
.RE
.TP
@@ -1548,7 +1575,7 @@ http://www.mono-project.com
.SH SEE ALSO
.PP
certmgr(1), csharp(1), mcs(1), mdb(1), monocov(1), monodis(1),
mono-config(5), mozroots(1), pdb2mdb(1), xsp(1), mod_mono(8).
mono-config(5), mozroots(1), mprof-report(1), pdb2mdb(1), xsp(1), mod_mono(8).
.PP
For more information on AOT:
http://www.mono-project.com/AOT
+8 -3
View File
@@ -73,9 +73,10 @@ to $prefix/lib/mono/xbuild . When used in Import, like:
xbuild tries various values for the msbuild property $(MSBuildExtensionsPath), in order:
1. Paths specified in the environment variable $MSBuildExtensionsPath.
2. $XDG_CONFIG_HOME/xbuild/tasks (or Environment.SpecialFolder.ApplicationData)
3. $prefix/lib/mono/xbuild (default location)
1. /Library/Frameworks/Mono.framework/External/xbuild on Mac OSX.
2. Paths specified in the environment variable $MSBuildExtensionsPath.
3. $XDG_CONFIG_HOME/xbuild/tasks (or Environment.SpecialFolder.ApplicationData)
4. $prefix/lib/mono/xbuild (default location)
Anywhere else in the project files, $(MSBuildExtensionsPath) will always resolve to the default
location. This is a xbuild-only feature.
@@ -111,6 +112,10 @@ For example, you could set this variable from your shell:
You can disable the built-in color scheme by setting this variable to
"disable".
.SH NOTES
On Mac OSX, for locating pkg-config (.pc) files, xbuild additionally
looks in "/Library/Frameworks/Mono.framework/External/pkgconfig" .
.SH SEE ALSO
.BR mono(1), mcs(1)
.SH COPYRIGHT
+2 -3
View File
@@ -7,9 +7,9 @@
TestResult-*.log
TestResult-*.xml
TestResult*.xml
errors/?mcs.log
errors/*.log
errors/dummy.xml
tests/?mcs.log
tests/*.log
tests/gtest-*.dll
tests/test-*.dll
tests/xml-*.xml
@@ -17,7 +17,6 @@ tests/?xml-*.xml
tests/test-*.netmodule
tests/data.xml
class/Mono.Data.Sqlite/test.db
class/Mono.CSharp/Mono.CSharp.dll.sources
class/RabbitMQ.Client/docs/specs/autogenerated-api-0-8.cs
class/RabbitMQ.Client/docs/specs/autogenerated-api-0-9.cs
class/RabbitMQ.Client/docs/specs/autogenerated-api-qpid-0-8.cs
+15 -12
View File
@@ -2,14 +2,16 @@ thisdir := .
SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs
basic_SUBDIRS := build jay mcs class tools
net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors mcs
moonlight_raw_SUBDIRS := build class tools mcs
moonlight_SUBDIRS := tools
monodroid_SUBDIRS := build class mcs
monotouch_SUBDIRS := build class mcs
# Resgen is corlib specific tool
basic_SUBDIRS := build jay mcs class
build_SUBDIRS := build class mcs class/aot-compiler tools
net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors
moonlight_raw_SUBDIRS := build class
monodroid_SUBDIRS := build class
monotouch_SUBDIRS := build class
net_3_5_SUBDIRS := build class tools/xbuild
net_4_0_SUBDIRS := build class nunit24 ilasm tools tests errors mcs docs
net_4_0_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
# List of test subdirs that should pass 100%
centum_tests := \
@@ -100,13 +102,14 @@ profiles-do--run-test:
# Orchestrate the bootstrap here.
_boot_ = all clean install
$(_boot_:%=profile-do--net_4_0--%): profile-do--net_4_0--%: profile-do--basic--%
$(_boot_:%=profile-do--net_4_0--%): profile-do--net_4_0--%: profile-do--build--%
$(_boot_:%=profile-do--net_3_5--%): profile-do--net_3_5--%: profile-do--net_2_0--%
$(_boot_:%=profile-do--moonlight--%): profile-do--moonlight--%: profile-do--moonlight_raw--%
$(_boot_:%=profile-do--monodroid--%): profile-do--monodroid--%: profile-do--basic--%
$(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%: profile-do--basic--%
$(_boot_:%=profile-do--moonlight_raw--%): profile-do--moonlight_raw--%: profile-do--basic--%
$(_boot_:%=profile-do--net_2_0--%): profile-do--net_2_0--%: profile-do--basic--%
$(_boot_:%=profile-do--monodroid--%): profile-do--monodroid--%: profile-do--build--%
$(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%: profile-do--build--%
$(_boot_:%=profile-do--moonlight_raw--%): profile-do--moonlight_raw--%:
$(_boot_:%=profile-do--net_2_0--%): profile-do--net_2_0--%: profile-do--build--%
$(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--%
testcorlib:
@cd class/corlib && $(MAKE) test run-test
+1 -1
View File
@@ -17,9 +17,9 @@ common/Consts.cs: common/Consts.cs.in $(wildcard config.make)
PLATFORMS = darwin linux win32
PROFILES = \
basic \
build \
net_2_0 \
moonlight_raw \
moonlight \
net_3_5 \
net_4_0
+5 -3
View File
@@ -4,7 +4,9 @@
base_prog = $(notdir $(PROGRAM))
prog_dir := $(filter-out . ./, $(dir $(PROGRAM)))
sourcefile = $(base_prog).sources
ifndef sourcefile
sourcefile := $(base_prog).sources
endif
base_prog_config := $(wildcard $(base_prog).config.$(PROFILE))
ifndef base_prog_config
base_prog_config := $(wildcard $(base_prog).config)
@@ -132,14 +134,14 @@ all-local: $(makefrag) $(extra_targets)
csproj-local:
config_file=`basename $(PROGRAM) .exe`-$(PROFILE).input; \
echo $(thisdir):$$config_file >> $(topdir)/../mono/msvc/scripts/order; \
echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
(echo $(is_boot); \
echo $(MCS); \
echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS); \
echo $(PROGRAM); \
echo $(BUILT_SOURCES_cmdline); \
echo $(build_lib); \
echo $(response)) > $(topdir)/../mono/msvc/scripts/inputs/$$config_file
echo $(response)) > $(topdir)/../msvc/scripts/inputs/$$config_file
ifneq ($(response),$(sourcefile))
+6 -4
View File
@@ -66,10 +66,12 @@ library_CLEAN_FILES += $(build_lib) $(build_lib).so $(build_lib).mdb $(build_lib
ifdef NO_SIGN_ASSEMBLY
SN = :
else
sn = $(topdir)/class/lib/basic/sn.exe
SN = $(Q) MONO_PATH="$(topdir)/class/lib/basic$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn)
ifeq ("$(SN)","")
sn = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/sn.exe
SN = $(Q) MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn)
SNFLAGS = -q
endif
endif
ifeq ($(PLATFORM), win32)
GACDIR = `cygpath -w $(mono_libdir)`
@@ -92,14 +94,14 @@ endif
csproj-local:
config_file=`basename $(LIBRARY) .dll`-$(PROFILE).input; \
echo $(thisdir):$$config_file >> $(topdir)/../mono/msvc/scripts/order; \
echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
(echo $(is_boot); \
echo $(MCS); \
echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS); \
echo $(LIBRARY_NAME); \
echo $(BUILT_SOURCES_cmdline); \
echo $(build_lib); \
echo $(response)) > $(topdir)/../mono/msvc/scripts/inputs/$$config_file
echo $(response)) > $(topdir)/../msvc/scripts/inputs/$$config_file
install-local: all-local
-1
View File
@@ -12,7 +12,6 @@ PLATFORM_TEST_HARNESS_EXCLUDES = NotOnMac,
EXTERNAL_MCS = gmcs
EXTERNAL_MBAS = mbas
EXTERNAL_RUNTIME = mono
RESGEN = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN)
#ILDISASM = monodis
ILDISASM = false
-1
View File
@@ -12,7 +12,6 @@ PLATFORM_TEST_HARNESS_EXCLUDES =
EXTERNAL_MCS = gmcs
EXTERNAL_MBAS = mbas
EXTERNAL_RUNTIME = mono
RESGEN = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN)
#ILDISASM = monodis
ILDISASM = false
-2
View File
@@ -14,9 +14,7 @@ EXTERNAL_MBAS = vbc.exe
EXTERNAL_RUNTIME =
# Disabled since it needs the SDK
#RESGEN = resgen.exe
#ILDISASM = ildasm.exe /test
RESGEN = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN)
#ILDISASM = monodis.bat
## Gross hack
+4 -2
View File
@@ -6,9 +6,11 @@ with_mono_path_monolite = MONO_PATH="$(topdir)/class/lib/monolite$(PLATFORM_PATH
monolite_flag := $(depsdir)/use-monolite
use_monolite := $(wildcard $(monolite_flag))
MONOLITE_MCS = $(topdir)/class/lib/monolite/basic.exe
ifdef use_monolite
PROFILE_RUNTIME = $(with_mono_path_monolite) $(RUNTIME)
BOOTSTRAP_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/monolite/mcs.exe
BOOTSTRAP_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(MONOLITE_MCS)
else
PROFILE_RUNTIME = $(EXTERNAL_RUNTIME)
BOOTSTRAP_MCS = $(EXTERNAL_MCS)
@@ -60,7 +62,7 @@ do-profile-check: $(depsdir)/.stamp
$(MAKE) $(MAKE_Q) $(PROFILE_OUT) || ok=false; \
rm -f $(PROFILE_EXE) $(PROFILE_OUT); \
if $$ok; then :; else \
if test -f $(topdir)/class/lib/monolite/mcs.exe; then \
if test -f $(MONOLITE_MCS); then \
$(MAKE) -s do-profile-check-monolite ; \
else \
echo "*** The compiler '$(BOOTSTRAP_MCS)' doesn't appear to be usable." 1>&2; \
+22
View File
@@ -0,0 +1,22 @@
# -*- makefile -*-
BOOTSTRAP_PROFILE = basic
BUILD_TOOLS_PROFILE = basic
INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/basic.exe
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
# nuttzing!
profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
NO_SIGN_ASSEMBLY = yes
NO_TEST = yes
NO_INSTALL = yes
FRAMEWORK_VERSION = 4.0
+1 -1
View File
@@ -1,6 +1,6 @@
#! -*- makefile -*-
BOOTSTRAP_PROFILE = basic
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
+1 -1
View File
@@ -1,6 +1,6 @@
#! -*- makefile -*-
BOOTSTRAP_PROFILE = basic
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-19
View File
@@ -1,19 +0,0 @@
#! -*- makefile -*-
my_runtime = $(RUNTIME) $(RUNTIME_FLAGS) --security=temporary-smcs-hack
INTERNAL_SMCS = $(my_runtime) $(topdir)/class/lib/$(PROFILE)/smcs.exe
BOOTSTRAP_PROFILE = moonlight_bootstrap
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(my_runtime) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/smcs.exe
MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_SMCS)
profile-check:
@:
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:MOONLIGHT
FRAMEWORK_VERSION = 2.1
NO_TEST = yes
# the tuner takes care of the install
NO_INSTALL = yes
+6 -5
View File
@@ -1,15 +1,16 @@
#! -*- makefile -*-
BOOTSTRAP_PROFILE = basic
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
BOOTSTRAP_MCS = mcs
MCS = $(BOOTSTRAP_MCS)
profile-check:
profile-check: $(depsdir)/.stamp
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:MOONLIGHT -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
PROFILE_MCS_FLAGS = -lib:$(topdir)/class/lib/moonlight_raw -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:MOONLIGHT -d:SILVERLIGHT -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
SN = sn
FRAMEWORK_VERSION = 2.1
NO_TEST = yes
+1 -1
View File
@@ -1,6 +1,6 @@
# -*- makefile -*-
BOOTSTRAP_PROFILE = basic
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
+1 -1
View File
@@ -1,6 +1,6 @@
# -*- makefile -*-
BOOTSTRAP_PROFILE = basic
BOOTSTRAP_PROFILE = build
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
+1 -1
View File
@@ -1,6 +1,6 @@
# -*- makefile -*-
BOOTSTRAP_PROFILE = basic
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
+10 -9
View File
@@ -24,6 +24,10 @@ Q=$(if $(V),,@)
# echo -e "\\t" does not work on some systems, so use 5 spaces
Q_MCS=$(if $(V),,@echo "MCS [$(PROFILE)] $(notdir $(@))";)
ifndef BUILD_TOOLS_PROFILE
BUILD_TOOLS_PROFILE = build
endif
USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS)
@@ -37,15 +41,12 @@ INSTALL_BIN = $(INSTALL) -c -m 755
INSTALL_LIB = $(INSTALL_BIN)
MKINSTALLDIRS = $(SHELL) $(topdir)/mkinstalldirs
INTERNAL_MBAS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/mbas/mbas.exe
INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/basic/mcs.exe
INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/mcs.exe
INTERNAL_ILASM = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/ilasm.exe
corlib = mscorlib.dll
ifndef BUILD_TOOLS_PROFILE
BUILD_TOOLS_PROFILE = basic
endif
INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resgen.exe
INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/resgen.exe
RESGEN = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN)
depsdir = $(topdir)/build/deps
@@ -102,7 +103,7 @@ endif
# Rest of the configuration
ifndef PROFILE
PROFILE = net_2_0
PROFILE = net_4_0
endif
include $(topdir)/build/profiles/$(PROFILE).make
@@ -117,8 +118,8 @@ endif
ifdef NO_INSTALL
GACUTIL = :
else
gacutil = $(topdir)/class/lib/basic/gacutil.exe
GACUTIL = MONO_PATH="$(topdir)/class/lib/basic$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
gacutil = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/gacutil.exe
GACUTIL = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
endif
STD_TARGETS = test run-test run-test-ondotnet clean install uninstall doc-update
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_2_0</OutputPath>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>Accessibility</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Accessibility\IAccessible.cs" />
<Compile Include="Accessibility\IAccessibleHandler.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\build\common\Consts.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_0</OutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>Accessibility</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Accessibility\IAccessible.cs" />
<Compile Include="Accessibility\IAccessibleHandler.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\build\common\Consts.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,125 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_2_0</OutputPath>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>Commons.Xml.Relaxng</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="..\..\build\common\Locale.cs" />
<Compile Include="Commons.Xml\XmlDefaultReader.cs" />
<Compile Include="Commons.Xml.Relaxng\Misc.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngDatatype.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngDatatypeProvider.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngDefaultDatatypes.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngException.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngGrammar.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngMergedProvider.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngNameClass.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngPattern.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngPatternType.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngReader.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />
<Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpContentType.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpNameClasses.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpObjects.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpPatterns.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\Util.cs" />
<Compile Include="Commons.Xml.Relaxng.Inference\RelaxngInference.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\RncTokenizer.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\RncWriter.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\XmlChar.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlBuiltInValidationProvider.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlCompileContext.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlConfig.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlException.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlFilteredXmlReader.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlReader.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlRelaxngSupport.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlSimplified.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlStructures.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlValidatingReader.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlValidationProvider.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlValidator.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlXsdSupport.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="System.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.dll</HintPath>
</Reference>
<Reference Include="System.Xml.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.Xml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="resources/relaxng.rng">
<LogicalName>relaxng.rng</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
@@ -0,0 +1,125 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_0</OutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>Commons.Xml.Relaxng</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="..\..\build\common\Locale.cs" />
<Compile Include="Commons.Xml\XmlDefaultReader.cs" />
<Compile Include="Commons.Xml.Relaxng\Misc.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngDatatype.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngDatatypeProvider.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngDefaultDatatypes.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngException.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngGrammar.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngMergedProvider.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngNameClass.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngPattern.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngPatternType.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngReader.cs" />
<Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />
<Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpContentType.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpNameClasses.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpObjects.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\RdpPatterns.cs" />
<Compile Include="Commons.Xml.Relaxng.Derivative\Util.cs" />
<Compile Include="Commons.Xml.Relaxng.Inference\RelaxngInference.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\RncTokenizer.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\RncWriter.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\XmlChar.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlBuiltInValidationProvider.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlCompileContext.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlConfig.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlException.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlFilteredXmlReader.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlReader.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlRelaxngSupport.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlSimplified.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlStructures.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlValidatingReader.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlValidationProvider.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlValidator.cs" />
<Compile Include="Commons.Xml.Nvdl\NvdlXsdSupport.cs" />
<Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="System.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.dll</HintPath>
</Reference>
<Reference Include="System.Xml.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.Xml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="resources/relaxng.rng">
<LogicalName>relaxng.rng</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
@@ -0,0 +1,118 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/compat/net_2_0</OutputPath>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>ICSharpCode.SharpZipLib</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include=".\ICSharpCode.SharpZipLib\BZip2\BZip2.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\BZip2\BZip2Constants.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\BZip2\BZip2InputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\BZip2\BZip2OutputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Checksums\Adler32.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Checksums\Crc32.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Checksums\IChecksum.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Checksums\StrangeCrc.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\GZip\GZipConstants.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\GZip\GZipInputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\GZip\GZipOutputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Tar\InvalidHeaderException.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarArchive.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarBuffer.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarEntry.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarHeader.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarInputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Tar\TarOutputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Deflater.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\DeflaterConstants.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\DeflaterEngine.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\DeflaterHuffman.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\DeflaterPending.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Inflater.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\InflaterDynHeader.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\PendingBuffer.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Streams\OutputWindow.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipConstants.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipEntry.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipFile.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipInputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\Zip\ZipOutputStream.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\AssemblyInfo.cs" />
<Compile Include=".\ICSharpCode.SharpZipLib\ZipException.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="System.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.dll</HintPath>
</Reference>
<Reference Include="System.Xml.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.Xml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_2_0</OutputPath>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>cscompmgd</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="..\..\build\common\Locale.cs" />
<Compile Include="Microsoft.CSharp\Compiler.cs" />
<Compile Include="Microsoft.CSharp\CompilerError.cs" />
<Compile Include="Microsoft.CSharp\ErrorLevel.cs" />
<Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="System.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_0</OutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>cscompmgd</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="..\..\build\common\Locale.cs" />
<Compile Include="Microsoft.CSharp\Compiler.cs" />
<Compile Include="Microsoft.CSharp\CompilerError.cs" />
<Compile Include="Microsoft.CSharp\ErrorLevel.cs" />
<Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="System.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_2_0</OutputPath>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>CustomMarshalers</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include=".\Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="..\..\build\common\Locale.cs" />
<Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumerableToDispatchMarshaler.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\ExpandoToDispatchExMarshaler.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumeratorToEnumVariantMarshaler.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\TypeToTypeInfoMarshaler.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="System.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_0</OutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>CustomMarshalers</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include=".\Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="..\..\build\common\Locale.cs" />
<Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumerableToDispatchMarshaler.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\ExpandoToDispatchExMarshaler.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumeratorToEnumVariantMarshaler.cs" />
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\TypeToTypeInfoMarshaler.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="System.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
+107
View File
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_2_0/tmp</OutputPath>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>I18N.CJK</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="CP932.cs" />
<Compile Include="ISO2022JP.cs" />
<Compile Include="CP51932.cs" />
<Compile Include="CP936.cs" />
<Compile Include="CP949.cs" />
<Compile Include="CP950.cs" />
<Compile Include="CodeTable.cs" />
<Compile Include="DbcsEncoding.cs" />
<Compile Include="DbcsConvert.cs" />
<Compile Include="GB18030Encoding.cs" />
<Compile Include="GB18030Source.cs" />
<Compile Include="JISConvert.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="I18N.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\I18N.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="big5.table">
<LogicalName>big5.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="gb2312.table">
<LogicalName>gb2312.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="jis.table">
<LogicalName>jis.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="ks.table">
<LogicalName>ks.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="gb18030.table">
<LogicalName>gb18030.table</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
+107
View File
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_4_0/tmp</OutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>I18N.CJK</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="CP932.cs" />
<Compile Include="ISO2022JP.cs" />
<Compile Include="CP51932.cs" />
<Compile Include="CP936.cs" />
<Compile Include="CP949.cs" />
<Compile Include="CP950.cs" />
<Compile Include="CodeTable.cs" />
<Compile Include="DbcsEncoding.cs" />
<Compile Include="DbcsConvert.cs" />
<Compile Include="GB18030Encoding.cs" />
<Compile Include="GB18030Source.cs" />
<Compile Include="JISConvert.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="I18N.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\I18N.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="big5.table">
<LogicalName>big5.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="gb2312.table">
<LogicalName>gb2312.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="jis.table">
<LogicalName>jis.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="ks.table">
<LogicalName>ks.table</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="gb18030.table">
<LogicalName>gb18030.table</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
+79
View File
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_2_0/tmp</OutputPath>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>I18N</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="ByteEncoding.cs" />
<Compile Include="Handlers.cs" />
<Compile Include="Manager.cs" />
<Compile Include="MonoEncoding.cs" />
<Compile Include="Strings.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
+79
View File
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_4_0/tmp</OutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>I18N</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="ByteEncoding.cs" />
<Compile Include="Handlers.cs" />
<Compile Include="Manager.cs" />
<Compile Include="MonoEncoding.cs" />
<Compile Include="Strings.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_2_0/tmp</OutputPath>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>I18N.MidEast</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="CP1254.cs" />
<Compile Include="CP1255.cs" />
<Compile Include="CP1256.cs" />
<Compile Include="CP28596.cs" />
<Compile Include="CP28598.cs" />
<Compile Include="CP28599.cs" />
<Compile Include="CP38598.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="I18N.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\I18N.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_4_0/tmp</OutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>I18N.MidEast</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="CP1254.cs" />
<Compile Include="CP1255.cs" />
<Compile Include="CP1256.cs" />
<Compile Include="CP28596.cs" />
<Compile Include="CP28598.cs" />
<Compile Include="CP28599.cs" />
<Compile Include="CP38598.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="I18N.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\I18N.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_2_0/tmp</OutputPath>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>I18N.Other</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="CP1251.cs" />
<Compile Include="CP1257.cs" />
<Compile Include="CP1258.cs" />
<Compile Include="CP20866.cs" />
<Compile Include="CP21866.cs" />
<Compile Include="CP28594.cs" />
<Compile Include="CP28595.cs" />
<Compile Include="CP57002.cs" />
<Compile Include="CP874.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="I18N.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\I18N.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_4_0/tmp</OutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>I18N.Other</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="CP1251.cs" />
<Compile Include="CP1257.cs" />
<Compile Include="CP1258.cs" />
<Compile Include="CP20866.cs" />
<Compile Include="CP21866.cs" />
<Compile Include="CP28594.cs" />
<Compile Include="CP28595.cs" />
<Compile Include="CP57002.cs" />
<Compile Include="CP874.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="I18N.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\I18N.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_2_0/tmp</OutputPath>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>I18N.Rare</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="CP866.cs" />
<Compile Include="CP1026.cs" />
<Compile Include="CP869.cs" />
<Compile Include="CP870.cs" />
<Compile Include="CP875.cs" />
<Compile Include="CP1047.cs" />
<Compile Include="CP1140.cs" />
<Compile Include="CP1141.cs" />
<Compile Include="CP1142.cs" />
<Compile Include="CP1143.cs" />
<Compile Include="CP1144.cs" />
<Compile Include="CP1145.cs" />
<Compile Include="CP1146.cs" />
<Compile Include="CP1147.cs" />
<Compile Include="CP1148.cs" />
<Compile Include="CP1149.cs" />
<Compile Include="CP20273.cs" />
<Compile Include="CP20277.cs" />
<Compile Include="CP20278.cs" />
<Compile Include="CP20280.cs" />
<Compile Include="CP20284.cs" />
<Compile Include="CP20285.cs" />
<Compile Include="CP20290.cs" />
<Compile Include="CP20297.cs" />
<Compile Include="CP20420.cs" />
<Compile Include="CP20424.cs" />
<Compile Include="CP20871.cs" />
<Compile Include="CP21025.cs" />
<Compile Include="CP37.cs" />
<Compile Include="CP500.cs" />
<Compile Include="CP708.cs" />
<Compile Include="CP852.cs" />
<Compile Include="CP855.cs" />
<Compile Include="CP857.cs" />
<Compile Include="CP858.cs" />
<Compile Include="CP862.cs" />
<Compile Include="CP864.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="I18N.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\I18N.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_4_0/tmp</OutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>I18N.Rare</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="CP866.cs" />
<Compile Include="CP1026.cs" />
<Compile Include="CP869.cs" />
<Compile Include="CP870.cs" />
<Compile Include="CP875.cs" />
<Compile Include="CP1047.cs" />
<Compile Include="CP1140.cs" />
<Compile Include="CP1141.cs" />
<Compile Include="CP1142.cs" />
<Compile Include="CP1143.cs" />
<Compile Include="CP1144.cs" />
<Compile Include="CP1145.cs" />
<Compile Include="CP1146.cs" />
<Compile Include="CP1147.cs" />
<Compile Include="CP1148.cs" />
<Compile Include="CP1149.cs" />
<Compile Include="CP20273.cs" />
<Compile Include="CP20277.cs" />
<Compile Include="CP20278.cs" />
<Compile Include="CP20280.cs" />
<Compile Include="CP20284.cs" />
<Compile Include="CP20285.cs" />
<Compile Include="CP20290.cs" />
<Compile Include="CP20297.cs" />
<Compile Include="CP20420.cs" />
<Compile Include="CP20424.cs" />
<Compile Include="CP20871.cs" />
<Compile Include="CP21025.cs" />
<Compile Include="CP37.cs" />
<Compile Include="CP500.cs" />
<Compile Include="CP708.cs" />
<Compile Include="CP852.cs" />
<Compile Include="CP855.cs" />
<Compile Include="CP857.cs" />
<Compile Include="CP858.cs" />
<Compile Include="CP862.cs" />
<Compile Include="CP864.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="I18N.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\I18N.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_2_0/tmp</OutputPath>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>I18N.West</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="CP10000.cs" />
<Compile Include="CP10079.cs" />
<Compile Include="CP1250.cs" />
<Compile Include="CP1252.cs" />
<Compile Include="CP1253.cs" />
<Compile Include="CP28592.cs" />
<Compile Include="CP28593.cs" />
<Compile Include="CP28597.cs" />
<Compile Include="CP28605.cs" />
<Compile Include="CP437.cs" />
<Compile Include="CP850.cs" />
<Compile Include="CP860.cs" />
<Compile Include="CP861.cs" />
<Compile Include="CP863.cs" />
<Compile Include="CP865.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="I18N.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\I18N.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../../class/lib/net_4_0/tmp</OutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>I18N.West</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\Assembly\AssemblyInfo.cs" />
<Compile Include="..\..\..\build\common\Consts.cs" />
<Compile Include="CP10000.cs" />
<Compile Include="CP10079.cs" />
<Compile Include="CP1250.cs" />
<Compile Include="CP1252.cs" />
<Compile Include="CP1253.cs" />
<Compile Include="CP28592.cs" />
<Compile Include="CP28593.cs" />
<Compile Include="CP28597.cs" />
<Compile Include="CP28605.cs" />
<Compile Include="CP437.cs" />
<Compile Include="CP850.cs" />
<Compile Include="CP860.cs" />
<Compile Include="CP861.cs" />
<Compile Include="CP863.cs" />
<Compile Include="CP865.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="I18N.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\I18N.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\\lib\build\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,109 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_2_0</OutputPath>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>IBM.Data.DB2</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include=".\Assembly\AssemblyInfo.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ClientUtils.cs" />
<Compile Include=".\IBM.Data.DB2\DB2CLIWrapper.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Command.cs" />
<Compile Include=".\IBM.Data.DB2\DB2CommandBuilder.cs" />
<Compile Include=".\IBM.Data.DB2\DB2OpenConnection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Connection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ConnectionPool.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ConnectionSettings.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Constants.cs" />
<Compile Include=".\IBM.Data.DB2\DB2DataAdapter.cs" />
<Compile Include=".\IBM.Data.DB2\DB2DataReader.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Environment.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Error.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ErrorCollection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Exception.cs" />
<Compile Include=".\IBM.Data.DB2\DB2InfoMessageEventHandler.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Parameter.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ParameterCollection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventArgs.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventHandler.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventArgs.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventHandler.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Transaction.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Type.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="System.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.dll</HintPath>
</Reference>
<Reference Include="System.Xml.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.Xml.dll</HintPath>
</Reference>
<Reference Include="System.Data.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.Data.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,109 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_0</OutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>IBM.Data.DB2</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include=".\Assembly\AssemblyInfo.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ClientUtils.cs" />
<Compile Include=".\IBM.Data.DB2\DB2CLIWrapper.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Command.cs" />
<Compile Include=".\IBM.Data.DB2\DB2CommandBuilder.cs" />
<Compile Include=".\IBM.Data.DB2\DB2OpenConnection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Connection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ConnectionPool.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ConnectionSettings.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Constants.cs" />
<Compile Include=".\IBM.Data.DB2\DB2DataAdapter.cs" />
<Compile Include=".\IBM.Data.DB2\DB2DataReader.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Environment.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Error.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ErrorCollection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Exception.cs" />
<Compile Include=".\IBM.Data.DB2\DB2InfoMessageEventHandler.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Parameter.cs" />
<Compile Include=".\IBM.Data.DB2\DB2ParameterCollection.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventArgs.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventHandler.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventArgs.cs" />
<Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventHandler.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Transaction.cs" />
<Compile Include=".\IBM.Data.DB2\DB2Type.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="System.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.dll</HintPath>
</Reference>
<Reference Include="System.Xml.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.Xml.dll</HintPath>
</Reference>
<Reference Include="System.Data.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.Data.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,130 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_2_0</OutputPath>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>ICSharpCode.SharpZipLib</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\OutputWindow.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterHuffman.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterPending.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterEngine.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\PendingBuffer.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterConstants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Inflater.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Deflater.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\InflaterDynHeader.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipConstants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipNameTransform.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipOutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\FastZip.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipFile.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipEntry.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\StrangeCRC.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\IChecksum.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\Adler32.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\CRC32.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2InputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2Constants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2OutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2Exception.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\InvalidHeaderException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarHeader.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarBuffer.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarOutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarArchive.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarEntry.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\FileSystemScanner.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\PathFilter.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\INameTransform.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\NameFilter.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GzipInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GZIPConstants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GzipOutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GZipException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Encryption\PkzipClassic.cs" />
<Compile Include="ICSharpCode.SharpZipLib\AssemblyInfo.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Main.cs" />
<Compile Include="ICSharpCode.SharpZipLib\SharpZipBaseException.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="System.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.dll</HintPath>
</Reference>
<Reference Include="System.Xml.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.Xml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
@@ -0,0 +1,130 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_0</OutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<NoStdLib>true</NoStdLib>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mscorlib</RootNamespace>
<AssemblyName>ICSharpCode.SharpZipLib</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Streams\OutputWindow.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterHuffman.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterPending.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterEngine.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\PendingBuffer.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\DeflaterConstants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Inflater.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\Deflater.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\Compression\InflaterDynHeader.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipConstants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipNameTransform.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipOutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\FastZip.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipFile.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Zip\ZipEntry.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\StrangeCRC.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\IChecksum.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\Adler32.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Checksums\CRC32.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2InputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2Constants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2OutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2Exception.cs" />
<Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\InvalidHeaderException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarHeader.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarBuffer.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarOutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarArchive.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Tar\TarEntry.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\FileSystemScanner.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\PathFilter.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\INameTransform.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Core\NameFilter.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GzipInputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GZIPConstants.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GzipOutputStream.cs" />
<Compile Include="ICSharpCode.SharpZipLib\GZip\GZipException.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Encryption\PkzipClassic.cs" />
<Compile Include="ICSharpCode.SharpZipLib\AssemblyInfo.cs" />
<Compile Include="ICSharpCode.SharpZipLib\Main.cs" />
<Compile Include="ICSharpCode.SharpZipLib\SharpZipBaseException.cs" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent></PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="mscorlib.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\mscorlib.dll</HintPath>
</Reference>
<Reference Include="System.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.dll</HintPath>
</Reference>
<Reference Include="System.Xml.dll">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\\lib\build\System.Xml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
+24 -1
View File
@@ -50,7 +50,25 @@ namespace IKVM.Reflection
public abstract ManifestResourceInfo GetManifestResourceInfo(string resourceName);
public abstract System.IO.Stream GetManifestResourceStream(string resourceName);
internal abstract Type GetTypeImpl(string typeName);
internal Type GetTypeImpl(string typeName)
{
Type type = FindType(TypeName.Split(TypeNameParser.Unescape(typeName)));
if (type == null && __IsMissing)
{
throw new MissingAssemblyException((MissingAssembly)this);
}
return type;
}
internal abstract Type FindType(TypeName name);
// The differences between ResolveType and FindType are:
// - ResolveType is only used when a type is assumed to exist (because another module's metadata claims it)
// - ResolveType can return a MissingType
internal Type ResolveType(TypeName typeName)
{
return FindType(typeName) ?? universe.GetMissingTypeOrThrow(this.ManifestModule, null, typeName);
}
public Module[] GetModules()
{
@@ -154,6 +172,11 @@ namespace IKVM.Reflection
}
}
public virtual bool __IsMissing
{
get { return false; }
}
internal abstract IList<CustomAttributeData> GetCustomAttributesData(Type attributeType);
}
}
@@ -28,6 +28,11 @@ namespace IKVM.Reflection
{
public abstract class ConstructorInfo : MethodBase
{
// prevent external subclasses
internal ConstructorInfo()
{
}
public static readonly string ConstructorName = ".ctor";
public static readonly string TypeConstructorName = ".cctor";
@@ -196,6 +201,11 @@ namespace IKVM.Reflection
get { return method.MetadataToken; }
}
public override bool __IsMissing
{
get { return method.__IsMissing; }
}
internal override MethodInfo GetMethodInfo()
{
return method;
@@ -1,5 +1,5 @@
/*
Copyright (C) 2009-2010 Jeroen Frijters
Copyright (C) 2009-2011 Jeroen Frijters
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -381,31 +381,24 @@ namespace IKVM.Reflection
return null;
}
public void __ReadTypeName(out string ns, out string name)
[Obsolete("Use Constructor.DeclaringType instead.")]
internal bool __TryReadTypeName(out string ns, out string name)
{
if (lazyConstructor == null)
if (Constructor.DeclaringType.IsNested)
{
ModuleReader mod = module as ModuleReader;
if (mod != null)
{
int methodToken = mod.CustomAttribute.records[index].Type;
if ((methodToken >> 24) == MemberRefTable.Index)
{
int methodIndex = (methodToken & 0xFFFFFF) - 1;
int typeToken = mod.MemberRef.records[methodIndex].Class;
if ((typeToken >> 24) == TypeRefTable.Index)
{
int typeIndex = (typeToken & 0xFFFFFF) - 1;
int typeNameSpace = mod.TypeRef.records[typeIndex].TypeNameSpace;
ns = typeNameSpace == 0 ? null : mod.GetString(typeNameSpace);
name = mod.GetString(mod.TypeRef.records[typeIndex].TypeName);
return;
}
}
}
ns = null;
name = null;
return false;
}
ns = Constructor.DeclaringType.Namespace;
name = Constructor.DeclaringType.Name;
ns = Constructor.DeclaringType.__Namespace;
name = Constructor.DeclaringType.__Name;
return true;
}
// for use by mcs
internal byte[] __GetBlob()
{
return ((ModuleReader)module).GetBlobCopy(module.CustomAttribute.records[index].Value);
}
public ConstructorInfo Constructor
@@ -565,6 +558,10 @@ namespace IKVM.Reflection
public static IList<CustomAttributeData> __GetDeclarativeSecurity(Assembly assembly)
{
if (assembly.__IsMissing)
{
throw new MissingAssemblyException((MissingAssembly)assembly);
}
return assembly.ManifestModule.GetDeclarativeSecurity(0x20000001);
}
@@ -1,5 +1,5 @@
/*
Copyright (C) 2008-2010 Jeroen Frijters
Copyright (C) 2008-2011 Jeroen Frijters
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -253,12 +253,30 @@ namespace IKVM.Reflection.Emit
this.fileKind = fileKind;
}
public void __Save(Stream stream, PortableExecutableKinds portableExecutableKind, ImageFileMachine imageFileMachine)
{
if (!stream.CanRead || !stream.CanWrite || !stream.CanSeek || stream.Position != 0)
{
throw new ArgumentException("Stream must support read/write/seek and current position must be zero.", "stream");
}
if (modules.Count != 1)
{
throw new NotSupportedException("Saving to a stream is only supported for single module assemblies.");
}
SaveImpl(modules[0].fileName, stream, portableExecutableKind, imageFileMachine);
}
public void Save(string assemblyFileName)
{
Save(assemblyFileName, PortableExecutableKinds.ILOnly, ImageFileMachine.I386);
}
public void Save(string assemblyFileName, PortableExecutableKinds portableExecutableKind, ImageFileMachine imageFileMachine)
{
SaveImpl(assemblyFileName, null, portableExecutableKind, imageFileMachine);
}
private void SaveImpl(string assemblyFileName, Stream streamOrNull, PortableExecutableKinds portableExecutableKind, ImageFileMachine imageFileMachine)
{
ModuleBuilder manifestModule = null;
@@ -398,7 +416,7 @@ namespace IKVM.Reflection.Emit
}
// finally, write the manifest module
ModuleWriter.WriteModule(keyPair, publicKey, manifestModule, fileKind, portableExecutableKind, imageFileMachine, unmanagedResources ?? manifestModule.unmanagedResources, entryPointToken);
ModuleWriter.WriteModule(keyPair, publicKey, manifestModule, fileKind, portableExecutableKind, imageFileMachine, unmanagedResources ?? manifestModule.unmanagedResources, entryPointToken, streamOrNull);
}
private int AddFile(ModuleBuilder manifestModule, string fileName, int flags)
@@ -489,11 +507,11 @@ namespace IKVM.Reflection.Emit
return list.ToArray();
}
internal override Type GetTypeImpl(string typeName)
internal override Type FindType(TypeName typeName)
{
foreach (ModuleBuilder mb in modules)
{
Type type = mb.GetTypeImpl(typeName);
Type type = mb.FindType(typeName);
if (type != null)
{
return type;
@@ -501,7 +519,7 @@ namespace IKVM.Reflection.Emit
}
foreach (Module module in addedModules)
{
Type type = module.GetTypeImpl(typeName);
Type type = module.FindType(typeName);
if (type != null)
{
return type;
@@ -644,7 +662,7 @@ namespace IKVM.Reflection.Emit
get { return assembly; }
}
internal override Type GetTypeImpl(string typeName)
internal override Type FindType(TypeName typeName)
{
return null;
}
@@ -85,6 +85,11 @@ namespace IKVM.Reflection.Emit
return methodBuilder.GetILGenerator(streamSize);
}
public void __ReleaseILGenerator()
{
methodBuilder.__ReleaseILGenerator();
}
public override CallingConventions CallingConvention
{
get { return methodBuilder.CallingConvention; }
@@ -375,13 +375,14 @@ namespace IKVM.Reflection.Emit
internal int WriteBlob(ModuleBuilder moduleBuilder)
{
ByteBuffer bb = new ByteBuffer(100);
ByteBuffer bb;
if (blob != null)
{
bb.Write(blob);
bb = ByteBuffer.Wrap(blob);
}
else
{
bb = new ByteBuffer(100);
BlobWriter bw = new BlobWriter(moduleBuilder, this, bb);
bw.WriteCustomAttributeBlob();
}
+18 -2
View File
@@ -33,14 +33,30 @@ namespace IKVM.Reflection.Emit
private readonly FieldBuilder fieldBuilder;
internal EnumBuilder(TypeBuilder typeBuilder, FieldBuilder fieldBuilder)
: base(typeBuilder)
{
this.typeBuilder = typeBuilder;
this.fieldBuilder = fieldBuilder;
}
public override Type UnderlyingSystemType
public override string __Name
{
get { return typeBuilder.UnderlyingSystemType; }
get { return typeBuilder.__Name; }
}
public override string __Namespace
{
get { return typeBuilder.__Namespace; }
}
public override string Name
{
get { return typeBuilder.Name; }
}
public override string FullName
{
get { return typeBuilder.FullName; }
}
public override Type BaseType
+4 -16
View File
@@ -166,33 +166,21 @@ namespace IKVM.Reflection.Emit
{
return 0;
}
if (x.tryOffset >= y.handlerOffset && x.tryOffset + x.tryLength <= y.handlerOffset + y.handlerLength)
{
return -1;
}
if (y.tryOffset >= x.handlerOffset && y.tryOffset + y.tryLength <= x.handlerOffset + x.handlerLength)
{
return 1;
}
if (x.tryOffset == y.tryOffset && x.tryLength == y.tryLength)
else if (x.tryOffset == y.tryOffset && x.tryLength == y.tryLength)
{
return x.ordinal < y.ordinal ? -1 : 1;
}
if (x.tryOffset + x.tryLength <= y.tryOffset)
else if (x.tryOffset >= y.tryOffset && x.handlerOffset + x.handlerLength <= y.handlerOffset + y.handlerLength)
{
return -1;
}
if (y.tryOffset + y.tryLength <= x.tryOffset)
else if (y.tryOffset >= x.tryOffset && y.handlerOffset + y.handlerLength <= x.handlerOffset + x.handlerLength)
{
return 1;
}
if (x.tryOffset > y.tryOffset || (x.tryOffset == y.tryOffset && x.tryLength < y.tryLength))
{
return -1;
}
else
{
return 1;
return x.ordinal < y.ordinal ? -1 : 1;
}
}
}
+27 -29
View File
@@ -1,5 +1,5 @@
/*
Copyright (C) 2008-2010 Jeroen Frijters
Copyright (C) 2008-2011 Jeroen Frijters
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -37,8 +37,8 @@ namespace IKVM.Reflection.Emit
{
private readonly TypeBuilder typeBuilder;
private readonly string name;
private readonly int nameIndex;
private readonly int pseudoToken;
private int nameIndex;
private int signature;
private Type returnType;
private Type[] parameterTypes;
@@ -46,7 +46,7 @@ namespace IKVM.Reflection.Emit
private MethodAttributes attributes;
private MethodImplAttributes implFlags;
private ILGenerator ilgen;
private int rva;
private int rva = -1;
private readonly CallingConventions callingConvention;
private List<ParameterBuilder> parameters;
private GenericTypeParameterBuilder[] gtpb;
@@ -59,9 +59,6 @@ namespace IKVM.Reflection.Emit
this.typeBuilder = typeBuilder;
this.name = name;
this.pseudoToken = typeBuilder.ModuleBuilder.AllocPseudoToken();
// because all the MethodBuilders constitute a virtual MethodDef table, we cannot allocate the string during WriteMethodDefRecord,
// since by then the metadata has already been frozen
this.nameIndex = typeBuilder.ModuleBuilder.Strings.Add(name);
this.attributes = attributes;
if ((attributes & MethodAttributes.Static) == 0)
{
@@ -77,6 +74,10 @@ namespace IKVM.Reflection.Emit
public ILGenerator GetILGenerator(int streamSize)
{
if (rva != -1)
{
throw new InvalidOperationException();
}
if (ilgen == null)
{
ilgen = new ILGenerator(typeBuilder.ModuleBuilder, streamSize);
@@ -84,6 +85,23 @@ namespace IKVM.Reflection.Emit
return ilgen;
}
public void __ReleaseILGenerator()
{
if (ilgen != null)
{
if (this.ModuleBuilder.symbolWriter != null)
{
this.ModuleBuilder.symbolWriter.OpenMethod(new SymbolToken(-pseudoToken | 0x06000000));
}
rva = ilgen.WriteBody(initLocals);
if (this.ModuleBuilder.symbolWriter != null)
{
this.ModuleBuilder.symbolWriter.CloseMethod();
}
ilgen = null;
}
}
public void SetCustomAttribute(ConstructorInfo con, byte[] binaryAttribute)
{
SetCustomAttribute(new CustomAttributeBuilder(con, binaryAttribute));
@@ -125,7 +143,6 @@ namespace IKVM.Reflection.Emit
const short BestFitOff = 0x0020;
const short CharMapErrorOn = 0x1000;
const short CharMapErrorOff = 0x2000;
int name = this.nameIndex;
short flags = CharSetNotSpec | CallConvWinapi;
if (bestFitMapping.HasValue)
{
@@ -174,10 +191,6 @@ namespace IKVM.Reflection.Emit
break;
}
}
if (entryName != null)
{
name = this.ModuleBuilder.Strings.Add(entryName);
}
if (exactSpelling.HasValue && exactSpelling.Value)
{
flags |= NoMangle;
@@ -193,7 +206,7 @@ namespace IKVM.Reflection.Emit
ImplMapTable.Record rec = new ImplMapTable.Record();
rec.MappingFlags = flags;
rec.MemberForwarded = pseudoToken;
rec.ImportName = name;
rec.ImportName = this.ModuleBuilder.Strings.Add(entryName ?? name);
rec.ImportScope = this.ModuleBuilder.ModuleRef.FindOrAddRecord(dllName == null ? 0 : this.ModuleBuilder.Strings.Add(dllName));
this.ModuleBuilder.ImplMap.AddRecord(rec);
}
@@ -582,25 +595,10 @@ namespace IKVM.Reflection.Emit
internal void Bake()
{
this.nameIndex = this.ModuleBuilder.Strings.Add(name);
this.signature = this.ModuleBuilder.GetSignatureBlobIndex(this.MethodSignature);
if (ilgen != null)
{
if (this.ModuleBuilder.symbolWriter != null)
{
this.ModuleBuilder.symbolWriter.OpenMethod(new SymbolToken(-pseudoToken | 0x06000000));
}
rva = ilgen.WriteBody(initLocals);
if (this.ModuleBuilder.symbolWriter != null)
{
this.ModuleBuilder.symbolWriter.CloseMethod();
}
ilgen = null;
}
else
{
rva = -1;
}
__ReleaseILGenerator();
if (declarativeSecurity != null)
{
+60 -47
View File
@@ -1,5 +1,5 @@
/*
Copyright (C) 2008-2010 Jeroen Frijters
Copyright (C) 2008-2011 Jeroen Frijters
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -48,7 +48,6 @@ namespace IKVM.Reflection.Emit
private readonly List<TypeBuilder> types = new List<TypeBuilder>();
private readonly Dictionary<Type, int> typeTokens = new Dictionary<Type, int>();
private readonly Dictionary<Type, int> memberRefTypeTokens = new Dictionary<Type, int>();
private readonly Dictionary<string, TypeBuilder> fullNameToType = new Dictionary<string, TypeBuilder>();
internal readonly ByteBuffer methodBodies = new ByteBuffer(128 * 1024);
internal readonly List<int> tokenFixupOffsets = new List<int>();
internal readonly ByteBuffer initializedData = new ByteBuffer(512);
@@ -109,7 +108,7 @@ namespace IKVM.Reflection.Emit
symbolWriter = SymbolSupport.CreateSymbolWriterFor(this);
}
// <Module> must be the first record in the TypeDef table
moduleType = new TypeBuilder(this, "<Module>", null, 0);
moduleType = new TypeBuilder(this, null, "<Module>");
types.Add(moduleType);
}
@@ -201,44 +200,34 @@ namespace IKVM.Reflection.Emit
public TypeBuilder DefineType(string name, TypeAttributes attr, Type parent, PackingSize packingSize, int typesize)
{
if (parent == null && (attr & TypeAttributes.Interface) == 0)
string ns = null;
int lastdot = name.LastIndexOf('.');
if (lastdot > 0)
{
parent = universe.System_Object;
ns = name.Substring(0, lastdot);
name = name.Substring(lastdot + 1);
}
TypeBuilder typeBuilder = new TypeBuilder(this, name, parent, attr);
PostDefineType(typeBuilder, packingSize, typesize);
TypeBuilder typeBuilder = __DefineType(ns, name);
typeBuilder.__SetAttributes(attr);
typeBuilder.SetParent(parent);
SetPackingSizeAndTypeSize(typeBuilder, packingSize, typesize);
return typeBuilder;
}
public EnumBuilder DefineEnum(string name, TypeAttributes visibility, Type underlyingType)
public TypeBuilder __DefineType(string ns, string name)
{
TypeBuilder tb = DefineType(name, (visibility & TypeAttributes.VisibilityMask) | TypeAttributes.Sealed, universe.System_Enum);
FieldBuilder fb = tb.DefineField("value__", underlyingType, FieldAttributes.Public | FieldAttributes.SpecialName | FieldAttributes.RTSpecialName);
return new EnumBuilder(tb, fb);
return DefineType(this, ns, name);
}
internal TypeBuilder DefineNestedTypeHelper(TypeBuilder enclosingType, string name, TypeAttributes attr, Type parent, PackingSize packingSize, int typesize)
{
if (parent == null && (attr & TypeAttributes.Interface) == 0)
{
parent = universe.System_Object;
}
TypeBuilder typeBuilder = new TypeBuilder(enclosingType, name, parent, attr);
PostDefineType(typeBuilder, packingSize, typesize);
if (enclosingType != null)
{
NestedClassTable.Record rec = new NestedClassTable.Record();
rec.NestedClass = typeBuilder.MetadataToken;
rec.EnclosingClass = enclosingType.MetadataToken;
this.NestedClass.AddRecord(rec);
}
return typeBuilder;
}
private void PostDefineType(TypeBuilder typeBuilder, PackingSize packingSize, int typesize)
internal TypeBuilder DefineType(ITypeOwner owner, string ns, string name)
{
TypeBuilder typeBuilder = new TypeBuilder(owner, ns, name);
types.Add(typeBuilder);
fullNameToType.Add(typeBuilder.FullName, typeBuilder);
return typeBuilder;
}
internal void SetPackingSizeAndTypeSize(TypeBuilder typeBuilder, PackingSize packingSize, int typesize)
{
if (packingSize != PackingSize.Unspecified || typesize != 0)
{
ClassLayoutTable.Record rec = new ClassLayoutTable.Record();
@@ -249,6 +238,13 @@ namespace IKVM.Reflection.Emit
}
}
public EnumBuilder DefineEnum(string name, TypeAttributes visibility, Type underlyingType)
{
TypeBuilder tb = DefineType(name, (visibility & TypeAttributes.VisibilityMask) | TypeAttributes.Sealed, universe.System_Enum);
FieldBuilder fb = tb.DefineField("value__", underlyingType, FieldAttributes.Public | FieldAttributes.SpecialName | FieldAttributes.RTSpecialName);
return new EnumBuilder(tb, fb);
}
public FieldBuilder __DefineField(string name, Type type, Type[] requiredCustomModifiers, Type[] optionalCustomModifiers, FieldAttributes attributes)
{
return moduleType.DefineField(name, type, requiredCustomModifiers, optionalCustomModifiers, attributes);
@@ -314,7 +310,7 @@ namespace IKVM.Reflection.Emit
{
ExportedTypeTable.Record rec = new ExportedTypeTable.Record();
rec.TypeDefId = type.MetadataToken;
rec.TypeName = this.Strings.Add(TypeNameParser.Unescape(type.Name));
rec.TypeName = this.Strings.Add(type.__Name);
if (type.IsNested)
{
rec.Flags = 0;
@@ -324,8 +320,8 @@ namespace IKVM.Reflection.Emit
else
{
rec.Flags = 0x00200000; // CorTypeAttr.tdForwarder
string ns = type.Namespace;
rec.TypeNamespace = ns == null ? 0 : this.Strings.Add(TypeNameParser.Unescape(ns));
string ns = type.__Namespace;
rec.TypeNamespace = ns == null ? 0 : this.Strings.Add(ns);
rec.Implementation = ImportAssemblyRef(type.Assembly);
}
return 0x27000000 | this.ExportedType.FindOrAddRecord(rec);
@@ -432,11 +428,16 @@ namespace IKVM.Reflection.Emit
get { return asm; }
}
internal override Type GetTypeImpl(string typeName)
internal override Type FindType(TypeName name)
{
TypeBuilder type;
fullNameToType.TryGetValue(typeName, out type);
return type;
foreach (Type type in types)
{
if (type.__Namespace == name.Namespace && type.__Name == name.Name)
{
return type;
}
}
return null;
}
internal override void GetTypesImpl(List<Type> list)
@@ -617,16 +618,14 @@ namespace IKVM.Reflection.Emit
if (type.IsNested)
{
rec.ResolutionScope = GetTypeToken(type.DeclaringType).Token;
rec.TypeName = this.Strings.Add(TypeNameParser.Unescape(type.Name));
rec.TypeNameSpace = 0;
}
else
{
rec.ResolutionScope = ImportAssemblyRef(type.Assembly);
rec.TypeName = this.Strings.Add(TypeNameParser.Unescape(type.Name));
string ns = type.Namespace;
rec.TypeNameSpace = ns == null ? 0 : this.Strings.Add(TypeNameParser.Unescape(ns));
}
rec.TypeName = this.Strings.Add(type.__Name);
string ns = type.__Namespace;
rec.TypeNameSpace = ns == null ? 0 : this.Strings.Add(ns);
token = 0x01000000 | this.TypeRef.AddRecord(rec);
}
typeTokens.Add(type, token);
@@ -890,9 +889,9 @@ namespace IKVM.Reflection.Emit
ExportedTypeTable.Record rec = new ExportedTypeTable.Record();
rec.Flags = (int)type.Attributes;
rec.TypeDefId = type.MetadataToken & 0xFFFFFF;
rec.TypeName = this.Strings.Add(TypeNameParser.Unescape(type.Name));
string ns = type.Namespace;
rec.TypeNamespace = ns == null ? 0 : this.Strings.Add(TypeNameParser.Unescape(ns));
rec.TypeName = this.Strings.Add(type.__Name);
string ns = type.__Namespace;
rec.TypeNamespace = ns == null ? 0 : this.Strings.Add(ns);
if (type.IsNested)
{
rec.Implementation = declaringTypes[type.DeclaringType];
@@ -1186,6 +1185,20 @@ namespace IKVM.Reflection.Emit
}
public void __Save(PortableExecutableKinds portableExecutableKind, ImageFileMachine imageFileMachine)
{
SaveImpl(null, portableExecutableKind, imageFileMachine);
}
public void __Save(Stream stream, PortableExecutableKinds portableExecutableKind, ImageFileMachine imageFileMachine)
{
if (!stream.CanRead || !stream.CanWrite || !stream.CanSeek || stream.Position != 0)
{
throw new ArgumentException("Stream must support read/write/seek and current position must be zero.", "stream");
}
SaveImpl(stream, portableExecutableKind, imageFileMachine);
}
private void SaveImpl(Stream streamOrNull, PortableExecutableKinds portableExecutableKind, ImageFileMachine imageFileMachine)
{
PopulatePropertyAndEventTables();
IList<CustomAttributeData> attributes = asm.GetCustomAttributesData(null);
@@ -1225,7 +1238,7 @@ namespace IKVM.Reflection.Emit
}
}
FillAssemblyRefTable();
ModuleWriter.WriteModule(null, null, this, PEFileKinds.Dll, portableExecutableKind, imageFileMachine, unmanagedResources, 0);
ModuleWriter.WriteModule(null, null, this, PEFileKinds.Dll, portableExecutableKind, imageFileMachine, unmanagedResources, 0, streamOrNull);
}
public void __AddAssemblyReference(AssemblyName assemblyName)
+1 -1
View File
@@ -25,7 +25,7 @@ using System;
namespace IKVM.Reflection.Emit
{
public class OpCodes
public sealed class OpCodes
{
public static readonly OpCode Nop = new OpCode(4888);
public static readonly OpCode Break = new OpCode(4199116);
+108 -88
View File
@@ -1,5 +1,5 @@
/*
Copyright (C) 2008-2010 Jeroen Frijters
Copyright (C) 2008-2011 Jeroen Frijters
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -86,11 +86,6 @@ namespace IKVM.Reflection.Emit
get { return DeclaringType.Namespace; }
}
public override Type UnderlyingSystemType
{
get { return this; }
}
public override string Name
{
get { return name; }
@@ -226,10 +221,11 @@ namespace IKVM.Reflection.Emit
private readonly ITypeOwner owner;
private readonly int token;
private int extends;
private Type baseType;
private Type lazyBaseType; // (lazyBaseType == null && attribs & TypeAttributes.Interface) == 0) => BaseType == System.Object
private readonly int typeName;
private readonly int typeNameSpace;
private readonly string nameOrFullName;
private readonly string ns;
private readonly string name;
private readonly List<MethodBuilder> methods = new List<MethodBuilder>();
private readonly List<FieldBuilder> fields = new List<FieldBuilder>();
private List<PropertyBuilder> properties;
@@ -248,22 +244,13 @@ namespace IKVM.Reflection.Emit
Baked = 4,
}
internal TypeBuilder(ITypeOwner owner, string name, Type baseType, TypeAttributes attribs)
internal TypeBuilder(ITypeOwner owner, string ns, string name)
{
this.owner = owner;
this.token = this.ModuleBuilder.TypeDef.AllocToken();
this.nameOrFullName = TypeNameParser.Escape(name);
SetParent(baseType);
this.attribs = attribs;
if (!this.IsNested)
{
int lastdot = name.LastIndexOf('.');
if (lastdot > 0)
{
this.typeNameSpace = this.ModuleBuilder.Strings.Add(name.Substring(0, lastdot));
name = name.Substring(lastdot + 1);
}
}
this.ns = ns;
this.name = name;
this.typeNameSpace = ns == null ? 0 : this.ModuleBuilder.Strings.Add(ns);
this.typeName = this.ModuleBuilder.Strings.Add(name);
}
@@ -272,7 +259,7 @@ namespace IKVM.Reflection.Emit
ConstructorBuilder cb = DefineConstructor(attributes, CallingConventions.Standard, Type.EmptyTypes);
ILGenerator ilgen = cb.GetILGenerator();
ilgen.Emit(OpCodes.Ldarg_0);
ilgen.Emit(OpCodes.Call, baseType.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, Type.EmptyTypes, null));
ilgen.Emit(OpCodes.Call, BaseType.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, Type.EmptyTypes, null));
ilgen.Emit(OpCodes.Ret);
return cb;
}
@@ -442,25 +429,49 @@ namespace IKVM.Reflection.Emit
public TypeBuilder DefineNestedType(string name, TypeAttributes attr, Type parent)
{
this.typeFlags |= TypeFlags.HasNestedTypes;
return this.ModuleBuilder.DefineNestedTypeHelper(this, name, attr, parent, PackingSize.Unspecified, 0);
return DefineNestedType(name, attr, parent, 0);
}
public TypeBuilder DefineNestedType(string name, TypeAttributes attr, Type parent, int typeSize)
{
this.typeFlags |= TypeFlags.HasNestedTypes;
return this.ModuleBuilder.DefineNestedTypeHelper(this, name, attr, parent, PackingSize.Unspecified, typeSize);
return DefineNestedType(name, attr, parent, PackingSize.Unspecified, typeSize);
}
public TypeBuilder DefineNestedType(string name, TypeAttributes attr, Type parent, PackingSize packSize)
{
return DefineNestedType(name, attr, parent, packSize, 0);
}
private TypeBuilder DefineNestedType(string name, TypeAttributes attr, Type parent, PackingSize packSize, int typeSize)
{
string ns = null;
int lastdot = name.LastIndexOf('.');
if (lastdot > 0)
{
ns = name.Substring(0, lastdot);
name = name.Substring(lastdot + 1);
}
TypeBuilder typeBuilder = __DefineNestedType(ns, name);
typeBuilder.__SetAttributes(attr);
typeBuilder.SetParent(parent);
this.ModuleBuilder.SetPackingSizeAndTypeSize(typeBuilder, PackingSize.Unspecified, typeSize);
return typeBuilder;
}
public TypeBuilder __DefineNestedType(string ns, string name)
{
this.typeFlags |= TypeFlags.HasNestedTypes;
return this.ModuleBuilder.DefineNestedTypeHelper(this, name, attr, parent, packSize, 0);
TypeBuilder typeBuilder = this.ModuleBuilder.DefineType(this, ns, name);
NestedClassTable.Record rec = new NestedClassTable.Record();
rec.NestedClass = typeBuilder.MetadataToken;
rec.EnclosingClass = this.MetadataToken;
this.ModuleBuilder.NestedClass.AddRecord(rec);
return typeBuilder;
}
public void SetParent(Type parent)
{
baseType = parent;
lazyBaseType = parent;
}
public void AddInterfaceImplementation(Type interfaceType)
@@ -662,6 +673,7 @@ namespace IKVM.Reflection.Emit
{
this.ModuleBuilder.AddDeclarativeSecurity(token, declarativeSecurity);
}
Type baseType = this.BaseType;
if (baseType != null)
{
extends = this.ModuleBuilder.GetTypeToken(baseType).Token;
@@ -707,7 +719,18 @@ namespace IKVM.Reflection.Emit
public override Type BaseType
{
get { return baseType; }
get
{
if (lazyBaseType == null && !IsInterface)
{
Type obj = Module.universe.System_Object;
if (this != obj)
{
lazyBaseType = obj;
}
}
return lazyBaseType;
}
}
public override string FullName
@@ -716,28 +739,33 @@ namespace IKVM.Reflection.Emit
{
if (this.IsNested)
{
return this.DeclaringType.FullName + "+" + nameOrFullName;
return this.DeclaringType.FullName + "+" + TypeNameParser.Escape(name);
}
if (ns == null)
{
return TypeNameParser.Escape(name);
}
else
{
return nameOrFullName;
return TypeNameParser.Escape(ns) + "." + TypeNameParser.Escape(name);
}
}
}
public override string __Name
{
get { return name; }
}
public override string __Namespace
{
get { return ns; }
}
public override string Name
{
get
{
if (this.IsNested)
{
return nameOrFullName;
}
else
{
return base.Name;
}
}
// FXBUG for a TypeBuilder the name is not escaped
get { return name; }
}
public override string Namespace
@@ -745,17 +773,11 @@ namespace IKVM.Reflection.Emit
get
{
// for some reason, TypeBuilder doesn't return null (and mcs depends on this)
return base.Namespace ?? "";
// note also that we don't return the declaring type namespace for nested types
return ns ?? "";
}
}
internal string GetBakedNamespace()
{
// if you refer to the TypeBuilder via its baked Type, Namespace will return null
// for the empty namespace (instead of "" like TypeBuilder.Namespace above does)
return base.Namespace;
}
public override TypeAttributes Attributes
{
get { return attribs; }
@@ -1022,142 +1044,140 @@ namespace IKVM.Reflection.Emit
sealed class BakedType : Type
{
private readonly TypeBuilder typeBuilder;
internal BakedType(TypeBuilder typeBuilder)
: base(typeBuilder)
{
this.typeBuilder = typeBuilder;
}
public override string AssemblyQualifiedName
{
get { return typeBuilder.AssemblyQualifiedName; }
get { return underlyingType.AssemblyQualifiedName; }
}
public override Type BaseType
{
get { return typeBuilder.BaseType; }
get { return underlyingType.BaseType; }
}
public override string __Name
{
get { return underlyingType.__Name; }
}
public override string __Namespace
{
get { return underlyingType.__Namespace; }
}
public override string Name
{
get { return typeBuilder.Name; }
}
public override string Namespace
{
get { return typeBuilder.GetBakedNamespace(); }
// we need to escape here, because TypeBuilder.Name does not escape
get { return TypeNameParser.Escape(underlyingType.__Name); }
}
public override string FullName
{
get { return typeBuilder.FullName; }
get { return GetFullName(); }
}
public override TypeAttributes Attributes
{
get { return typeBuilder.Attributes; }
get { return underlyingType.Attributes; }
}
public override Type[] __GetDeclaredInterfaces()
{
return typeBuilder.__GetDeclaredInterfaces();
return underlyingType.__GetDeclaredInterfaces();
}
public override MethodBase[] __GetDeclaredMethods()
{
return typeBuilder.__GetDeclaredMethods();
return underlyingType.__GetDeclaredMethods();
}
public override __MethodImplMap __GetMethodImplMap()
{
return typeBuilder.__GetMethodImplMap();
return underlyingType.__GetMethodImplMap();
}
public override FieldInfo[] __GetDeclaredFields()
{
return typeBuilder.__GetDeclaredFields();
return underlyingType.__GetDeclaredFields();
}
public override EventInfo[] __GetDeclaredEvents()
{
return typeBuilder.__GetDeclaredEvents();
return underlyingType.__GetDeclaredEvents();
}
public override PropertyInfo[] __GetDeclaredProperties()
{
return typeBuilder.__GetDeclaredProperties();
return underlyingType.__GetDeclaredProperties();
}
public override Type[] __GetDeclaredTypes()
{
return typeBuilder.__GetDeclaredTypes();
return underlyingType.__GetDeclaredTypes();
}
public override Type DeclaringType
{
get { return typeBuilder.DeclaringType; }
get { return underlyingType.DeclaringType; }
}
public override StructLayoutAttribute StructLayoutAttribute
{
get { return typeBuilder.StructLayoutAttribute; }
}
public override Type UnderlyingSystemType
{
// Type.Equals/GetHashCode relies on this
get { return typeBuilder; }
get { return underlyingType.StructLayoutAttribute; }
}
public override Type[] GetGenericArguments()
{
return typeBuilder.GetGenericArguments();
return underlyingType.GetGenericArguments();
}
internal override Type GetGenericTypeArgument(int index)
{
return typeBuilder.GetGenericTypeArgument(index);
return underlyingType.GetGenericTypeArgument(index);
}
public override Type[][] __GetGenericArgumentsOptionalCustomModifiers()
{
return typeBuilder.__GetGenericArgumentsOptionalCustomModifiers();
return underlyingType.__GetGenericArgumentsOptionalCustomModifiers();
}
public override Type[][] __GetGenericArgumentsRequiredCustomModifiers()
{
return typeBuilder.__GetGenericArgumentsRequiredCustomModifiers();
return underlyingType.__GetGenericArgumentsRequiredCustomModifiers();
}
public override bool IsGenericType
{
get { return typeBuilder.IsGenericType; }
get { return underlyingType.IsGenericType; }
}
public override bool IsGenericTypeDefinition
{
get { return typeBuilder.IsGenericTypeDefinition; }
get { return underlyingType.IsGenericTypeDefinition; }
}
public override bool ContainsGenericParameters
{
get { return typeBuilder.ContainsGenericParameters; }
get { return underlyingType.ContainsGenericParameters; }
}
public override int MetadataToken
{
get { return typeBuilder.MetadataToken; }
get { return underlyingType.MetadataToken; }
}
public override Module Module
{
get { return typeBuilder.Module; }
get { return underlyingType.Module; }
}
internal override int GetModuleBuilderToken()
{
return typeBuilder.GetModuleBuilderToken();
return underlyingType.GetModuleBuilderToken();
}
}
}
+5
View File
@@ -26,6 +26,11 @@ namespace IKVM.Reflection
{
public abstract class EventInfo : MemberInfo
{
// prevent external subclasses
internal EventInfo()
{
}
public sealed override MemberTypes MemberType
{
get { return MemberTypes.Event; }
+5
View File
@@ -27,6 +27,11 @@ namespace IKVM.Reflection
{
public abstract class FieldInfo : MemberInfo
{
// prevent external subclasses
internal FieldInfo()
{
}
public sealed override MemberTypes MemberType
{
get { return MemberTypes.Field; }
+92 -5
View File
@@ -1,5 +1,6 @@
/*
Copyright (C) 2010 Jeroen Frijters
Copyright (C) 2011 Marek Safar
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -38,15 +39,27 @@ namespace IKVM.Reflection
static class Fusion
{
private static readonly bool UseNativeFusion = Environment.OSVersion.Platform == PlatformID.Win32NT && System.Type.GetType("Mono.Runtime") == null && Environment.GetEnvironmentVariable("IKVM_DISABLE_FUSION") == null;
private static readonly bool UseNativeFusion = GetUseNativeFusion();
private static bool GetUseNativeFusion()
{
try
{
return Environment.OSVersion.Platform == PlatformID.Win32NT
&& System.Type.GetType("Mono.Runtime") == null
&& Environment.GetEnvironmentVariable("IKVM_DISABLE_FUSION") == null;
}
catch (System.Security.SecurityException)
{
return false;
}
}
internal static bool CompareAssemblyIdentity(string assemblyIdentity1, bool unified1, string assemblyIdentity2, bool unified2, out AssemblyComparisonResult result)
{
if (UseNativeFusion)
{
bool equivalent;
Marshal.ThrowExceptionForHR(CompareAssemblyIdentity(assemblyIdentity1, unified1, assemblyIdentity2, unified2, out equivalent, out result));
return equivalent;
return CompareAssemblyIdentityNative(assemblyIdentity1, unified1, assemblyIdentity2, unified2, out result);
}
else
{
@@ -54,10 +67,18 @@ namespace IKVM.Reflection
}
}
private static bool CompareAssemblyIdentityNative(string assemblyIdentity1, bool unified1, string assemblyIdentity2, bool unified2, out AssemblyComparisonResult result)
{
bool equivalent;
Marshal.ThrowExceptionForHR(CompareAssemblyIdentity(assemblyIdentity1, unified1, assemblyIdentity2, unified2, out equivalent, out result));
return equivalent;
}
[DllImport("fusion", CharSet = CharSet.Unicode)]
private static extern int CompareAssemblyIdentity(string pwzAssemblyIdentity1, bool fUnified1, string pwzAssemblyIdentity2, bool fUnified2, out bool pfEquivalent, out AssemblyComparisonResult pResult);
private static bool CompareAssemblyIdentityPure(string assemblyIdentity1, bool unified1, string assemblyIdentity2, bool unified2, out AssemblyComparisonResult result)
// internal for use by mcs
internal static bool CompareAssemblyIdentityPure(string assemblyIdentity1, bool unified1, string assemblyIdentity2, bool unified2, out AssemblyComparisonResult result)
{
ParsedAssemblyName name1;
ParsedAssemblyName name2;
@@ -109,6 +130,11 @@ namespace IKVM.Reflection
result = AssemblyComparisonResult.EquivalentPartialMatch;
return true;
}
else if (IsFrameworkAssembly(name2))
{
result = partial ? AssemblyComparisonResult.EquivalentPartialFXUnified : AssemblyComparisonResult.EquivalentFXUnified;
return true;
}
else if (name1.Version < name2.Version)
{
if (unified2)
@@ -141,6 +167,11 @@ namespace IKVM.Reflection
return true;
}
}
else if (IsStrongNamed(name1))
{
result = AssemblyComparisonResult.NonEquivalent;
return false;
}
else
{
result = partial ? AssemblyComparisonResult.EquivalentPartialWeakNamed : AssemblyComparisonResult.EquivalentWeakNamed;
@@ -148,6 +179,62 @@ namespace IKVM.Reflection
}
}
static bool IsFrameworkAssembly(ParsedAssemblyName name)
{
// A list of FX assemblies which require some form of remapping
// When 4.0 + 1 version is release, assemblies introduced in v4.0
// will have to be added
switch (name.Name)
{
case "System":
case "System.Core":
case "System.Data":
case "System.Data.DataSetExtensions":
case "System.Data.Linq":
case "System.Data.OracleClient":
case "System.Data.Services":
case "System.Data.Services.Client":
case "System.IdentityModel":
case "System.IdentityModel.Selectors":
case "System.Runtime.Remoting":
case "System.Runtime.Serialization":
case "System.ServiceModel":
case "System.Transactions":
case "System.Windows.Forms":
case "System.Xml":
case "System.Xml.Linq":
return name.PublicKeyToken == "b77a5c561934e089";
case "System.Configuration":
case "System.Configuration.Install":
case "System.Design":
case "System.DirectoryServices":
case "System.Drawing":
case "System.Drawing.Design":
case "System.EnterpriseServices":
case "System.Management":
case "System.Messaging":
case "System.Runtime.Serialization.Formatters.Soap":
case "System.Security":
case "System.ServiceProcess":
case "System.Web":
case "System.Web.Mobile":
case "System.Web.Services":
return name.PublicKeyToken == "b03f5f7f11d50a3a";
case "System.ComponentModel.DataAnnotations":
case "System.ServiceModel.Web":
case "System.Web.Abstractions":
case "System.Web.Extensions":
case "System.Web.Extensions.Design":
case "System.Web.DynamicData":
case "System.Web.Routing":
return name.PublicKeyToken == "31bf3856ad364e35";
}
return false;
}
// note that this is the fusion specific parser, it is not the same as System.Reflection.AssemblyName
private static bool ParseAssemblyName(string fullName, out ParsedAssemblyName parsedName)
{
@@ -93,6 +93,7 @@
<Compile Include="MethodImplMap.cs" />
<Compile Include="MethodInfo.cs" />
<Compile Include="MethodSignature.cs" />
<Compile Include="Missing.cs" />
<Compile Include="Module.cs" />
<Compile Include="ParameterInfo.cs" />
<Compile Include="ParameterModifier.cs" />
@@ -25,7 +25,7 @@ using System;
namespace IKVM.Reflection
{
public class LocalVariableInfo
public sealed class LocalVariableInfo
{
private readonly int index;
private readonly Type type;
@@ -38,17 +38,17 @@ namespace IKVM.Reflection
this.pinned = pinned;
}
public virtual bool IsPinned
public bool IsPinned
{
get { return pinned; }
}
public virtual int LocalIndex
public int LocalIndex
{
get { return index; }
}
public virtual Type LocalType
public Type LocalType
{
get { return type; }
}
@@ -27,7 +27,7 @@ using IKVM.Reflection.Metadata;
namespace IKVM.Reflection
{
public class ManifestResourceInfo
public sealed class ManifestResourceInfo
{
private readonly ModuleReader module;
private readonly int index;
+10
View File
@@ -33,6 +33,11 @@ namespace IKVM.Reflection
#pragma warning disable 660, 661
public abstract class MemberInfo : ICustomAttributeProvider
{
// prevent external subclasses
internal MemberInfo()
{
}
public abstract string Name { get; }
public abstract Type DeclaringType { get; }
public abstract MemberTypes MemberType { get; }
@@ -47,6 +52,11 @@ namespace IKVM.Reflection
get;
}
public virtual bool __IsMissing
{
get { return false; }
}
public bool IsDefined(Type attributeType, bool inherit)
{
return CustomAttributeData.__GetCustomAttributes(this, attributeType, inherit).Count != 0;
+5
View File
@@ -27,6 +27,11 @@ namespace IKVM.Reflection
{
public abstract class MethodBase : MemberInfo
{
// prevent external subclasses
internal MethodBase()
{
}
internal abstract MethodSignature MethodSignature { get; }
internal abstract int ParameterCount { get; }
public abstract ParameterInfo[] GetParameters();
+5
View File
@@ -28,6 +28,11 @@ namespace IKVM.Reflection
{
public abstract class MethodInfo : MethodBase, IGenericContext, IGenericBinder
{
// prevent external subclasses
internal MethodInfo()
{
}
public sealed override MemberTypes MemberType
{
get { return MemberTypes.Method; }
@@ -257,6 +257,11 @@ namespace IKVM.Reflection
get { return callingConvention; }
}
internal int GenericParameterCount
{
get { return genericParamCount; }
}
private sealed class Binder : IGenericBinder
{
private readonly Type declaringType;
+783
View File
@@ -0,0 +1,783 @@
/*
Copyright (C) 2011 Jeroen Frijters
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
Jeroen Frijters
[email protected]
*/
using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
namespace IKVM.Reflection
{
[Serializable]
public sealed class MissingAssemblyException : InvalidOperationException
{
[NonSerialized]
private readonly MissingAssembly assembly;
internal MissingAssemblyException(MissingAssembly assembly)
: base("Assembly '" + assembly.FullName + "' is a missing assembly and does not support the requested operation.")
{
this.assembly = assembly;
}
private MissingAssemblyException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context)
: base(info, context)
{
}
public Assembly Assembly
{
get { return assembly; }
}
}
[Serializable]
public sealed class MissingModuleException : InvalidOperationException
{
[NonSerialized]
private readonly MissingModule module;
internal MissingModuleException(MissingModule module)
: base("Module from missing assembly '" + module.Assembly.FullName + "' does not support the requested operation.")
{
this.module = module;
}
private MissingModuleException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context)
: base(info, context)
{
}
public Module Module
{
get { return module; }
}
}
[Serializable]
public sealed class MissingMemberException : InvalidOperationException
{
[NonSerialized]
private readonly MemberInfo member;
internal MissingMemberException(MemberInfo member)
: base("Member '" + member + "' is a missing member and does not support the requested operation.")
{
this.member = member;
}
private MissingMemberException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context)
: base(info, context)
{
}
public MemberInfo MemberInfo
{
get { return member; }
}
}
sealed class MissingAssembly : Assembly
{
private readonly MissingModule module;
private readonly string name;
internal MissingAssembly(Universe universe, string name)
: base(universe)
{
module = new MissingModule(this);
this.name = name;
}
public override Type[] GetTypes()
{
throw new MissingAssemblyException(this);
}
public override string FullName
{
get { return name; }
}
public override AssemblyName GetName()
{
return new AssemblyName(name);
}
public override string ImageRuntimeVersion
{
get { throw new MissingAssemblyException(this); }
}
public override Module ManifestModule
{
get { return module; }
}
public override MethodInfo EntryPoint
{
get { throw new MissingAssemblyException(this); }
}
public override string Location
{
get { throw new MissingAssemblyException(this); }
}
public override AssemblyName[] GetReferencedAssemblies()
{
throw new MissingAssemblyException(this);
}
public override Module[] GetModules(bool getResourceModules)
{
throw new MissingAssemblyException(this);
}
public override Module[] GetLoadedModules(bool getResourceModules)
{
throw new MissingAssemblyException(this);
}
public override Module GetModule(string name)
{
throw new MissingAssemblyException(this);
}
public override string[] GetManifestResourceNames()
{
throw new MissingAssemblyException(this);
}
public override ManifestResourceInfo GetManifestResourceInfo(string resourceName)
{
throw new MissingAssemblyException(this);
}
public override System.IO.Stream GetManifestResourceStream(string resourceName)
{
throw new MissingAssemblyException(this);
}
public override bool __IsMissing
{
get { return true; }
}
internal override Type FindType(TypeName typeName)
{
return null;
}
internal override IList<CustomAttributeData> GetCustomAttributesData(Type attributeType)
{
throw new MissingAssemblyException(this);
}
}
sealed class MissingModule : Module
{
private readonly MissingAssembly assembly;
internal MissingModule(MissingAssembly assembly)
: base(assembly.universe)
{
this.assembly = assembly;
}
public override int MDStreamVersion
{
get { throw new MissingModuleException(this); }
}
public override Assembly Assembly
{
get { return assembly; }
}
public override string FullyQualifiedName
{
get { throw new MissingModuleException(this); }
}
public override string Name
{
get { throw new MissingModuleException(this); }
}
public override Guid ModuleVersionId
{
get { throw new MissingModuleException(this); }
}
public override Type ResolveType(int metadataToken, Type[] genericTypeArguments, Type[] genericMethodArguments)
{
throw new MissingModuleException(this);
}
public override MethodBase ResolveMethod(int metadataToken, Type[] genericTypeArguments, Type[] genericMethodArguments)
{
throw new MissingModuleException(this);
}
public override FieldInfo ResolveField(int metadataToken, Type[] genericTypeArguments, Type[] genericMethodArguments)
{
throw new MissingModuleException(this);
}
public override MemberInfo ResolveMember(int metadataToken, Type[] genericTypeArguments, Type[] genericMethodArguments)
{
throw new MissingModuleException(this);
}
public override string ResolveString(int metadataToken)
{
throw new MissingModuleException(this);
}
public override Type[] __ResolveOptionalParameterTypes(int metadataToken)
{
throw new MissingModuleException(this);
}
public override string ScopeName
{
get { throw new MissingModuleException(this); }
}
internal override Type FindType(TypeName typeName)
{
return null;
}
internal override void GetTypesImpl(System.Collections.Generic.List<Type> list)
{
throw new MissingModuleException(this);
}
public override AssemblyName[] __GetReferencedAssemblies()
{
throw new MissingModuleException(this);
}
internal override Type GetModuleType()
{
throw new MissingModuleException(this);
}
internal override IKVM.Reflection.Reader.ByteReader GetBlob(int blobIndex)
{
throw new MissingModuleException(this);
}
public override void __GetDataDirectoryEntry(int index, out int rva, out int length)
{
throw new MissingModuleException(this);
}
public override IList<CustomAttributeData> __GetPlaceholderAssemblyCustomAttributes(bool multiple, bool security)
{
throw new MissingModuleException(this);
}
public override long __RelativeVirtualAddressToFileOffset(int rva)
{
throw new MissingModuleException(this);
}
public override __StandAloneMethodSig __ResolveStandAloneMethodSig(int metadataToken, Type[] genericTypeArguments, Type[] genericMethodArguments)
{
throw new MissingModuleException(this);
}
public override int __Subsystem
{
get { throw new MissingModuleException(this); }
}
internal override void ExportTypes(int fileToken, IKVM.Reflection.Emit.ModuleBuilder manifestModule)
{
throw new MissingModuleException(this);
}
public override void GetPEKind(out PortableExecutableKinds peKind, out ImageFileMachine machine)
{
throw new MissingModuleException(this);
}
public override bool __IsMissing
{
get { return true; }
}
internal override IList<CustomAttributeData> GetCustomAttributesData(Type attributeType)
{
throw new MissingModuleException(this);
}
}
sealed class MissingType : Type
{
private readonly Module module;
private readonly Type declaringType;
private readonly string ns;
private readonly string name;
internal MissingType(Module module, Type declaringType, string ns, string name)
{
this.module = module;
this.declaringType = declaringType;
this.ns = ns;
this.name = name;
}
internal override MethodBase FindMethod(string name, MethodSignature signature)
{
MethodInfo method = new MissingMethod(this, name, signature);
if (name == ".ctor")
{
return new ConstructorInfoImpl(method);
}
return method;
}
internal override Type FindNestedType(TypeName name)
{
return null;
}
public override bool __IsMissing
{
get { return true; }
}
public override Type DeclaringType
{
get { return declaringType; }
}
public override string __Name
{
get { return name; }
}
public override string __Namespace
{
get { return ns; }
}
public override string Name
{
get { return TypeNameParser.Escape(name); }
}
public override string FullName
{
get { return GetFullName(); }
}
public override Module Module
{
get { return module; }
}
public override Type BaseType
{
get { throw new MissingMemberException(this); }
}
public override TypeAttributes Attributes
{
get { throw new MissingMemberException(this); }
}
public override Type[] __GetDeclaredTypes()
{
throw new MissingMemberException(this);
}
public override Type[] __GetDeclaredInterfaces()
{
throw new MissingMemberException(this);
}
public override MethodBase[] __GetDeclaredMethods()
{
throw new MissingMemberException(this);
}
public override __MethodImplMap __GetMethodImplMap()
{
throw new MissingMemberException(this);
}
public override FieldInfo[] __GetDeclaredFields()
{
throw new MissingMemberException(this);
}
public override EventInfo[] __GetDeclaredEvents()
{
throw new MissingMemberException(this);
}
public override PropertyInfo[] __GetDeclaredProperties()
{
throw new MissingMemberException(this);
}
public override Type[] __GetRequiredCustomModifiers()
{
throw new MissingMemberException(this);
}
public override Type[] __GetOptionalCustomModifiers()
{
throw new MissingMemberException(this);
}
public override Type[] GetGenericArguments()
{
throw new MissingMemberException(this);
}
public override Type[][] __GetGenericArgumentsRequiredCustomModifiers()
{
throw new MissingMemberException(this);
}
public override Type[][] __GetGenericArgumentsOptionalCustomModifiers()
{
throw new MissingMemberException(this);
}
public override StructLayoutAttribute StructLayoutAttribute
{
get { throw new MissingMemberException(this); }
}
public override bool IsGenericType
{
get { throw new MissingMemberException(this); }
}
public override bool IsGenericTypeDefinition
{
get { throw new MissingMemberException(this); }
}
internal override IList<CustomAttributeData> GetCustomAttributesData(Type attributeType)
{
throw new MissingMemberException(this);
}
internal override Type BindTypeParameters(IGenericBinder binder)
{
return this;
}
}
sealed class MissingMethod : MethodInfo
{
private readonly Type declaringType;
private readonly string name;
private readonly MethodSignature signature;
private MethodInfo forwarder;
internal MissingMethod(Type declaringType, string name, MethodSignature signature)
{
this.declaringType = declaringType;
this.name = name;
this.signature = signature;
}
private MethodInfo Forwarder
{
get
{
MethodInfo method = TryGetForwarder();
if (method == null)
{
throw new MissingMemberException(this);
}
return method;
}
}
private MethodInfo TryGetForwarder()
{
if (forwarder == null && !declaringType.__IsMissing)
{
MethodBase mb = declaringType.FindMethod(name, signature);
ConstructorInfo ci = mb as ConstructorInfo;
if (ci != null)
{
forwarder = ci.GetMethodInfo();
}
else
{
forwarder = (MethodInfo)mb;
}
}
return forwarder;
}
public override bool __IsMissing
{
get { return TryGetForwarder() == null; }
}
public override Type ReturnType
{
get { return signature.GetReturnType(this); }
}
public override ParameterInfo ReturnParameter
{
get { return new ParameterInfoImpl(this, -1); }
}
internal override MethodSignature MethodSignature
{
get { return signature; }
}
internal override int ParameterCount
{
get { return signature.GetParameterCount(); }
}
private sealed class ParameterInfoImpl : ParameterInfo
{
private readonly MissingMethod method;
private readonly int index;
internal ParameterInfoImpl(MissingMethod method, int index)
{
this.method = method;
this.index = index;
}
private ParameterInfo Forwarder
{
get { return index == -1 ? method.Forwarder.ReturnParameter : method.Forwarder.GetParameters()[index]; }
}
public override string Name
{
get { return Forwarder.Name; }
}
public override Type ParameterType
{
get { return index == -1 ? method.signature.GetReturnType(method) : method.signature.GetParameterType(method, index); }
}
public override ParameterAttributes Attributes
{
get { return Forwarder.Attributes; }
}
public override int Position
{
get { return index; }
}
public override object RawDefaultValue
{
get { return Forwarder.RawDefaultValue; }
}
public override Type[] GetOptionalCustomModifiers()
{
if (index == -1)
{
return Util.Copy(method.signature.GetReturnTypeOptionalCustomModifiers(method));
}
return Util.Copy(method.signature.GetParameterOptionalCustomModifiers(method, index));
}
public override Type[] GetRequiredCustomModifiers()
{
if (index == -1)
{
return Util.Copy(method.signature.GetReturnTypeRequiredCustomModifiers(method));
}
return Util.Copy(method.signature.GetParameterRequiredCustomModifiers(method, index));
}
public override MemberInfo Member
{
get { return method; }
}
public override int MetadataToken
{
get { return Forwarder.MetadataToken; }
}
internal override Module Module
{
get { return method.Module; }
}
internal override IList<CustomAttributeData> GetCustomAttributesData(Type attributeType)
{
return Forwarder.GetCustomAttributesData(attributeType);
}
public override string ToString()
{
return Forwarder.ToString();
}
}
public override ParameterInfo[] GetParameters()
{
ParameterInfo[] parameters = new ParameterInfo[signature.GetParameterCount()];
for (int i = 0; i < parameters.Length; i++)
{
parameters[i] = new ParameterInfoImpl(this, i);
}
return parameters;
}
public override MethodAttributes Attributes
{
get { return Forwarder.Attributes; }
}
public override MethodImplAttributes GetMethodImplementationFlags()
{
return Forwarder.GetMethodImplementationFlags();
}
public override MethodBody GetMethodBody()
{
return Forwarder.GetMethodBody();
}
public override CallingConventions CallingConvention
{
get { return signature.CallingConvention; }
}
internal override int ImportTo(IKVM.Reflection.Emit.ModuleBuilder module)
{
return Forwarder.ImportTo(module);
}
public override string Name
{
get { return name; }
}
public override Type DeclaringType
{
get { return declaringType.IsModulePseudoType ? null : declaringType; }
}
public override Module Module
{
get { return declaringType.Module; }
}
public override bool Equals(object obj)
{
MissingMethod other = obj as MissingMethod;
return other != null
&& other.declaringType == declaringType
&& other.name == name
&& other.signature.Equals(signature);
}
public override int GetHashCode()
{
return declaringType.GetHashCode() ^ name.GetHashCode() ^ signature.GetHashCode();
}
internal override MethodBase BindTypeParameters(Type type)
{
return Forwarder.BindTypeParameters(type);
}
public override bool ContainsGenericParameters
{
get { return Forwarder.ContainsGenericParameters; }
}
internal override IList<CustomAttributeData> GetCustomAttributesData(Type attributeType)
{
return Forwarder.GetCustomAttributesData(attributeType);
}
public override Type[] GetGenericArguments()
{
return Forwarder.GetGenericArguments();
}
internal override Type GetGenericMethodArgument(int index)
{
return Forwarder.GetGenericMethodArgument(index);
}
internal override int GetGenericMethodArgumentCount()
{
return Forwarder.GetGenericMethodArgumentCount();
}
public override MethodInfo GetGenericMethodDefinition()
{
return Forwarder.GetGenericMethodDefinition();
}
internal override MethodInfo GetMethodOnTypeDefinition()
{
return Forwarder.GetMethodOnTypeDefinition();
}
internal override bool HasThis
{
get { return Forwarder.HasThis; }
}
public override bool IsGenericMethod
{
get { return IsGenericMethodDefinition; }
}
public override bool IsGenericMethodDefinition
{
get { return signature.GenericParameterCount != 0; }
}
public override MethodInfo MakeGenericMethod(params Type[] typeArguments)
{
return Forwarder.MakeGenericMethod(typeArguments);
}
public override int MetadataToken
{
get { return Forwarder.MetadataToken; }
}
}
}
+14 -3
View File
@@ -287,9 +287,10 @@ namespace IKVM.Reflection
public abstract Type[] __ResolveOptionalParameterTypes(int metadataToken);
public abstract string ScopeName { get; }
internal abstract Type GetTypeImpl(string typeName);
internal abstract void GetTypesImpl(List<Type> list);
internal abstract Type FindType(TypeName name);
public Type GetType(string className)
{
return GetType(className, false, false);
@@ -322,7 +323,12 @@ namespace IKVM.Reflection
return null;
}
}
return parser.Expand(GetTypeImpl(parser.FirstNamePart), this.Assembly, throwOnError, className);
Type type = FindType(TypeName.Split(TypeNameParser.Unescape(parser.FirstNamePart)));
if (type == null && __IsMissing)
{
throw new MissingModuleException((MissingModule)this);
}
return parser.Expand(type, this.Assembly, throwOnError, className);
}
public Type[] GetTypes()
@@ -387,6 +393,11 @@ namespace IKVM.Reflection
public abstract AssemblyName[] __GetReferencedAssemblies();
public virtual bool __IsMissing
{
get { return false; }
}
internal Type CanonicalizeType(Type type)
{
Type canon;
@@ -402,7 +413,7 @@ namespace IKVM.Reflection
internal abstract ByteReader GetBlob(int blobIndex);
internal IList<CustomAttributeData> GetCustomAttributesData(Type attributeType)
internal virtual IList<CustomAttributeData> GetCustomAttributesData(Type attributeType)
{
return GetCustomAttributes(0x00000001, attributeType);
}
@@ -27,6 +27,11 @@ namespace IKVM.Reflection
{
public abstract class ParameterInfo : ICustomAttributeProvider
{
// prevent external subclasses
internal ParameterInfo()
{
}
public sealed override bool Equals(object obj)
{
ParameterInfo other = obj as ParameterInfo;
@@ -27,6 +27,11 @@ namespace IKVM.Reflection
{
public abstract class PropertyInfo : MemberInfo
{
// prevent external subclasses
internal PropertyInfo()
{
}
public sealed override MemberTypes MemberType
{
get { return MemberTypes.Property; }
@@ -101,14 +101,14 @@ namespace IKVM.Reflection.Reader
return list.ToArray();
}
internal override Type GetTypeImpl(string typeName)
internal override Type FindType(TypeName typeName)
{
Type type = manifestModule.GetType(typeName);
Type type = manifestModule.FindType(typeName);
for (int i = 0; type == null && i < externalModules.Length; i++)
{
if ((manifestModule.File.records[i].Flags & ContainsNoMetaData) == 0)
{
type = GetModule(i).GetType(typeName);
type = GetModule(i).FindType(typeName);
}
}
return type;
@@ -167,11 +167,7 @@ namespace IKVM.Reflection.Reader
internal float ReadSingle()
{
if (end - pos < 4)
throw new BadImageFormatException();
float value = BitConverter.ToSingle(buffer, pos);
pos += 4;
return value;
return SingleConverter.Int32BitsToSingle(ReadInt32());
}
internal double ReadDouble()
@@ -73,11 +73,6 @@ namespace IKVM.Reflection.Reader
get { return TypeAttributes.Public; }
}
public sealed override Type UnderlyingSystemType
{
get { return this; }
}
public sealed override string FullName
{
get { return null; }
@@ -131,7 +126,7 @@ namespace IKVM.Reflection.Reader
get { throw new InvalidOperationException(); }
}
internal override Type GetTypeImpl(string typeName)
internal override Type FindType(TypeName typeName)
{
throw new InvalidOperationException();
}
@@ -1,5 +1,5 @@
/*
Copyright (C) 2009 Jeroen Frijters
Copyright (C) 2009-2011 Jeroen Frijters
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -31,76 +31,105 @@ namespace IKVM.Reflection.Reader
{
sealed class MetadataReader : MetadataRW
{
private readonly BinaryReader br;
private readonly Stream stream;
private const int bufferLength = 2048;
private readonly byte[] buffer = new byte[bufferLength];
private int pos = bufferLength;
internal MetadataReader(ModuleReader module, BinaryReader br, byte heapSizes)
internal MetadataReader(ModuleReader module, Stream stream, byte heapSizes)
: base(module, (heapSizes & 0x01) != 0, (heapSizes & 0x02) != 0, (heapSizes & 0x04) != 0)
{
this.br = br;
this.stream = stream;
}
internal short ReadInt16()
private void FillBuffer(int needed)
{
return br.ReadInt16();
int count = bufferLength - pos;
if (count != 0)
{
// move remaining bytes to the front of the buffer
Buffer.BlockCopy(buffer, pos, buffer, 0, count);
}
pos = 0;
while (count < needed)
{
int len = stream.Read(buffer, count, bufferLength - count);
if (len == 0)
{
throw new BadImageFormatException();
}
count += len;
}
if (count != bufferLength)
{
// we didn't fill the buffer completely, so have to restore the invariant
// that all data from pos up until the end of the buffer is valid
Buffer.BlockCopy(buffer, 0, buffer, bufferLength - count, count);
pos = bufferLength - count;
}
}
internal ushort ReadUInt16()
{
return br.ReadUInt16();
return (ushort)ReadInt16();
}
internal short ReadInt16()
{
if (pos > bufferLength - 2)
{
FillBuffer(2);
}
byte b1 = buffer[pos++];
byte b2 = buffer[pos++];
return (short)(b1 | (b2 << 8));
}
internal int ReadInt32()
{
return br.ReadInt32();
if (pos > bufferLength - 4)
{
FillBuffer(4);
}
byte b1 = buffer[pos++];
byte b2 = buffer[pos++];
byte b3 = buffer[pos++];
byte b4 = buffer[pos++];
return b1 | (b2 << 8) | (b3 << 16) | (b4 << 24);
}
private int ReadIndex(bool big)
{
if (big)
{
return ReadInt32();
}
else
{
return ReadUInt16();
}
}
internal int ReadStringIndex()
{
if (bigStrings)
{
return br.ReadInt32();
}
else
{
return br.ReadUInt16();
}
return ReadIndex(bigStrings);
}
internal int ReadGuidIndex()
{
if (bigGuids)
{
return br.ReadInt32();
}
else
{
return br.ReadUInt16();
}
return ReadIndex(bigGuids);
}
internal int ReadBlobIndex()
{
if (bigBlobs)
{
return br.ReadInt32();
}
else
{
return br.ReadUInt16();
}
return ReadIndex(bigBlobs);
}
internal int ReadResolutionScope()
{
int codedIndex;
if (bigResolutionScope)
{
codedIndex = br.ReadInt32();
}
else
{
codedIndex = br.ReadUInt16();
}
int codedIndex = ReadIndex(bigResolutionScope);
switch (codedIndex & 3)
{
case 0:
@@ -118,15 +147,7 @@ namespace IKVM.Reflection.Reader
internal int ReadTypeDefOrRef()
{
int codedIndex;
if (bigTypeDefOrRef)
{
codedIndex = br.ReadInt32();
}
else
{
codedIndex = br.ReadUInt16();
}
int codedIndex = ReadIndex(bigTypeDefOrRef);
switch (codedIndex & 3)
{
case 0:
@@ -142,15 +163,7 @@ namespace IKVM.Reflection.Reader
internal int ReadMemberRefParent()
{
int codedIndex;
if (bigMemberRefParent)
{
codedIndex = br.ReadInt32();
}
else
{
codedIndex = br.ReadUInt16();
}
int codedIndex = ReadIndex(bigMemberRefParent);
switch (codedIndex & 7)
{
case 0:
@@ -170,15 +183,7 @@ namespace IKVM.Reflection.Reader
internal int ReadHasCustomAttribute()
{
int codedIndex;
if (bigHasCustomAttribute)
{
codedIndex = br.ReadInt32();
}
else
{
codedIndex = br.ReadUInt16();
}
int codedIndex = ReadIndex(bigHasCustomAttribute);
switch (codedIndex & 31)
{
case 0:
@@ -228,15 +233,7 @@ namespace IKVM.Reflection.Reader
internal int ReadCustomAttributeType()
{
int codedIndex;
if (bigCustomAttributeType)
{
codedIndex = br.ReadInt32();
}
else
{
codedIndex = br.ReadUInt16();
}
int codedIndex = ReadIndex(bigCustomAttributeType);
switch (codedIndex & 7)
{
case 2:
@@ -250,15 +247,7 @@ namespace IKVM.Reflection.Reader
internal int ReadMethodDefOrRef()
{
int codedIndex;
if (bigMethodDefOrRef)
{
codedIndex = br.ReadInt32();
}
else
{
codedIndex = br.ReadUInt16();
}
int codedIndex = ReadIndex(bigMethodDefOrRef);
switch (codedIndex & 1)
{
case 0:
@@ -272,15 +261,7 @@ namespace IKVM.Reflection.Reader
internal int ReadHasConstant()
{
int codedIndex;
if (bigHasConstant)
{
codedIndex = br.ReadInt32();
}
else
{
codedIndex = br.ReadUInt16();
}
int codedIndex = ReadIndex(bigHasConstant);
switch (codedIndex & 3)
{
case 0:
@@ -296,15 +277,7 @@ namespace IKVM.Reflection.Reader
internal int ReadHasSemantics()
{
int codedIndex;
if (bigHasSemantics)
{
codedIndex = br.ReadInt32();
}
else
{
codedIndex = br.ReadUInt16();
}
int codedIndex = ReadIndex(bigHasSemantics);
switch (codedIndex & 1)
{
case 0:
@@ -318,15 +291,7 @@ namespace IKVM.Reflection.Reader
internal int ReadHasFieldMarshal()
{
int codedIndex;
if (bigHasFieldMarshal)
{
codedIndex = br.ReadInt32();
}
else
{
codedIndex = br.ReadUInt16();
}
int codedIndex = ReadIndex(bigHasFieldMarshal);
switch (codedIndex & 1)
{
case 0:
@@ -340,15 +305,7 @@ namespace IKVM.Reflection.Reader
internal int ReadHasDeclSecurity()
{
int codedIndex;
if (bigHasDeclSecurity)
{
codedIndex = br.ReadInt32();
}
else
{
codedIndex = br.ReadUInt16();
}
int codedIndex = ReadIndex(bigHasDeclSecurity);
switch (codedIndex & 3)
{
case 0:
@@ -364,15 +321,7 @@ namespace IKVM.Reflection.Reader
internal int ReadTypeOrMethodDef()
{
int codedIndex;
if (bigTypeOrMethodDef)
{
codedIndex = br.ReadInt32();
}
else
{
codedIndex = br.ReadUInt16();
}
int codedIndex = ReadIndex(bigTypeOrMethodDef);
switch (codedIndex & 1)
{
case 0:
@@ -386,15 +335,7 @@ namespace IKVM.Reflection.Reader
internal int ReadMemberForwarded()
{
int codedIndex;
if (bigMemberForwarded)
{
codedIndex = br.ReadInt32();
}
else
{
codedIndex = br.ReadUInt16();
}
int codedIndex = ReadIndex(bigMemberForwarded);
switch (codedIndex & 1)
{
case 0:
@@ -408,15 +349,7 @@ namespace IKVM.Reflection.Reader
internal int ReadImplementation()
{
int codedIndex;
if (bigImplementation)
{
codedIndex = br.ReadInt32();
}
else
{
codedIndex = br.ReadUInt16();
}
int codedIndex = ReadIndex(bigImplementation);
switch (codedIndex & 3)
{
case 0:
@@ -430,93 +363,44 @@ namespace IKVM.Reflection.Reader
}
}
private int ReadToken(int table, bool big)
{
int rid;
if (big)
{
rid = br.ReadInt32();
}
else
{
rid = br.ReadUInt16();
}
return rid | (table << 24);
}
internal int ReadField()
{
if (bigField)
{
return br.ReadInt32();
}
else
{
return br.ReadUInt16();
}
return ReadIndex(bigField);
}
internal int ReadMethodDef()
{
if (bigMethodDef)
{
return br.ReadInt32();
}
else
{
return br.ReadUInt16();
}
return ReadIndex(bigMethodDef);
}
internal int ReadParam()
{
if (bigParam)
{
return br.ReadInt32();
}
else
{
return br.ReadUInt16();
}
return ReadIndex(bigParam);
}
internal int ReadProperty()
{
if (bigProperty)
{
return br.ReadInt32();
}
else
{
return br.ReadUInt16();
}
return ReadIndex(bigProperty);
}
internal int ReadEvent()
{
if (bigEvent)
{
return br.ReadInt32();
}
else
{
return br.ReadUInt16();
}
return ReadIndex(bigEvent);
}
internal int ReadTypeDef()
{
return ReadToken(TypeDefTable.Index, bigTypeDef);
return ReadIndex(bigTypeDef) | (TypeDefTable.Index << 24);
}
internal int ReadGenericParam()
{
return ReadToken(GenericParamTable.Index, bigGenericParam);
return ReadIndex(bigGenericParam) | (GenericParamTable.Index << 24);
}
internal int ReadModuleRef()
{
return ReadToken(ModuleRefTable.Index, bigModuleRef);
return ReadIndex(bigModuleRef) | (ModuleRefTable.Index << 24);
}
}
}
+24 -14
View File
@@ -308,22 +308,22 @@ namespace IKVM.Reflection.Reader
callingConvention = System.Runtime.InteropServices.CallingConvention.Winapi;
break;
}
list.Add(MakeNamedArgument(type, "EntryPoint", entryPoint));
list.Add(MakeNamedArgument(type, "ExactSpelling", flags, NoMangle));
list.Add(MakeNamedArgument(type, "SetLastError", flags, SupportsLastError));
list.Add(MakeNamedArgument(type, "PreserveSig", (int)GetMethodImplementationFlags(), (int)MethodImplAttributes.PreserveSig));
list.Add(MakeNamedArgument(type, "CallingConvention", (int)callingConvention));
AddNamedArgument(list, type, "EntryPoint", entryPoint);
AddNamedArgument(list, type, "ExactSpelling", flags, NoMangle);
AddNamedArgument(list, type, "SetLastError", flags, SupportsLastError);
AddNamedArgument(list, type, "PreserveSig", (int)GetMethodImplementationFlags(), (int)MethodImplAttributes.PreserveSig);
AddNamedArgument(list, type, "CallingConvention", (int)callingConvention);
if (charSet.HasValue)
{
list.Add(MakeNamedArgument(type, "CharSet", (int)charSet.Value));
AddNamedArgument(list, type, "CharSet", (int)charSet.Value);
}
if ((flags & (BestFitOn | BestFitOff)) != 0)
{
list.Add(MakeNamedArgument(type, "BestFitMapping", flags, BestFitOn));
AddNamedArgument(list, type, "BestFitMapping", flags, BestFitOn);
}
if ((flags & (CharMapErrorOn | CharMapErrorOff)) != 0)
{
list.Add(MakeNamedArgument(type, "ThrowOnUnmappableChar", flags, CharMapErrorOn));
AddNamedArgument(list, type, "ThrowOnUnmappableChar", flags, CharMapErrorOn);
}
attribs.Add(new CustomAttributeData(constructor, new object[] { dllName }, list));
return;
@@ -331,19 +331,29 @@ namespace IKVM.Reflection.Reader
}
}
private static CustomAttributeNamedArgument MakeNamedArgument(Type type, string field, string value)
private static void AddNamedArgument(List<CustomAttributeNamedArgument> list, Type type, string fieldName, string value)
{
return new CustomAttributeNamedArgument(type.GetField(field), new CustomAttributeTypedArgument(type.Module.universe.System_String, value));
AddNamedArgument(list, type, fieldName, type.Module.universe.System_String, value);
}
private static CustomAttributeNamedArgument MakeNamedArgument(Type type, string field, int value)
private static void AddNamedArgument(List<CustomAttributeNamedArgument> list, Type type, string fieldName, int value)
{
return new CustomAttributeNamedArgument(type.GetField(field), new CustomAttributeTypedArgument(type.Module.universe.System_Int32, value));
AddNamedArgument(list, type, fieldName, type.Module.universe.System_Int32, value);
}
private static CustomAttributeNamedArgument MakeNamedArgument(Type type, string field, int flags, int flagMask)
private static void AddNamedArgument(List<CustomAttributeNamedArgument> list, Type type, string fieldName, int flags, int flagMask)
{
return new CustomAttributeNamedArgument(type.GetField(field), new CustomAttributeTypedArgument(type.Module.universe.System_Boolean, (flags & flagMask) != 0));
AddNamedArgument(list, type, fieldName, type.Module.universe.System_Boolean, (flags & flagMask) != 0);
}
private static void AddNamedArgument(List<CustomAttributeNamedArgument> list, Type attributeType, string fieldName, Type valueType, object value)
{
// some fields are not available on the .NET Compact Framework version of DllImportAttribute
FieldInfo field = attributeType.GetField(fieldName);
if (field != null)
{
list.Add(new CustomAttributeNamedArgument(field, new CustomAttributeTypedArgument(valueType, value)));
}
}
internal override MethodSignature MethodSignature
@@ -1,5 +1,5 @@
/*
Copyright (C) 2009-2010 Jeroen Frijters
Copyright (C) 2009-2011 Jeroen Frijters
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -74,8 +74,8 @@ namespace IKVM.Reflection.Reader
private MethodBase[] methods;
private MemberInfo[] memberRefs;
private Dictionary<int, string> strings = new Dictionary<int, string>();
private Dictionary<string, Type> types = new Dictionary<string, Type>();
private Dictionary<string, LazyForwardedType> forwardedTypes = new Dictionary<string, LazyForwardedType>();
private Dictionary<TypeName, Type> types = new Dictionary<TypeName, Type>();
private Dictionary<TypeName, LazyForwardedType> forwardedTypes = new Dictionary<TypeName, LazyForwardedType>();
private sealed class LazyForwardedType
{
@@ -87,12 +87,16 @@ namespace IKVM.Reflection.Reader
this.assemblyRef = assemblyRef;
}
internal Type GetType(ModuleReader module, string typeName)
internal Type GetType(ModuleReader module, TypeName typeName)
{
if (type == null)
{
Assembly asm = module.ResolveAssemblyRef(assemblyRef);
type = asm.GetType(typeName, true);
type = asm.ResolveType(typeName);
if (type == null)
{
throw new TypeLoadException(typeName.ToString());
}
}
return type;
}
@@ -156,13 +160,13 @@ namespace IKVM.Reflection.Reader
{
throw new BadImageFormatException("Invalid metadata signature");
}
ushort MajorVersion = br.ReadUInt16();
ushort MinorVersion = br.ReadUInt16();
uint Reserved = br.ReadUInt32();
/*ushort MajorVersion =*/ br.ReadUInt16();
/*ushort MinorVersion =*/ br.ReadUInt16();
/*uint Reserved =*/ br.ReadUInt32();
uint Length = br.ReadUInt32();
byte[] buf = br.ReadBytes((int)Length);
Version = Encoding.UTF8.GetString(buf).TrimEnd('\u0000');
ushort Flags = br.ReadUInt16();
/*ushort Flags =*/ br.ReadUInt16();
ushort Streams = br.ReadUInt16();
StreamHeader[] streamHeaders = new StreamHeader[Streams];
for (int i = 0; i < streamHeaders.Length; i++)
@@ -176,14 +180,14 @@ namespace IKVM.Reflection.Reader
private void ReadTables(BinaryReader br)
{
Table[] tables = GetTables();
uint Reserved0 = br.ReadUInt32();
/*uint Reserved0 =*/ br.ReadUInt32();
byte MajorVersion = br.ReadByte();
byte MinorVersion = br.ReadByte();
metadataStreamVersion = MajorVersion << 16 | MinorVersion;
byte HeapSizes = br.ReadByte();
byte Reserved7 = br.ReadByte();
/*byte Reserved7 =*/ br.ReadByte();
ulong Valid = br.ReadUInt64();
ulong Sorted = br.ReadUInt64();
/*ulong Sorted =*/ br.ReadUInt64();
for (int i = 0; i < 64; i++)
{
if ((Valid & (1UL << i)) != 0)
@@ -195,7 +199,7 @@ namespace IKVM.Reflection.Reader
tables[i].RowCount = 0;
}
}
MetadataReader mr = new MetadataReader(this, br, HeapSizes);
MetadataReader mr = new MetadataReader(this, br.BaseStream, HeapSizes);
for (int i = 0; i < 64; i++)
{
if ((Valid & (1UL << i)) != 0)
@@ -251,9 +255,9 @@ namespace IKVM.Reflection.Reader
{
moduleType = type;
}
else
else if (!type.IsNestedByFlags)
{
types.Add(type.FullName, type);
types.Add(new TypeName(type.__Namespace, type.__Name), type);
}
}
// add forwarded types to forwardedTypes dictionary (because Module.GetType(string) should return them)
@@ -262,7 +266,7 @@ namespace IKVM.Reflection.Reader
int implementation = ExportedType.records[i].Implementation;
if (implementation >> 24 == AssemblyRefTable.Index)
{
string typeName = GetTypeName(ExportedType.records[i].TypeNamespace, ExportedType.records[i].TypeName);
TypeName typeName = GetTypeName(ExportedType.records[i].TypeNamespace, ExportedType.records[i].TypeName);
forwardedTypes.Add(typeName, new LazyForwardedType((implementation & 0xFFFFFF) - 1));
}
}
@@ -362,19 +366,15 @@ namespace IKVM.Reflection.Reader
case AssemblyRefTable.Index:
{
Assembly assembly = ResolveAssemblyRef((scope & 0xFFFFFF) - 1);
string typeName = GetTypeName(TypeRef.records[index].TypeNameSpace, TypeRef.records[index].TypeName);
Type type = assembly.GetType(typeName);
if (type == null)
{
throw new TypeLoadException(String.Format("Type '{0}' not found in assembly '{1}'", typeName, assembly.FullName));
}
typeRefs[index] = type;
TypeName typeName = GetTypeName(TypeRef.records[index].TypeNameSpace, TypeRef.records[index].TypeName);
typeRefs[index] = assembly.ResolveType(typeName);
break;
}
case TypeRefTable.Index:
{
Type outer = ResolveType(scope, null);
typeRefs[index] = outer.GetNestedType(GetString(TypeRef.records[index].TypeName), BindingFlags.Public | BindingFlags.NonPublic);
TypeName typeName = GetTypeName(TypeRef.records[index].TypeNameSpace, TypeRef.records[index].TypeName);
typeRefs[index] = outer.ResolveNestedType(typeName);
break;
}
case ModuleTable.Index:
@@ -382,13 +382,13 @@ namespace IKVM.Reflection.Reader
{
throw new NotImplementedException("self reference scope?");
}
typeRefs[index] = GetType(GetTypeName(TypeRef.records[index].TypeNameSpace, TypeRef.records[index].TypeName));
typeRefs[index] = FindType(GetTypeName(TypeRef.records[index].TypeNameSpace, TypeRef.records[index].TypeName));
break;
case ModuleRefTable.Index:
{
Module module = ResolveModuleRef(ModuleRef.records[(scope & 0xFFFFFF) - 1]);
string typeName = GetTypeName(TypeRef.records[index].TypeNameSpace, TypeRef.records[index].TypeName);
Type type = assembly.GetType(typeName);
TypeName typeName = GetTypeName(TypeRef.records[index].TypeNameSpace, TypeRef.records[index].TypeName);
Type type = module.FindType(typeName);
if (type == null)
{
throw new TypeLoadException(String.Format("Type '{0}' not found in module '{1}'", typeName, module.Name));
@@ -477,16 +477,9 @@ namespace IKVM.Reflection.Reader
}
}
private string GetTypeName(int typeNamespace, int typeName)
private TypeName GetTypeName(int typeNamespace, int typeName)
{
if (typeNamespace == 0)
{
return GetString(typeName);
}
else
{
return GetString(typeNamespace) + "." + GetString(typeName);
}
return new TypeName(GetString(typeNamespace), GetString(typeName));
}
private Assembly ResolveAssemblyRef(int index)
@@ -561,7 +554,7 @@ namespace IKVM.Reflection.Reader
get { return assembly; }
}
internal override Type GetTypeImpl(string typeName)
internal override Type FindType(TypeName typeName)
{
PopulateTypeDef();
Type type;
@@ -821,7 +814,7 @@ namespace IKVM.Reflection.Reader
}
type = type.BaseType;
} while (type != null);
throw new MissingMethodException(org.ToString(), name);
return universe.GetMissingMethodOrThrow(org, name, methodSig);
}
}
@@ -981,21 +974,21 @@ namespace IKVM.Reflection.Reader
public override IList<CustomAttributeData> __GetPlaceholderAssemblyCustomAttributes(bool multiple, bool security)
{
string typeName;
TypeName typeName;
switch ((multiple ? 1 : 0) + (security ? 2 : 0))
{
case 0:
typeName = "System.Runtime.CompilerServices.AssemblyAttributesGoHere";
typeName = new TypeName("System.Runtime.CompilerServices", "AssemblyAttributesGoHere");
break;
case 1:
typeName = "System.Runtime.CompilerServices.AssemblyAttributesGoHereM";
typeName = new TypeName("System.Runtime.CompilerServices", "AssemblyAttributesGoHereM");
break;
case 2:
typeName = "System.Runtime.CompilerServices.AssemblyAttributesGoHereS";
typeName = new TypeName("System.Runtime.CompilerServices", "AssemblyAttributesGoHereS");
break;
case 3:
default:
typeName = "System.Runtime.CompilerServices.AssemblyAttributesGoHereSM";
typeName = new TypeName("System.Runtime.CompilerServices", "AssemblyAttributesGoHereSM");
break;
}
List<CustomAttributeData> list = new List<CustomAttributeData>();
@@ -110,7 +110,7 @@ namespace IKVM.Reflection.Reader
throw new NotSupportedException();
}
internal override Type GetTypeImpl(string typeName)
internal override Type FindType(TypeName typeName)
{
return null;
}
+24 -10
View File
@@ -1,5 +1,5 @@
/*
Copyright (C) 2009 Jeroen Frijters
Copyright (C) 2009-2011 Jeroen Frijters
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -41,8 +41,8 @@ namespace IKVM.Reflection.Reader
{
this.module = module;
this.index = index;
this.typeName = TypeNameParser.Escape(module.GetString(module.TypeDef.records[index].TypeName));
this.typeNamespace = TypeNameParser.Escape(module.GetString(module.TypeDef.records[index].TypeNamespace));
this.typeName = module.GetString(module.TypeDef.records[index].TypeName);
this.typeNamespace = module.GetString(module.TypeDef.records[index].TypeNamespace);
}
public override Type BaseType
@@ -99,16 +99,20 @@ namespace IKVM.Reflection.Reader
public override Type[] __GetDeclaredInterfaces()
{
int token = this.MetadataToken;
List<Type> list = new List<Type>();
List<Type> list = null;
// TODO use binary search?
for (int i = 0; i < module.InterfaceImpl.records.Length; i++)
{
if (module.InterfaceImpl.records[i].Class == token)
{
if (list == null)
{
list = new List<Type>();
}
list.Add(module.ResolveType(module.InterfaceImpl.records[i].Interface, this));
}
}
return list.ToArray();
return Util.ToArray(list, Type.EmptyTypes);
}
public override MethodBase[] __GetDeclaredMethods()
@@ -192,19 +196,24 @@ namespace IKVM.Reflection.Reader
return Empty<PropertyInfo>.Array;
}
public override string Name
public override string __Name
{
get { return typeName; }
}
public override string Namespace
public override string __Namespace
{
get { return typeNamespace; }
}
public override Type UnderlyingSystemType
public override string Name
{
get { return this; }
get { return TypeNameParser.Escape(typeName); }
}
public override string FullName
{
get { return GetFullName(); }
}
public override int MetadataToken
@@ -295,12 +304,17 @@ namespace IKVM.Reflection.Reader
return sb.ToString();
}
internal bool IsNestedByFlags
{
get { return (this.Attributes & TypeAttributes.VisibilityMask & ~TypeAttributes.Public) != 0; }
}
public override Type DeclaringType
{
get
{
// note that we cannot use Type.IsNested for this, because that calls DeclaringType
if ((this.Attributes & TypeAttributes.VisibilityMask & ~TypeAttributes.Public) == 0)
if (!IsNestedByFlags)
{
return null;
}
+9 -9
View File
@@ -91,7 +91,7 @@ namespace IKVM.Reflection
throw new BadImageFormatException();
}
Type type = ReadTypeDefOrRefEncoded(module, br, context);
if (!type.IsGenericTypeDefinition)
if (!type.__IsMissing && !type.IsGenericTypeDefinition)
{
throw new BadImageFormatException();
}
@@ -360,10 +360,18 @@ namespace IKVM.Reflection
{
bb.Write(ELEMENT_TYPE_VOID);
}
else if (type == u.System_Int32)
{
bb.Write(ELEMENT_TYPE_I4);
}
else if (type == u.System_Boolean)
{
bb.Write(ELEMENT_TYPE_BOOLEAN);
}
else if (type == u.System_String)
{
bb.Write(ELEMENT_TYPE_STRING);
}
else if (type == u.System_Char)
{
bb.Write(ELEMENT_TYPE_CHAR);
@@ -384,10 +392,6 @@ namespace IKVM.Reflection
{
bb.Write(ELEMENT_TYPE_U2);
}
else if (type == u.System_Int32)
{
bb.Write(ELEMENT_TYPE_I4);
}
else if (type == u.System_UInt32)
{
bb.Write(ELEMENT_TYPE_U4);
@@ -408,10 +412,6 @@ namespace IKVM.Reflection
{
bb.Write(ELEMENT_TYPE_R8);
}
else if (type == u.System_String)
{
bb.Write(ELEMENT_TYPE_STRING);
}
else if (type == u.System_IntPtr)
{
bb.Write(ELEMENT_TYPE_I);
@@ -27,7 +27,7 @@ using System.Text;
namespace IKVM.Reflection
{
public class StrongNameKeyPair
public sealed class StrongNameKeyPair
{
internal readonly System.Reflection.StrongNameKeyPair keyPair;
+141 -43
View File
@@ -1,5 +1,5 @@
/*
Copyright (C) 2009-2010 Jeroen Frijters
Copyright (C) 2009-2011 Jeroen Frijters
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -44,6 +44,18 @@ namespace IKVM.Reflection
public abstract class Type : MemberInfo, IGenericContext, IGenericBinder
{
public static readonly Type[] EmptyTypes = Empty<Type>.Array;
protected readonly Type underlyingType;
// prevent subclassing by outsiders
internal Type()
{
this.underlyingType = this;
}
internal Type(Type underlyingType)
{
this.underlyingType = underlyingType;
}
public static Binder DefaultBinder
{
@@ -175,9 +187,9 @@ namespace IKVM.Reflection
get { return null; }
}
public virtual Type UnderlyingSystemType
public Type UnderlyingSystemType
{
get { return this; }
get { return underlyingType; }
}
public override Type DeclaringType
@@ -185,13 +197,19 @@ namespace IKVM.Reflection
get { return null; }
}
public override string Name
public virtual string __Name
{
get
{
string fullname = FullName;
return fullname.Substring(fullname.LastIndexOf('.') + 1);
}
get { throw new InvalidOperationException(); }
}
public virtual string __Namespace
{
get { throw new InvalidOperationException(); }
}
public abstract override string Name
{
get;
}
public virtual string Namespace
@@ -200,11 +218,9 @@ namespace IKVM.Reflection
{
if (IsNested)
{
return null;
return DeclaringType.Namespace;
}
string fullname = FullName;
int index = fullname.LastIndexOf('.');
return index < 0 ? null : fullname.Substring(0, index);
return __Namespace;
}
}
@@ -213,9 +229,23 @@ namespace IKVM.Reflection
throw new InvalidOperationException();
}
public static bool operator ==(Type t1, Type t2)
{
// Casting to object results in smaller code than calling ReferenceEquals and makes
// this method more likely to be inlined.
// On CLR v2 x86, microbenchmarks show this to be faster than calling ReferenceEquals.
return (object)t1 == (object)t2
|| ((object)t1 != null && (object)t2 != null && (object)t1.underlyingType == (object)t2.underlyingType);
}
public static bool operator !=(Type t1, Type t2)
{
return !(t1 == t2);
}
public bool Equals(Type type)
{
return !ReferenceEquals(type, null) && ReferenceEquals(type.UnderlyingSystemType, this.UnderlyingSystemType);
return this == type;
}
public override bool Equals(object obj)
@@ -327,33 +357,35 @@ namespace IKVM.Reflection
return FullName;
}
public virtual string FullName
public abstract string FullName
{
get
get;
}
protected string GetFullName()
{
string ns = TypeNameParser.Escape(this.__Namespace);
Type decl = this.DeclaringType;
if (decl == null)
{
Type decl = this.DeclaringType;
string ns = this.Namespace;
if (ns == null)
{
if (decl == null)
{
return this.Name;
}
else
{
return decl.FullName + "+" + this.Name;
}
return this.Name;
}
else
{
if (decl == null)
{
return ns + "." + this.Name;
}
else
{
return decl.FullName + "+" + ns + "." + this.Name;
}
return ns + "." + this.Name;
}
}
else
{
if (ns == null)
{
return decl.FullName + "+" + this.Name;
}
else
{
return decl.FullName + "+" + ns + "." + this.Name;
}
}
}
@@ -736,6 +768,24 @@ namespace IKVM.Reflection
return GetConstructor(bindingAttr, binder, types, modifiers);
}
internal Type ResolveNestedType(TypeName typeName)
{
return FindNestedType(typeName) ?? Module.universe.GetMissingTypeOrThrow(Module, this, typeName);
}
// unlike the public API, this takes the namespace and name into account
internal virtual Type FindNestedType(TypeName name)
{
foreach (Type type in __GetDeclaredTypes())
{
if (type.__Namespace == name.Namespace && type.__Name == name.Name)
{
return type;
}
}
return null;
}
public Type GetNestedType(string name)
{
return GetNestedType(name, BindingFlags.Public);
@@ -745,7 +795,8 @@ namespace IKVM.Reflection
{
foreach (Type type in GetNestedTypes(bindingAttr))
{
if (type.Name == name)
// FXBUG the namespace is ignored
if (type.__Name == name)
{
return type;
}
@@ -1106,6 +1157,25 @@ namespace IKVM.Reflection
get { return this.DeclaringType != null; }
}
public virtual bool __ContainsMissingType
{
get
{
if (this.__IsMissing)
{
return true;
}
foreach (Type arg in this.GetGenericArguments())
{
if (arg.__ContainsMissingType)
{
return true;
}
}
return false;
}
}
public Type MakeArrayType()
{
return ArrayType.Make(this, null, null);
@@ -1471,7 +1541,7 @@ namespace IKVM.Reflection
}
}
internal MethodBase FindMethod(string name, MethodSignature signature)
internal virtual MethodBase FindMethod(string name, MethodSignature signature)
{
foreach (MethodBase method in __GetDeclaredMethods())
{
@@ -1574,6 +1644,11 @@ namespace IKVM.Reflection
get { return elementType.Name + GetSuffix(); }
}
public sealed override string Namespace
{
get { return elementType.Namespace; }
}
public sealed override string FullName
{
get { return elementType.FullName + GetSuffix(); }
@@ -1621,6 +1696,19 @@ namespace IKVM.Reflection
}
}
public sealed override bool __ContainsMissingType
{
get
{
Type type = elementType;
while (type.HasElementType)
{
type = type.GetElementType();
}
return type.__ContainsMissingType;
}
}
internal sealed override Type BindTypeParameters(IGenericBinder binder)
{
Type type = elementType.BindTypeParameters(binder);
@@ -2058,7 +2146,7 @@ namespace IKVM.Reflection
internal static Type Make(Type type, Type[] typeArguments, Type[][] requiredCustomModifiers, Type[][] optionalCustomModifiers)
{
bool identity = true;
if (type is TypeBuilder || type is BakedType)
if (type is TypeBuilder || type is BakedType || type.__IsMissing)
{
// a TypeBuiler identity must be instantiated
identity = false;
@@ -2262,11 +2350,6 @@ namespace IKVM.Reflection
get { return type.Namespace; }
}
public override Type UnderlyingSystemType
{
get { return this; }
}
public override string Name
{
get { return type.Name; }
@@ -2280,7 +2363,7 @@ namespace IKVM.Reflection
{
return null;
}
StringBuilder sb = new StringBuilder(base.FullName);
StringBuilder sb = new StringBuilder(this.type.FullName);
sb.Append('[');
foreach (Type type in args)
{
@@ -2356,6 +2439,21 @@ namespace IKVM.Reflection
}
}
public override bool __ContainsMissingType
{
get
{
foreach (Type type in args)
{
if (type.__ContainsMissingType)
{
return true;
}
}
return this.type.__IsMissing;
}
}
public override StructLayoutAttribute StructLayoutAttribute
{
get { return type.StructLayoutAttribute; }
Loaded 100 of 1764 files, more files were not shown because too many files have changed in this diff. Show more