Compare commits

..
Author SHA1 Message Date
Rodrigo Kumpera c9d9a10ff0 Merge remote-tracking branch 'origin/pr/1908' into HEAD 2015-07-02 14:04:45 -04:00
Alexander Kyte 6ea8bdec15 [runtime] Conversion of a printf to string append for performance 2015-07-01 16:34:20 -04:00
Alexander Kyte 0ab1aa2a78 [runtime] Avoid repeated method hashing in find_aot_module 2015-07-01 16:32:52 -04:00
Alex Rønne Petersen 198235db76 [profiler] Fix missing TYPE_JIT events for alloc/exception/monitor backtraces. 2015-06-05 22:10:07 +02:00
Alexis Christoforides 046a426065 Restore "Fix XAttribute.ToString method (Xamarin-29935)"
The patch is now accepted.
2015-06-05 15:33:58 -04:00
Atsushi Eno 19be22ca00 [xbuild] for resolving assemblies from pkg-config, prefer specified version
... even if SpecificVersion is false. There is no reason to prefer any
mismatching version when SpecificVersion=false.

That behavior caused monodevelop build failures because of incorrectly-
resolved gtk# packages. After this fix, this issue goes away.
https://github.com/mono/monodevelop/blob/2436ad1874694ec811871dacf9a659a79b5fad0d/README.md#known-problems
2015-06-05 14:19:03 -04:00
Miguel de Icaza 02adfce5cf [monop] Band-aid, cope with IKVM's Type.Namespace crashing on generic types
[monop] Add test suite for monop
2015-06-05 14:14:24 -04:00
Rodrigo Kumpera 8019f53849 Bump mono to 4.0.2 2015-06-05 14:14:21 -04:00
Zoltan Varga e967ed4868 [arm64] Increase the size of the thunk area to work around https://bugzilla.xamarin.com/show_bug.cgi?id=28747. 2015-06-05 14:02:47 -04:00
Zoltan Varga 2a0f19e0d2 [jit] Emulate OP_RREM if OP_FREM is emulated. Fixes #30698. 2015-06-03 15:31:48 -04:00
Alexander Kyte ef16e5a45c [runtime] Don't set flag to skip future initialization on half-baked classes 2015-06-03 12:13:20 +02:00
Zoltan Varga c68e6be205 [runtime] Fix the signature of native-func-aot wrappers. AOT the delegate invoke wrapper which is used to invoke it. Fixes #29970. 2015-06-02 19:05:26 -04:00
Sebastien Pouliot fad43d28b9 [corlib] Xamarin.Mac to continue default to the OS default codepage
XM 2.0 was the first version to ship the mobile (w/unified) and it used
the OS default codepage.

The previous, system mono, profile was already using the OS default
codepage so it make sense for XM to be consistent across profiles (
including the 4.5 subset)
2015-06-02 16:53:53 -04:00
Sebastien Pouliot e4510d8546 [corlib] Let XI and XM define their own default encoding [#29928]
605192528d used UTF8Unmarked for MONOTOUCH
and XAMMAC. However it's initialized differently (than the old UTF8) and
caused unit test regressions in System and System.Net.Http unit tests

This new logic moves the default encoding creation into the products
themselves.
2015-06-02 16:53:42 -04:00
Alexis Christoforides a3b2464acb Bump to include xamarin/bockbuild@0669caebbc 2015-06-02 16:02:38 -04:00
Alex Rønne Petersen 0bf88ca938 [profiler] Initialize threads in runtime initialization callback.
For the helper and writer thread to actually work, we need Mono's threading
subsystem to be initialized (so we can use TLS and hazard pointers). We now
wait with starting these threads until Mono gives us the go-ahead.

This means that a bit more data will be buffered up in the thread-local log
buffers during startup, but it shouldn't really matter in practice.
2015-06-02 15:50:15 -04:00
Zoltan Varga 348b0980cd [arm] Fix the handling of callee saved fp registers during unwinding, previously they were saved in an 32 bit array. Fixes #29726. 2015-06-02 15:28:12 -04:00
Zoltan Varga 80c4f56c1c [aot] Avoid duplicate plt symbols for plt entries for synchronized methods. Fixes #28961. 2015-06-02 15:27:14 -04:00
Sebastien Pouliot 955b2d61c9 [linker] Resolve AssemblyName[Reference] when sweeping [#29211]
The exact name (e.g. version) might differ between the original
AssemblyNameReference and the one being used (e.g. PCL).

To make sure we remove unused references we need to resolve
the AssemblyNameReference into AssemblyDefinition and then
continue the sweep based on the _new_ AssemblyNameReference.
2015-06-02 14:58:50 -04:00
Marcos Henrich d64e196394 Merge pull request #1758 from esdrubal/tzdroidfix
[corlib] Fixes DST without AdjustmentRules
2015-05-22 15:52:12 +01:00
Marek Safar ed1d3ec526 [corlib] BinaryReader with Unicode encoding needs to read bytes in a pair. Fixes #30171 2015-05-20 09:55:49 +02:00
Marek Safar 11b58305d0 [runtime] Add more 3.0 fx assemblies to remapping table. Fixes #29459 2015-05-15 15:55:26 -04:00
João Matos ef50e28e6c Merge pull request #1810 from directhex/mono-4.0.0-branch
Add missing Microsoft.Portable.VisualBasic_4.{0,5}.targets to EXTRA_DIST
2015-05-15 13:01:40 +01:00
Jo Shields de778fd998 Add missing Microsoft.Portable.VisualBasic_4.{0,5}.targets to EXTRA_DIST 2015-05-15 12:14:18 +01:00
Alexis Christoforides e308d07968 Bump to include mono/bockbuild@e94f64444d which reverts the nuget bump I mistakenly pushed to the branch. 2015-05-14 15:15:58 -07:00
Rodrigo Kumpera 766c45cacf Merge pull request #1807 from mono/revert-1787-Xamarin-29935
Revert "Fix XAttribute.ToString method (Xamarin-29935)"
2015-05-14 18:08:44 -04:00
Rodrigo Kumpera 00bd897cd6 Revert "Fix XAttribute.ToString method (Xamarin-29935)" 2015-05-14 18:07:21 -04:00
Atsushi Eno bee689faf9 Merge pull request #1787 from ermshiperete/Xamarin-29935
Fix XAttribute.ToString method (Xamarin-29935)
2015-05-15 02:54:40 +08:00
jaredpar 6d5afc17fc Improve Visual Basic build support
This fixes a couple of small issues with the Visual Basic build support:

- The VBC task now respects the $(NoStdLib) MSBuild option.
- The field @(ReferencePath) should be used for References in the VBC
target as it is for the CSC target.
- The CreateVisualBasicManifestResourceNames task is compiled and used
in the same manner as CreateCSharpManifestResourceNames hence it should
be loaded via UsingTask in the same manner as well.
- Include the VisualBasic Portable targets files.
2015-05-14 14:23:27 +02:00
Alan McGovern 888a961d27 Trigger a build 2015-05-14 08:20:25 +01:00
Zoltan Varga d17c251d93 [runtime] Fix the initialization of the pid array in ves_icall_System_Diagnostics_Process_GetProcesses_internal (). 2015-05-14 03:32:38 +02:00
Alexis Christoforides 83c226b78f Bump to include mono/bockbuild@78924fd36e. Fixes 29898 2015-05-13 10:31:23 -07:00
Marek Safar 79dbfbec17 [system.runtime.caching] Remove inappropropriate use of Marshal.SizeOf. Fixes #29667 2015-05-11 20:10:50 +02:00
Eberhard Beilharz 58acbf1239 Fix XAttribute.ToString method (Xamarin-29935)
This fix is more or less copied over from Microsoft's referencesource
implementation.

Change-Id: Icdb5979bd1b274afc5ee3a27f07db5ef64eb94aa
2015-05-11 15:13:04 +02:00
Eberhard Beilharz ec0d27cbc3 Unit test that demonstrates Xamarin-29935
Change-Id: I3510a2ccb897e0a0baf03af3a34bb74d6b700e03
2015-05-11 15:13:01 +02:00
Neale Ferguson d7f9ffaa25 Fix decimal comparison by using signed char comparison of signs; Fix size of jmp instruction sequence 2015-05-08 13:24:08 -04:00
Rolf Bjarne Kvinge f80248053d Add a monotouch_runtime corlib sources. 2015-05-06 17:52:29 -04:00
Zoltan Varga c06ccca9b4 [jit] Correctly disable seq points in wrappers on android. 2015-05-06 15:05:32 -04:00
Zoltan Varga 88674ce963 [sdb] Transition from step over to step into when control leaves managed code. Fixes #28557. 2015-05-06 15:03:37 -04:00
Mark Probst e280710722 [sgen] Check SP on thread suspend correctly. Fixes #29177. 2015-05-05 16:51:49 -04:00
Marcos Henrich f14352027e [corlib] Fixes DST without AdjustmentRules.
Fixes IsDaylightSavingTime returning false when
SupportsDaylightSavingTime was set to false because TimeZoneInfo was
create with no AdjustmentRules.

Now if TimeZoneInfo uses transitions SupportsDaylightSavingTime will be
set to true regardless of AdjustmentRules.
2015-05-04 14:30:50 +01:00
Sebastien Pouliot 5a0b19f1a1 [linker] Mark SecurityDeclarations [#28918]
Security declarations looks very similar to custom attributes - but
they are not (e.g. a different metadata table).

They need to be marked, just like other metadata, by the linker because
they can encode types that won't show up in the type (or assembly)
references.

Ignoring this can create an invalid binary (the kind that even Cecil
can't load back for further processing).
2015-05-01 13:45:09 +02:00
Zoltan Varga ed6b20ecc8 [jit] Increase some trampoline sizes. 2015-04-29 17:24:05 -04:00
Alex Rønne Petersen f5bd8428e3 [utils] Fix yet more visibility issues. 2015-04-29 18:03:55 +02:00
Alex Rønne Petersen 72e497f232 [mini] Fix visibility of mono_aot_get_method (). 2015-04-29 18:03:55 +02:00
Rolf Bjarne Kvinge 77adc2a461 [runtime] Don't call mach_port_deallocate on tasks we don't own.
Fixes random/strange hangs/crashes (many native API starts returning
out-of-memory errors when there is plenty of memory available, other
just hang inexplicably) when profiling.
2015-04-29 16:53:28 +01:00
Ludovic Henry d5acd37572 [runtime] Fix call to task_for_pid in proclib utils
task_for_pid requires special privileges on osx 10.5+ and ios, so it's better to avoid calling it.
2015-04-29 16:53:19 +01:00
João Matos e5678fa983 [aot] Improve error checking when setting up class vtable.
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=28816.
2015-04-29 16:35:11 +01:00
Zoltan Varga 9476d562d9 [jit] Use the same dwarf<->hw register mapping on x86 for both LLVM and jitted code, the one used by LLVM is the official version.
Cherry-pick of https://github.com/mono/mono/commit/2cab68d28c574320f6927b6677b4e3ea213b2e20.
2015-04-29 16:22:10 +01:00
Alex Rønne Petersen c110da5dc6 [mini] Expose mono_aot_get_method () as an API-unstable function.
This will be used by the profiler.
2015-04-29 16:34:19 +02:00
Alex Rønne Petersen 44ba74f134 [mini] Expose an API-unstable mono_get_jit_info_from_method () function.
This will be used by the profiler.

Conflicts:

	mono/mini/mini-runtime.c
2015-04-29 16:34:04 +02:00
Alex Rønne Petersen 0424c0e425 [profiler] Disable perf events by default.
As it turns out, `perf` support crashes/hangs on a lot of Linux
kernels in the wild, and produces no output on some Android devices.
So, given that using a signal + helper thread is more reliable, use
it by default and make `perf` support optional.

The configure flag is now `--enable-perf-events`.
2015-04-29 10:45:01 +02:00
Alex Rønne Petersen 145bf1a485 [profiler] Avoid a slow path in mono_jit_info_table_find (). 2015-04-29 10:44:56 +02:00
Alex Rønne Petersen 5b658b5c72 [profiler] Really fix looking up JIT info for AOT'd methods.
mono_aot_get_method () will not necessarily put methods into the
MonoDomain::jit_code_hash table. But it does return an IP that we
can use to look up the JIT info with mono_jit_info_table_find ().
2015-04-29 10:44:48 +02:00
Alex Rønne Petersen f81d1dba42 [profiler] Fix finding methods in other domains than the current one.
In certain cross-domain scenarios, the method we're executing
is not necessarily emitted in the current domain. So we need
to scan all domains for it.
2015-04-29 10:44:39 +02:00
Alex Rønne Petersen e01c79dffd [profiler] Redesign buffer flushing and method reporting.
The main goal of this change is to ensure that all methods have a `TYPE_JIT`
event emitted in the stream before they are referenced in other events. Before
this change, `TYPE_JIT` events could arrive out of order or not be emitted at
all because of generic sharing.

We now use a separate thread for writing log buffers to the output file.
Whenever a method is referenced in a TLS log buffer, we add it to a TLS list of
methods. When we ship the TLS log buffer off to the writer thread, we also send
the TLS list of methods. The writer thread first goes over all the methods and,
if some of them haven't had a `TYPE_JIT` event emitted yet, emits them to a
temporary buffer which is flushed just before flushing the main log buffer.

This approach ensures that `TYPE_JIT` events will *always* come before the
events that reference them.

Bookkeeping of which methods have been emitted to the output stream is done in
a global, concurrent hash table. Before a thread adds a method to its TLS list
of methods, it checks if the method is in the hash table. If it is, we know
that the method has already been emitted to the output stream, so it isn't
added to the list. The writer thread is the only thread that updates the hash
table (which happens when it flushes the temporary method buffer). So,
eventually, all TLS method lists will end up being empty because all methods
have been emitted to the output stream.
2015-04-29 10:44:31 +02:00
Zoltan Varga 373d684397 Fix the mobile build. 2015-04-28 15:58:47 -04:00
Zoltan Varga 735f5b3ee8 [runtime] Fix the non-msvc build. 2015-04-27 16:08:47 -04:00
Zoltan Varga feb16e4022 [jit] Disable deadce in the liveness2 pass as well when compiling for sdb. Fixes #28847. 2015-04-27 15:20:01 -04:00
Alex Rønne Petersen 436c5d2e57 [mini] Fix intrinsic signature checks to take into account the 'this' parameter. 2015-04-27 15:11:40 -04:00
Zoltan Varga d0620f1ab5 [runtime] Fix freeing invalid memory in CreateProcess () if the executable was not found. Fixes #28209. 2015-04-27 15:00:45 -04:00
Alexis Christoforides 3a6e855647 [DataContractJsonSerializer] Allow abstract base classes in lists. Fixes #26998
Abstract classes can still have subclasses with KnownType attributes, which are allowed in deserialization.

This used to work as the '__type' hint  was always honored no matter the type, and broke with https://github.com/mono/mono/commit/71e152accc727089faffa6b4fd6bf58cb62636cf which removed that behavior.
2015-04-27 12:17:31 -04:00
Marek Safar 5521f11004 [corlib] First specific culture returned by enumerator was not fully initialized. Fixes #29039 2015-04-27 16:43:41 +02:00
Marek Safar 1513f8f827 Merge pull request #1727 from esdrubal/mono-4.0.0-branch
[System.Xml] Fixed DateTime parsing of Xml strings
2015-04-27 16:35:26 +02:00
Miguel de Icaza 7975f5090d Update version 2015-04-26 09:00:31 -04:00
Marek Safar 1aa57ef746 [corlib] Add DefaultDllImportSearchPathsAttribute 2015-04-25 08:53:19 -04:00
Alexis Christoforides fd35b80bef Bump to bring in xamarin/bockbuild@257a1a8920 2015-04-22 15:20:53 -04:00
Marcos Henrich 71385a445f [System.Xml] Fixed DateTime parsing of Xml strings
System.Xml was failing to parse DateTime serializations such as
"2000-02-29T23:59:59+13:60".
This is caused by using .NET DateTime and still having the old
System.Xml in branch 4.0
This logic is implemented in .NET by XsdDateTime.
Added fallbacks to .NET XsdDateTime (renamed to XsdDateTime2) when our
parser fails.

The fix is specific to mono 4.0. As in mono master we are already using
.NET System.Xml.
2015-04-22 13:27:32 +01:00
Alexis Christoforides c8db1b0fbc Bump to bring in xamarin/bockbuild@42570d260b 2015-04-16 12:52:12 -04:00
Rodrigo Kumpera d136b7923f Commit marker for the gtk rendering fix. 2015-04-13 11:42:16 -04:00
João Matos ba35e6882f Merge pull request #1697 from directhex/mono-4.0.0-branch
[RPM] Fix MONO_PATH in RPM dependency generators
2015-04-09 13:22:29 +01:00
Jo Shields 0dfb848cde [RPM] Fix MONO_PATH in RPM dependency generators
Otherwise, RPMs don't have any dependency information
2015-04-09 13:19:15 +01:00
Zoltan Varga f42a83b1b4 [runtime] Allocate more space to thunks in dynamic methods. Fixes #28747. 2015-04-07 17:15:21 -04:00
Alexander Köplinger 38e08858e6 Fix incorrectly resolved merge conflict
aot-compiler was incorrectly removed from net_4_5_SUBDIRS in ccc2e36bc5, it should still be there in mono-4.0.0-branch (it was moved to  net_4_5_PARALLEL_SUBDIRS in 3ceb869495 later on).
2015-04-07 14:36:12 +02:00
Alexander Köplinger ccc2e36bc5 Integrate binary reference assemblies for v2.0/3.5 into the build system
Rename the net_4_0 profile which is already only used to trigger copying of reference assemblies
to binary_reference_assemblies and include the 2.0/3.5 files there. This should make it easier
to add more profiles in the future and doesn't clutter the build system as much as making separate
net_2_0 and net_3_5 profiles that do the same.

Conflicts:
	mcs/class/Makefile
2015-04-06 18:27:27 -04:00
Rodrigo Kumpera fe1279932f Update the reference assemblies we ship in mono. 2015-04-06 12:52:37 -04:00
Marcos Henrich 9236ac41e9 [corlib] TimeZoneInfo.TryAddTicks is now private. 2015-04-04 15:22:07 +01:00
Marek Safar 4639c99a48 [mcs] Mutate nested storey initialization only when needed. Fixes #28211 2015-04-03 15:55:07 +02:00
Marcos Henrich 7fc9ff987a [corlib] Refactored TimeZoneInfo DateTime overflow checks.
Added more overflow checks.
Fixed some overflow checks.
2015-04-03 10:27:53 +01:00
Marcos Henrich 989c0ff6aa [corlib] Fixed ParseTZBuffer with DST periods longer than a year.
AdjustmentRule specifies a DST period that starts and ends within a year.
When we have a DST period longer than a year, the generated AdjustmentRule may not be usable.
Thus we fallback to the transitions.
Fixes #24086.
2015-04-03 10:27:52 +01:00
Marcos Henrich 4420113b52 [corlib] Removed referencesource duplicated code. 2015-04-03 10:27:51 +01:00
Marcos Henrich f7c051a73c [corlib] Renamed GetUtcOffset to GetUtcOffsetHelper.
The new name is to avoid using the helper method instead of GetUtcOffset.
2015-04-03 10:27:50 +01:00
Marcos Henrich c555aee959 [corlib] Changed TimeZoneInfo methods to use GetUtcOffset.
In some cases rules are not available so we use GetUtcOffset instead of GetApplicableRule.
2015-04-03 10:27:48 +01:00
Sebastien Pouliot f26999f403 [linker] Ensure updated Scope for exported types (e.g. unlinked PCL facade assemblies in a Nuget) [#28617] 2015-04-02 16:46:11 -04:00
Sebastien Pouliot 125e4f4705 [tools] Fix mono-cil-strip to return non-zero on failure [#28617] 2015-04-02 16:46:01 -04:00
Marek Safar 8d291f789a [mcs] Handle null operator inside parenthesis expression. Fixes #28172 2015-04-02 15:24:33 +02:00
Zoltan Varga f70e175f52 Fix the build. 2015-04-01 10:53:48 -04:00
Zoltan Varga cd906692af Revert "Fix the build."
This reverts commit 21d849bd5b.

Revert this as it picked up unrelated changes.
2015-04-01 10:52:35 -04:00
Marek Safar 1830c45f5e [system.net.http] Use correct separator for headers tostring 2015-04-01 10:01:47 +02:00
Sebastien Pouliot 3a1c4b6e41 [tests] ManualResetEventSlim.SpinCount depends on the number of CPU/cores and we can't assume everything as multiple CPU/cores [#28611] 2015-03-31 21:30:48 -04:00
Zoltan Varga bce084ad29 [runtime] Add more caches to mono_marshal_get_native_wrapper () to avoid mixing wrappers with/without exception checks. 2015-03-31 18:33:13 -04:00
Zoltan Varga 21d849bd5b Fix the build. 2015-03-27 12:14:31 -04:00
Zoltan Varga ce30aaaa01 [runtime] Synchronize the overflow checks between mono_string_new_size () and mono_gc_alloc_string (). 2015-03-27 06:38:14 -04:00
Zoltan Varga 5c1a143121 [jit] Avoid emitting seq points in inlined methods. 2015-03-27 06:37:55 -04:00
Marek Safar f99b5b2825 [mcs] Reset flowanalysis finally scope per parameters block. Fixes #28196 2015-03-27 07:36:34 +01:00
Zoltan Varga ce674ebde7 [io-layer] Fix the freeing of MonoProcess structures. Fixes #28209. 2015-03-26 20:50:36 -04:00
Marek Safar 87c62a19b2 [system.net.http] Parse range values using long range. Fixes #26109 2015-03-26 23:47:04 +01:00
Marek Safar d2a79f98fb [mcs] The left-hand side of an assignment cannot contain a null propagating operator. Fixes #28435 2015-03-26 22:52:38 +01:00
Vincent Povirk 051999d6f0 Rename decimal functions to not conflict with win32 versions. 2015-03-26 21:01:45 +01:00
Martin Baulig 4e6e2a89fe [System]: Fix the AllowWriteStreamBuffering check. Bugs #26640 and #26936.
Added new tests for this to the web-tests:
https://github.com/xamarin/web-tests/commit/e7b5ac42897e629e9e4107cf6f9ae9e0a9fef45a

and re-enabled this one, which regressed:
https://github.com/xamarin/web-tests/commit/046da02c631c8799c7ab5025cd3b685f4a3e66f6

(cherry picked from commit 6808e6a5e6)
2015-03-26 16:13:39 +01:00
Marek Safar 291931ebea [mcs] Report abstract member hiding only for members which one can override. Fixes #28213 2015-03-26 10:06:52 +01:00
Marek Safar 57df2b7bc3 [mcs] Resize identifier buffer in all cases. Fixes #28292 2015-03-25 17:19:04 +01:00
Marek Safar 4fb3a99b5f [mcs] Fix parsing of interpolated strings inside conditional expression. Fixes #28293 2015-03-25 16:37:22 +01:00
Marek Safar b4eb72ca7d [mcs] Allow built-in types to have partial declaration 2015-03-25 15:13:25 +01:00
Zoltan Varga c61bcc925d [runtime] Avoid returning null from Marshal.AllocCoTaskMem () if size is 0. Fixes #28383. 2015-03-25 01:31:33 -04:00
Alex Rønne Petersen b4d6290008 [profiler] Make perf syscall work on ARM64. 2015-03-25 02:43:34 +01:00
Alex Rønne Petersen 9e5820094b [profiler] Clean up some unused declarations. 2015-03-25 02:43:29 +01:00
Alex Rønne Petersen 86ee34858d [profiler] Don't build the profiler on Windows. 2015-03-25 02:43:17 +01:00
Alex Rønne Petersen b0a10b2f73 [configure] Add a --disable-perf-events flag to disable perf on Linux. 2015-03-25 02:43:07 +01:00
Alex Soto 84a1764a57 [MonoDataSqlite] Add test for Xamarin.iOS specific bug 27864
src: https://bugzilla.xamarin.com/show_bug.cgi?id=27864

As of iOS 8.2 Apple updated Sqlite and broke queries that used to work
pre iOS 8.2 like the select command in this test, The pruppose of this
test is to know when apple fixes this. Expected test behaivour is as follows.

* If iOS 8.2+ Test will pass as long as apple does not fix the bug
* If iOS < 8.2 Test will pass as it does work as expected
* If iOS 8.2+ and apple fixed bug 27864 test will fail and we will need to
  remove the fail check on lines 105 and 106
2015-03-24 17:34:19 -06:00
Zoltan Varga a0a93c4263 Revert "[io-layer] Fix the freeing of MonoProcess structures. Fixes #28209."
This reverts commit 9e351577c2.

Revert this until it is fixed.
2015-03-24 17:35:54 -04:00
Zoltan Varga e25c686499 Revert "[runtime] Fix an uninitialized memory error added by eaf200b37bd8ba29d59fc7054f8409e9b76b5697."
This reverts commit 2335cca8fd.

Revert this until it is fixed.
2015-03-24 17:35:40 -04:00
Zoltan Varga d2f18038ba Revert "[runtime] Fix another regression caused by eaf200b37bd8ba29d59fc7054f8409e9b76b5697."
This reverts commit 5c55cf4b06.

Revert this until it is fixed.
2015-03-24 17:35:20 -04:00
Zoltan Varga 5c55cf4b06 [runtime] Fix another regression caused by eaf200b37b. 2015-03-24 16:51:53 -04:00
Marcos Henrich ec5f493016 [System] Fixed RemoveConnectionGroup concurrent issue.
CloseConnectionGroup can concurrently call RemoveConnectionGroup and remove a group that has added to removeList.
We now check that the group still exists before removing it.
Fixes #19823.
2015-03-24 19:19:09 +00:00
Zoltan Varga 2335cca8fd [runtime] Fix an uninitialized memory error added by eaf200b37b. 2015-03-24 14:56:31 -04:00
Zoltan Varga 9e351577c2 [io-layer] Fix the freeing of MonoProcess structures. Fixes #28209. 2015-03-24 12:37:01 -04:00
Sebastien Pouliot b7bcd23071 [tests] Tweak MemoryMappedFile test case that fails on iOS/ARM64 [#27667]
Filled with Apple. From bug report:

The problem appears to be caused by a bug in mmap on the arm64 ios.

In this test, we request a page and mmap returns successfully, but when trying
to access the mapped memory, the program crashes after the 4097th byte, meaning
that it only maps us 4kb(???). It should be mentioned that on arm64 ios the
page size is 16kb.
2015-03-24 10:47:32 -04:00
Sebastien Pouliot 798a777153 Revert "Fix mmap past file end on arm64 ios."
This reverts commit 70f5971e04.
2015-03-24 10:17:08 -04:00
Alex Rønne Petersen c52336f439 [arm] Also fix OP_ATOMIC_STORE_R4. 2015-03-24 04:26:04 +01:00
Sebastien Pouliot e3dc17469e [tests] Tweak DateTime.AddMillisecondsOutOfRangeException* tests to work on ARM [#28311] 2015-03-23 18:09:14 -04:00
Marek Safar 26d10e6572 Bump reference sources for bug #28331 2015-03-23 20:12:40 +01:00
Zoltan Varga 89a9c7646e [arm] Fix OP_ATOMIC_LOAD_R4. 2015-03-23 14:25:45 -04:00
Sebastien Pouliot b1c6715167 [tests] Some of the new decimal tests (ported from MS tests) do not work on every culture, this set one that works for them 2015-03-20 15:26:39 -04:00
Zoltan Varga f1258f8548 [runtime] Disable the locking of archives in libtool, it was a workaround around an old darwin bug which got fixed years ago: http://lists.gnu.org/archive/html/bug-libtool/2009-05/msg00062.html. 2015-03-20 00:18:06 -04:00
Zoltan Varga a4372a69fb [aot] Fix support for direct icalls in llvm mode. 2015-03-19 23:26:41 -04:00
Zoltan Varga d474800f1a [jit] Use unique castclass caches in all cases. Fixes #27787. 2015-03-19 22:46:25 -04:00
Zoltan Varga a59c479a68 [runtime] Fix the isinst_with_cache wrapper on 64 bit platforms. 2015-03-19 22:46:17 -04:00
Zoltan Varga ce8f657da1 [io-layer] Avoid closing std file descriptors on shutdown. Fixes #28098. 2015-03-19 17:36:36 -04:00
Zoltan Varga 1605a60754 Fix the build. 2015-03-17 17:44:06 -04:00
Zoltan Varga 67a5a11bd3 [jit] Avoid disabling direct calls to icalls on arm64+llvm. 2015-03-17 17:38:51 -04:00
Zoltan Varga 00232c8704 [jit] Add exception checks after direct calls to icalls by inlining the wrapper. 2015-03-17 17:38:22 -04:00
Zoltan Varga 44a0663032 [jit] Disable direct icalls for now to fix the build. 2015-03-17 17:38:12 -04:00
Zoltan Varga 93cae9f52b [jit] Add support for directly calling normal icalls. Enable it for a few perf-sensitive classes like Math. 2015-03-17 17:37:31 -04:00
Zoltan Varga 0078c40250 [aot] Enable direct calls to icalls in aot mode, disable them when the 'direct-calls' aot option is used. 2015-03-17 17:33:41 -04:00
Zoltan Varga 18d408f00d [jit] Disable direct calls to icalls when using llvm, llvm can't handle direct calls to 64 bit addresses (tests/jit-float.exe fails). 2015-03-17 17:28:54 -04:00
Zoltan Varga 9578437645 [jit] Make the opcode emulation jit icalls callable without a wrapper in some cases. 2015-03-17 17:26:18 -04:00
Zoltan Varga df3eb65bb7 [runtime] Use mono_set_pending_exception () in some places in icalls. Avoid using it for throwing exceptions returned by mono_thread_execute_interruption (), since that seems to cause problems. 2015-03-17 17:25:15 -04:00
Zoltan Varga 82b07416d5 [runtime] Mark mono_set_pending_exception () as a cold function, so calling code is generated out-of-line. 2015-03-17 17:25:02 -04:00
Zoltan Varga 886b00dc1c [jit] Use mono_set_pending_exception () instead of throwing exceptions in JIT icalls. 2015-03-17 17:24:56 -04:00
Zoltan Varga 990c40cd4e [jit] Make mono_thread_interruption_checkpoint () return the exception which needs to be thrown and throw it from the managed method/wrapper which called it. 2015-03-17 17:24:27 -04:00
Vlad Brezae 1b875c9b15 [x86] Handle stack pop done by native stdcalls.
The problem was caused with the introduction of the pushless backend. We have to compensate for the arguments being popped by native stdcall callees, to keep param_area from shrinking. Fixes #27597
2015-03-17 04:53:59 -04:00
Zoltan Varga e4c026208c [io-layer] Avoid the usage of atexit (), clean up handles normally. 2015-03-16 16:26:37 -04:00
Marcos Henrich 52ddcb28c3 [runtime] Fixed Process.GetProcesses ().
Process.GetProcesses () was not returning any processes.
2015-03-16 12:56:00 +00:00
Zoltan Varga 565c18bf2f Fix the build. 2015-03-14 15:13:08 -04:00
Zoltan Varga c961e6ed4b Fix the aot compiler. 2015-03-14 05:02:19 -04:00
João Matos d5b9350783 [aot] Wrap the commands we pass to Windows's system() in double quotes.
We need an extra set of quotes around the whole command to properly handle commands
with spaces since internally the command is called through "cmd /c.

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=27899.
2015-03-13 17:15:12 +00:00
João Matos 3f23cdd9a5 [aot] Escape the command executables with quotes to deal properly with spaces in paths. 2015-03-13 17:15:10 +00:00
João Matos b4921c741c [aot] Ensure the LLVM tools path ends with a directory separator appropriate to the system. 2015-03-13 17:15:08 +00:00
Rolf Bjarne Kvinge eee6839126 [mono-api-html] Render generic parameter constraints.
Makes changed constraints show up in diffs.
2015-03-13 16:44:20 +01:00
Zoltan Varga 3b18a06f63 [jit] Throw the proper exception on integer overflow from div/rem if MONO_ARCH_NEED_DIV_CHECK is defined. 2015-03-12 18:28:04 -04:00
João Matos 08678f18e7 [eglib] Fixed file being created without read/write permission on Windows.
This bug manifested itself as files being written to disk with 0 bytes.

Fixes the AOT compiler on Windows not working properly.

https://bugzilla.xamarin.com/show_bug.cgi?id=27900
2015-03-12 16:41:37 +00:00
Marcos Henrich d51afc4c5b [corlib] TimeZoneInfo.TryGetTransitionOffset overflow checks. 2015-03-12 13:23:03 +00:00
Marcos Henrich bc7b4e330a [corlib] Fixed DateTime overflow check in TimeZoneInfo. 2015-03-12 12:46:17 +00:00
Zoltan Varga 9f0f929a97 [jit] Enable the gsharedvt testcase which now works. 2015-03-11 18:48:39 -04:00
Rodrigo Kumpera 165a47d044 Merge pull request #1625 from BrzVlad/fix-ios-mmap
Fix mmap past file end on arm64 ios.
2015-03-11 17:14:55 -05:00
Vlad Brezae 70f5971e04 Fix mmap past file end on arm64 ios.
On arm64, where page size is 16k, if trying to map after the file end mmap doesn't map us the full page but only 4kb. This bug is present on iOS 8.2. As a workaround, we forcefully extend the file to the desired size to make sure than we can map the full page.

https://bugzilla.xamarin.com/show_bug.cgi?id=27667
2015-03-11 14:01:43 -07:00
Marek Safar fac9fc87e6 [system] Fixes InvalidCastException in OpenReadAsyncCallback 2015-03-11 17:28:59 +01:00
Rodrigo Kumpera 5554b6ad11 [io-layer] When checking if a file is a program check both read and execute permissions. Fixes #27565
The original behavior of only checking for read permission broke sudo on OSX which only have the execute permission set.
2015-03-11 12:28:51 -04:00
Jo Shields 625f62c167 [msvc] Change target MSVC release from v120 to v120_xp
They're basically the same thing, but v120 has DX10+ capabilities and v120_xp
is DX9 only. Since we're not building against DirectX, the difference is
purely academic - but changing the value to v120_xp means MSVC binaries run
on XP+, not Vista+

(cherry picked from commit 577482e336)
2015-03-11 15:25:16 +00:00
Jo Shields d3aedd8189 [msvc] Refresh .def files
(cherry picked from commit 1d33de4a70)
2015-03-11 12:06:46 +00:00
Jo Shields 1bd3b8aca0 Bump winconfig.h to 4.0.0 2015-03-11 10:13:09 +00:00
Jo Shields 39dbbe2d65 Use MSVC2013 for *all* mono.sln dependants
(cherry picked from commit c127ea46a3)
2015-03-11 10:00:48 +00:00
Jo Shields 7f27bd72df Add _WIN32_WINNT to Release definition, not just Debug
(cherry picked from commit 21bc7fa948bee919644a733ca1355366c69926fd)
2015-03-11 09:49:15 +00:00
João Matos f31b86c340 [runtime] Upgraded Jay MSVC project to VS 2013.
(cherry picked from commit b528a79db5)
2015-03-11 09:37:25 +00:00
João Matos bc98119172 [runtime] Fixed the MSVC build.
Even though this seems like it's just moving the files around in the project, for some reason it makes a difference to VS.

(cherry picked from commit 220afd9d49)
2015-03-11 09:30:01 +00:00
Zoltan Varga 1aba894227 Fix the build. 2015-03-10 18:26:51 -04:00
Zoltan Varga 419f2abbd9 Fix some bugs in 92ca06aa7d. Fixes #26989. 2015-03-10 17:54:26 -04:00
Zoltan Varga ab869b5517 [jit] Fix the handling of byref locals in mono_allocate_stack_slots2 (). 2015-03-10 17:52:42 -04:00
Mark Probst c00db28a9b [tests] Test case for #27147. 2015-03-10 14:44:52 -07:00
Mark Probst a69610255d [sgen] Fix a bug in 64 bit LOS cardtable scanning. Fixes #27147. 2015-03-10 14:44:50 -07:00
Alexander Köplinger 397fb0c548 [corlib] Fix timezone dependent DateTimeOffset test
Instead of trying to recreate the date with the current timezone, we should make the date assume UTC and compare against that.
2015-03-09 21:59:43 -04:00
João Matos 73d7873d31 [runtime] Fixed Windows mono_threads_core_get_stack_bounds to work with cross-compiled targets. 2015-03-09 14:22:16 +00:00
João Matos 66c1b9c77c Enable x86 cross compilation on Windows. 2015-03-06 18:15:12 +00:00
João Matos 922f5662ed Do not try to use the native GCC linker when targeting Android from Windows. 2015-03-06 17:43:06 +00:00
João Matos 59c0207c87 Fixed Windows system commands calls with non-ASCII paths.
This is a bit of an hack but it works for now... ideally we should be processing the Unicode command line flags passed by the CRT at startup instead of trying to convert the MBCS string to a wide string.
2015-03-06 17:43:04 +00:00
Sebastien Pouliot e80398b23f Remove the EXPORT ciphers and related code path
That was still useful in 2003/2004 but the technical and legal landscape
    changed a lot since then. Removing the old, limited key size, cipher
    suites also allow removed additional parts of the code that deals with
    them.
2015-03-06 10:37:57 -05:00
Sebastien Pouliot 4c54e08936 Remove the client-side SSLv2 fallback.
There's almost no SSLv3 web site left so a v2 fallback is only extra
    code we do not need to carry forward.
2015-03-06 10:37:55 -05:00
Sebastien Pouliot 5c2a3c25fd TLS protocol: add handshake state validation 2015-03-06 10:37:53 -05:00
Rodrigo Kumpera 53d221e810 [loader] If probing for a pinvoke fails, log the error mono_dl_symbol gives us.
We used to swallow the error, which is unhelpful.

The reason for that might be because we probe multiple names before giving up but
even then, it's ok log all attempts. It will make troubleshooting easy, even if we
have to go through a lot more log entries.
2015-03-05 15:22:03 -05:00
Zoltan Varga ea43208df6 [sdb] Avoid asserts on darwin when the thread deregistration code is ran from a pthread dtor. Fixes #27697. 2015-03-05 15:03:54 -05:00
Sebastien Pouliot 81f43a2487 [tests] IPInterfaceProperties DNS address does not currently work on iOS devices (since it read /etc/resolve.conf). Ignore it for XI until #27707 is fixed 2015-03-05 14:04:09 -05:00
Miguel de Icaza 89a08ecc33 [System.ServiceModel.Web/WebMessageFormatter] Fix OperationContracts with void returns
WebMessageFormatter crashes when the OperationContracts had a void return type.

Fixes #20764, patch from <[email protected]>
2015-03-05 11:34:39 -05:00
Miguel de Icaza 9aae4ade12 [SslClientStream] Prevent crashes when a connection is closed
When a socket has been closed as part of the negotiation, the
SendAlert method would crash when trying to reuse the socket.

Add try/catch around this to prevent this.

Fixes #19334
2015-03-05 11:33:55 -05:00
João Matos 51d34c61fd Support multiple options when processing the AOT flag "ld-flags". 2015-03-03 16:29:41 +00:00
Zoltan Varga 1050938254 [aot] Fix thumb support with separate llvm modules. 2015-03-02 22:38:38 -05:00
Zoltan Varga ab5d6b3b9f [arm] Fix support for backward branches in mono_arm_get_thumb_plt_entry (). 2015-03-02 22:38:33 -05:00
Marek Safar b6438ca27b [mcs] Handle string constants inside interpolated string expression. Fixes #27533 2015-03-02 14:20:42 +01:00
Jo Shields 092a04e4f7 Workaround for X509Certificate.RSA throwing an unhandled exception in ASN1 parsing of certificates with ECC public keys only. 2015-03-02 13:07:14 +00:00
Marek Safar fcb023636e Bump referencesource to mono-4.0.0-branch 2015-03-02 11:11:33 +01:00
Marek Safar b16f85b9dd [mcs] Add cloning to string interpolation expressions. Fixes #27525 2015-03-02 10:17:15 +01:00
Alexis Christoforides 5b7798b6c5 Bump to trigger build with https://github.com/xamarin/bockbuild/commit/b8ac90ecd1e89edd9ba62e3fe04581cb75f1d063 2015-03-01 12:09:54 -05:00
Zoltan Varga 709565592d [llvm] Increase the size of a parameter array which was too small for some arm64 calling conventions. 2015-02-27 13:33:54 -05:00
João Matos 85f7fefe8a Added "ld-flags" to pass extra linker flags to the AOT linker pipeline. 2015-02-27 17:27:16 +00:00
Rodrigo Kumpera e0873dee3b Remove explicit support for 2.0, it will now use 4.5 2015-02-27 11:07:44 -05:00
Zoltan Varga 26340997e5 [aot] Fix thumb support when using separate llvm modules. 2015-02-26 15:27:31 -05:00
Zoltan Varga 43743ac7f8 [runtime] Add a --disable-visibility-hidden flag to disable the usage of -fvisibility=hidden for now. 2015-02-26 15:20:59 -05:00
Rolf Bjarne Kvinge cfe89ef924 Ignore a few decimal tests on mobile, according to #27269
https://bugzilla.xamarin.com/show_bug.cgi?id=27269
2015-02-26 20:00:41 +01:00
Zoltan Varga 8a3a77dce1 [runtime] Disable the "bridge-implementation=tarjan,major=marksweep-conc|ms-conc-tarjan-bridge" sgen tests which currently fail. 2015-02-26 12:57:52 -05:00
Rolf Bjarne Kvinge 00251b8c11 Don't use _NSGetEnviron on arm64. 2015-02-26 13:55:41 +01:00
Rolf Bjarne Kvinge 2c78813a69 Restrict IOKit usage to desktop OSX.
IOKit is a private framework in iOS, so it can't be used (and
no headers are provided, so it doesn't even compile).
2015-02-26 13:52:16 +01:00
João Matos a9a759626a Fixed compilation on Linux targets without linux/serial.h.
/Users/builder/data/lanes/monodroid-mavericks-master/7de6731a/source/mono/support/serial.c:25:26: fatal error: linux/serial.h: No such file or directory
 #include <linux/serial.h>

The header is only available on Android NDK API level >= 21.
2015-02-26 12:10:03 +00:00
Alexander Köplinger ebf6644648 Remove EntityFramework from class libs
We currently ship a horribly outdated version of EF. This is unnecessary since EF is on NuGet and has an active set of users using it on Unix.

Miguel gave his +1 on the mailing list already.
2015-02-26 01:29:54 +01:00
Rodrigo Kumpera c5a2a17a55 Fix my last commit to properly include the tarjan test suite. 2015-02-25 19:16:20 -05:00
Rodrigo Kumpera a2042e361c Add the tarjan bridge to the test matrix. 2015-02-25 19:16:14 -05:00
Rodrigo Kumpera 1293675929 [sgen] Fix the sgen bridge test suite. Oh my. 2015-02-25 19:16:10 -05:00
Rodrigo Kumpera 5875dd48c2 [sgen-bridge] Fix all the bridges after the change to have descriptor loading happen outside of scanning.
This changes all bridges to use the _safe variant of sgen_obj_get_descriptor. Bridge processing happens in
the post-scan world, before objects get untagged.
2015-02-25 18:23:24 -05:00
Miguel de Icaza c1d60b3918 [Serial] Add support for high baud rates to MacOS 2015-02-25 16:32:43 -05:00
Miguel de Icaza 6e688fc5a8 [serial,signal] Add support for Linux arbitrary baud rates + drop Apple legacy poll support
This patch brings support for arbitrary baud rates in Linux, from patch:

https://bugzilla.xamarin.com/show_bug.cgi?id=8207

Which has been MIT licensed (see mono-devel-list).

In addition, while testing the patch, discovered that we are using
fakepoll.h on MacOS which was there to support Tiger-era broken poll
implementations.

The details about the lack of poll support come from this document
that is now only available on web.archive.org:

http://web.archive.org/web/20030604064847/http://developer.apple.com/technotes/tn2002/tn2071.html

And the original Mono bug that reported the problem in 2008, followed
by the fixes is reported and discussed here:

https://bugzilla.novell.com/show_bug.cgi?id=384227

The source of the problem, confirmed by an Apple employee at the time
(form the bug) is that poll sometimes results in returning POLLHUP
when a POLLIN was expected:

http://curl.haxx.se/mail/lib-2005-05/0122.html

This web site tracks the behavior of poll (POLLHUP and POLLIN) across
Posix implementations when you reach an end of file:

http://www.greenend.org.uk/rjk/tech/poll.html
2015-02-25 15:17:33 -05:00
Marek Safar ff2d07c4a1 [system.net.http] Add another workaround for incompatible mono Uri handling. Fixes #27386 2015-02-25 12:32:11 +01:00
Marek Safar 83d87aeb90 [System.Net.Http] Change relative uri test to not require internet access 2015-02-25 12:32:02 +01:00
Marek Safar ca9ee4b264 [Mono.XBuild.Tasks] Fixes versioning with newer than 4.0 special msbuild profiles 2015-02-24 18:11:00 -05:00
Rodrigo Kumpera 807ca43a59 Bump mono version to 4.0 2015-02-24 17:28:43 -05:00
Rodrigo Kumpera 7ca1857b8d Merge pull request #1592 from akoeplinger/remove-npgsql-4.0
Remove Npgsql from class libs (mono-4.0.0-branch)
2015-02-24 14:55:40 -06:00
Alexander Köplinger 51e5f8cc9b Remove Npgsql from class libs
This has been requested by the maintainers of Npgsql a few times already (https://bugzilla.xamarin.com/show_bug.cgi?id=23119) and we should do it for Mono 4.0.
Miguel gave his +1 on the mailing list already.
2015-02-24 21:50:42 +01:00
Marek Safar 46b86edb63 [facades] Add missing System.ServiceModel.Primitives forwarders to MT profile. Fixes #27338 2015-02-24 20:31:01 +01:00
Marek Safar ee2d91851a [system.net.http] Accept header with multiple values. Fixes #27352 2015-02-24 19:18:44 +01:00
Marek Safar 3e854a1f22 [build] 3.10 bump for bootstrap was too much 2015-02-24 09:01:52 +01:00
Marek Safar 4576568996 [system] Bump reference sources to get correct category names 2015-02-24 08:51:33 +01:00
Zoltan Varga 51a74a27da [runtime] Disable some dyncall/gsharedvt fullaot tests on amd64. 2015-02-23 19:50:03 -05:00
Zoltan Varga 7aa521b02c [bcl] Fix Console support on ios, the TextWriter class from the reference sources called TextWriter:Write(char), so stdout was never flushed. 2015-02-23 19:47:52 -05:00
3411 changed files with 141327 additions and 17240 deletions

No files matched your search

+1 -1
View File
@@ -26,7 +26,7 @@
[submodule "external/referencesource"]
path = external/referencesource
url = git://github.com/mono/referencesource
branch = mono
branch = mono-4.0.0-branch
[submodule "external/reference-assemblies"]
path = external/binary-reference-assemblies
url = git://github.com/mono/reference-assemblies.git
+1 -1
View File
@@ -52,7 +52,7 @@ dist-hook:
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
rm -rf `find $(top_distdir)/external -path '*\.git'`
rm -f `find $(top_distdir)/external -path '*\.exe'`
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/v4\.0*'`
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*'`
cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
# Disable this for now because it is very slow and causes wrench to timeout:
+7 -19
View File
@@ -10,32 +10,20 @@ It is an open source implementation of Microsoft's .NET Framework based on the E
**Build Status**
Officially supported architectures:
| debian-amd64 | debian-i386 | debian-armel | debian-armhf | windows-amd64 |
|-------------------------|------------------------|-------------------------|-------------------------|---------------------------|
| [![debian-amd64][1]][2] | [![debian-i386][3]][4] | [![debian-armel][5]][6] | [![debian-armhf][7]][8] | [![windows-amd64][9]][10] |
Community supported architectures:
| debian-ppc64el | centos-s390x |
|-----------------------------|---------------------------|
| [![debian-ppc64el][11]][12] | [![centos-s390x][13]][14] |
| debian-amd64 | debian-i386 | debian-ppc64el | centos-s390x | windows-amd64 |
|:-----------------------:|:----------------------:|:-------------------------:|:-----------------------:|:-------------------------:|
| [![debian-amd64][1]][2] | [![debian-i386][3]][4] | [![debian-ppc64el][5]][6] | [![centos-s390x][7]][8] | [![windows-amd64][9]][10] |
[1]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/badge/icon
[2]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/
[3]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/badge/icon
[4]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/
[5]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armel/badge/icon
[6]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armel/
[7]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armhf/badge/icon
[8]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armhf/
[5]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/badge/icon
[6]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/
[7]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/badge/icon
[8]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/
[9]: https://ci.appveyor.com/api/projects/status/1e61ebdfpbiei58v/branch/master?svg=true
[10]: https://ci.appveyor.com/project/ajlennon/mono-817/branch/master
[11]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/badge/icon
[12]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/
[13]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/badge/icon
[14]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/
Compilation and Installation
============================
+54 -28
View File
@@ -4,41 +4,54 @@
# For further details see http://www.appveyor.com
#
# Use 'unstable' Appveyor build worker image as Appveyor have added Cygwin to this for us
os: Unstable
#
# Custom environment variables
#
environment:
global:
CYG_ROOT: C:\cygwin
CYG_ROOT: C:/cygwin
CYG_MIRROR: http://cygwin.mirror.constant.com
CYG_CACHE: C:\cygwin\var\cache\setup
CYG_BASH: C:\cygwin\bin\bash
#
# Cache Cygwin files to speed up build
#
cache:
- '%CYG_CACHE%'
#
# Do a shallow clone of the repo to speed up build
#
clone_depth: 1
CYG_CACHE: C:/cygwin/var/cache/setup
NSIS_ROOT: C:\nsis
#
# Initialisation prior to pulling the Mono repository
# Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
#
init:
- git config --global core.autocrlf input
- 'echo Building Mono for Windows'
- 'echo System architecture: %PLATFORM%'
- 'echo Repo build branch is: %APPVEYOR_REPO_BRANCH%'
- 'echo Build folder is: %APPVEYOR_BUILD_FOLDER%'
# Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
- 'git config --global core.autocrlf input'
#
# Install needed build dependencies
#
install:
- ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"'
- 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages autoconf,automake,bison,gcc-core,gcc-g++,mingw-runtime,mingw-binutils,mingw-gcc-core,mingw-gcc-g++,mingw-pthreads,mingw-w32api,libtool,make,python,gettext-devel,gettext,intltool,libiconv,pkg-config,git,curl,libxslt > NUL 2>&1'
- '%CYG_BASH% -lc "cygcheck -dc cygwin"'
# NOTE: Already installed on current Appveyor unstable image
# - 'echo Retrieving Cygwin'
# - 'appveyor DownloadFile http://cygwin.com/setup-x86.exe -FileName %CYGROOT%/setup-x86.exe'
- 'echo Setting up Cygwin dependencies'
- '%CYG_ROOT%\setup-x86.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P autoconf -P automake -P bison -P gcc-core -P gcc-g++ -P mingw-runtime -P mingw-binutils -P mingw-gcc-core -P mingw-gcc-g++ -P mingw-pthreads -P mingw-w32api -P libtool -P make -P python -P gettext-devel -P gettext -P intltool -P libiconv -P pkg-config -P git -P wget -P curl > NUL'
- 'echo Check Cygwin setup'
- '%CYG_ROOT%/bin/bash -lc "cygcheck -dc cygwin"'
- 'echo Done setting up Cygwin'
- 'echo Retrieving NSIS'
- 'appveyor DownloadFile "http://sunet.dl.sourceforge.net/project/nsis/NSIS 2/2.46/nsis-2.46-setup.exe" -FileName nsissetup.exe'
- 'echo Setting up NSIS'
- 'nsissetup.exe /S /D=%NSIS_ROOT%'
- 'echo Done setting up NSIS'
#
# NOTE: msbuild doesn't work at present so use Cygwin to build
#
#build:
# project: C:\projects\mono\msvc\mono.sln
# verbosity: detailed
# Cygwin build script
#
@@ -46,16 +59,29 @@ install:
#
# The stdin/stdout file descriptor appears not to be valid for the Appveyor
# build which causes failures as certain functions attempt to redirect
# default file handles. Ensure a dummy file descriptor is opened with 'exec'.
# default file handles. Ensure a dummy file descriptor is opened with exec.
#
build_script:
- 'echo Building...'
- '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./autogen.sh --prefix=/usr/local --host=i686-pc-mingw32"'
- '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make get-monolite-latest"'
- '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make -j2"'
- 'echo Installing...'
- 'mkdir %APPVEYOR_BUILD_FOLDER%\install'
- '%CYG_BASH% -lc "export CYGWIN=winsymlinks:native; mount \"$APPVEYOR_BUILD_FOLDER\install\" /usr/local; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make install; umount /usr/local"'
- cmd: 'echo Cygwin root is: %CYG_ROOT%'
- cmd: 'echo Build folder is: %APPVEYOR_BUILD_FOLDER%'
- cmd: 'echo Repo build branch is: %APPVEYOR_REPO_BRANCH%'
- cmd: 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%'
- cmd: 'echo Autogen running...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; NOCONFIGURE=1 ./autogen.sh --prefix=/usr/local --with-preview=yes"'
- cmd: 'echo Configure running...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./configure --host=i686-pc-mingw32"'
- cmd: 'echo Pulling monolite latest...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make get-monolite-latest"'
- cmd: 'echo Make running...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make"'
- cmd: 'echo Installing...'
- cmd: 'mkdir %APPVEYOR_BUILD_FOLDER%\install'
- cmd: '%CYG_ROOT%/bin/bash --login -lc "export CYGWIN=winsymlinks:native; mount \"$APPVEYOR_BUILD_FOLDER\install\" /usr/local; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make install; umount /usr/local"'
# - cmd: 'echo Building package...'
# - cmd: 'cd %APPVEYOR_BUILD_FOLDER%'
# - cmd: '%NSIS_ROOT%\makensis /DMILESTONE=%APPVEYOR_REPO_BRANCH% /DSOURCE_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER\install\*.* /DBUILDNUM=%APPVEYOR_BUILD_VERSION% monowiz.win32.nsi'
# - cmd: 'Building distribution...'
# - cmd: '%CYG_ROOT%/bin/bash -lc "export CYGWIN=winsymlinks:native; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make dist"'
#
# Disable tests for now
+8 -1
View File
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
#AC_PREREQ([2.62])
AC_INIT(mono, [4.1.0],
AC_INIT(mono, [4.0.2],
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
AC_CONFIG_SRCDIR([README.md])
@@ -2521,6 +2521,12 @@ fi
AC_ARG_ENABLE(bcl-opt, [ --disable-bcl-opt BCL is compiled with no optimizations (allows accurate BCL debugging)], test_bcl_opt=$enableval, test_bcl_opt=yes)
AC_ARG_ENABLE(perf-events, [ --enable-perf-events Enable using `perf` for profiling on Linux], test_perf_events=$enableval, test_perf_events=no)
if test "x$test_perf_events" == "xyes"; then
AC_DEFINE(ENABLE_PERF_EVENTS, 1, [Enable using `perf` for profiling on Linux])
AC_SUBST(ENABLE_PERF_EVENTS)
fi
AC_MSG_CHECKING([if big-arrays are to be enabled])
AC_ARG_ENABLE(big-arrays, [ --enable-big-arrays Enable the allocation and indexing of arrays greater than Int32.MaxValue], enable_big_arrays=$enableval, enable_big_arrays=no)
if test "x$enable_big_arrays" = "xyes" ; then
@@ -3824,6 +3830,7 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/web.config],
],[LN_S='$LN_S'])
AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/echo "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
AC_CONFIG_COMMANDS([nolock-libtool], [sed -e 's/lock_old_archive_extraction=yes/lock_old_archive_extraction=no/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
AC_OUTPUT([
Makefile
+1 -4
View File
@@ -13,14 +13,11 @@
<section name="startup" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false"/>
<section name="system.codedom" type="System.CodeDom.Compiler.CodeDomConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.data" type="System.Data.Common.DbProviderFactoriesConfigurationHandler, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.diagnostics" type="System.Diagnostics.SystemDiagnosticsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.diagnostics" type="System.Diagnostics.DiagnosticsConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.runtime.remoting" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
<section name="system.windows.forms" type="System.Windows.Forms.WindowsFormsSection, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="windows" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
<section name="strongNames" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
<sectionGroup name="system.runtime.serialization" type="System.Runtime.Serialization.Configuration.SerializationSectionGroup, System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="dataContractSerializer" type="System.Runtime.Serialization.Configuration.DataContractSerializerSection, System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
</sectionGroup>
<sectionGroup name="system.web" type="System.Web.Configuration.SystemWebSectionGroup, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<section name="anonymousIdentification" type="System.Web.Configuration.AnonymousIdentificationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="authentication" type="System.Web.Configuration.AuthenticationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
+1 -1
View File
@@ -58,7 +58,7 @@ int mkstemp (char *tmp_template)
utf16_template = _wmktemp( utf16_template);
if (utf16_template && *utf16_template) {
/* FIXME: _O_TEMPORARY causes file to disappear on close causing a test to fail */
fd = _wopen( utf16_template, _O_BINARY | _O_CREAT /*| _O_TEMPORARY*/ | _O_EXCL, _S_IREAD | _S_IWRITE);
fd = _wopen( utf16_template, _O_BINARY | _O_CREAT /*| _O_TEMPORARY*/ | _O_RDWR | _O_EXCL, _S_IREAD | _S_IWRITE);
}
/* FIXME: this will crash if utf16_template == NULL */
+3 -3
View File
@@ -12,7 +12,7 @@ monotouch_runtime_SUBDIRS := build class
xammac_SUBDIRS := build class
mobile_SUBDIRS := build class
mobile_static_SUBDIRS := build class
net_4_0_SUBDIRS := build class
binary_reference_assemblies_SUBDIRS := build class
net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
xbuild_12_SUBDIRS := build class tools/xbuild
xbuild_14_SUBDIRS := build class tools/xbuild
@@ -30,7 +30,7 @@ dir-check:
# fun specialty targets
PROFILES = net_4_5 net_4_0 xbuild_12 xbuild_14
PROFILES = net_4_5 binary_reference_assemblies xbuild_12 xbuild_14
.PHONY: all-profiles $(STD_TARGETS:=-profiles)
all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -51,7 +51,7 @@ profiles-do--run-test:
_boot_ = all clean install
$(_boot_:%=profile-do--xbuild_14--%): profile-do--xbuild_14--%: profile-do--net_4_5--%
$(_boot_:%=profile-do--xbuild_12--%): profile-do--xbuild_12--%: profile-do--net_4_5--%
$(_boot_:%=profile-do--net_4_0--%): profile-do--net_4_0--%: profile-do--build--%
$(_boot_:%=profile-do--binary_reference_assemblies--%): profile-do--binary_reference_assemblies--%: profile-do--build--%
$(_boot_:%=profile-do--net_4_5--%): profile-do--net_4_5--%: profile-do--build--%
$(_boot_:%=profile-do--monodroid--%): profile-do--monodroid--%: profile-do--build--%
$(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%: profile-do--build--%
+1 -1
View File
@@ -18,7 +18,7 @@ PLATFORMS = darwin linux win32
PROFILES = \
basic \
build \
net_4_0 \
binary_reference_assemblies \
net_4_5 \
xbuild_12 \
xbuild_14
-1
View File
@@ -78,7 +78,6 @@ static class Consts
//
public const string AssemblyI18N = "I18N, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
public const string AssemblyMicrosoft_JScript = "Microsoft.JScript, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblyMicrosoft_VisualStudio_Web = "Microsoft.VisualStudio.Web, Version=" + VsVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblyMicrosoft_VSDesigner = "Microsoft.VSDesigner, Version=" + VsVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
-2
View File
@@ -9,9 +9,7 @@ static class AssemblyRef
public const string EcmaPublicKey = "b77a5c561934e089";
public const string MicrosoftPublicKey = "b03f5f7f11d50a3a";
public const string MicrosoftJScript = Consts.AssemblyMicrosoft_JScript;
public const string MicrosoftVSDesigner = Consts.AssemblyMicrosoft_VSDesigner;
public const string SystemData = Consts.AssemblySystem_Data;
public const string SystemDesign = Consts.AssemblySystem_Design;
public const string SystemDrawing = Consts.AssemblySystem_Drawing;
public const string SystemWeb = Consts.AssemblySystem_Web;
-3
View File
@@ -166,6 +166,3 @@ $(makefrag): $(topdir)/build/executable.make $(depsdir)/.stamp
doc-update-local:
@:
# Need to be here so it comes after the definition of DEP_DIRS/DEP_LIBS
gen-deps:
@echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE)
+2 -17
View File
@@ -8,18 +8,6 @@
# All the dep files now land in the same directory so we
# munge in the library name to keep the files from clashing.
# The including makefile can set the following variables:
# LIB_MCS_FLAGS - Command line flags passed to mcs.
# LIB_REFS - This should be a space separated list of assembly names which are added to the mcs
# command line.
#
# All dependent libs become dependent dirs for parallel builds
# Have to rename to handle differences between assembly/directory names
DEP_LIBS=$(patsubst System.Xml,System.XML,$(LIB_REFS))
LIB_MCS_FLAGS += $(patsubst %,-r:%,$(LIB_REFS))
sourcefile = $(LIBRARY).sources
# If the directory contains the per profile include file, generate list file.
@@ -80,7 +68,7 @@ endif
ifdef RESOURCE_STRINGS
ifdef BOOTSTRAP_PROFILE
MCS_FLAGS_RESOURCE_STRINGS += $(RESOURCE_STRINGS:%=--getresourcestrings:%)
MCS_FLAGS_INTERNAL += $(RESOURCE_STRINGS:%=--getresourcestrings:%)
endif
endif
@@ -279,7 +267,7 @@ endif
$(the_lib): $(the_libdir)/.stamp
$(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir:=/.stamp)
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(MCS_FLAGS_RESOURCE_STRINGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
$(Q) $(SN) -R $@ $(LIBRARY_SNK)
ifdef LIBRARY_USE_INTERMEDIATE_FILE
@@ -357,6 +345,3 @@ $(the_libdir)/.doc-stamp: $(the_lib)
$(MDOC_UP)
@echo "doc-stamp" > $@
# Need to be here so it comes after the definition of DEP_DIRS/DEP_LIBS
gen-deps:
@echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE)
@@ -0,0 +1,7 @@
# -*- makefile -*-
profile-check:
@:
NO_BUILD = yes
NO_TEST = yes
-12
View File
@@ -1,12 +0,0 @@
# -*- makefile -*-
profile-check:
@:
FRAMEWORK_VERSION = 4.0
XBUILD_VERSION = 4.0
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
NO_BUILD = yes
NO_TEST = yes
+1 -56
View File
@@ -28,7 +28,7 @@ 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_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS) $(MCS_FLAGS_INTERNAL)
USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS) $(CPPFLAGS)
CSCOMPILE = $(Q_MCS) $(MCS) $(USE_MCS_FLAGS)
@@ -156,12 +156,6 @@ ifndef PROFILE_SUBDIRS
PROFILE_SUBDIRS = $(SUBDIRS)
endif
# These subdirs can be built in parallel
PROFILE_PARALLEL_SUBDIRS := $($(PROFILE)_PARALLEL_SUBDIRS)
ifndef PROFILE_PARALLEL_SUBDIRS
PROFILE_PARALLEL_SUBDIRS = $(PARALLEL_SUBDIRS)
endif
ifndef FRAMEWORK_VERSION_MAJOR
FRAMEWORK_VERSION_MAJOR = $(basename $(FRAMEWORK_VERSION))
endif
@@ -173,57 +167,8 @@ endif
list='$(PROFILE_SUBDIRS)'; for d in $$list ; do \
(cd $$d && $(MAKE) $*) || { final_exit="exit 1"; $$dk; } ; \
done; \
if [ $* = "all" -a -n "$(PROFILE_PARALLEL_SUBDIRS)" ]; then \
$(MAKE) do-all-parallel ENABLE_PARALLEL_SUBDIR_BUILD=1 || { final_exit="exit 1"; $$dk; } ; \
else \
list='$(PROFILE_PARALLEL_SUBDIRS)'; for d in $$list ; do \
(cd $$d && $(MAKE) $*) || { final_exit="exit 1"; $$dk; } ; \
done; \
fi; \
$$final_exit
#
# Parallel build support
#
# The variable $(PROFILE)_PARALLEL_SUBDIRS should be set to the list of directories
# which could be built in parallel. These directories are built after the directories in
# $(PROFILE)_SUBDIRS.
# Parallel building is currently only supported for the 'all' target.
#
# Each directory's Makefile may define DEP_LIBS and DEP_DIRS to specify the libraries and
# directories it depends on.
#
ifneq ($(PROFILE_PARALLEL_SUBDIRS),)
dep_dirs = .dep_dirs-$(PROFILE)
$(dep_dirs):
@echo "Creating $@..."
list='$(PROFILE_PARALLEL_SUBDIRS)'; \
echo > $@; \
for d in $$list; do \
$(MAKE) -C $$d gen-deps DEPS_TARGET_DIR=$$d DEPS_FILE=$(abspath $@); \
done
-include $(dep_dirs)
endif
.PHONY: gen-deps
# The gen-deps target is in library.make/executable.make so it can pick up
# DEP_LIBS/DEP_DIRS
clean-dep-dir:
$(RM) $(dep_dirs)
clean-local: clean-dep-dir
ifdef ENABLE_PARALLEL_SUBDIR_BUILD
.PHONY: do-all-parallel $(PROFILE_PARALLEL_SUBDIRS)
do-all-parallel: $(PROFILE_PARALLEL_SUBDIRS)
$(PROFILE_PARALLEL_SUBDIRS):
@set . $$MAKEFLAGS; \
cd $@ && $(MAKE)
endif
ifndef DIST_SUBDIRS
DIST_SUBDIRS = $(SUBDIRS) $(DIST_ONLY_SUBDIRS)
endif
+1 -2
View File
@@ -7,8 +7,7 @@ RESOURCE_FILES = resources/relaxng.rng
OTHER_RES = $(RESOURCE_FILES)
LIBRARY = Commons.Xml.Relaxng.dll
LIB_REFS = System System.Xml
LIB_MCS_FLAGS = /r:$(corlib) \
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll \
$(foreach r, $(OTHER_RES), /resource:$(r),$(notdir $(r)))
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
EXTRA_DISTFILES = \
@@ -7,8 +7,7 @@ LIBRARY_NAME = ICSharpCode.SharpZipLib.dll
LIBRARY_COMPAT = yes
LIBRARY_SNK = SharpZipLib.key
LIB_REFS = System System.Xml
LIB_MCS_FLAGS = -r:$(corlib)
LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll
NO_TEST = yes
EXTRA_DISTFILES = SharpZipLib.pub $(LIBRARY_SNK)
+1 -2
View File
@@ -3,8 +3,7 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = Cscompmgd.dll
LIB_REFS = System
LIB_MCS_FLAGS = /r:$(corlib)
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
LIBRARY_NAME = cscompmgd.dll
+1 -2
View File
@@ -3,8 +3,7 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = CustomMarshalers.dll
LIB_REFS = System
LIB_MCS_FLAGS = /r:$(corlib)
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
NO_TEST = yes
include ../../build/library.make
+1 -1
View File
@@ -51,4 +51,4 @@ doc-update-local:
@echo "not doing docs"
doc-update-recursive:
@echo "do not recurse the Facades folder"
@echo "do not recurse the Facades folder"
@@ -11,8 +11,7 @@ LIBRARY = System.Collections.Concurrent.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Collections.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.ComponentModel.Annotations.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.ComponentModel.DataAnnotations
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ComponentModel.DataAnnotations
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.ComponentModel.EventBasedAsync.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.ComponentModel.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Diagnostics.Debug.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Diagnostics.Tools.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Dynamic.Runtime.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.Core System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core /r:System
PLATFORM_DEBUG_FLAGS =
+1 -2
View File
@@ -11,8 +11,7 @@ LIBRARY = System.IO.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Linq.Expressions.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Linq.Parallel.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Linq.Queryable.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
PLATFORM_DEBUG_FLAGS =
+1 -2
View File
@@ -11,8 +11,7 @@ LIBRARY = System.Linq.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Net.NetworkInformation.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Net.Primitives.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Net.Requests.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.ObjectModel.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Runtime.Extensions.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Runtime.InteropServices.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Runtime.Numerics.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.Numerics
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Numerics
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Runtime.Serialization.Json.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.Runtime.Serialization
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Runtime.Serialization
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Runtime.Serialization.Primitives.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.Runtime.Serialization
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Runtime.Serialization
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Runtime.Serialization.Xml.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.Runtime.Serialization System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Runtime.Serialization /r:System.Xml
PLATFORM_DEBUG_FLAGS =
+1 -2
View File
@@ -11,8 +11,7 @@ LIBRARY = System.Runtime.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System System.ComponentModel.Composition System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.ComponentModel.Composition /r:System.Core
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.ServiceModel.Http.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.ServiceModel
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ServiceModel
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.ServiceModel.Primitives.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.ServiceModel System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ServiceModel /r:System.Xml
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.ServiceModel.Security.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.ServiceModel
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ServiceModel
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Text.RegularExpressions.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Threading.Tasks.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Threading.Timer.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core
PLATFORM_DEBUG_FLAGS =
+1 -2
View File
@@ -11,8 +11,7 @@ LIBRARY = System.Threading.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Xml.ReaderWriter.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Xml
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Xml.XDocument.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.Xml.Linq System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Xml.Linq /r:System.Xml
PLATFORM_DEBUG_FLAGS =
@@ -11,8 +11,7 @@ LIBRARY = System.Xml.XmlSerializer.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_REFS = System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Xml
PLATFORM_DEBUG_FLAGS =
+2 -2
View File
@@ -3,8 +3,8 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = IBM.Data.DB2.dll
LIB_REFS = System System.Xml System.Data
LIB_MCS_FLAGS = /unsafe /r:$(corlib) -warn:1
LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll \
/r:System.Xml.dll /r:System.Data.dll -warn:1
NO_TEST = yes
EXTRA_DISTFILES = ibm.pub
+1 -2
View File
@@ -5,8 +5,7 @@ include ../../build/rules.make
LIBRARY = ICSharpCode.SharpZipLib.dll
LIBRARY_SNK = SharpZipLib.key
LIB_REFS = System System.Xml
LIB_MCS_FLAGS = /r:$(corlib) -warn:1
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll -warn:1
NO_TEST = yes
EXTRA_DISTFILES = SharpZipLib.pub $(LIBRARY_SNK)
@@ -46,4 +46,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
+1 -1
View File
@@ -109,4 +109,4 @@
<UserProperties REFS-JarPath-mainsoft-web="..\bin\Debug_Java20\Mainsoft.Web.jar" REFS-JarPath-nunit-framework="..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.jar" REFS-JarPath-system-web="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Web.jar" REFS-JarPath-system-configuration="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Configuration.jar" REFS-JarPath-rt="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\jre5\lib\rt.jar" REFS-JarPath-system-xml="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Xml.jar" REFS-JarPath-system-data="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Data.jar" REFS-JarPath-system="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.jar" REFS-JarPath-mscorlib="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\mscorlib.jar" />
</VisualStudio>
</ProjectExtensions>
</Project>
</Project>
+47 -55
View File
@@ -26,8 +26,8 @@ mobile_common_dirs := \
Mono.Security \
System \
I18N \
System.Runtime.Serialization \
System.Xml.Linq \
System.Runtime.Serialization \
System.ServiceModel \
System.ServiceModel.Web \
System.Json \
@@ -84,7 +84,8 @@ net_4_5_dirs := \
System.Core \
Mono.Security \
System.Security \
System.Configuration \
System.Configuration \
I18N \
$(resgen_dir) \
System.Drawing \
System.Transactions \
@@ -95,7 +96,7 @@ net_4_5_dirs := \
Accessibility \
Mono.WebBrowser \
System.Runtime.Serialization.Formatters.Soap \
System.Windows.Forms \
Managed.Windows.Forms \
Mono.Data.Sqlite \
System.Web.ApplicationServices \
System.Web \
@@ -104,20 +105,33 @@ net_4_5_dirs := \
System.Configuration.Install \
System.Management \
System.Data.OracleClient \
Microsoft.VisualC \
Cscompmgd \
PEAPI \
Commons.Xml.Relaxng \
Novell.Directory.Ldap \
Mono.Security.Win32 \
System.DirectoryServices \
System.DirectoryServices.Protocols \
RabbitMQ.Client \
Mono.Messaging \
System.Messaging \
Mono.Messaging.RabbitMQ \
System.ServiceProcess \
System.Drawing.Design \
System.Design \
ICSharpCode.SharpZipLib \
Mono.Http \
Mono.Cairo \
IBM.Data.DB2 \
CustomMarshalers \
Mono.Cecil \
Mono.Cecil.Mdb \
Mono.Debugger.Soft \
SystemWebTestShim \
System.ServiceModel.Internals \
System.Runtime.Serialization \
System.Xml.Linq \
System.Runtime.Serialization \
System.Data.DataSetExtensions \
System.Data.Linq \
System.Web.Abstractions \
System.Web.Routing \
@@ -127,10 +141,18 @@ net_4_5_dirs := \
System.Web.Extensions \
System.Web.Extensions.Design \
System.Web.DynamicData \
Mono.C5 \
Mono.Management \
Mono.Options \
Mono.Simd \
Mono.Tasklets \
System.Dynamic \
Mono.CSharp \
System.Net \
System.Json \
System.Numerics \
Microsoft.CSharp \
System.Windows.Forms.DataVisualization \
System.Xaml \
WindowsBase \
System.ServiceModel.Activation \
@@ -138,41 +160,7 @@ net_4_5_dirs := \
System.ServiceModel.Discovery \
System.Runtime.Caching \
System.Runtime.DurableInstancing \
Microsoft.Web.Infrastructure \
System.ServiceModel.Web \
System.Net.Http \
System.Net.Http.WebRequest \
System.Web.Razor \
System.Web.WebPages.Deployment \
System.Web.WebPages \
System.Web.WebPages.Razor \
System.Web.Mvc3 \
System.Net.Http.Formatting \
System.Web.Http \
System.Web.Http.SelfHost \
System.Web.Http.WebHost
# These are the subdirs which depends on libs in net_4_5_dirs
# or have proper dependencies between each other
net_4_5_parallel_dirs := \
PEAPI \
I18N \
Mono.Http \
Mono.Cairo \
Mono.Cecil \
Mono.Cecil.Mdb \
Mono.Debugger.Soft \
Mono.C5 \
Mono.Management \
Mono.Options \
Mono.Simd \
Mono.Tasklets \
Mono.CodeContracts \
Mono.Parallel \
Mono.Security.Win32 \
Mono.Messaging.RabbitMQ \
System.Dynamic \
System.Windows.Forms.DataVisualization \
System.Reactive.Interfaces \
System.Reactive.Core \
System.Reactive.Linq \
@@ -184,25 +172,32 @@ net_4_5_parallel_dirs := \
System.Reactive.Observable.Aliases \
System.Reactive.Experimental \
System.Reactive.Debugger \
Microsoft.Web.Infrastructure \
WebMatrix.Data \
System.ServiceModel.Web \
System.Data.Services.Client \
System.Data.Services \
System.Data.Entity \
System.Data.DataSetExtensions \
System.Json.Microsoft \
System.Data.Entity \
monodoc \
System.Threading.Tasks.Dataflow \
System.ComponentModel.Composition.4.5 \
System.Net.Http \
System.Net.Http.WebRequest \
System.Web.Razor \
System.Web.WebPages.Deployment \
System.Web.WebPages \
System.Web.WebPages.Razor \
System.Web.Mvc3 \
System.Net.Http.Formatting \
System.Web.Http \
System.Web.Http.SelfHost \
System.Web.Http.WebHost \
Mono.CodeContracts \
System.IO.Compression \
System.IO.Compression.FileSystem \
System.Windows \
System.Xml.Serialization \
System.Numerics \
Novell.Directory.Ldap \
System.DirectoryServices \
System.DirectoryServices.Protocols \
RabbitMQ.Client \
Microsoft.VisualC \
WebMatrix.Data \
monodoc \
$(pcl_facade_dirs)
xbuild_2_0_dirs := \
@@ -222,15 +217,14 @@ monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
mobile_static_SUBDIRS := $(mobile_static_dirs)
mobile_SUBDIRS := $(mobile_dynamic_dirs)
xammac_SUBDIRS := $(xammac_dirs)
net_4_0_SUBDIRS := reference-assemblies
net_4_5_SUBDIRS := $(net_4_5_dirs) $(xbuild_4_0_dirs)
net_4_5_PARALLEL_SUBDIRS := $(net_4_5_parallel_dirs) aot-compiler
binary_reference_assemblies_SUBDIRS := reference-assemblies
net_4_5_SUBDIRS := $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
xbuild_14_SUBDIRS := $(xbuild_4_0_dirs)
include ../build/rules.make
SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_5_dirs) $(net_4_5_parallel_dirs)
SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_5_dirs)
DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs)
@@ -278,5 +272,3 @@ dist-local: dist-default
csproj-local:
clean-local:
$(RM) -rf $(topdir)/class/lib/$(PROFILE)
File renamed without changes.
Loaded 100 of 3411 files, more files were not shown because too many files have changed in this diff. Show more