Compare commits

..
1196 Commits
Author SHA1 Message Date
Ludovic Henry dd3a38cd27 [mcs] Add msbuild for corlib, System, System.Core, System.Xml, System.Configuration, Mono.Posix, Mono.Security, Mono.CompilerServices.SymbolWriter 2017-07-13 18:15:57 -04:00
Ludovic Henry d373a38d2a [mcs] Remove dead LIBRARY_FLAGS 2017-05-26 17:29:54 -04:00
Ludovic Henry 592a4a7105 [mcs] Rename BOOTSTRAP_(MCS|PROFILE) to BUILD_(MCS|PROFILE) 2017-05-26 16:46:23 -04:00
Ludovic Henry 219f32ec1a [mcs] Inline INTERNAL_CSC and INTERNAL_CSC_LOCATION into BOOTSTRAP_MCS 2017-05-26 16:45:29 -04:00
Ludovic Henry 4acdb7d122 [mcs] Merge BUILD_TOOLS_PROFILE and BOOTSTRAP_PROFILE which always have the same value 2017-05-26 16:30:40 -04:00
Ludovic Henry a1bcfe45ec [mcs] Declare BOOTSTRAP_MCS in rules.make to avoid duplication 2017-05-26 16:30:39 -04:00
Ludovic Henry 759c911ae0 [mcs] Merge BOOT_COMPILE and LIBRARY_COMPILE into CSCOMPILE as they always have the same value 2017-05-26 16:30:38 -04:00
Ludovic Henry 956572edf6 [mcs] Replace MCS by BOOTSTRAP_MCS since they always have the same value 2017-05-26 16:30:37 -04:00
Ludovic Henry 821dddc994 [mcs] Remove unused LIBRARY_USE_INTERMEDIATE_FILE and PROGRAM_USE_INTERMEDIATE_FILE 2017-05-26 16:28:30 -04:00
Marek Safar 84bac28050 [mcs] Codegen for optimized new with valuetype load and awaited arguments. Fixes #56081 2017-05-26 18:24:35 +02:00
Bernhard Urban 5467391bbc [arm] use r8 instead of r5 in icall trampoline, because r5 is used as IMT reg 2017-05-26 16:19:38 +02:00
Bernhard Urban 94db1a63f0 [arm] respect iOS specific ABI for frame pointer in icall trampoline 2017-05-26 16:19:38 +02:00
Zoltan Varga 4f1514cc22 [aot] Avoid printing out AOT NOT FOUND messages for icall methods which have no body. 2017-05-25 18:00:01 -04:00
Damien Diederen a661eb8c9d [arm] Do not use the ARM Run-time ABI in cross-compilers (#4914) 2017-05-25 13:16:38 -04:00
Vlad Brezae 49a83d0b72 Merge pull request #4926 from BrzVlad/fix-tls-v5
[arm] Don't use fast tls on v5 arm
2017-05-25 14:53:39 +03:00
e-kovalenko c271644e20 Fix mono build with disabled sgen (#4915)
Build of the Mono failed with the Boehm GC only (without SGEN)
if it configured like this: --with-gc=included --withsgen=no
2017-05-25 01:11:40 +02:00
Marcin Cieślak c96819eb25 sysctl takes 3 name components (#4883)
Adapted from:

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=212259

https://github.com/mono/mono/pull/3480

https://svnweb.freebsd.org/ports?view=revision&revision=423356
2017-05-25 01:09:05 +02:00
Marcin Cieślak 3b9f8e8d77 Move <sys/types.h> higher for integer types (#4884)
Fix build on FreeBSD 8 and maybe others
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198404#c6
2017-05-25 01:06:53 +02:00
Vlad Brezae ef239e765e [arm] Don't use fast tls on v5 arm
The thread coprocessor registers appear only in v7 specification.
2017-05-25 01:14:00 +03:00
Aleksey Kliger (λgeek) 2d403b3a44 Merge pull request #4923 from lambdageek/bug-56694
[appdomain] Don't leak MonoReflectionAssemblyHandles firing events

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=56694
2017-05-24 17:35:22 -04:00
Rodrigo Kumpera 3b3017dbe4 Merge pull request #4872 from kumpera/add_test_for_eloop
[runtime] Fix runtime behavior when dealing with missing symlinks
2017-05-24 16:25:41 -04:00
Aleksey Kliger (λgeek) 2dabc3e221 Merge pull request #4845 from lambdageek/dev-coop-delegates
[marshal] Use coop handles for delegates icalls
2017-05-24 15:56:38 -04:00
Marcin Cieślak 940944dcde Bug #56499: unreadable /etc/localtime should not cause an exception (#4881)
* Bug #56499: unreadable /etc/localtime should not cause an exception

* Fix build
2017-05-24 20:53:23 +02:00
Aleksey Kliger 182f7c33c1 [sgen] Scan the handle stack for dangling ptrs during domain unload
There should be no handles pointing to objects in the domain that is unloading
in any thread's handle stack once mono_gc_clear_domain () is called.
2017-05-24 14:10:42 -04:00
Aleksey Kliger e3ede19ce7 [coop handles] Fix wrong #ifdef 2017-05-24 14:10:41 -04:00
Aleksey Kliger e6fc657342 [appdomain] Don't leak MonoReflectionAssemblyHandles in callbacks to managed 2017-05-24 14:09:51 -04:00
Aleksey Kliger a957ab18a3 [tests] Regression test for #56694
When an AssemblyLoad event fires in a domain, a System.Reflection.Assembly
object is created in that domain for the assembly being loaded.  The bug left
this object alive after the domain was unloaded, which lead to a GC crash.
2017-05-24 14:09:50 -04:00
Zoltan Varga bde8ce85e0 [runtime] Implement interior handles as a special case to simplify and speed up the more common handle code. (#4921) 2017-05-24 13:58:18 -04:00
Marek Safar 76849c1cfb [corlib] Fixes warning 2017-05-24 19:28:44 +02:00
Marek Safar 1d115c6cd1 [mcs] Parsing of nested unbound types. Fixes #55400 2017-05-24 19:28:44 +02:00
Marek Safar d1add5e846 [corlib] Remove unused field 2017-05-24 19:28:44 +02:00
Miguel de Icaza b11e90f2f7 Improve error messages to help users diagnose problems when using custom mode (#4922)
* Improve error messages to help users diagnose problems when using the custom mode

* Update mkbundle.cs
2017-05-24 13:19:58 -04:00
Zoltan Varga fe1c006f59 [runtime] Convert a g_warning to a type load failure. (#4920) 2017-05-24 09:35:18 -04:00
Zoltan Varga 64cb61349f Fix make dist. 2017-05-23 22:51:09 -04:00
Rodrigo Kumpera 19631350a2 Update test for correct behavior. 2017-05-23 14:59:02 -07:00
Rodrigo Kumpera c2a7bb4598 [runtime] Fix multiple issues around symlink handling.
After fixing my windows setup, I managed to properly test MS's behavior, which is a lot saner and it's the following:

Opening fails with ERROR_CANT_RESOLVE_FILENAME (1921).
Testing and Deleting works.

Fixing File.Delete required removing the lstat we do before deleting, which no longer serves any purpose.

Fixing File.Exists requires handling ELOOP when stat fails and we retry with lstat.
2017-05-23 14:46:53 -07:00
Martin Baulig d62228e521 [System]: Don't call OnCompleted(this) twice in SocketAsyncEventArgs.FinishWrapperConnectSuccess(). (#4894) 2017-05-23 15:42:05 -04:00
Alexander Köplinger 7075c21582 [bcl] Fix compiling xunit-based tests
We moved System.Runtime.InteropServices.RuntimeInformation to a facade.
2017-05-23 19:54:35 +02:00
Zoltan Varga 581e33fcb6 [runtime] Add specialized versions of mono_icall_handle_new () for internal/non-internal pointers. (#4918) 2017-05-23 11:46:59 -04:00
Zoltan Varga f787cfb2ba Fix full aot (#4919)
* [runtime] Fix the generation of invalid IL in the return marshalling of stringbuilders.

* [runtime] Disable some failing fullaot tests.
2017-05-23 11:36:43 -04:00
Aleksey Kliger 0ec79ec49e [runtime] Use coop handles for System.Delegate.AllocDelegateLike_internal 2017-05-23 11:30:48 -04:00
Aleksey Kliger 52acc12919 [marshal] Use coop handles for System.Delegate.GetVirtualMethod_internal 2017-05-23 11:30:48 -04:00
Aleksey Kliger 631d4e0052 [marshal] Use coop handles in mono_delegate_to_ftnptr
* Create mono_delegate_handle_to_ftnptr for the implementation
* Use coop handles for
  System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegateInternal
2017-05-23 11:30:48 -04:00
Aleksey Kliger e1354fd956 [runtime] Remove temporary fcn mono_delegate_ctor_with_method_fixme 2017-05-23 11:30:48 -04:00
Aleksey Kliger 2d7ce926aa [marshal] Change mono_delegate_ctor to use coop handles 2017-05-23 11:30:48 -04:00
Aleksey Kliger 8b9eaf7a72 [marshal] Use handles in mono_ftnptr_to_delegate
* Move most of the logic to mono_ftnptr_to_delegate_handle
* Use handles for
  System.Runtime.InteropServices.Marshal.GetDelegateForFunctionPointerInternal
2017-05-23 11:30:48 -04:00
Aleksey Kliger a61c283115 [runtime] Use coop handles in mono_delegate_ctor_with_method
Use coop handles in icall System.Delegate.CreateDelegate_internal

TODO: change callsites fo mono_delegate_ctor_with_method_fixme to use handles
2017-05-23 11:30:48 -04:00
Aleksey Kliger 4a78d5cb13 [marshal] Use coop handles for OffsetOf, SizeOf, Prelink, PrelinkAll
System.Runtime.InteropServices.Marshal methods
* OffsetOf
* Prelink
* PrelinkAll
* SizeOf
2017-05-23 11:30:47 -04:00
Alexander Köplinger beb36c6a31 Remove outdated info and unused files from mcs/ (#4916)
Most of the removed files weren't touched in the last decade
and are unused so it's better to remove them to avoid confusion
about what they do.

I also went over and removed the most outdated info from readme
files, we probably want to do a more thorough overhaul in the future.
2017-05-23 14:27:42 +02:00
Marek Safar a0fc3f4dcf [mcs] When setting struct empty layout consider compiler generated fields. Fixes #55604 2017-05-23 08:41:04 +02:00
Alexander Köplinger 872976e6c6 Bump bockbuild to fix build 2017-05-23 02:32:55 +02:00
Zoltan Varga f285740333 [runtime] Add a fastpath to mono_object_isinst_icall (). (#4917) 2017-05-22 20:24:14 -04:00
Alexander Köplinger 3b2da24533 Use nuget 4.3.0-preview1 to fix build
4.5.0 is not yet available.

Also use lowercase nuget.exe to match the URL on https://dist.nuget.org/
2017-05-23 00:16:22 +02:00
Marek Safar ab98a01bac [mcs] Add expression bodied syntax for accessors. Fixes #54991 2017-05-22 23:31:07 +02:00
Alexis Christoforides 99c93cbe85 [MacSDK] Update Nuget to 4.5, switch to binary release instead of building 2017-05-22 16:04:51 -04:00
Alexander Köplinger 29741a40cb [bcl] Make monolite platform specific (#4910)
mscorlib.dll etc will be platform specific in the future. This also
means that we need to adapt monolite since it'll become platform
specific once we start the divergence.

monolite is essentially a repackaging of the "build" profile which
means we need to turn that profile into multi-platform profile
like net_4_x. We'll still have a symlink from build -> build-darwin
and the monolite which is downloaded or packaged in the tarball
is expanded into mcs/lib/monolite-<platform> depending on the platform
you're building on.

I had to move the get-monolite-latest target from the top-level
Makefile.am into mcs/class/Makefile so it has access to HOST_PLATFORM,
but it arguably should've been there anyway before.
2017-05-22 18:09:44 +02:00
Alexander Köplinger a796ce400d [bcl] Exclude Mono.CSharp.dll from api diff
We don't guarantee a stable API there and it changes often
when mcs internals change.
2017-05-22 18:02:12 +02:00
Alex Rønne Petersen 506e60cf63 [profiler] Fall back to CLOCK_MONOTONIC if CLOCK_PROCESS_CPUTIME_ID results in EINVAL. (#4913)
This is the case on WSL.
2017-05-22 11:02:22 -04:00
Marek Safar 3f527c012d [mcs] Inflate referenced current types for imported type definitions. Fixes #56462 2017-05-22 17:01:12 +02:00
Marek Safar 027da05f20 [mcs] Removes TypeManager calls from MoreSpecific 2017-05-22 17:01:12 +02:00
vkargov eb18b8c0de [ci] Add the collect-coverage tag for use on Jenkins. (#4912)
* [ci] Add the collect-coverage tag for use on Jenkins.

* Move collect-coverage up so we don't set different values for -O
2017-05-22 14:43:28 +02:00
Bernhard Urban 88a90e5c20 [mcs] extend API for loading types and consuming source file from a stream (#4905) 2017-05-22 12:40:19 +02:00
Rodrigo Kumpera d0b38e1871 [corlib] Address reviewer comments to new test. 2017-05-19 15:06:19 -07:00
Alexander Köplinger 836194d63b Bump api-snapshot 2017-05-19 22:51:54 +02:00
Marek Safar ea0f582d72 Bump Roslyn to 2.3 preview 2017-05-19 21:45:26 +02:00
Alexis Christoforides aaf9fd3dbd Bump bockbuild 2017-05-19 15:24:13 -04:00
Alexander Köplinger ab514a67ee Bump the btls submodule
Bring in the change that makes building the "tool" subdirectory
in BTLS off by default - we don't need it in Mono and it fails
to build on some platforms with older C++ compiler.
2017-05-19 19:55:41 +02:00
Marek Safar 323fcec547 [mcs] Report more unsafe code errors in iterators. Fixes #56616 2017-05-19 18:46:14 +02:00
Marek Safar 3877878670 [build] Remove platforms from xbuild build 2017-05-19 18:16:28 +02:00
Zoltan Varga afffab3b5c [amd64] Fix the allocation of the caller area in filter clauses. Fixes #56567. (#4903) 2017-05-19 11:37:38 -04:00
Alexander Köplinger 3637f8cddf [bcl] Dispose Cecil AssemblyDefinition after usage (#4900)
Follow-up to https://github.com/mono/mono/pull/4899. I audited
all the places in BCL where we made use of Cecil's AssemblyDefinition
and made sure we're properly disposing them and not keeping files
unnecessarily open.

I used InMemory=true in cases where tracking the lifetime would
be complicated. There are also some tests in mcs/tests which I
didn't bother to fix.
2017-05-19 12:59:00 +02:00
Katelyn Gadd 087316c833 Warn on failure to create default Reflection.Emit SymbolWriter instead of throwing and failing (#4748)
* Bug #53038: Warn on failure to create default Reflection.Emit SymbolWriter (on platforms like Android that don't ship one) instead of throwing and failing
2017-05-19 09:24:49 +02:00
Zoltan Varga 3713c3d810 [amd64] Remove the restriction on the locals stack size. Fixes #56452. (#4901) 2017-05-18 22:47:56 -04:00
Bernhard Urban 56e3456e5f [interp] respect 64bit alignment on armv7 2017-05-19 00:03:49 +02:00
Alexander Köplinger c989c25405 [pdb2mdb] Dispose Cecil AssemblyDefinition on pdb2mdb (#4899)
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56275

Recent Cecil 0.10 changed to not reading the assembly in memory but
instead reads directly from the underlying stream [0]. This however
means that the file handle is not freed until the AssemblyDefinition
is disposed.

Xamarin.Android is using the pdb2mdb source as part of
Xamarin.Android.Build.Tasks.dll and hit an issue where the file
would be locked inside of VS.

[0] http://cecil.pe/post/149243207656/mono-cecil-010-beta-1
(cherry picked from commit 5077205a44)
2017-05-18 21:44:04 +02:00
Alexander Köplinger 3bb98453bb [configure] Add stdalign.h checks for BTLS to ARM platforms too
We added it for x86/amd64 in 488b550ac0
but missed adding that check when ARM was added recently.
2017-05-18 20:13:45 +02:00
vkargov 1009c92386 [aot] Fix a memory leak related to constraint allocation/deallocation. (#4880)
* [jit] Make a copy of the constraint in mini_get_shared_gparam().

* [aot] Free the temporary gshared constraint in decode_class_ref().
2017-05-18 14:08:58 -04:00
Katelyn Gadd 20ab5bfe7a Fixes for bug#54388 "InternalsVisibleTo is case sensitive" * Fix the JIT so that access checks are performed on constructors * Use ASCII case insensitivity when performing cross-assembly access checks for internals * Update mcs to use case-insensitive comparisons when evaluating InternalsVisibleTo attributes for access checks (matching the new runtime behavior, and the behavior of roslyn)
This issue is actually a pair of bugs:
1. We don't perform any access checks for constructors (which can give a false impression of our behavior for this issue). This means that you can also invoke private constructors from other assemblies.
2. InternalsVisibleTo checks are done using strcmp instead of a case-insensitive comparison.
2017-05-18 19:00:28 +02:00
Marek Safar 4465db2b46 [corlib] Bump DoubleWait test timeouts 2017-05-18 17:45:01 +02:00
vkargov f55019707b Fix eglibc remapping and revive the test for its completeness. (#4896)
* [eglib] Add the missing eglib remappings.

* [tests] Revive the eglib remapping completeness test.
2017-05-18 11:04:58 -04:00
Marek Safar 8522b3d989 Adds System.Net.Http 4.3.2 to blacklist 2017-05-18 14:45:14 +02:00
Alexander Köplinger 4b2ec296b6 [configure] Remove the --enable-dynamic-btls switch, it is the only option 2017-05-18 12:58:57 +02:00
Marek Safar b21dc44004 [ci] Enable linker tests on PRs 2017-05-18 10:07:38 +02:00
Marek Safar 16aeed9691 Add linker tests 2017-05-18 10:07:38 +02:00
Marek Safar 11e95169e7 Add LinkerDescriptor 2017-05-18 10:07:38 +02:00
Marek Safar fdc0acbb01 Bump linker 2017-05-18 10:07:38 +02:00
Zoltan Varga 92bc142c7c [runtime] Make RuntimeHelpers:SufficientExecutionStack () a no-op on android for now. Fixes #56240. (#4889) 2017-05-17 12:33:08 -04:00
Aleksey Kliger 5a5145461d [coop handles] Add mechanism to track handle leaks
When MONO_HANDLE_TRACK_SP is defined, each handle records the native C stack pointer
at the time of its nearest enclosing HANDLE_FUNCTION_ENTER.  If a subsequent
handle is allocated with a lower stack pointer (in memory; ie higher in the
call tree) then a HANDLE_FUNCTION_RETURN is missing and we're leaking handles.
2017-05-17 12:20:37 -04:00
Bernhard Urban 9710e93212 [interp] assume EABI for passing arguments to arm trampoline 2017-05-17 17:36:43 +02:00
Bernhard Urban e13b6b397e [interp] use helper function to check if generic inst is a value type 2017-05-17 17:36:43 +02:00
Bernhard Urban eac4aabb7e [arm] respect thumb mode in mixed mode unwinding 2017-05-17 17:36:43 +02:00
Bernhard Urban 31778d9146 [interp] properly pass 64bit integers to native code on 32bit arches 2017-05-17 17:36:43 +02:00
Bernhard Urban 5f72be6d6d [interp] disable some tests that fail on CI only
can't reproduce the crash on my dev device, will investigate later.
2017-05-17 17:36:43 +02:00
Bernhard Urban 67441500e4 [interp] make mixed mode work on arm 2017-05-17 17:36:43 +02:00
Bernhard Urban 77e670ccb3 [interp] generics/vt fix regarding elem size for ldelem.vt 2017-05-17 17:36:43 +02:00
Bernhard Urban 908e8381f0 [interp] intrinsify System.Array.UnsafeLoad 2017-05-17 17:36:43 +02:00
Bernhard Urban c49249d3b8 [interp] add a conversion that is only required for 32bit 2017-05-17 17:36:43 +02:00
Bernhard Urban de6528383b [interp] icall trampoline for arm 2017-05-17 17:36:43 +02:00
Bernhard Urban 29c82e9a81 [interp] make mixed mode work on arm64 2017-05-17 17:36:43 +02:00
Bernhard Urban 8f886aa5ad [interp] fix gcc warnings 2017-05-17 17:36:43 +02:00
Bernhard Urban 18d4e1c1d7 [interp] fix conv.u4.r8 on arm64 2017-05-17 17:36:43 +02:00
Bernhard Urban 4010476492 [interp/tramp] use MONO_STRUCT_OFFSET infrastructure and extract constants 2017-05-17 17:36:43 +02:00
Bernhard Urban 19bdbfa77c [interp] implement icall_trampoline for arm64 2017-05-17 17:36:43 +02:00
Alexander Köplinger 62e8f04c23 Rename Microsoft.NuGet.Build.Tasks.dll.sources to exclude profile
The earlier name sent gensources.sh into an infinite loop,
not sure why yet. The directory is only built for xbuild_14
anyway so this should be safe.
2017-05-17 14:14:04 +02:00
Alexander Köplinger 40a27d977b Fix tarball build
The itanium backend was removed.
2017-05-17 05:39:08 +02:00
David Naylor 8b27dee31d w32handle: double the available slots (#4856)
Mono crashes if the system has more than ~128G of RAM.  Doubling the
number of slots fixes the SIGSEGV error on FreeBSD.
2017-05-16 20:45:24 -04:00
Alexander Köplinger 0ed7b3647a [MacSDK] Remove some outdated info from ReadMe.rtf
uninstallMono.sh is no longer installed.

The website has instructions for removing Mono:
http://www.mono-project.com/docs/about-mono/supported-platforms/osx/#uninstalling-mono-on-mac-os-x
2017-05-17 00:29:48 +02:00
Jo Shields 66f78c9b43 [btls] Add "desktop" ARM Linux configurations (for IoT, mostly) (#4875)
* [btls] Add "desktop" ARM Linux configurations (for IoT, mostly)

* [btls] Disable optimized asm on soft-float ARM

It depends on a NEON FPU, which we don't target on soft float
2017-05-16 22:24:29 +02:00
Alexander Köplinger f4ce23e0b7 [btls] Add MonoPInvokeCallback attribute on all full aot profiles (#4879)
It was #ifdef'ed to only be available on monotouch before,
but the testing_aot_full profile in CI runs into this test failure:

```
MESSAGE:
System.ExecutionEngineException : Attempting to JIT compile method '(wrapper native-to-managed) Mono.Btls.MonoBtlsSslCtx:NativeVerifyCallback (intptr,int,intptr)' while running in aot-only mode. See https://developer.xamarin.com/guides/ios/advanced_topics/limitations/ for more information.

+++++++++++++++++++
STACK TRACE:
  at (wrapper managed-to-native) System.Object:__icall_wrapper_mono_thread_interruption_checkpoint ()
  at (wrapper managed-to-native) System.Runtime.InteropServices.Marshal:GetFunctionPointerForDelegateInternal (System.Delegate)
  at System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate[TDelegate] (TDelegate d) [0x00013] in <fa55a8c31ba0490383239e5850d81686>:0
  at Mono.Btls.MonoBtlsSslCtx..ctor (Mono.Btls.MonoBtlsSslCtx+BoringSslCtxHandle handle) [0x00059] in <18810f39bffc41dcb0263eb2043cc10e>:0
  at Mono.Btls.MonoBtlsSslCtx..ctor () [0x0000b] in <18810f39bffc41dcb0263eb2043cc10e>:0
  at Mono.Btls.MonoBtlsContext.InitializeConnection () [0x00000] in <18810f39bffc41dcb0263eb2043cc10e>:0
  at Mono.Btls.MonoBtlsContext.StartHandshake () [0x00000] in <18810f39bffc41dcb0263eb2043cc10e>:0
  at Mono.Net.Security.MobileAuthenticatedStream.ProcessHandshake (Mono.Net.Security.AsyncProtocolRequest asyncRequest, Mono.Net.Security.AsyncOperationStatus status) [0x00004] in <18810f39bffc41dcb0263eb2043cc10e>:0
  at Mono.Net.Security.AsyncProtocolRequest.ProcessOperation (Mono.Net.Security.AsyncOperationStatus status) [0x0006b] in <18810f39bffc41dcb0263eb2043cc10e>:0
  at Mono.Net.Security.AsyncProtocolRequest.ProcessOperation () [0x0000d] in <18810f39bffc41dcb0263eb2043cc10e>:0
  at Mono.Net.Security.AsyncProtocolRequest.StartOperation () [0x0003c] in <18810f39bffc41dcb0263eb2043cc10e>:0
  at Mono.Net.Security.AsyncProtocolRequest.StartOperation (Mono.Net.Security.AsyncOperation operation) [0x00024] in <18810f39bffc41dcb0263eb2043cc10e>:0
  at Mono.Net.Security.MobileAuthenticatedStream.ProcessAuthentication (System.Net.LazyAsyncResult lazyResult) [0x00057] in <18810f39bffc41dcb0263eb2043cc10e>:0
```

The attribute itself is already conditional on MONOTOUCH and
FULL_AOT_RUNTIME so simply removing the ifdef should fix the issue.
2017-05-16 21:29:49 +02:00
Niklas Therning 7f245c7798 Merge pull request #4877 from ntherning/fix-file-handle-leak-in-mono_mmap_open_file-on-windows
Fixes a file handle leak in mono_mmap_open_file() on Windows
2017-05-16 19:36:18 +02:00
Niklas Therning 566eb0ccdb Fixes a file handle leak in mono_mmap_open_file() on Windows. See
https://bugzilla.xamarin.com/show_bug.cgi?id=56493.
2017-05-16 19:35:11 +02:00
Mikayla Hutchinson 8077ff5da7 [xbuild] Add web targets for 15.0 (#4868) 2017-05-16 12:31:19 +02:00
Alexander Köplinger b41b5928ec [msvc] Remove order.xml (#4867)
It's a build artifact anyway since we check in the generated csproj's
so you don't really need the order.xml.

After the new platform-specific BCL changes went in it also started
containing stuff like `-r:./../../class/lib/net_4_x-linux/mscorlib.dll`
which makes it even less useful to have checked in as it'd get
changed when you build on OSX for example.
2017-05-16 12:10:34 +02:00
Ludovic Henry c74f8a0ea5 [threadpool] Fix alignment of ThreadPoolWorkerCounter (#4871)
It is accessed with a 64bits atomic operation, so it needs to be 64bits aligned, even on a 32bits platform. A CPU exception EXC_ARM_DA_ALIGN triggers on armv7 32bits.

Fix https://bugzilla.xamarin.com/show_bug.cgi?id=56202
2017-05-15 22:19:34 -04:00
Vlad Brezae e120193ed1 Merge pull request #4752 from BrzVlad/feature-dynamic-nrs
[sgen] Dynamic nursery sizing
2017-05-16 03:22:50 +03:00
Rodrigo Kumpera d99cf6b096 [corlib] Reduce the warning spew our testsuite produces. 2017-05-15 16:20:14 -07:00
Rodrigo Kumpera 7283aded35 [corlib] Add tests for the behavior of IO in the face of a symlink loop.
The behavior was empirically found on windows and dotnet.
2017-05-15 16:19:07 -07:00
Rodrigo Kumpera c51f5516ce [corlib] Remove the File.Exists check before opening the file.
It's both racy and not necessary.

Beyond that, it will produce the wrong exception if opening the file fails for a different reason that it's missing.

This is an issue in case of bad permissions or symlink loops.
2017-05-15 16:17:23 -07:00
Zoltan Varga 163cfa71fd Interp fixes (#4864)
* [interp] Add support for mkrefany,refanytype and refanyval.

* [interp] Avoid inlining empty methods marked with NoInlining.

* [interp] Fix the popping of arguments when inlining empty methods.
2017-05-15 18:53:10 -04:00
Frederik Carlier 62a24d06c2 System.Drawing: Various netstandard1.6 compat fixes (#4863)
Minor fixes which make System.Drawing compatible with netstandard1.6:
- Use MemoryStream.ToArray instead of .GetBuffer
- Use RuntimeInformation.IsOSPlatform to determine the operating system
- Use Stream.Dispose instead of Stream.Close
- Disable serialization support for exceptions
- Don't use AppDomain
2017-05-15 21:10:01 +02:00
Jonathan Pryor 384c431d88 [amd64] Make more inline functions in header static (#4869)
Related: commit 00c6a94a

When [Xamarin.Android attempts to build with mono/2017-04][0], the
build breaks when cross-linking Windows code via MXE due to the
presence of an undefined `inline`d function:

	./.libs/libmini.a(libmini_la-tramp-amd64.o):…/xamarin-android/external/mono/mono/mini/tramp-amd64.c:746:
	undefined reference to `mono_arch_unwindinfo_get_size'

Turn `mono_arch_unwindinfo_find_pc_rt_func_in_table()` and
`mono_arch_unwindinfo_get_size()` into `static inline` functions so
that they don't cause "undefined reference" linker errors.

Additionally, audit the rest of `mono` to ensure there aren't any
other `inline` functions that aren't `static`:

	$ git grep '\<inline\>' mono | grep -v static | grep -E '(\.c|\.h):'
	# ~50 matches, all of which are in comments or otherwise not relevant.

[0]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/388/
2017-05-15 13:36:48 -04:00
Zoltan Varga e5552e6905 [runtime] Remove ia64 backend, the Itanium architecture is dead. (#4859) 2017-05-15 13:04:32 -04:00
Rodrigo Kumpera 230535d995 Merge pull request #4851 from kumpera/handle_eloop_errno
[metadata] Handle ELOOP in mono_w32error_unix_to_win32.
2017-05-15 07:58:33 -07:00
Martin Baulig 1e259bf34d [System]: Update corefx/SR.cs in preparation of the upcoming HttpListener merge. (#4849) 2017-05-15 10:39:19 -04:00
Aleksey Kliger d321424cab [sre] Don't leak coop handles in mono_dynimage_encode_typedef_or_ref_full
This function calls mono_class_get_ref_info which allocates a coop handle.
However it is called from an icall that wasn't converted to use coop handles
yet, so nothing was saving/restoring the handle stack mark, and consequently
the handles leak.
2017-05-15 10:33:54 -04:00
Jonathan Chambers 7eafb61cf1 Use handle macros to avoid leaking result of mono_type_get_object_handle 2017-05-15 10:33:54 -04:00
Bernhard Urban 125892ae42 [interp] update ignore list for CI 2017-05-15 15:51:57 +02:00
monojenkins 79cc1aeccd [msvc] Update csproj files (#4846) 2017-05-15 14:23:05 +02:00
Bernhard Urban e314d56b21 [image] follow up fix for 62bc1b229e
otherwise we try to access `ignored_assemblies_names` out of bounds
2017-05-15 12:46:33 +02:00
Vlad Brezae 5c09208917 [tests] Remove unreferenced bridge test targets
These were changed and renamed in a previous commit.
2017-05-15 12:52:51 +03:00
Vlad Brezae ca15fa930e [sgen] Track down promoted size also with parallel minors 2017-05-15 12:52:51 +03:00
Vlad Brezae 820988907c [sgen] Use the idle object ops for worker jobs
We had the object ops set in the job when allocating the job (typically by the main gc thread). When enqueueing jobs, we leave their ops NULL, and when the worker actually executes the job, it will use the idle object ops, which can get dynamically optimized over the work cycle.
2017-05-15 12:52:51 +03:00
Vlad Brezae f1542c6e52 [sgen] Don't execute jobs before actually starting the workers
It's counter intuitive and it might lead to races at some point.
2017-05-15 12:52:51 +03:00
Vlad Brezae 5c74ddb92d [sgen] Resize nursery according also to pause times 2017-05-15 12:52:51 +03:00
Vlad Brezae cd658d90cc [sgen] Dynamic nursery sizing
We attempt to have a nursery that is as large as possible, while keeping a relative limit to the heap size.
2017-05-15 12:52:51 +03:00
Vlad Brezae 63d33d7f94 [sgen] Remove unused function 2017-05-15 12:52:51 +03:00
Vlad Brezae 393db66fa0 [sgen] Remove some redundancy with nursery section 2017-05-15 12:52:51 +03:00
Vlad Brezae 882ae6dc81 [sgen] Kill USER_CONFIG
It is useless and confusing. We always support setting the nursery-size through MONO_GC_PARAMS.
2017-05-15 12:52:51 +03:00
Frederik Carlier b6147c325e System.Drawing: netstandard1.6 compatibility: String fixes (#4862)
- ImageFormatConverter uses string.Compare to compare extensions for known file types. It uses CultureInfo.InvariantCulture,
  which is not available on netstandard1.6. Because all the extensions use ASCII-characters, StringCOmparsion.OrdinalIgnoreCase
  can be used, which is equivalent.
- Replace ToLower (CultureInfo.InvariantCulture) with .ToLowerInvariant ()
2017-05-15 02:39:24 +02:00
Frederik Carlier f121eb73d4 [System.Drawing] NS1.6 compatibility: Use GetTypeInfo () where required (#4861)
* netstandard1.6 compatibility: Use GetTypeInfo () where required

A lot of methods have moved from Type to TypeInfo in netstandard1.6, add calls to GetTypeInfo ()
where required to support compiling System.Drawing on netstandard1.6

* Add missing using statement
2017-05-15 02:23:43 +02:00
Alexander Köplinger 291a32febc [csproj] Update generator to handle platform-specific assemblies (#4847)
After https://github.com/mono/mono/pull/4837 was merged the
csproj update bot started sending PRs which hardcoded net_4_x-linux
as the OutputPath.

Updated the csproj generator to detect this and use a variable
in the OutputPath instead. It'll autodetect based on the current OS
and can be overriden by passing /p:HostPlatform=foobar to msbuild.

Ideally we'd have configurations for each platform in the csproj since
in the future the file lists will be different but this is a first step.
2017-05-13 17:26:35 +02:00
Marek Safar 62bc1b229e [runtime] Remove System.ValueTuple from denied assemblies. It's not needed
anymore because we have reference assemblies and it didn't work for mobile tools (e.g. linker)
2017-05-13 16:27:45 +02:00
Alexander Köplinger c31458a5ad [MacSDK] Whitelist mono32 2017-05-13 13:08:07 +02:00
Rodrigo Kumpera 0ccfcec6fe [metadata] Handle ELOOP in mono_w32error_unix_to_win32. 2017-05-12 15:34:52 -07:00
Vlad Brezae c217843334 Merge pull request #4828 from BrzVlad/fix-windows-ci
[runtime] Fix windows ci
2017-05-12 22:43:35 +03:00
Martin Baulig 5c0f506a8d [System]: Replace HttpListenerResponseHelper with HttpStatusDescription from CoreFX (#4833)
* [System]: Replace HttpListenerResponseHelper with HttpStatusDescription from CoreFX.

* Update common.sources
2017-05-12 14:32:50 -04:00
Jan-Joost Spanjers b60cf06374 Include gmodule-win32-internals.h in tarball (#4843) 2017-05-12 16:44:40 +02:00
Martin Baulig 9f0f177b6f [System]: Add HttpListenerBasicIdentity.platformnotsupported.cs for watch. (#4836) 2017-05-12 10:33:07 -04:00
Zoltan Varga 2d19e5e052 Amd64 gsharedvt small sizes (#4841)
* [jit] Fix CPBLK for large sizes.

* [amd64] Fix the byref->byval passing of small arguments from gsharedvt methods, we were loading loading them as pointers, which meant the upper bits might contain garbage. Fixes #56247.
2017-05-12 08:58:56 -04:00
Alexander Köplinger e0b669dc1b Update API snapshot with recent API changes 2017-05-12 14:32:40 +02:00
Marek Safar 52d82cba0a Bump corefx 2017-05-12 07:34:44 +02:00
Zoltan Varga e7839d77b4 [jit] Fix CPBLK for large sizes. 2017-05-11 20:26:49 -04:00
vkargov 6ac36d6c40 Merge pull request #4327 from vkargov/vk-abcremedy
[runtime] Abcrem fixes.
2017-05-11 17:02:57 -07:00
Alexander Köplinger 2324773fbb [Facades] Update with new typeforwarders/APIs (#4838) 2017-05-12 01:36:05 +02:00
Ludovic Henry 5250b855e5 [mcs] Add platform specific files (#4837)
* [mcs] Rework %-recursive target to explicitely list subdirectories

* [mcs] Rename PLATFORM to BUILD_PLATFORM

* [mcs] Add platform specific files

This is to support adding corefx platform specific files. To do that, we now support `mcs/class/corlib/linux_net_4_x_corlib.dll.sources` for example, on top of `mcs/class/corlib/net_4_x_corlib.dll.sources` and `mcs/class/corlib/corlib.dll.sources`.

The 3 platforms that are supported are: `linux`, `darwin` and `win32`.

* [mcs] Build cross-platform bcl in separate folder
2017-05-11 19:19:09 -04:00
Martin Baulig 3f779475e3 [System]: HttpListener.CreateSslStream() should always use passed-in callback. (#4835) 2017-05-11 16:20:38 -04:00
Alexander Köplinger 720b81ff71 Revert "[MacSDK] Include 'opt' as a PATH-available binary"
This reverts commit 47365cd54b.

We didn't do this in the private bockbuild and putting
'opt' from Mono into the PATH could be problematic.

This makes us consistent with the private bockbuild whitelist.
2017-05-11 21:52:34 +02:00
Jonathan Chambers 053868c17b Specify Encoding.UTF8 when marshaling native runtime string. If not, string constructor accesses Encoding.Default which causes infinite recursion on Windows for codepages supported via I18N. While trying to load I18N assemblies, assembly names are marshaled in managed code now hitting this code path. Fixes Xamarin bug 43988. 2017-05-11 19:21:43 +02:00
vkargov f2dc087948 [jit] Keep unwind info in the domain's memory pool. (#4825) 2017-05-11 12:33:41 -04:00
Aleksey Kliger (λgeek) 006de2be02 Merge pull request #4796 from lambdageek/dev-handles-may04
[runtime] Another batch of coop handles icalls
2017-05-11 10:33:02 -04:00
Alexander Köplinger a8f395f763 [MacSDK] Port change to license.rtf from private bockbuild
https://github.com/xamarin/bockbuild/commit/97d660778097b391151776a611494a545becd62c
2017-05-11 01:38:11 +02:00
Vlad Brezae 055b15e042 [runtime] Don't consume exception if not allowed to
The thread_state indicates whether we have a pending exception that needs to be consumed (be it sync or async). Normally we check the state before calling mono_thread_execute_interruption, but make sure we don't consume an exception if the thread_state doesn't allow us to (we can have an abort requested but mono_thread_clear_interruption_requested can return FALSE if we are inside an abort protected block and shouldn't process it)
2017-05-11 02:14:11 +03:00
Vlad Brezae 07c6296f1c Merge pull request #4816 from BrzVlad/fix-remoting-exception
[remoting] Serialize exceptions between domains inside try/catch
2017-05-11 01:38:33 +03:00
Vlad Brezae c7e4ef422e [tests] Don't starve the main thread by doing GCs
Thread.Yield doesn't guarantee that the thread doing GCs won't do it excessively, leading to significant variances in test run time.

Decrease number of iterations since these tests can take around 1 min.
2017-05-11 00:15:55 +03:00
Rodrigo Kumpera 2ed4cddf00 Merge pull request #4818 from kumpera/unaligned-cleanup-2
Last bucket of cleanups before I land the actual code for unaligned.
2017-05-10 13:23:08 -07:00
Martin Baulig 859eac6db7 [System]: Add new 'common-networking.sources' and move stuff from 'common.sources'. (#4815)
* [System]: Add new 'common-networking.sources' and move stuff from 'common.sources'.

This moves all the networking-related sources which aren't supported on monotouch_watch
into a separate file, so we don't have to maintain a huge "Thing That Should Not Exist".

* Put back System.Net/NtlmClient.cs - we actually do need it.

* Add HttpListenerTimeoutManager.platformnotsupported.cs.

* Make it build.
2017-05-10 15:43:57 -04:00
Ludovic Henry b0289fe19c [process] Disable tests that do not work on mobile (#4598) 2017-05-10 14:53:03 -04:00
monojenkins 35a4c994c8 [msvc] Update csproj files (#4822) 2017-05-10 18:31:46 +02:00
Aleksey Kliger c2cd663d62 [security] Use coop handles for ves_icall_System_Security_Principal_WindowsIdentity_GetUserToken 2017-05-10 11:14:01 -04:00
Aleksey Kliger 1a86a68e46 [security] Use coop handles for ves_icall_System_Security_Principal_WindowsIdentity_GetTokenName 2017-05-10 11:14:00 -04:00
Aleksey Kliger 7f81c06a0c [security] Use coop handles for ves_icall_System_Security_Principal_WindowsIdentity_GetCurrentToken
Refactor it into mono_security_principal_windows_identity_get_current_token ()
and then call that from ves_icall_System_Security_Principal_WindowsIdentity_GetCurrentToken ()
2017-05-10 11:14:00 -04:00
Aleksey Kliger 427e0f335c [runtime] Use coop handles for System.RuntimeMethodHandle.GetFunctionPointer 2017-05-10 11:14:00 -04:00
Aleksey Kliger 21ae2786da [sre] Use coop handles for ModuleBuilder.set_wrappers_type 2017-05-10 11:14:00 -04:00
Aleksey Kliger 83daf8e0e8 [sre] Use coop handles for ModuleBuilder.GetRegisteredToken
- Fix typo in REFLECTION_EMIT_INIT/REFLECTION_EMIT_SAVE in
  mono_dynamic_image_register_token
- Add mono_dynamic_image_get_registered_token ()
- N.B. locking change - ves_icall_ModuleBuilder_GetRegisteredToken used to take
  the loader lock.  Now it calls mono_dynamic_image_get_registered_token which
  just takes the image lock.
2017-05-10 11:14:00 -04:00
Aleksey Kliger b834b10a3b [runtime] Use coop handles for System.Environment.internalBroadcastSettingChange 2017-05-10 11:14:00 -04:00
Aleksey Kliger b8670a4dbe [locales] Use coop handles for System.Text.Normalization.load_normalization_resource 2017-05-10 11:13:59 -04:00
Aleksey Kliger f110c73056 [sre] Use coop handles for System.Reflection.Emit.EnumBuilder.setup_enum_type 2017-05-10 11:13:59 -04:00
Aleksey Kliger 4f65bd0778 [sre] Use coop handles for System.Reflection.Emit.SignatureHelper.get_signature_local 2017-05-10 11:13:59 -04:00
Aleksey Kliger 7c50f6318c [sre] Use coop handles for System.Reflection.Emit.SignatureHelper.get_signature_field 2017-05-10 11:13:59 -04:00
Aleksey Kliger 0f952a7adf [loader] resolve symlinks when looking for an image in the loaded_images cache
Consider the old code (which just used mono_path_canonicalize)

Suppose foo.dll is a symlink to bar.dll

Suppose we've try to load foo.dll the first time:
do_mono_image_open is passed "foo.dll" it then sets image->name to "bar.dll"
which is then used by register_image to do a lookup and then inserts the
mapping from "bar.dll" to the new image (call it Image1).

Suppose we try to load foo.dll a second time:
we check for "foo.dll" in the loaded_images cache and get NULL.
So we call do_mono_image_open ("foo.dll", ...) again, and again image->name is
set to "bar.dll".  (Call this Image2)
We call register_image again which looks up bar.dll and gets Image1.  So it
increments the refcount for Image1 and unloads Image2 and so
mono_image_open_a_lot returns Image1.

With the new code:

The first time we try to load foo.dll everything is the same.  The second time
we try to load foo.dll, we resolve the symlink from "foo.dll" to "bar.dll" in
mono_image_open_a_lot and return Image1 directly from loaded_images.
2017-05-10 10:57:18 -04:00
Rolf Bjarne Kvinge 3af24f31f3 [System] Use 'ObjCRuntimeInternal' as the namespace instead of 'ObjCRuntime'. (#4820)
Use 'ObjCRuntimeInternal' as the namespace instead of 'ObjCRuntime' to avoid
these compiler-warnings when building xamarin-macios assemblies (which defines
the same types in the ObjCRuntime namespace, and to whom System.dll has an
InternalsVisibleTo attribute):

> xamarin-macios/src/build/watch/watch/Foundation/NSExtensionRequestHandling.g.cs(28,49): warning CS0436: The type `ObjCRuntime.INativeObject' conflicts with the imported type of same name'. Ignoring the imported type definition
> xamarin-macios/src/ObjCRuntime/INativeObject.cs(6,19): (Location of the symbol related to previous warning)
> xamarin-macios/_ios-build/Library/Frameworks/Xamarin.iOS.framework/Versions/git/lib/mono/Xamarin.WatchOS/repl/System.dll (Location of the symbol related to previous warning)
2017-05-10 16:52:01 +02:00
Rodrigo Kumpera 02783048e9 [mini] Cleanup usage of mini_emit_memcpy and bad values for alignment - align to 4 on 64bits is *bad*. 2017-05-09 16:47:38 -07:00
Rodrigo Kumpera 348527989d [jit] CPBLK and INITBLK now use the funtions in memory-access.c 2017-05-09 16:04:36 -07:00
Rodrigo Kumpera 59dd7ccff2 [jit] Add mini_emit_memory_copy_bytes and mini_emit_memory_init_bytes to be used by cpblk and iniblk. 2017-05-09 16:04:31 -07:00
Rodrigo Kumpera 2517184252 Merge pull request #4781 from kumpera/unaligned-cleanup-1
First pass of cleanups to introduce a clear layer that deals with emiting load/stores.
2017-05-09 19:01:57 -04:00
Vlad Brezae df047ec2db [remoting] Serialize exceptions between domains inside try/catch
If a remote invoke in another domain throws an exception, the xdomain-dispatch wrapper will serialize the exception and pass it over to the calling domain so that it can be rethrown there. Serializing the exception object can itself throw an exception which we didn't properly catch, leading to unwinding to the caller domain without changing the domain state back and wreaking havoc.

If the serialization of the original exception throws a new exception, this new exception takes its place, being passed instead to the caller domain.
2017-05-10 00:54:47 +03:00
Marek Safar ce55518eb9 Bump corefx 2017-05-09 22:55:46 +02:00
Rodrigo Kumpera e026ad7e55 [runtime] Update msvc build scripts. 2017-05-09 13:51:11 -07:00
Zoltan Varga 3edf9da975 [jit] Allow inlining of methods with the AggressiveInlining flag even if they make calls. (#4811) 2017-05-09 15:36:22 -04:00
Zoltan Varga b6caf7d37a [jit] Mark bblocks making calls to the corlib ThrowHelper class as out of line. (#4812) 2017-05-09 14:33:26 -04:00
Marek Safar 9b06c6a000 [System.Data] Update cas test category 2017-05-09 19:14:51 +02:00
Marek Safar 68e177a966 [mcs] Conditional check on attribute type needs to check its base types too 2017-05-09 19:08:51 +02:00
monojenkins 5d33eca131 [msvc] Update csproj files (#4813) 2017-05-09 18:58:10 +02:00
Martin Baulig 280f222afa [System]: Remove 'SECURITY_DEP' conditional from HttpListener and related classes. (#4810) 2017-05-09 11:22:19 -04:00
Alexander Köplinger 94a0d73732 [tools] Add resx2sr to "build" profile (#4807)
Similar to 9635b9cea0 we
can now break the dependency on WinForms from resx2sr.

This allows us to add it to the "build" profile
and clean up the Makefile.
2017-05-09 14:28:10 +02:00
Rodrigo Kumpera 15df083d06 [jit] Add mini_emit_memory_store and use it for STOBJ. 2017-05-08 16:33:40 -07:00
Rodrigo Kumpera 4dee9cb05f [jit] Fix identation. 2017-05-08 16:11:58 -07:00
Rodrigo Kumpera cbcd4e8914 [jit] Use mini_emit_memory_load for ldind, ldobj and ldfld 2017-05-08 16:11:45 -07:00
Rodrigo Kumpera 2b5495896e [jit] Add mini_emit_memory_load that is to be used to lower CIL memory loads. 2017-05-08 16:09:28 -07:00
Martin Baulig e6e4422fb4 [System]: Add private '_internalLock' field to HttpListener. (#4809)
After switching to the CoreFx version, HttpListener.Mono.cs will remain,
so it needs to use the proper locking object.
2017-05-08 18:33:08 -04:00
Alexander Köplinger 6587eb73ae [bcl] Add API diff for monotouch/monodroid profiles (#4805)
This runs the API diff against the monotouch and monodroid
profiles in addition to net_4_x to help us catch mistakes that
only affect the mobile profiles.

To make updating the API snapshot in case of an intentional change
easier without needing to build those profiles locally I added
a way to download the diff as a .patch file. You can just download
the file from the API diff Jenkins generates and apply it locally.
2017-05-09 00:08:05 +02:00
Alexander Köplinger f95b3f433c [bcl] Cleanup outdated csproj/sln files (#4806)
They were either replaced by the autogenerated csproj files
or just completely broken for years.
2017-05-09 00:07:45 +02:00
Zoltan Varga 9247bb5ce6 [sdb] Avoid printing out the ThreadAbortException used to abort the protocol receiver thread. (#4804) 2017-05-08 17:34:06 -04:00
Martin Baulig 69689c95e5 [System]: Make HttpListener partial and move Mono-specific bits into HttpListener.Mono.cs. (#4808)
* [System]: Make HttpListener partial and move Mono-specific bits into HttpListener.Mono.cs.

* Remove ancient EMBEDDED_IN_1_0 conditional.

* Remove unused using statements.

* HttpListener.CreateSslStream() now uses RemoteCertificateValidationCallback.
2017-05-08 16:27:04 -04:00
Martin Baulig e5cdc000d7 [System]: Rename the internal class 'ChunkStream' into 'MonoChunkStream'. (#4803)
* [System]: Fully stub-out SslStream on platforms where it's not supported.

* Remove 'SECURITY_DEP' conditional from LocalCertificateSelectionCallback.

* Add the internal delegates and remove 'SECURITY_DEP' from SslStream.platformnotsupported.cs.

* In SslStream.cs, we now provide the full API when '!SECURITY_DEP' using the
PlatformNotSupportedException()-based implementation from SslStream.platformnotsupported.cs

* [System]: Rename the internal class 'ChunkStream' into 'MonoChunkStream'.

Our 'ChunkStream' is used by 'WebConnection', so it will stay after using
HttpListener from corefx.
2017-05-08 12:13:50 -04:00
Martin Baulig 141970828e [System]: Fully stub-out SslStream on platforms where it's not supported (#4802)
* [System]: Fully stub-out SslStream on platforms where it's not supported.

* Remove 'SECURITY_DEP' conditional from LocalCertificateSelectionCallback.

* Add the internal delegates and remove 'SECURITY_DEP' from SslStream.platformnotsupported.cs.

* In SslStream.cs, we now provide the full API when '!SECURITY_DEP' using the
PlatformNotSupportedException()-based implementation from SslStream.platformnotsupported.cs

* Fix typo.
2017-05-08 12:12:08 -04:00
Rodrigo Kumpera 5e1d20ac48 Merge pull request #4799 from xmcclure/mingw-has-secure-api
Fix mingw/mxe build
2017-05-08 12:07:46 -04:00
Aleksey Kliger f5696e5888 [mono-error] Always call TLE(string,string) constructor
if assembly name is NULL, mono_exception_from_name_two_strings_checked looks
for a TLE(string) constructor - which takes a message - which we immediately
overwrite.

So pass the empty string instead, which goes to the (Mono-specific)
TLE(string,string) constructor which intializes ClassName and AssemblyName
members of a TLE.
2017-05-08 10:49:12 -04:00
Aleksey Kliger c21ffa3695 [runtime] Fail classes that have a field with a bad underlying type
If a class T has a field e of enum type E, and E is either
incomplete (EnumBuilder that hasn't had CreateType called) or a broken class,
then mark T as failed.
2017-05-08 10:49:12 -04:00
Aleksey Kliger 4bb7e0805e [test] Don't crash if incomplete enum type is a static field in a class 2017-05-08 10:49:12 -04:00
Andi McClure 48a1825bff Fix mingw/mxe build
wcscat_s is not available on mingw unless a special symbol is defined. Add this symbol to exceptions-amd64.c
2017-05-05 13:29:18 -04:00
Zoltan Varga 608fbb28a0 [jit] Fix 4c0df6de33, use __GNUC__ instead of GNUC. 2017-05-05 08:28:36 -04:00
Bernhard Urban 2c9595fe9b [interp] do widening for more arith ops 2017-05-05 13:06:36 +02:00
Alexander Köplinger 12d5afd75f [configure.ac] Fix inadvertently invoking X server (#4792)
I noticed this when I cleaned my Mono repo and reran autogen.sh.
I suddenly got a popup from XQuartz about "Unrecognized option: =".

Turns out this was introduced in 9e967f00b3,
the second half of the if is missing `test`, so it actually runs
`x = xyes` which starts XQuartz :D

Also cleaned up the USE_NLS checking since that ran immediately
before this and just printed "no" before which confused me.
2017-05-05 00:04:43 +02:00
Aleksey Kliger (λgeek) 23ae27b70d Merge pull request #4782 from lambdageek/dev-mono_string_new-excise
[runtime] Mark mono_string_new external only
2017-05-04 17:31:01 -04:00
Andi McClure 047414c02c Merge pull request #4788 from xmcclure/if-winrt
Fix hybrid AOT build
2017-05-04 16:56:12 -04:00
Martin Baulig 45bcf3e665 [System]: Fix TLS Provider registration and use BTLS instead of Legacy. (#4793) 2017-05-04 16:51:16 -04:00
Andi McClure fde1280c21 Require #if WIN_PLATFORM more strictly around some WinRT timezone functions
This was breaking the hybrid AOT build.
2017-05-04 12:46:35 -04:00
Aleksey Kliger eeac70e579 [runtime] Mark mono_string_new external only
Runtime should use mono_string_new_checked
2017-05-04 12:01:16 -04:00
Aleksey Kliger cc8d3f09dd [interp] Use mono_string_new_checked instead of mono_string_new 2017-05-04 12:01:15 -04:00
Aleksey Kliger e05a638937 [mini] Use mono_string_new_checked instead of mono_string_new
(mono-security-windows.c) (aot-compiler.c) (debugger-agent.c) (driver.c) (mini-exceptions.c)
2017-05-04 12:01:13 -04:00
Aleksey Kliger 419331f455 [runtime] Use coop handles for some simple icalls
- System.Text.EncodingHelper.InternalCodePage
- System.Runtime.InteropServices.Marshal.PtrToStringAnsi(intptr)
- Use coop handles for ves_icall_System_Configuration_DefaultConfig_get_machine_config_path
- Use coop handles for ves_icall_System_Configuration_InternalConfigurationHost_get_bundled_app_config
- Use coop handles for System.Web.Util.ICalls.GetMachineInstallDirectory
2017-05-04 12:00:39 -04:00
Aleksey Kliger 72787358ad [locales] Use coop handles for System.Globalization.CultureInfo.get_current_locale_name 2017-05-04 12:00:33 -04:00
Aleksey Kliger a77fff8e4c [runtime] Use coop handles for System.Environment icalls
- get_UserName
- get_NewLine
- get_MachineName
- GetWindowsFolderPath
- GetOSVersionString

MonoError-ize mono_icall_get_environment_variable_names
2017-05-04 12:00:31 -04:00
Aleksey Kliger 087178ba2c [appdomain] Make mono_domain_set_config external only
Runtime should use mono_domain_config_checked ()
2017-05-04 12:00:30 -04:00
Aleksey Kliger 5f96b9c6e7 [locales] Use mono_string_new_checked instead of mono_string_new 2017-05-04 12:00:28 -04:00
Aleksey Kliger b28dfdd4ee [runtime] Use mono_string_new_checked instead of mono_string_new
(w32file.c) (filewatcher.c) (appdomain.c) (attach.c) (appdomain.c)
(gc.c) (marshal.c) (mono-perfcounters.c) (mono-security.c) (object.c)
(sre.c) (threadpool.c) (threads.c) (w32process.c) (w32socket.c)
2017-05-04 12:00:20 -04:00
Zoltan Varga 4c0df6de33 [jit] Compile unwinder_unwind_frame without optimization on arm64 as old gcc versions seems to miscompile it. 2017-05-04 11:59:09 -04:00
Aleksey Kliger b24fbe31cb [mono-route] Use _checked functions
And include config.h
2017-05-04 11:30:59 -04:00
Aleksey Kliger 9bb07c7986 [mono-error] Use mono_string_new_checked instead of mono_string_new 2017-05-04 11:26:59 -04:00
Aleksey Kliger 8d349deb2a [runtime] Use mono_string_new_checked in exception.c 2017-05-04 11:26:58 -04:00
Aleksey Kliger 20bdb3ec83 [pedump] Fix running with cooperative GC
This is the pedump analog of 9f5115a343
which fixed monodis under coop.
2017-05-04 10:01:54 -04:00
Alexander Köplinger 9667b4ef59 [bcl] Add .NET 4.7 reference assemblies (#4791) 2017-05-04 12:56:27 +02:00
Alexander Köplinger 49bb738eb2 [System.Net.Http] Fix XI build 2017-05-04 06:11:24 +02:00
vkargov d24633b39c [jit] Fix memory leak in trampoline info registration. (#4775) 2017-05-03 16:28:58 -04:00
Alexis Christoforides e523f243d6 [MacSDK] Build msbuild for Release config 2017-05-03 15:56:47 -04:00
Vlad Brezae 1afda33e4f Merge pull request #4787 from BrzVlad/fix-degraded-mode
[sgen] Fix accidental triggering of degraded mode
2017-05-03 22:47:01 +03:00
Alexis Christoforides e266dbe695 Bump bockbuild 2017-05-03 14:50:40 -04:00
Andi McClure 00dff71419 Merge pull request #4780 from xmcclure/assembly-loader-default
Document --assembly-loader and change default to 'legacy'
2017-05-03 13:45:44 -04:00
Andi McClure ca6365b316 Document --assembly-loader, change default to 'legacy' and fix comment
Also set testing_gac tests to use --assembly-loader=strict, since it is no longer the default
2017-05-03 10:48:48 -04:00
Vlad Brezae 94fe3dfb62 [sgen] Fix accidental triggering of degraded mode
We trigger degraded mode when we are unable to properly build the nursery fragments due to excessive nursery pinning. This is done by initializing degraded_mode at the end of a minor. alloc_degraded is used to do allocation to major heap either as part of mature allocation or as part of degraded mode (when we bump the degraded_mode so we can detect when the next minor should be triggered).

When failing to allocate from the nursery after doing a minor (because the other threads might have already consumed the nursery) we need to do a mature allocation (as a fallback) instead of a degraded mode allocation so we don't uselessly enable the mode.
2017-05-03 17:11:00 +03:00
Zoltan Varga 5e7137b6fe Mixed mode exception handling (#4777)
* [mixed] Add beginnings of unwinding support for interp->jit transitions by pushing an LMF frame on the stack when exiting interpreted code.

* [runtime] Add a mono_debug_lookup_source_location_by_il () helper function to lookup a source location using an IL offset.

* [mixed] Add support for mixed mode managed stack walks.

* [interp] Generate line number info for interpreted code, using the same MonoDebugMethodJitInfo structure used by the JIT.

* [interp] Pass the clause index to the MINT_ENDFINALLY opcode. Not yet used.

* [interp] Create a MonoJitInfo structure for each interpreted method. Not yet used.

* [interp] Add a mono_interp_set_resume_state () function which can be used to set the frame/ip the interpreter will resume execution from when execution returns to it.

* [mixed] Add support for mixed mode exception handling by extending the normal JIT exception handling code in mini-exceptions.c to handle interpreted frames as well.

* [jit] Add an Unwinder type to reduce the amount of code duplication when unwinding though interpreter frames.

* [interp] Fix the !ENABLE_INTERPRETER build.

* [interp] Disable an assert which is hit even when running without --interpreter.

* Fix a comment.

* [interp] Fix an assertion. Fix/add comments.
2017-05-03 00:45:59 -04:00
Aleksey Kliger (λgeek) b89cb75d02 [loader] Add a few Framework Facades assemblies (#4784)
that were previously missing, or mislabeled as ordinary framework assemblies.
2017-05-03 01:01:28 +02:00
Alexis Christoforides 1207564519 [MacSDK] Add 'csc' (Roslyn compiler) to whitelist 2017-05-02 13:10:19 -04:00
Rodrigo Kumpera 897fb5025a [jit] Move memcpy and memset emmiters to new file called memory-access.c 2017-05-01 13:50:22 -07:00
Rodrigo Kumpera 509763cebe [mini] Rename & expose a few functions to mini.h.
This adds to mini.h & fixes naming of the following functions:
	emit_get_gsharedvt_info_klass
	mono_emit_calli
	get_memcpy_method
	get_memset_method
	emit_memory_barrier
	emit_runtime_constant
	mini_class_check_context_used
	mono_emit_wb_aware_memcpy
	emit_write_barrier

Those functions will be used later by the memory access functions to be extracted out of method-to-ir.c
2017-05-01 13:14:37 -07:00
Alexander Köplinger 137e1e75d1 [ci] Output nunit xml if "verify" test step fails
Allows us to better catch this on Jenkins.
2017-04-29 23:43:53 +02:00
Alexander Köplinger c38becfba1 [ci] Don't fail when setting GitHub status doesn't work 2017-04-29 23:17:27 +02:00
monojenkins 3e46fb402b [msvc] Update csproj files (#4776) 2017-04-29 18:35:42 +02:00
Aleksey Kliger (λgeek) 00efe86cd3 Merge pull request #4767 from lambdageek/bug-55681
[sre-save] Handle ConstructorBuilder custom attribute constructors
2017-04-28 17:44:27 -04:00
Aleksey Kliger (λgeek) fe79b8de83 Merge pull request #4759 from lambdageek/flags-strict-strong-names
Put strict strong name checking behind a configure flag and runtime option
2017-04-28 17:43:50 -04:00
Bernhard Urban 4312802ba7 [interp] implement MONO_JIT_{AT,DE}TACH, so native2managed wrappers can be handled by the interpreter 2017-04-28 20:52:06 +02:00
Bernhard Urban b9043ed64c [interp] implement CEE_MONO_{TLS,ATOMIC_STORE_I4}
so we can execute the alloc wrapper
2017-04-28 20:52:06 +02:00
Bernhard Urban 1982951c60 [interp] remove ves_exec_method_with_context_with_ip, othwerwise we end up having to native frames for each managed frame in the debugger
and that's annoying.
2017-04-28 20:52:06 +02:00
Bernhard Urban c2e47804fa [tests] print seed
I've seen this test failing on CI with --interpreter, can't reproduce it
though.  Next time it would be nice to see the used seed.
2017-04-28 20:52:06 +02:00
Bernhard Urban 341c0782e9 [interp] enable a couple delegate tests on CI 2017-04-28 20:52:06 +02:00
Bernhard Urban c26a8bbb74 [interp] testcase for static field stuff 2017-04-28 20:52:06 +02:00
Bernhard Urban 722ddbf451 [interp] resolve MonoClass and MonoClassField from image like we do in mini 2017-04-28 20:52:06 +02:00
Bernhard Urban 1f7386bd86 [interp] resolve right class for valuetype 2017-04-28 20:52:06 +02:00
Bernhard Urban 3ac455390e [interp] check for pending exceptions after icall 2017-04-28 20:52:06 +02:00
Bernhard Urban a402abe0c6 [interp] let JIT handle native2managed wrappers, but hack around dynamic methods 2017-04-28 20:52:06 +02:00
Bernhard Urban dd945c7ca5 [interp] add stelem.u2 2017-04-28 20:52:06 +02:00
Bernhard Urban fe9b9619fc [interp] move interp_init call so embedders don't have to call it explicitly 2017-04-28 20:52:06 +02:00
Alexander Köplinger 0ea0f84a0d [bcl] Add API diff targets (#4406)
With these targets we can generate a snapshot of the current
Mono API in C# source code form.

Whenever we make changes, we can rerun this to ensure we didn't
inadvertently change the public API.

It also outputs a diff in html form that we can show on CI.
2017-04-28 20:28:32 +02:00
monojenkins 41739fb3e5 [msvc] Update csproj files (#4772) 2017-04-28 19:59:53 +02:00
Rodrigo Kumpera 594719dbf2 Merge pull request #4771 from mono/revert-4765-master
Revert "[jit] Fix memory leak in trampoline info registration."
2017-04-28 09:25:54 -07:00
Rodrigo Kumpera 13db722d6f Revert "[jit] Fix memory leak in trampoline info registration." 2017-04-28 09:25:36 -07:00
Rodrigo Kumpera a4eb5c2f91 Merge pull request #4765 from vkargov/master
[jit] Fix memory leak in trampoline info registration.
2017-04-28 09:24:56 -07:00
Alexander Köplinger a5c47a0894 [System.Data] Add InvalidUdtException back
It was accidentally removed in 2729605554.
2017-04-28 17:00:31 +02:00
Aleksey Kliger 76689aab4a [sre-save] Handle ConstructorBuilder custom attribute constructors.
The code expected that a custom attribute was specified as a MonoCMethod and
was calling mono_image_create_token().  However that function expects to be
called from the managed S.R.E.ModuleBuilder:GetToken (MemberInfo) which handles
all the builders in managed code.  Consequently mono_image_create_token () was
asserting.

So now we encode the token for a ConstructorBuilder in place.
2017-04-28 10:11:21 -04:00
Aleksey Kliger 5857790608 [sre] Make mono_image_get_methodref_token non-static in sre-internals.h 2017-04-28 10:11:20 -04:00
Dean Ellis 59737b2a47 [mkbundle] Add support for generating monodroid compatible mkbundle code at runtime (#4728)
monodroid used to build its own version of mkbundle since it
requires slightly different code than the desktop. This
logic was protected in a #if block. Now that monodroid is
trying to make use of the shipped mkbundle rather than use
its own we need to turn this logic on at runtime.

A new parameter has been added

	--bundled-header

When this option is passed, the code which skips including

	mono/metadata/mono-config.h

will be skipped in favour of defining the required structures
and entry points directly.
2017-04-28 13:18:29 +02:00
Marek Safar 2d964d860c [System.Reflection.DispatchProxy] Move to facades to support _._ nugets 2017-04-28 10:54:22 +02:00
Marek Safar f69b00568f [Facades] Update version numbers 2017-04-28 10:54:22 +02:00
Marek Safar 41a4bda979 [corlib] Add new types 2017-04-28 10:53:15 +02:00
Marek Safar 5730b425b3 Bump corert 2017-04-28 10:53:15 +02:00
Aleksey Kliger e45b8b2f4f [test] Regression tests for ConstructorBuilder custom attributes
Regression tests for https://bugzilla.xamarin.com/show_bug.cgi?id=55681
2017-04-27 17:58:07 -04:00
Marek Safar 414e74bb4c Bump corefx 2017-04-27 23:38:57 +02:00
Vladimir Kargov 7b3f134caa [jit] Fix memory leak in trampoline info registration. 2017-04-27 13:14:13 -07:00
Martin Baulig 618f75ffe7 [System]: Cleanup internal TLS Provider registration. (#4758)
* [System]: Cleanup internal TLS Provider registration.

Merge MonoTlsProviderFactory.Apple.cs and MonoTlsProviderFactory.Droid.cs
into MonoTlsProviderFactory.cs.

Disable the dynamic reflection-load on mobile while still keeping the
registration, so we can use IsSupported() and friends.

* Make it build.
2017-04-27 14:36:41 -04:00
Alexis Christoforides 37e4a78fb7 Bump bockbuild 2017-04-27 13:06:29 -04:00
monojenkins 915441ac03 [msvc] Update csproj files (#4763) 2017-04-27 18:25:53 +02:00
Alexis Christoforides 06657dc387 [MacSDK] Update F# -> 4.1.8 2017-04-27 11:32:24 -04:00
Alexis Christoforides f61b6ce5ab [MacSDK] Use msbuild's install script instead of duplicating it here 2017-04-27 11:17:59 -04:00
Alexis Christoforides 7a1a832f65 [MacSDK] Minor corrections on package's postinstall script 2017-04-27 11:13:50 -04:00
Johan Lorensson f75e5b4bc3 Merge pull request #4716 from Unity-Technologies/eglib-msvc-targets
Separate the eglib source and build instructions
2017-04-27 14:50:30 +02:00
Zoltan Varga 0b9bbcc7b2 [simd] Add support for Vector.IsHardwareAccelerated in the System.Numerics.Vectors assembly as well. Fixes #55577. (#4762) 2017-04-27 14:19:46 +02:00
Zoltan Varga 10d334b8c6 [runtime] Add a variant of mono_string_new_wrapper () and use it from marshalling code to avoid asserting when encountering invalid strings. (#4753) 2017-04-27 04:46:48 -04:00
Marek Safar 8e22402bfa Fixes build 2017-04-27 10:23:16 +02:00
Marek Safar c0929c34e0 [Facades] Move more asseblies to Facades to support implicit reference for _._ like nugets and ignore version mismatch 2017-04-27 09:23:30 +02:00
Aleksey Kliger 9e967f00b3 [loader] Rename enable-minimal=assembly_remapping to desktop_loader
Use a single DISABLE_DESKTOP_LOADER define instead of
DISABLE_ASSEMBLY_REMAPPING and DISABLE_STRICT_STRONG_NAMES
2017-04-26 19:38:34 -04:00
Aleksey Kliger 8532b7d59b Revert "[assembly] Add Facades dir to default_path on all runtimes"
This reverts commit d7e3698dbc.
2017-04-26 19:09:47 -04:00
Aleksey Kliger 5dd2290ef2 [runtime] Add --assembly-loader=[strict,legacy] runtime argument
If mono is compiled without DISABLE_STRICT_STRONG_NAMES, but someone passes
--assembly-loader=legacy at runtime, give them the lax strong name
checking behavior (a candidate assembly is good as long as the name is right, but ignoring
the public key token and version).
2017-04-26 19:09:45 -04:00
Aleksey Kliger 0d920026b5 [loader] --enable-minimal=assembly_remapping implies no strict strong name checking
When strict strong name checking is enabled, Mono will check public key tokens
and versions match between a requested assembly reference and a candidate found
via its usual loading directories.

amend
2017-04-26 19:09:05 -04:00
Martin Baulig 5e08742b5c [System]: Fix bug #52508 in HttpListener when doing multiple Https request.
Move the call to SslStream.AuthenticateAsServer() into the constructor because
we don't want to call it again when Init() is called from Close().
2017-04-26 18:54:27 -04:00
Martin Baulig 427cc60438 Revert changes that I accidentally pushed on top of PR #4756. 2017-04-26 17:21:21 -04:00
Martin Baulig cb885fe3e0 [Mono.Security.Interface]: Improve synergy between SslStream and IMonoSslStream (#4756)
* [Mono.Security.Interface]: Improve synergy between `MonoTlsProvider`, `SslStream` and `IMonoSslStream`.

* Add `IMonoSslStream.SslStream` property; the `IMonoSslStream` is now only created my the `SslStream`
  constructor, so `SslStream` "owns" the `IMonoSslStream`.

* Add internal `MonoTlsProvider.CreateSslStreamInternal()`.

* `SslStream` does not need to implement any additional interfaces; we can do without after
   getting rid of the wrapper classes.

* Add internal `SslStream.CreateMonoSslStream(Stream,bool,MonoTlsProvider,MonoTlsSettings)`.

* `MonoTlsProvider.CreateSslStream()` implementations should use this new method.

* Remove ancient obsolete MonoTlsProviderFactory APIs.

* `HttpListener` and `HttpConnection` now use `SslStream` instead of `IMonoSslStream`.

* [System]: Cleanup internal TLS Provider registration.

* Make it build.
2017-04-26 17:15:37 -04:00
Joshua Peterson 22b6b95814 Define HAVE_STRUCT_SOCKADDR_IN6 on Windows (#4755)
This enables IPv6 support on Windows.
2017-04-26 20:25:53 +02:00
Martin Baulig 00ef68347f [Mono.Security.Interface]: Add MonoTlsProviderFactory.GetMonoSslStream(HttpListenerContext). (#4749)
* [System]: Cleanup 'SECURITY_DEP' conditionals in the internal TLS code.

* [System]: Remove 'Mono.Net.Security.IMonoSslStream'; use 'Mono.Security.Interface.IMonoSslStream' instead.

* [System]: Remove 'Mono.Net.Security.IMonoTlsProvider'; use 'Mono.Security.Interface.MonoTlsProvider' instead.

* [System]: Cleanup internal TLS code.

* [Mono.Security]: Add MonoTlsProviderFactory.GetSslStream(HttpListenerContext).

* [System]: `SslStream' should not implement any additional interfaces.
2017-04-26 10:29:36 -04:00
Manuel de la Pena 8b35ee7237 Make changes as per review to make the code more thread safe. 2017-04-26 14:46:37 +02:00
Manuel de la Pena 390e75170b Ensure that when an async read is performed on a response content the
errors are correctly dealt with.

Some network errors in iOS are exposed as Stream errors, specially those
related with the lost of the connection. This patch ensures that if such
an issue happens an exception is raised in the async read task.

Fixes bug https://bugzilla.xamarin.com/show_bug.cgi?id=53792
2017-04-26 14:46:37 +02:00
Aleksey Kliger (λgeek) 25bcd22d15 Merge pull request #4730 from lambdageek/facades-and-bug-580
* Check strong names on a couple more codepaths during assembly loading.  Fixes [bugzilla #580](https://bugzilla.xamarin.com/show_bug.cgi?id=580) and [bugzilla #55436](https://bugzilla.xamarin.com/show_bug.cgi?id=55436)
* Add `--apply-bindings=FILE` option.  Allows us to specify a configuration file for assembly binding redirections when AOTing.
* Use the above flag when AOTing `System.ReflectionMetadata.dll` to pick up `csc.exe.config`
* Add all the Facades to the `framework_assemblies` list in the runtime.  Facade and non-Facade framework assemblies behave differently:
  * for Facades, don't do any version remapping, and any version is okay.
  * for non-Facades, consult the version map to remap depdending on the --runtime used.
2017-04-25 18:15:50 -04:00
Andi McClure 8cad881e13 Merge pull request #4745 from xmcclure/ipv6-cleanup
Fix some style issues introduced by PR#4720
2017-04-25 16:52:46 -04:00
Aleksey Kliger c629125a1d [man] Document --apply-bindings=FILE option 2017-04-25 15:25:53 -04:00
Aleksey Kliger d7e3698dbc [assembly] Add Facades dir to default_path on all runtimes
Previous it was just the desktop runtime, but now that we have special handling
for framework facade assemblies in the loader, we should do it on other
runtimes, too.
2017-04-25 15:25:52 -04:00
Aleksey Kliger 96afbd04c4 [roslyn] Pass --apply-bindings=$(csc_exe).config when AOT-ing System.Reflection.Metadata
To pick up assembly binding redirections from csc.exe.config
2017-04-25 15:25:44 -04:00
Aleksey Kliger 24acd0ff82 [assembly] Add Facades to framework_assemblies list 2017-04-25 15:25:43 -04:00
Aleksey Kliger 1c63fceb42 [assembly] When loading framework facade assemblies, any version is ok in mono_assembly_candidate_predicate_sn_same_name
As long as the name and public key token matches.

This is different from the non-facade framework assemblies for which the
name and version must match but the public key token is ignored.
2017-04-25 15:25:41 -04:00
Aleksey Kliger 2a1bce7fef [assembly] add ANAME_EQ_IGNORE_VERSION flag to assembly_names_equal_flags() 2017-04-25 15:25:40 -04:00
Aleksey Kliger cf31c4eed1 [aot] Add --apply-bindings=FILE option
Apply bindings from configuration file FILE when running the AOT compiler.

This is useful if you need to AOT a module bar.dll that is loaded when the main
assembly foo.exe has a configuration file foo.exe.config that specifies
assembly bindings that bar.dll should respect.
2017-04-25 15:25:29 -04:00
Aleksey Kliger 397de9a6b0 [domain] Factor out mono_domain_parse_assembly_bindings
Move to a separate function the code that parses assembly bindings from a configuration file.
2017-04-25 14:40:37 -04:00
monojenkins 0a9422abed [msvc] Update csproj files 2017-04-25 18:33:23 +02:00
Marek Safar 08c7d3c120 Remove unused facade 2017-04-25 18:00:41 +02:00
Josh Peterson 9454206b34 Make the filters file match the targets files
* Create one filters file for each targets file
* Import each filters file into the project-level filters file
* Add folders for Common, Win32, and Posix targets files
2017-04-25 11:58:23 -04:00
Aleksey Kliger 2e95286e4d [loader] Pass sn_same_name predicate when loading from basedir and from default_path, too.
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=580
2017-04-25 11:22:57 -04:00
Marek Safar a2c9df5617 [System.Diagnostics.Tracing] Don't generate empty debyg symbols 2017-04-25 17:00:26 +02:00
Marek Safar 29340d4df3 [System.Data.Common] Add IDbColumnSchemaGenerator 2017-04-25 17:00:26 +02:00
Marek Safar 07b8eaa68f [Facades] Don't build debug symbols for System.Net.Sockets 2017-04-25 17:00:26 +02:00
Andi McClure 7bc0e0cdd7 Fix some style issues introduced by PR#4720
Existing code in this file mixing ifdefs with if {} else {} places the ifdef after the } but before the else.
2017-04-25 10:31:55 -04:00
Andi McClure ec380c722e Merge pull request #4720 from Unity-Technologies/config-checks-ipv6
Add autoconf checks for platforms without IPv6
2017-04-25 10:20:18 -04:00
Joshua Peterson 3e6c4f5264 Merge branch 'master' into config-checks-ipv6 2017-04-25 09:28:15 -04:00
Zoltan Varga 6a91ef1ac3 [jit] Remove some debug spew. 2017-04-25 05:10:14 -04:00
Marek Safar 2729605554 Bump corefx 2017-04-25 09:09:50 +02:00
Zoltan Varga 8e5124c890 [runtime] Add explicit (float) casts to test_0_float_precision () to make the test work when compiled with csc /O. 2017-04-24 19:14:41 -04:00
Andi McClure 45d90b20b7 Merge pull request #4710 from Unity-Technologies/additional-config-checks
Add #ifdef checks for code that might not exist
2017-04-24 16:23:52 -04:00
Marek Safar 0bc9c95a14 [build] Fixes setup for libraries without sources 2017-04-24 19:42:51 +02:00
monojenkins 562e261f3a [msvc] Update csproj files (#4740) 2017-04-24 18:31:11 +02:00
Zoltan Varga f15b1a5233 [cil-stripper] Mark stripped methods as noinline to prevent the JIT from trying to inline them. Fixes #55041. (#4732) 2017-04-24 12:21:27 -04:00
Vlad Brezae fafdb46e13 Merge pull request #4727 from BrzVlad/fix-xamarin-studio
[metadata] Fix special static field access
2017-04-24 18:37:00 +03:00
Alexander Köplinger 27fd8e5ad8 [Facades] Use Open.snk for netstandard.dll
We were using the wrong key since dotnet/standard switched to using the new Open key.
2017-04-24 16:24:49 +02:00
Josh Peterson 0c20ba842f Separate the eglib source and build instructions
This change extracts the eglib source files from the build instuctions
for builds via MSVC on Windows. It also separates the source files into
platform-specific and common .targets files. This provides more
flexibility for builds from MSVC in a few important ways:

1. We can do MSVC-based builds for platforms that will not be pushed to
public repos by checking out the Mono code externally and importing the
.targets files into a custom .vcxproj for the platform.
2. We can replace the platform specific .targets files with a custom set
of source files to implement a different platform abstraction layer
that will not be public without the need to merge changes to the
.vcxproj from the public repo.

This allows for ease of synchronizing changes to the public Mono
repo with private forks, while _not_ changing the behavior of the code
in the public repo.
2017-04-24 10:08:33 -04:00
Marek Safar bf6b05b0a3 [System] UriBuilder from corefx 2017-04-24 13:21:52 +02:00
Marek Safar 6784c6120f Bump Roslyn to 2.1 2017-04-24 12:38:52 +02:00
Rodrigo Kumpera cfeac85100 [corlib] Use AppContextSwitches implementation from RS. Fixes #54448 (#4682) 2017-04-24 10:20:20 +02:00
Zoltan Varga 1debf39341 Make the loading of llvm EH info async safe. (#4725)
* [aot] Emit class references in EH info in such as way that they can be skipped when reading them in async context.

* [aot] Rewrite the LLVM EH info loading code by moving allocations to callers so the lower level code is async safe.

* [aot] Make the memory allocation in the loading of llvm EH info async safe. Remove fields from MonoLLVMFDEInfo which are passed as parameters.

* [runtime] Add the ability to store the unwind info address/length in the MonoJitInfo structure instead of referencing it using the 'unwind_info' field.

* [aot] Make the loading of llvm EH information async safe.
2017-04-23 19:16:49 -04:00
Marek Safar 2cb98cb8ed [mdoc] Integrate api-doc-tools version 2017-04-23 13:50:48 +02:00
Zoltan Varga b21c70ff49 [runtime] Disable some tests in full-aot mode which cannot be AOTed because of type loading errors. 2017-04-22 19:06:36 -04:00
Vlad Brezae b1360afe0a [metadata] Lock around special static fields hash access
If a type is loaded in another thread, the fields hash can get resized, leading to failure.
2017-04-22 02:30:23 +03:00
Vlad Brezae 00c6a94a9c [amd64] Make inline function in header static
This was actually failing the osx build for me, probably due to symbol conflicts.
2017-04-22 02:30:23 +03:00
Vlad Brezae 3d1b921a19 [metadata] Don't use static_data_array
Memory allocated with mono_gc_alloc_fixed is uncollectable both on sgen and boehm. This array serves no other purpose. It should probably be killed entirely, but it's part of the API.
2017-04-22 02:30:20 +03:00
Rodrigo Kumpera e9518198e5 Merge pull request #4701 from kumpera/jit_improvements
[JIT] Last two optimizations to Roslyn.
2017-04-21 17:03:35 -04:00
Aleksey Kliger (λgeek) a1cabeee67 Merge pull request #4723 from lambdageek/bug-54485
[metadata] expand uninstantiated generic type definitions used as generic type args
2017-04-21 16:26:39 -04:00
Aleksey Kliger ee13c84852 [metadata] If a GTD appears uninstantiated in a generic instantiation argument,
replace it by its canonical open instantiation.

If we have
```
  class Foo<A,B,C> { ... }
  class Bar<T,U> { ... }
```

Then if someone tries to construct `Bar<Foo, int>` (or more precisely, the
MonoGenericInst corresponding to `<Foo, int>` instead return `Bar< Foo<A,B,C>, int >`.

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=54485
2017-04-20 18:58:31 -04:00
Aleksey Kliger 7111c840b9 [metadata] Add a canonical_inst MonoType to MonoClassGtd
The canonical instantiation of a generic type definition is the open
instantiation where the GTD is applied to its own generic parameters in order.

Suppose we have `class T<A,B> { ... }` then the canonical instantiation is just "T<A,B>".
2017-04-20 18:58:29 -04:00
Matthew Leibowitz 7e2571ed33 [Mono.Options] CommandSet and PCL/NetStandard Support (#4719)
When `PCL` is defined, the intent is that the resulting
`Mono.Options.dll` assembly will be usable on all PCL profiles.
This includes "silly" profiles such as Profile259, which lacks the
`System.Console` type, meaning e.g. `Console.Out` doesn't exist.

Unfortunately, the
`CommandSet(string, Converter<string, string, TextWriter, TextWriter)`
constructor would use `Console.Out` and `Console.Error` when the
`TextWriter` parameters were `null`, meaning this constructor can't
be provided for all PCL profiles.

Altering the constructor to instead use `TextWriter.Null` would allow
the constructor to be provided, but would be a *worse* experience,
IMHO: anybody (everybody!) expecting the default values to
"do something useful" will be sorely disappointed, as output and
error messages would instead be dropped. :-(

Instead, remove this constructor:

	public CommandSet (string suite, MessageLocalizerConverter localizer = null, TextWriter output = null, TextWriter error = null);

and replace it with these *two* constructors:

	public CommandSet (string suite, MessageLocalizerConverter localizer = null)
	public CommandSet (string suite, TextWriter output, TextWriter error, MessageLocalizerConverter localizer = null)

The first constructor, which accepts no `TextWriter` parameters, is
only provided in non-PCL builds, allowing it to use `Console.Out`.

The second constructor is available in PCL profiles, and *requires*
that `output` and `error` be non-`null`.

Documentation has been updated accordingly.
2017-04-20 16:28:05 -04:00
Aleksey Kliger 247e158bf4 [tests] System.Type.MakeGenericType with a GTD as argument
Regression test for https://bugzilla.xamarin.com/show_bug.cgi?id=54485
2017-04-19 16:21:51 -04:00
Alexander Kyte ca2292b6c2 Merge pull request #4722 from alexanderkyte/checked_after
[scripts] Don't build in checked mode
2017-04-19 15:47:14 -04:00
Alexander Köplinger fd41560563 Fix README.md to show correct values for --with-libgc
External boehm is no longer supported.
2017-04-19 21:18:43 +02:00
Alexander Köplinger ceabda8a54 [corlib/System.Data] Test fixes for xammac 4.5 and watchos
The TrimSpecial() method and Windows-specific code was removed from
xammac 4.5 so reflection can't find it anymore, handle this case.

Also add a workaround for SqlParameterCollectionTest.CopyToTest()
which fails on watchos since the SqlCommand would throw a PNSE.
It's a workaround because it just makes the test ignored since we don't
set the env var that ConnectionManager.Instance.Sql reads in XI tests,
but it makes the test consistent with the other tests in the suite.
We should fix this properly later on.
2017-04-19 21:08:52 +02:00
Josh Peterson b83d6e717d Add #ifdef checks for code that might not exist
* Some platforms don't support these features, so guard them.
* For platforms that do support them, no changes should occur.
2017-04-19 14:25:12 -04:00
monojenkins 4472be61f0 [msvc] Update csproj files 2017-04-19 19:03:39 +02:00
Alexander Kyte 1138466b13 [scripts] Don't build in checked mode 2017-04-19 12:57:51 -04:00
Josh Peterson 32451337b0 Add autoconf checks for platforms without IPv6
* There is an existing check for the `sockaddr_in6` struct.
* Use it to wrap code that implements IPv6.
* This makes porting to platforms that don't support IPv6 easier.
* It should have no impact on platforms that do support IPv6.
2017-04-19 11:24:39 -04:00
Alexander Köplinger f11c25c426 [System.Data] Call SqlConnection.ClearAllPools() only when we had a connection
When ConnectionManager.Instance.Sql.ConnectionString throws in
SetUp() we'd still call SqlConnection.ClearAllPools() in the TearDown()
which happens for example when the connection string environment
variable is not set.

This is a problem on WatchOS since SqlConnection.ClearAllPools()
throws PlatformNotSupportedException there, making the tests fail.
Instead we now check whether the connectionString is set and only
call the method in that case.
2017-04-19 14:40:10 +02:00
Marek Safar 1a77e8727c Bump cecil 2017-04-19 11:59:07 +02:00
Mikayla Hutchinson 0db4d85147 Fix RemoteEndpoint with async+DualMode (#4717) 2017-04-19 11:48:41 +02:00
Marek Safar 92fa05e67f [Mono.CSharp] Fixes parallel build 2017-04-19 08:33:44 +02:00
Zoltan Varga faa5384be5 [runtime] Shadow copy the .pdb files as well. Fixes #55095. (#4715) 2017-04-18 22:31:14 -04:00
Alexander Köplinger 5c75d264a8 [System] Don't include AlsaDevice on xammac_net_4_5
(cherry picked from commit 79ad720d5d)
2017-04-18 23:11:23 +02:00
Rodrigo Kumpera a8d9e343c6 [runtime] Forgot to update strelemref_wrapper_name with the new wrapper type. 2017-04-18 13:05:22 -07:00
Marek Safar 87b7b97e0d [Mono.CSharp] Fixes parallel build 2017-04-18 20:06:24 +02:00
Andi McClure eb602f66dc Merge pull request #4708 from xmcclure/orbis-system-net
Minor orbis fix in System.Net
2017-04-18 14:05:16 -04:00
Zoltan Varga 8d7c83a277 [jit] Disable handler block trampolines+aot support on ios, it does an async stack walk, and the eh info for llvm compiled methods cannot be loaded in async context currently. Works around #54658. (#4713) 2017-04-18 14:03:55 -04:00
Alexander Köplinger 856377a61d [configure] Fix docs for --with-libgc option (#4707)
It was renamed from --with-gc to --with-libgc in 66ca91f10b,
but a few places were missed.
2017-04-18 19:41:13 +02:00
monojenkins 000e598f31 [msvc] Update csproj files (#4711) 2017-04-18 19:20:51 +02:00
Alexander Kyte b4df5611cb Merge pull request #4712 from alexanderkyte/master-circular-fix
[runtime] Fix circular types in SRE
2017-04-18 13:01:27 -04:00
Alexander Kyte a8dfce5466 [runtime] Handle circular references in SRE types
We previously recursed through the entire directed cyclic graph
of the type passed to SRE. When given a (legal) circular type reference,
we encountered stack overflows. This was particularly easy to trigger
with fsharpi and with FAKE.

By creating everything about the type before searching for the parent,
and by defering all type hierarchy establishment until the type must be
surfaced to manage code, we tease out the data dependencies caught up in
the cycle.

Note the bounded lifetime of the unmanaged object hidden in the SRE
module, which acts as a global reference for all types reachable from
the TypeBuilder passed to the runtime through the icall.
2017-04-18 11:33:16 -04:00
Alexander Kyte db95a04065 [runtime] Test circular references in SRE 2017-04-18 11:30:05 -04:00
Andi McClure 60ffbfb725 Minor orbis fix in System.Net 2017-04-18 11:09:28 -04:00
Alexander Köplinger 20e00bd15b Bump nuget-buildtasks 2017-04-18 13:52:23 +02:00
Marek Safar 5f94a10a06 [runtime] Blacklist System.Threading.Overlapped nugets 2017-04-18 13:49:05 +02:00
Ankit Jain e54ce145ea Update nuget-buildtasks from upstream's dev15.1 branch (#4703)
* Update nuget-buildtasks from upstream's `dev15.1` branch

dev15.1 branch + fixup import paths

This was prompted by needing to support nuget restore for projects with
`PackageReference`.

* [nuget] Bump reference to NuGet.BuildTasks to pick up a build fix
2017-04-18 13:17:07 +02:00
Bill Holmes fdfa4b94bb Remove the use of ExpectedException in Mono.Posix Tests (#4698)
* Remove the use of ExpectedException in Mono.Posix Tests

ExpectedException is not available in later versions of
NUnit.  To test the NetCore 2.0 version of Mono.Posix I
need a newer version of NUnit that does not contain ExpectedException.

Using Assert.Throws should be equivalent.

* Mono.Posix Tests move CanUseRealTimeSignals checks

Moving the CanUseRealTimeSignals check outside of the
Assert.Throws callback function.

This is a change in test behavior requested by @akoeplinger
in the PR review.

* Fixing Mono.Posix.UnixSignalTest.TestSignumPropertyThrows

This test throws InvalidOperationException and we need to check
for that in the Assert.Throws type.
2017-04-18 12:59:56 +02:00
Mikayla Hutchinson 8d12608cca Add System.Net.Http 4.3.1 to blacklist 2017-04-18 10:54:53 +02:00
Marek Safar 66d32a0271 [corlib] Fixes static builds (#4687)
* [corlib] Fixes static builds
2017-04-18 10:03:29 +02:00
Julius Vitkauskas 372f28339f Place break inside if block 2017-04-18 09:53:34 +02:00
David Karlaš 00efc0305a Bug 55148 - Debugger checks type which is possibly never used (#4690) 2017-04-18 01:35:23 -04:00
Rodrigo Kumpera 53914b88bb [JIT/GC] Optimize mono_gc_wbarrier_value_copy_bitmap.
mono_gc_wbarrier_value_copy_bitmap shown up when profiling Roslyn and this PR applies the following set of optimizations to it:

- Drop the bitmap, the extra branch in the loop costs more than the extra cardtable store itself
- Rename it to mono_gc_wbarrier_range_copy to reflect its new meaning
- Remove the JIT wrapper, this function doesn't need it
- Use mono_gc_get_range_copy_func as a way to punch through all layers and get the actual implementation
- Move the implementation to sgen-cardtable.c where everything can be inlined
- Exploit the fact we only need to mark the first card of a given range and thus we can hoist the address calculation outside of the loop

All of this speeds up a microbenchmark by 2x and Roslyn wallclock by around 2%.
2017-04-17 15:51:33 -07:00
Rodrigo Kumpera 3ee037c830 [runtime] Optimize virtual_stelemref for classes even further.
This optimization exploits the fact that if the element type idepth is <= MONO_DEFAULT_SUPERTABLE_SIZE we can skip the idepth check.

This improves an array store only benchmark by 11%.

On Roslyn, all arrays falls into this case.
2017-04-17 13:48:43 -07:00
Aleksey Kliger bb293a828f [w32error] Fix g_error args in mono_w32error_unix_to_win32 2017-04-17 13:56:00 -04:00
Ankit Jain e83be97cb3 Empty commit to force a wrench build 2017-04-14 21:48:02 -04:00
Aleksey Kliger (λgeek) 9a21932f43 Merge pull request #4569 from lambdageek/dev-coop-handles-march
Misc coop handles work
2017-04-14 15:30:53 -04:00
Martin Baulig 93c02cfd32 [appletls]: Disable the new keychain code on XI. (#4695)
(cherry picked from commit b6255d35cd)
2017-04-14 14:51:55 -04:00
Ludovic Henry 52b00f2922 [WebConnection] Fix race condition between Close and BeginWrite (#4693)
* [WebConnection] Make ReadDone and InitRead instance methods to avoid passing cnc around

* [WebConnection] Inline only call to InitConnection

* [WebConnection] Fix race condition between Close and BeginWrite
2017-04-14 14:51:42 -04:00
monojenkins 462834e6ea [msvc] Update csproj files (#4696) 2017-04-14 19:12:35 +02:00
Aleksey Kliger a7141c23ff [custom-attrs] Use coop handles for mono_reflection_get_custom_attrs_info_checked
* use handles in icalls
  - ves_icall_MonoCustomAttrs_GetCustomAttributesDataInternal
  - ves_icall_MonoCustomAttrs_GetCustomAttributesInternal
2017-04-14 10:59:26 -04:00
Aleksey Kliger 2eebae392b [reflection] Move mono_reflection_type_get_handle to sre-internals.h
It's basically deprecated and only use in reflection until reflection is
converted to use handles.
2017-04-14 10:59:26 -04:00
Aleksey Kliger 46e7189c12 [custom-attrs] Rename custom_attrs_defined_internal to ves_icall_MonoCustomAttrs_IsDefinedInternal
and use coop handles.
2017-04-14 10:59:26 -04:00
Aleksey Kliger 2087bd22c5 [remoting] Use coop handles for S.R.Remoting.Contexts.Context.{Register,Release}Context
* ves_icall_System_Runtime_Remoting_Contexts_Context_RegisterContext
* ves_icall_System_Runtime_Remoting_Contexts_Context_ReleaseContext

Added new mono_threads_{register,release}_app_context to be used internally in
the runtime.
2017-04-14 10:59:25 -04:00
Aleksey Kliger 0256888233 [runtime] Use coop handles for ves_icall_System_AppDomain_DoUnhandledException 2017-04-14 10:59:25 -04:00
Aleksey Kliger 2ed750a887 [domain] Mark mono_context_set external only
runtime should use mono_context_set_handle
2017-04-14 10:59:25 -04:00
Aleksey Kliger 6b11f950e5 [remoting] Move mono_context_{get,set} icall registration to remoting
It was previously in marshal
2017-04-14 10:59:25 -04:00
Aleksey Kliger a5cea12cb3 [domain] Use handles for MonoAppContext icalls
* ves_icall_System_AppDomain_InternalGetContext
* ves_icall_System_AppDomain_InternalGetDefaultContext
* ves_icall_System_AppDomain_InternalSetContext
2017-04-14 10:59:25 -04:00
Aleksey Kliger e1626a41ea [reflection] Use coop handles for MonoEventInfo.get_event_info 2017-04-14 10:59:24 -04:00
Marek Safar e146a9e9ca Bump CoreRT 2017-04-14 09:18:16 +02:00
Zoltan Varga bc93e7fbe4 [runtime] Avoid freeing a string passed to mono_mb_emit_exception_full (), it doesn't assume ownership of it. Fixes random wrench failures after 91ae166406. 2017-04-13 17:11:34 -04:00
Alexander Köplinger 2f34c3325d Revert "[acceptance-tests] Disable a regressed coreclr test"
This reverts commit 5e8012a678.

The bug was fixed.
2017-04-13 22:46:05 +02:00
Zoltan Varga e9f54cb051 [jit] Make newarr [void] unverified. Fixes #55083. 2017-04-13 16:40:48 -04:00
Aleksey Kliger (λgeek) 5d72ee7c92 Merge pull request #4680 from lambdageek/bug-49721-take2
[loader] Ignore public key token in strong name match, if requested framework assembly was remapped
2017-04-13 14:27:02 -04:00
Martin Baulig d8ce8b81c3 [btls]: Cleanup certificate store initialization (#4683)
* [BTLS]: Cleanup certificate store initialization.

* Kill unused MonoBtlsX509Store.AddTrustedRoots().

* In server-mode, MonoBtlsProvider.SetupCertificateStore() now only adds
  certificates explicitly trused via MonoTlsSettings.TrustAnchors.

* MonoTlsProvider.ValidateCertificate() - which is called from
  X509Certificate2.Verify() via X509CertificateImplBtls.Verify() - now
  uses MonoTlsSettings.DefaultSettings and assumes client-mode.

* [appletls]: Actually use the new code that was added in PR #4671.

* [btls]: Add new MonoTlsSettings.CertificateValidationTime property.

This allows you to set a custom time for certificate expiration checks.

* [appletls]: Bind SecTrustSetVerifyDate() and check MonoTlsSettings.CertificateValidationTime.
2017-04-13 13:46:54 -04:00
Alexander Köplinger 84b7714ba6 Fix check for file in gensources.sh
It didn't correctly check whether the file exists so we got
"tail: no such file or directory" messages during the build.
2017-04-13 19:15:37 +02:00
Zoltan Varga 4cf2b5feee [runtime] Fix some small domain related memory leaks. (#4685) 2017-04-13 12:16:24 -04:00
Marek Safar c2169c0121 [System.Core][System.ComponentModel.DataAnnotations] Update strings 2017-04-13 17:04:40 +02:00
Rodrigo Kumpera c7dfe96397 Merge pull request #4675 from kumpera/runtime-scalability-take1
[runtime] Reduce contention on some top locks when running Roslyn.
2017-04-12 16:01:36 -07:00
Martin Baulig 169ab664c7 [appletls]: Actually use the new code that was added in PR #4671. 2017-04-12 17:13:06 -04:00
Alexander Kyte 91ae166406 Merge pull request #4615 from alexanderkyte/string_error_handling
[runtime] Don't discard string conversion errors
2017-04-12 15:47:39 -04:00
Zoltan Varga 3aaacc57b0 [ppdb] Fix a crash if mono_ppdb_get_seq_points () is only passed a 'source_file' argument. 2017-04-12 15:16:13 -04:00
monojenkins b09b3689f2 [msvc] Update csproj files 2017-04-12 18:53:10 +02:00
Aleksey Kliger 177b2e1913 [loader] Ignore public key token in strong name match, if requested framework assembly was remapped
When framework assemblies are compiled for the mobile runtime, they are
generally signed with a different key than the normal desktop one.
Unfortunately each assembly has different logic for which key is
used (typically silverlight.pub or corefx.pub in place of ecma.pub), and short
of hardcoding a table in the runtime, there's no good way to know.
2017-04-12 12:43:27 -04:00
Aleksey Kliger b7fff94589 [assembly] Add option to ignore public key tokens when comparing MonoAssemblyNames 2017-04-12 12:43:26 -04:00
Aleksey Kliger 68720076b1 Revert "[loader] Remap public key tokens of framework assemblies when running with --runtime=mobile"
This reverts commit af7195e349.
2017-04-12 12:43:26 -04:00
Alexander Köplinger 5e8012a678 [acceptance-tests] Disable a regressed coreclr test
I filed a tracking bug.
2017-04-12 15:00:11 +02:00
Vlad Brezae ea56fb0847 Merge pull request #4670 from BrzVlad/fix-sgen-testing
[tests] sgen testing tweaks
2017-04-12 03:54:08 +03:00
Vlad Brezae dac191e4e3 [tests] Improve configurations of sgen tests
Main pointers :
 - explicit minor and bridge configuration (add some for missing major)
 - reduce duplicated testing or of low relevance (like split nursery)
 - intensive testing of latest new configurations combined (parallel minor + major + future experiments)
 - include testing with a small and a large nursery for additional variance
2017-04-12 03:51:52 +03:00
Vlad Brezae 6fa9160954 [tests] Add timeout limits to some longer sgen tests 2017-04-12 03:51:50 +03:00
Rodrigo Kumpera 30de1a50a6 [loader] Make MonoImageSet::gclass_cache concurrent. 2017-04-11 16:03:24 -07:00
Rodrigo Kumpera 834460c91d [loader] Move typespec_cache to a lock-free-reads hashtable. 2017-04-11 16:03:18 -07:00
Rodrigo Kumpera a701179293 [loader] Add a lock-free cache in front of get_image_set. Doesn't override on fetch, maybe needs tweaking? 2017-04-11 16:02:00 -07:00
Rodrigo Kumpera 66454b1a50 Merge pull request #4673 from kumpera/fix_stdelem_ref_perf
[runtime] Fix get_virtual_stelemref_wrapper STELEMREF_CLASS case to actually do the base class check.
2017-04-11 18:07:56 -04:00
Martin Baulig 1eb27c1df8 [appletls]: Use SecIdentityCreate() to avoid using the Mac keychain. (#4671)
* [appletls]: Use SecIdentityCreate() to avoid using the Mac keychain when we have a private key.

Reading Certificates from the Mac Keychain
==========================================

Reading the private key from the keychain is a new feature introduced with
AppleTls on XamMac and iOS. On Desktop Mono, this new feature has several
known issues and it also did not received any testing yet. We go back to the old
way of doing things, which is to explicitly provide an X509Certificate2 with a
private key.

Keychain Dialog Popups
======================

When using Xamarin.Mac or Xamarin.iOS, we try to search the keychain
for the certificate and private key.

On Xamarin.iOS, this is easy because each app has its own keychain.

On Xamarin.Mac, the .app package needs to be trusted via code-sign
to get permission to access the user's keychain. [FIXME: I still have to
research how to actually do that.] Without this, you will get a popup
message each time, asking you whether you want to allow the app to access
the keychain, but you can make these go away by selecting "Trust always".

On Desktop Mono, this is problematic because selecting "Trust always"
give the 'mono' binary (and thus everything you'll ever run with Mono)
permission to retrieve the private key from the keychain.

This code would also trigger constant keychain popup messages,
which could only be suppressed by granting full trust. It also makes it
impossible to run Mono in headless mode.

SecIdentityCreate
=================

To avoid these problems, we are currently using an undocumented API
called SecIdentityRef() to avoid using the Mac keychain whenever a
X509Certificate2 with a private key is used.

On iOS and XamMac, you can still provide the X509Certificate without
a private key - in this case, a keychain search will be performed (and you
may get a popup message on XamMac).
2017-04-11 17:43:51 -04:00
Rodrigo Kumpera 65f260675e [runtime] Fix get_virtual_stelemref_wrapper STELEMREF_CLASS case to actually do the base class check.
The code was bailing straight to native which is significantly slower. This is the result of roslyn compiling corlib on my machine:

Before:
real	0m5.757s
user	0m22.059s
sys	0m1.736s

After:
real	0m5.816s
user	0m23.623s
sys	0m1.693s
2017-04-11 11:36:49 -07:00
Alexander Köplinger 1c987f5bd0 [netstandard] Remove System.ArgIterator from facade
It was removed today: https://github.com/dotnet/standard/commit/52651e78ac329c56fb59cebf5b24174f25acb070
2017-04-11 20:23:26 +02:00
Alexander Köplinger a0d6c26a04 [Facades] Build netstandard.dll by default (#4501)
Added a new EXTERNAL_FACADE_DRAWING_REFERENCE variable which
specifies the path to an assembly that contains drawing types,
e.g. in the monotouch/monodroid case System.Drawing is built
inside the XI/XA repos.

Also update netstandard typeforwards to the latest version
from the dotnet/standard repo.
2017-04-11 20:18:55 +02:00
monojenkins 07bf83dd61 [msvc] Update csproj files 2017-04-11 19:15:50 +02:00
Rodrigo Kumpera 5548745ffa Merge pull request #4116 from kumpera/jit-job-control
[mini] Introduce job control to the JIT. Limits by active and duplicate jobs.
2017-04-11 10:13:38 -07:00
Zoltan Varga 9556be1f23 [arm] Fix a gsharedvt assertion which happens with gsharedvt methods with a lot of arguments. Fixes #54976. 2017-04-11 11:51:53 -04:00
Marek Safar afb392a079 Update README.Mono.md 2017-04-11 16:36:11 +02:00
Marek Safar 6efe816846 Readme rename 2017-04-11 14:00:15 +02:00
Marek Safar 07adebd8bf Updates referencesource to .NET 4.7 2017-04-11 12:25:37 +02:00
Alexander Köplinger 9635b9cea0 [resgen] Remove dependency on WinForms and use it in mobile profiles (#4667)
resgen.exe used to load WinForms via reflection which is a pretty
large dependency. Instead we can just embed the few types that
are used for reading/writing resx files directly into the app.

Add System.Drawing.dll to the "build" profile so we can put
resgen there as well and allow us to no longer rely on system
resgen for mobile profiles like monotouch/monodroid.
2017-04-10 20:15:34 +02:00
monojenkins e0c31c054c [msvc] Update csproj files (#4669) 2017-04-10 18:48:21 +02:00
Marek Safar a9dc556d0a [corlib] Deconstruct api from corert 2017-04-10 14:46:52 +02:00
Marek Safar 2e2698a6e3 Bump corert 2017-04-10 14:46:52 +02:00
Marek Safar 7b3c907796 [corlib] Add few checks for array boxing conversion of pointer types 2017-04-10 14:46:52 +02:00
Marek Safar 8b7a2ebc53 [corlib] Share corert Array code 2017-04-10 14:46:52 +02:00
Vlad Brezae 31c446a1ac [tests] Bump timeouts on sgen tests
Tests that have been known to regularly fail in the past.
2017-04-10 15:22:49 +03:00
Zoltan Varga 0ed43bba73 [arm64] Add a test file for codegen macros. Not used. 2017-04-09 19:00:04 -04:00
Ludovic Henry 4b9235f567 [tests] Make stress testing more verbose (#4664) 2017-04-07 20:56:59 -04:00
Rodrigo Kumpera f57f188d5e [mini] Fix spurious wakeups within JIT job control.
The first iteration of this code suffered from spurious wakeups due to using a single cond-var for all compilation.

This introduce a per-job cond var and make threads wait on that. Spurious wakeups are quite problematic in heavily threaded
code such as Roslyn. On average, every wait would get 2 extra wakeups for no good reason.

With this change, on my laptop compilation times are the following:

With spurious wakeups:
real	0m6.134s
user	0m23.588s
sys	0m2.331s

Without spurious wakeups:
real	0m5.658s
user	0m22.851s
sys	0m1.694s

This represents a 8% wallclock speedup and 3% user time speedup.

As part of this change, the active threads accounting is gone as the number of waits due to cpu overload was close to zero.
2017-04-07 15:55:43 -07:00
Andi McClure f64c3798c8 Merge pull request #4660 from xmcclure/llvm-orbis
LLVM Orbis support
2017-04-07 16:16:23 -04:00
Andi McClure f922e1e565 LLVM: Orbis support, fix typo in configure.ac 2017-04-07 16:12:58 -04:00
jmserrano 393c357c53 Fix bug in SessionStateModule when session data is deleted 2017-04-07 22:07:01 +02:00
Alexander Köplinger 13f5db4888 [Facades] Add facades to winaot/orbis profiles (#4656)
Also remove Mono.Simd as we don't it on new platforms.

Cleanup monotouch_dirs to not depend on testing_aot_full_dirs since
it should be separate (even though it contains the same right now).
2017-04-07 20:05:34 +02:00
Andi McClure 8ed730958d Merge pull request #4663 from xmcclure/bump-linker
Bump linker external to its master
2017-04-07 13:47:16 -04:00
Alexander Köplinger f9e4ca356a [bcl] Add check for newline to gensources.sh (#4662)
This has bitten us a bunch of times now so let's make sure
it doesn't happen again.
2017-04-07 18:07:52 +02:00
Andi McClure edf9f452e5 Bump linker external to its master 2017-04-07 11:42:00 -04:00
Alexander Köplinger 47ca0c0ae8 Make sure .sources files end with newline
It confuses the build on Linux otherwise.
2017-04-07 14:50:16 +02:00
Marek Safar 082daa04df Bump corert 2017-04-07 08:52:28 +02:00
Zoltan Varga 8c7e025342 [arm] Commit the generated arm_dpimacros.h/arm_vfpmacros.h files, they change very infrequently, and having to generate them complicates the cross compiler/offsets tool build. (#4655) 2017-04-07 00:44:23 -04:00
Rodrigo Kumpera 5289e52104 Remove debug fflush and fix active_jit_methods accounting in case of recursion. 2017-04-06 18:43:04 -07:00
Zoltan Varga 891b90b9d8 [runtime] Update the offsets tool to a new version of CppSharp and use 64 bit binaries on osx. (#4659) 2017-04-06 21:09:17 -04:00
Rodrigo Kumpera 43d66ff4d8 Fix compilation issues. 2017-04-06 16:09:00 -07:00
Rodrigo Kumpera 9b97962a04 [mini] Introduce job control to the JIT. Limits by active and duplicate jobs.
This shown up as a problem under parallel roslyn.

We hit frequently the case of multiple threads compiling the same method in parallel
and wasting all but one.

Another issue that happens, but infrequently, is having more threads JITing than there
are cores in the machine. Such thrashing doesn't help.

Test setup. 4/8 macbook pro compiling corlib.

Baseline:
real	0m7.665s
user	0m20.078s
sys	0m2.653s
Methods JITted using mono JIT       : 22422
Total time spent JITting (sec)      : 18.5365

With this patch:
real	0m6.149s
user	0m18.504s
sys	0m1.487s
Methods JITted using mono JIT       : 16619
Total time spent JITting (sec)      : 4.9420

New counters
JIT compile waited others           : 7681
JIT compile 1+ jobs                 : 1
JIT compile overload wait           : 67
JIT compile spurious wakeups        : 14469

This results in a 20% wall clock reduction but only a 8% reduction on user.

We JIT 26% less methods, with very few duplications. Showing this drastically improves the situation.

JIT compilation time metrics are bogus due to .cctors and other sources of interference. So take it with a grain of salt.

Future work:

Based on the new counters, it's clear that the current wakeup design is suboptimal and we could further improve it by cutting on spurious wakeups.
2017-04-06 16:09:00 -07:00
Vincent Povirk c66af2563e [tests] Fix out of tree build. (#4657) 2017-04-07 00:08:18 +02:00
Ludovic Henry e0fe955483 [tests] Add stress testing and reduce sgen normal testing time (#4653)
* [tests] Keep testing even if a test has failed

* [tests] Add stress testing and reduce sgen normal testing time
2017-04-06 14:49:04 -04:00
Zoltan Varga a762f83e13 [jit] Only free the unwind info inside a MonoTrampInfo if its owned by the structure. 2017-04-06 13:21:38 -04:00
Alexander Köplinger c0c41be207 [tools] Remove old msbuild experiment
This is just confusing now that we have the real thing.
2017-04-06 09:16:08 +02:00
Rolf Bjarne Kvinge e3f6365d8b [runtime] Free leaked variable. (#4643) 2017-04-05 23:06:58 -04:00
Zoltan Varga 9302c31f81 [aot] Print JIT failures without having to pass an additional option. (#4648) 2017-04-05 23:06:47 -04:00
Rodrigo Kumpera 8df83179b6 Merge pull request #4612 from kumpera/android-changes-part2
Fix Android compilation and some tests
2017-04-05 16:59:08 -07:00
Ludovic Henry ef42d89ffc [tests] Rework how we AOT compile tests + General cleanup of make targets (#4639) 2017-04-05 19:54:49 -04:00
Rodrigo Kumpera ce4063f14f [runtime] Don't return the modules for the current process when pid != getpid (). 2017-04-05 14:18:26 -07:00
Rodrigo Kumpera 3a49748b76 [System] Disable test that is too unreliable. 2017-04-05 14:18:26 -07:00
Rodrigo Kumpera 9092eac2ea Improve test assert. 2017-04-05 14:18:26 -07:00
Rodrigo Kumpera 1fb2ab2244 [System] Disable a few tests that don't work on Android. 2017-04-05 14:18:26 -07:00
Rodrigo Kumpera ddcd1adb73 [System] Disable test that doesn't work on Android. 2017-04-05 14:18:26 -07:00
Rodrigo Kumpera 65ea950e30 [io-layer] Don't RC std handles or the current process on every lookup.
Caller don't expect those lookups to be RC'd so they don't compensate. This leads to unbound growth of their ref count, which eventually overflows.
2017-04-05 14:18:26 -07:00
Rodrigo Kumpera cbe527afce [runtime] When looking up the process name, don't bail out if you can't load its modules.
Loading modules for other processes can fail under some linux sandboxing rules but that doesn't mean
we should not be able to compute the process name. So when module == NULL, we make module loading non-fatal.
2017-04-05 14:18:25 -07:00
Rodrigo Kumpera 276b0a9940 [runtime] Improve tracing of process name lookup functions. 2017-04-05 14:18:25 -07:00
Rodrigo Kumpera 2cca55ee73 [runtime] Fix compilation under Android 2017-04-05 14:18:25 -07:00
Zoltan Varga dddf0d8ea0 [jit] Fix a leak in the trampoline info registration code. (#4646) 2017-04-05 16:23:15 -04:00
Bernhard Urban e3d9aad2a3 [interp] testcase for stack overflow on tail recursion opt
inspired by

./mcs/mcs/assign.cs:
SimpleAssign:CheckEqualAssign ()
2017-04-05 20:41:05 +02:00
Bernhard Urban 406c1d25ad [interp] fix stack overflow on tail recursion 2017-04-05 20:41:05 +02:00
Bernhard Urban 8b58ce4ce3 [interp] fix stack alloc size 2017-04-05 20:41:05 +02:00
monojenkins 5624d0d2ca [msvc] Update csproj files (#4645) 2017-04-05 18:42:25 +02:00
Egor Bogatov 11789c98ce [System.Data] Fix Azure SQL specific issues (ProviderTests) (#4622)
* [System.Data] Fix Azure SQL specific issues (ProviderTests)

* [System.Data] ChangeDatabase - Azure specific test

* [System.Data] SqlConnectionTest: use Assert.Throws instead
2017-04-05 15:12:21 +02:00
Marek Safar 59bbb688a5 [Facades] Add forwarder for DbDataReaderExtensions 2017-04-05 10:03:02 +02:00
monojenkins 6ed5db6dc8 [msvc] Update csproj files 2017-04-05 09:10:15 +02:00
Alexander Köplinger 3bfff911dd [tests] Fix the mcs-compileall target in runtime/ (#4637)
It is used as the "verify" step on Jenkins/Wrench and I noticed
it didn't run recently.

Looks like it was broken a while ago by 695e8f53ae.
Moving the verifiable_files variable at the top is wrong since
the $$profile variable is only defined inside the for loop and
so we'd get an empty list.

When that was fixed it still didn't work as piping to `echo`
doesn't work. Replaced it with a Makefile solution instead.
2017-04-05 03:34:23 +02:00
Vlad Brezae a9b5b501fd Merge pull request #4630 from BrzVlad/feature-valloc-limit
[sgen] OOM testing
2017-04-05 02:52:03 +03:00
Vlad Brezae e2b4f546cf [runtime] Add arch size InterlockedAdd 2017-04-05 01:16:47 +03:00
Vlad Brezae decbfc3e73 [sgen] Add old forgotten oom tests to sgen oom suite 2017-04-05 01:16:47 +03:00
Vlad Brezae c67775554f [sgen] Add oom testing suite 2017-04-05 01:16:46 +03:00
Vlad Brezae 2842685613 [sgen] Don't pass gc options to the test-runner
Also remove some plain configurations (in the tests we should explicitly select the major)
2017-04-05 01:16:42 +03:00
Vlad Brezae 1b6292607c Merge pull request #4618 from BrzVlad/feature-par-nrs
[sgen] Parallel nursery collections
2017-04-05 01:13:00 +03:00
Martin Baulig 989aefce37 [appletls]: Make CFObject.dlsym() private and fix CFBoolean. (#4640)
This fixes a native crash when attempting to use appletls.
2017-04-04 14:28:17 -04:00
Vlad Brezae b388646ad0 [sgen] Split up concurrent sweep from worker logic
While this was ok because workers and sweep could not run at the same time, this is no longer the case with parallel nursery collections. In the future, if many threads will be required for different types of jobs, we can consider running them on same native thread, but the jobs will still need to have appropriate contexts (the SgenThreadPool they belong to).
2017-04-04 16:00:06 +03:00
Vlad Brezae 5d80d08b8c [sgen] Increase gray stack section size
Stealing a gray section is relatively expensive since it requires locking. We want to avoid repeated stealing, since only one gray queue section is stolen at a time (in the case of the parallel collector).
2017-04-04 16:00:06 +03:00
Vlad Brezae 6c62196f5c [sgen] Increase parallelization of minors 2017-04-04 16:00:05 +03:00
Vlad Brezae 8bc93c4b39 [sgen] Parallel nursery collections
Scans the card table and the roots on the workers, including draining the stack.
2017-04-04 16:00:04 +03:00
Michael DeRoy 47ca2c886d Fix mono_marshal_alloc to accept gsize instead of gulong(unsigned long) (#4623)
* Fix mono_marshal_alloc to accept gsize instead of platform dependent unsigned long

* fix header
2017-04-04 08:20:13 -04:00
Marek Safar 6706cae9a2 [System.Core] Linker friendly test update 2017-04-04 10:50:56 +02:00
Marek Safar 305b77c1fe [Facades] Fixes System.Threading.Overlapped 2017-04-04 10:04:48 +02:00
Marek Safar 19c8fad57b [System.Core] Remove duplicate files 2017-04-04 09:40:16 +02:00
Marek Safar 2742838b12 Bump cecil 2017-04-04 09:12:51 +02:00
Marek Safar 74770d3768 [corlib] Port more of corert array 2017-04-04 08:40:42 +02:00
Zoltan Varga 3a37fbaa0b [llvm] Add sign extensions for the index register used during bounds checks and array address calculations. (#4636) 2017-04-03 17:23:26 -04:00
Andi McClure bc7bb8ef59 Merge pull request #4635 from xmcclure/5.3-bump
Bump master to 5.3 due to creation of 2017-04 branch
2017-04-03 15:21:51 -04:00
Zoltan Varga 786f289e00 [jit] Fix a regression caused by 399f6e2425. Avoid a crash if MONO_VERBOS_METHOD is used. 2017-04-03 15:01:28 -04:00
Andi McClure c5aa6d1494 Bump to 5.3 due to creation of 2017-04 branch 2017-04-03 13:18:02 -04:00
Zoltan Varga 1a5dbe063a [jit] Fix the casting between arrays with bounds and vectors even for special cased types like object[]. Fixes #54212. (#4633) 2017-04-03 12:22:58 -04:00
Francois Botha 41fe812a81 Correctly detect relative Uri in package parts (#3630) 2017-04-03 16:48:34 +02:00
Zoltan Varga ce2a8fcad1 [runtime] Default Interface Method support (#4625)
* [runtime] Add support for the simplest case of default interfaces, where the default method is used.

* [runtime] Implement overriding of default interface methods in interfaces.

* [jit] Fix gshared support for default interface methods, they require an mrgctx since the this argument doesn't point to the implementing class, not the interface.
2017-04-03 10:42:07 -04:00
Andi McClure 0568203e32 Merge pull request #4628 from xmcclure/orbis-profile
Platform support fixes
2017-03-31 16:14:47 -04:00
Zoltan Varga 17f001214e [jit] Fix the ppc build. 2017-03-31 15:56:21 -04:00
Alexander Köplinger 500765a5d3 Make monolite profile directory versioned (#4631)
If you're building with monolite currently the build system
checks for the existence of mcs/class/lib/monolite and just
uses it in that case.

It becomes a problem when bumping corlib version since if you
pull the update and try to build it'll use the old monolite
and you'll hit the "corlib version not in sync" error.

By making the monolite directory include the version this can
be avoided and everything works out of the box.

Also removed the confusing "You need Mono version 4.8 or better"
message since we actually require a newer version in
basic-profile-check.cs now and keeping them in sync is error prone.
2017-03-31 19:51:10 +02:00
monojenkins 8dba6fc778 [msvc] Update csproj files (#4632) 2017-03-31 19:50:48 +02:00
Andi McClure bebbf5134d Style fixes for PR feedback 2017-03-31 11:53:53 -04:00
Michael DeRoy d95cc551df change icall to use gsize as well 2017-03-31 09:47:57 -04:00
Vlad Brezae fd5089b471 [sgen] Add debug option for valloc limit
This allows us to stress test OOM inside sgen (and potentially other areas).
2017-03-31 15:17:53 +03:00
Marek Safar b34ad6d930 [System] Fixes build 2017-03-31 13:31:34 +02:00
Alexander Köplinger 6f1d247060 Fix Windows build 2017-03-31 02:35:19 +02:00
monojenkins 8e59eaa046 [msvc] Update csproj files (#4624) 2017-03-31 02:03:41 +02:00
Alexander Kyte f704d56c37 Merge pull request #4621 from alexanderkyte/strdup_env
[runtime] Switch getenv to use heap memory
2017-03-30 18:17:29 -04:00
Andi McClure 41a4e6b63a Add System.Security.dll to orbis profile 2017-03-30 17:57:07 -04:00
Andi McClure 40ded2b552 More platform support fixes
- Support platforms without mkdtemp
- Fix compile for console-null.c
2017-03-30 17:57:06 -04:00
Andi McClure 2ffb9a35a7 Combined cherrypick of changes between mono-4.8.0-branch and orbis-branch-30
ORBIS #ifdefs in BCL, exclude several files and assembly directories
from the orbis build, HAVE_LOCALTIME_R define in C.
2017-03-30 17:57:00 -04:00
Vlad Brezae 7a04c99af1 [sgen] Emit fast inline wbarrier instead of the wrapper one
Which seems to be about 4 times slower than the inline one.
2017-03-30 17:37:52 -04:00
Bernhard Urban 222df67b5f [interp] basic filter clause support 2017-03-30 15:16:17 -04:00
Alexander Kyte 399f6e2425 [runtime] Switch getenv to use heap memory
Getenv doesn't use heap memory, it uses static memory.
Mono's usage is consistent with a view of getenv memory contents
that are durable and can be stored and manipulated.

In a multithreaded context, getenv calls can race and corrupt
string buffers as they are read. In a single threaded context,
subsequent calls to getenv will lead to overwriting the memory
that pointers to previous calls point to.

In order to bring memory safety back, we duplicate memory and
manage it at each call-site.

Note: this changes the API semantics of g_getenv. This is necessary
because the locking around the getenv buffer is safest when confined to
the function in eglib.
2017-03-30 13:58:10 -04:00
Mikayla Hutchinson 1688f5d0c6 [System.Web] Implement HostingEnvironment.QueueBackgroundWorkItem
From reference source.

This is required for the Azure Functions Host to run unmodified.
2017-03-30 19:05:04 +02:00
Alexander Köplinger feff7ee306 Bring in the new reference assemblies (#4619)
This bumps the reference assemblies submodule so we can install
the new assemblies which are built from source.
2017-03-30 17:02:10 +02:00
Alexander Kyte 53811fb124 [runtime] Fix typo in icall name (#4616) 2017-03-30 08:39:05 -04:00
Zoltan Varga 45837e1a5a Add beginnings of mixed code execution support (#4613)
* [interp] Fix a few problems exposed by the iltests.exe test suite.

The ENDFINALLY opcode should empty the stack. The INITBLK opcode is two bytes.

* [interp] Store the MonoMethod->RuntimeMethod mapping in a separate hash in MonoJitDomainInfo instead of using MonoDomain.jit_code_hash, the latter contains MonoMethod->MonoJitInfo mappings. Also avoid holding the domain lock while creating the RuntimeMethod structure.

* [interp] Add a mono_jit_compile_method_jit_only () function which always compiles its argument using the JIT/AOT.

* [interp] Print a warning when --interpreter is used with a runtime compiled without ENABLE_INTERPRETER.

* [interp] Fix the size of the icall enter trampoline on amd64. Fix some formatting issues.

* [interp] Add support for calling JITted code from the interpreter. This uses the gsharedvt_out wrappers used by bitcode to reduce the number of possible calling conventions since all arguments and the return value are passed/returned by value. Not enabled yet.

* [interp] Add a --interp= argument which allows passing of options to the interpreter. Add a 'jit=' option which is used to control the set of types whose methods will be called by exiting the interpreter.

* [interp] Add tests for mixed mode execution.

* [interp] Add support for calling interpreter code from JITted code.

* [interp] add mixedmode target to CI

* Revert a debug change.

* [runtime] Fix the locking in the gsharedvt/interp wrapper creation functions.

* [interp] Implement support for interp->jit calls with more than 8 arguments.
2017-03-30 07:32:44 -04:00
Marek Safar dba0a9c566 [System] WebSockets from corefx 2017-03-30 13:24:56 +02:00
Vlad Brezae 31434d52b3 [sgen] Remove CARDTABLE_STATS
For dirty card counts we already have heavy counters. For card table scan time we already have the binary protocol which has more flexibility.
2017-03-30 14:13:24 +03:00
Vlad Brezae 335828b3e3 [sgen] Make sure workers don't have evacuating blocks on the free-lists
Double copying of an object during a collection is not allowed. If we allocate from an evacuating block this can happen.
2017-03-30 14:13:24 +03:00
Vlad Brezae 358039d9eb [sgen] Blocks on the freelist don't need to have been swept 2017-03-30 14:13:24 +03:00
Vlad Brezae e0067a1201 [sgen] Shutdown thread pool worker even if it's not active 2017-03-30 14:13:24 +03:00
Vlad Brezae 772573f370 [sgen] Don't use workers during finishing pause if we're not parallel
Worker can be used though to drain the gray stack of workers after a forced finish (at the start of the finishing pause).
2017-03-30 14:13:24 +03:00
Vlad Brezae eee846a77f [sgen] Add scan/copy context for the simple parallel nursery 2017-03-30 14:13:24 +03:00
Vlad Brezae ba6c07c49c [sgen] Add option for parallel nursery collector 2017-03-30 14:13:24 +03:00
Zoltan Varga dd08fd4160 [bcl] Avoid waiting for events inside a finalizer in Process.WaitForExit () because it can hang if the thread which sets the event is aborted during shutdown. Fixes #53843. (#4609) (#4617) 2017-03-29 21:42:01 -04:00
Alexander Kyte dcdfb3c500 [runtime] Don't discard string conversion errors 2017-03-29 15:45:55 -04:00
monojenkins bcefc71078 [msvc] Update csproj files 2017-03-29 18:29:22 +02:00
Rodrigo Kumpera 2099acf5f4 Merge pull request #4540 from kumpera/android-changes-part1
[bcl+runtime] Multiple small cleanups to Android.
2017-03-29 11:46:29 -04:00
Marek Safar 2c542fdc1b [tools] Remove unused sources 2017-03-29 12:12:09 +02:00
Zoltan Varga b17b5f38d6 [jit] Cleanup the signature of the mono_arch_get_static_rgctx_trampoline () function. (#4605)
Remove the unused MonoMethod argument, and rename the 'mrgctx' argument to 'arg', since it can be any value, not just
an mrgctx.
2017-03-29 05:38:30 -04:00
Marek Safar 25765e8d97 Bump cecil 2017-03-29 10:25:11 +02:00
Marek Safar e7a5ef4aeb Bump corefx 2017-03-29 09:28:14 +02:00
Zoltan Varga d189c74fa7 [jit] Add ref types to mini_get_underlying_type (), use it to simplify the switch loops in the jit. (#4606) 2017-03-28 20:17:31 -04:00
Ludovic Henry a9e73e7370 [threadpool] Pass callback at initialization (#4546)
This remove the possibility to execute different callbacks on the threadpool, but this allows us to remove the work_items_lock, which is called on the hot path of the ThreadPool.
2017-03-28 17:03:31 -04:00
monojenkins ea954f481b [msvc] Update csproj files 2017-03-28 22:17:12 +02:00
Andi McClure 897ecfd59c Merge pull request #4168 from xmcclure/aot-man
Correctly document --aot options in man page
2017-03-28 14:14:08 -04:00
Andi McClure d417b6d7dc Remove 'experimental' label from full/hybrid AOT in manpage 2017-03-28 14:08:04 -04:00
Andi McClure 2d4106dd06 Correctly document --aot options in man page
- Ensure all AOT options are both documented and listed in
  alphabetical order in both the manpage and --help line
- Ensure all exceptoins are commented in the aot-compiler.c source
  with "intentionally udnocumented"
2017-03-28 14:08:00 -04:00
Marek Safar 200dff9cd1 [mono] Remove unused icall 2017-03-28 18:28:41 +02:00
Miguel de Icaza cefa02738c Update copyright years 2017-03-28 11:18:43 -04:00
Rolf Bjarne Kvinge 7e24a650a8 [corlib] Add back X509 support for watchOS.
Otherwise we'd be regressing existing (and working) behavior.
2017-03-28 11:19:20 +02:00
Chris Hamons a2083326f5 Disable a few x509 tests that fail on older macOS
- Handles https://bugzilla.xamarin.com/show_bug.cgi?id=53958
- https://bugzilla.xamarin.com/show_bug.cgi?id=53689 is filed to turn them
  back on later with a better version check
- SecCertificateCreateWithData handles invalid arguments differently based on
  macOS version
2017-03-27 23:59:32 +02:00
Marek Safar a2ec6eb28e [corlib] Add more Array tests 2017-03-27 23:36:35 +02:00
Marek Safar 778388f9ee [System.Windows.Forms] Fixes DataGridViewColumnCollection comparer not to return 1 on match 2017-03-27 23:36:35 +02:00
Marek Safar 62385ee390 [System.Windows.Forms] Imrove DataGridViewColumnCollectionTest 2017-03-27 23:36:35 +02:00
Marek Safar 75eacd49ae [corlib] Use array managed parts from corert to fix bugs in sorting and arguments checking. Fixes #53196 and similar 2017-03-27 23:36:35 +02:00
Marek Safar 42aafd4c01 Bump corert 2017-03-27 23:36:35 +02:00
Marek Safar bf52e31dc2 [corlib] Fix RegistryKeyTest cleanup 2017-03-27 23:36:35 +02:00
Andi McClure 68c053315e Merge pull request #4594 from lambdageek/bug-53890
[remoting] Pass correct object to invoke of IRemotingTypeInfo.CanCastTo
2017-03-27 15:15:26 -04:00
Johan Lorensson a3304910e9 Merge pull request #4570 from lateralusX/jlorenss/visual_studio_msbuild_fix
Windows msbuild triggers too much to rebuild.
2017-03-27 09:04:53 +02:00
Jb Evain 91c849e442 Add FieldInfoMirror.FullName (#4588) 2017-03-26 09:33:34 -04:00
Bernhard Urban 5a36c9f1fd [interp] call mono_unhandled_exception, so exit() is called with proper return code 2017-03-26 06:12:31 -04:00
Bernhard Urban c3194fdd4a [interp] enable more tests for CI 2017-03-26 06:12:31 -04:00
Bernhard Urban 232236bed7 [interp] support floating point in runtime_invoke 2017-03-26 06:12:31 -04:00
Bernhard Urban 87d566aa5a [interp] allow more gregs, enable pinvoke17.exe 2017-03-26 06:12:31 -04:00
Bernhard Urban 30d0db2e53 [interp] throw NRE in mint_strlen 2017-03-26 06:12:31 -04:00
Bernhard Urban d7b0d18bf0 [interp] add write barriers
issues found with
`MONO_GC_DEBUG=3,collect-before-allocs,check-remset-consistency ../mini/mono-sgen --interpreter /Users/bernhardu/work/mono/b/lib/mono/4.5/mcs.exe hello.cs`
2017-03-25 11:04:26 +01:00
Bernhard Urban 13f3aab33e [interp] respect reference type in stobj insn
stackval_from_data does everything for us.
2017-03-25 11:04:26 +01:00
Aleksey Kliger eeb5d4c670 [remoting] Pass correct object to invoke of IRemotingTypeInfo.CanCastTo
Pass the payload of the coop handle as the 'this' object, not the handle
itself.

Add asserts in ves_icall_Remoting_RealProxy_InternalGetProxyType that
remote_class and the proxy_class are non-NULL.

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=53890
2017-03-24 19:10:14 -04:00
Jon Purdy 17aa73d0ae [docs] Update formatting in mono-api-utils. 2017-03-24 13:43:07 -07:00
Jon Purdy 327ef5d7a5 [docs] Update formatting in mono-api-unsorted. 2017-03-24 13:43:07 -07:00
Jon Purdy a616c819ef [docs] Update formatting in mono-api-type. 2017-03-24 13:43:07 -07:00
Jon Purdy 8f0f3c934a [docs] Update formatting in mono-api-threads. 2017-03-24 13:43:07 -07:00
Jon Purdy 41bbde6add [docs] Update formatting in mono-api-string. 2017-03-24 13:43:07 -07:00
Jon Purdy 1c1a8550f3 [docs] Update formatting in mono-api-security. 2017-03-24 13:43:07 -07:00
Jon Purdy 171e74beab [docs] Update formatting in mono-api-reflection. 2017-03-24 13:43:07 -07:00
Jon Purdy 0cbf3e4a3c [docs] Update formatting in mono-api-profiler. 2017-03-24 13:43:07 -07:00
Jon Purdy dd398d3481 [docs] Update formatting in mono-api-object. 2017-03-24 13:43:07 -07:00
Jon Purdy 1a5a4384d2 [docs] Update formatting in mono-api-methods. 2017-03-24 13:43:07 -07:00
Jon Purdy e8ee7f1f1d [docs] Update formatting in mono-api-metadata. 2017-03-24 13:43:07 -07:00
Jon Purdy 2ab495d049 [docs] Update formatting in mono-api-jitinternal. 2017-03-24 13:43:07 -07:00
Jon Purdy 60c26e4dd9 [docs] Update formatting in mono-api-jit. 2017-03-24 13:43:07 -07:00
Jon Purdy 136f149c28 [docs] Update formatting in mono-api-internal. 2017-03-24 13:43:07 -07:00
Jon Purdy f76ffd46ce [docs] Update formatting in mono-api-image. 2017-03-24 13:43:07 -07:00
Jon Purdy 82a606c516 [docs] Update formatting in mono-api-gchandle. 2017-03-24 13:43:07 -07:00
Jon Purdy 61ccc132bc [docs] Update formatting in mono-api-gc. 2017-03-24 13:43:07 -07:00
Jon Purdy 8476f66ff2 [docs] Update formatting in mono-api-exc. 2017-03-24 13:43:07 -07:00
Jon Purdy 41f760c673 [docs] Update formatting in mono-api-embedding. 2017-03-24 13:43:07 -07:00
Jon Purdy cc0eb1b4cc [docs] Update formatting in mono-api-dynamic-codegen. 2017-03-24 13:43:07 -07:00
Jon Purdy 781e549c48 [docs] Update formatting in mono-api-domains. 2017-03-24 13:43:07 -07:00
Jon Purdy 4735975f0c [docs] Update formatting in mono-api-debug. 2017-03-24 13:43:07 -07:00
Jon Purdy c4597c7b8d [docs] Update formatting in mono-api-counters. 2017-03-24 13:43:07 -07:00
Jon Purdy 507c619003 [docs] Update formatting in mono-api-class. 2017-03-24 13:43:07 -07:00
Jon Purdy 1a2e6167f4 [docs] Update formatting in mono-api-class. 2017-03-24 13:43:07 -07:00
Jon Purdy 17fb976edf [docs] Update formatting in mono-api-assembly. 2017-03-24 13:43:07 -07:00
Jon Purdy fc5ed9af92 [exdoc] Enable formatting in deprecated annotations. 2017-03-24 13:43:07 -07:00
Jon Purdy 3478b0aa86 [exdoc] Handle punctuation better in code formatting. 2017-03-24 13:43:07 -07:00
Jon Purdy dce4401036 [docs] Use Doxygen syntax for Monodoc. 2017-03-24 13:43:07 -07:00
Jon Purdy b058816edd [exdoc] Update warnings. 2017-03-24 13:43:07 -07:00
Jon Purdy b8688a447f [exdoc] Support Doxygen syntax. 2017-03-24 13:43:07 -07:00
Jon Purdy c39797389a [docs] Fix exdoc warnings. 2017-03-24 13:43:07 -07:00
Jon Purdy 9cad7ff740 [exdoc] Refactor.
Avoid globals, use proper data structures instead of strings, and
produce some warnings for documentation errors.
2017-03-24 13:43:07 -07:00
Jon Purdy 747c9fdc79 [exdoc] Add missing dependency. 2017-03-24 13:43:07 -07:00
Jon Purdy 3830a53dc4 [exdoc] Enable 'warnings' and 'strict'. 2017-03-24 13:43:07 -07:00
Jon Purdy 85bd889b9f [exdoc] Fix whitespace. 2017-03-24 13:43:07 -07:00
Jon Purdy ffaa990747 [docs] Remove redundant filename. 2017-03-24 13:43:07 -07:00
Jon Purdy 4c5545630d [docs] Fix Doxygen errors.
Doxygen treats '@code' as the start of a '@code'...'@endcode' block, so
it raised spurious "reached end of file while inside code block" errors
when '@code' was used to denote a parameter. Change these instances to
'\param code' (declaration) and '\p code' (mention).
2017-03-24 13:43:07 -07:00
Jon Purdy a86062cef0 [docs] Enable documentation for utils. 2017-03-24 13:43:07 -07:00
Jon Purdy 580ccb1ffb [docs] Enable documentation for mini. 2017-03-24 13:43:07 -07:00
Jon Purdy 8cc92b3c9a [docs] Enable documentation for sgen. 2017-03-24 13:43:07 -07:00
Jon Purdy 648916b028 [docs] Enable documentation for metadata. 2017-03-24 13:43:07 -07:00
Jon Purdy c90f2f651f [docs] Improve Doxygen config. 2017-03-24 13:43:07 -07:00
Marek Safar 6fafd08b50 Revert "Update corefx"
This reverts commit 2a2c317d07.
2017-03-24 20:04:55 +01:00
Marek Safar cbc30eb58e [tests] Remove duplicate property 2017-03-24 20:04:51 +01:00
Andi McClure 752ae75341 Merge pull request #4590 from xmcclure/master
Improve "Could not resolve type with token" exception message
2017-03-24 14:42:43 -04:00
Andi McClure 3922cd7d77 Improve "Could not resolve type with token" exception message 2017-03-24 14:37:26 -04:00
Marek Safar 2a2c317d07 Update corefx 2017-03-24 19:36:23 +01:00
Marek Safar 8c9259e7e9 [mcs] Reset also all partial parts current-type 2017-03-24 15:37:20 +01:00
Vlad Brezae 3e7abade0e Merge pull request #4503 from BrzVlad/fix-appdomain-unload
[runtime] Fix abort issues
2017-03-24 16:21:30 +02:00
Miguel de Icaza 7a5658f388 A few fixes to the man page 2017-03-24 10:14:28 -04:00
Zoltan Varga ba36f4d622 [bcl] Add a finalizer to MemoryMappedFile. 2017-03-24 14:35:18 +01:00
Marek Safar 9e79e88494 [System.Data] Update tests for mobile profiles 2017-03-24 14:15:41 +01:00
Vlad Brezae 3bfd0fd2f8 [runtime] Don't reset abort exception in invoke wrapper
It leads to missing self aborts on full-aot.
2017-03-24 00:17:30 +02:00
Vlad Brezae d570afec5f [runtime] Improve debugging of thread interruptions 2017-03-23 23:46:27 +02:00
Vlad Brezae c4512332ed [runtime] Defer async requests during abort protected blocks
We avoid unnecessary checks for each interruption checkpoint.
2017-03-23 23:46:26 +02:00
Vlad Brezae 4d1c90a812 [runtime] Fix detecting abort at end of abort protected block
If we have a pending abort then we know we will have the thread_state set and the thread_interruption_requested bumped. We used to consume this request and set the MonoError with the exception. The problems with this is that not all callsites handle the passed MonoError and handling it means converting it back to a pending exception anyway. We just leave the interruption request untouched now.

If the cctor self aborts it means that we consumed the abort exception so we do need to call mono_thread_resume_interruption to reactivate it. We need to make sure that we still don't throw a TypeInitializationException if we had a self abort.
2017-03-23 23:46:23 +02:00
Martin Baulig 4638c98ba0 [AppleTls]: Use correct definition of SecTrustResult. (#4586)
* [AppleTls]: Use correct definition of `SecTrustResult`.

We need all the values in this enum because `SecTrustResult.Unspecified`
means success - which currently has an integer value of 4, not 0.

* Oops, make it build.

* Don't make it public.

* Revert whitespace change.
2017-03-23 16:29:47 -04:00
Andi McClure ce44460fc7 Bump version to 5.1.0 2017-03-23 16:29:06 -04:00
Filip Navara b9448d5320 Add test for AutomaticDecompression behaviour
Test that HttpWebRequest.AutomaticDecompression actually performs the
decompression and that it removes the Content-Encoding header. Also fix
the value of Content-Encoding for other tests to follow the HTTP
specification.
2017-03-23 19:30:57 +01:00
Filip Navara e6f020d390 Remove Content-Encoding header after doing automatic decompression
Match the .NET Framework behaviour by removing the Content-Encoding
header after doing automatic decompression.
2017-03-23 19:30:57 +01:00
monojenkins 5217f963e7 [msvc] Update csproj files 2017-03-23 17:27:08 +01:00
Aleksey Kliger 8435306c98 [reflection] Set correct reflected type in MonoMethod.get_base_method
It can be the case that we have two different System.MonoMethod objects that both
point to the same native MonoMethod* but have two different reflected types.
(For example if we call derivedType.GetMethod("f") where f is virtual and
derivedType corresponds to a class that did not override a base definition.  In
that case, the MonoMethod* corresponds to the parent type's f method, but the
reflected type is derivedType)

In this case, GetBaseDefinition will return the same MonoMethod* but the
reflected type of the result should be the base type, not the derived type.
2017-03-23 10:31:53 -04:00
Aleksey Kliger e461e9c6d2 [tests] Additional tests of System.Reflection.MethodInfo.GetBaseDefinition 2017-03-23 10:31:53 -04:00
Ludovic Henry 41d647d252 [threadpool-io] Ensure selector thread is running before waiting on it (#4572)
This could result in a unecessary wait on shutdown where the selector thread would have exited, and the finalizer thread would try to dispose a Socket, which would try to remove the socket from the IOSelector. This removal operation would wait on the selector thread to acknowledge the removal, but because the selector thread would have alreday exited, we would wait on an event that would never happen.
2017-03-23 10:09:33 -04:00
Andoni Morales Alastruey 25a5bedec1 [mkbundle] Use correctly link paths when loading assembly deps 2017-03-23 11:28:36 +01:00
Brian Raderman 70828363f1 invoke_array_extract_argument() will create objects and set them in the parameters array when it detects a null parameter, but when we return a by-value parameter may no longer be null, which is an error. This fix detects the change and sets the parameter back to null for by-value parameters before we return. 2017-03-23 11:19:56 +01:00
Adrian Cheng 45db742590 One brace missed 2017-03-23 11:18:56 +01:00
Adrian Cheng b6d57b4107 Clean unrelated changes left 2017-03-23 11:18:56 +01:00
Adrian Cheng bbdba7d191 Try hardly to fix the revert the style changes I made... 2017-03-23 11:18:56 +01:00
Adrian Cheng 90efacbec9 Put the spaces back before calling function and indexing to follow coding guidelins 2017-03-23 11:18:56 +01:00
Adrian Cheng 66f47e25e9 Change brace style to follow coding guidelines 2017-03-23 11:18:56 +01:00
Adrian Cheng 3e906acfe2 Replace whitespaces to 8-spaces tabs 2017-03-23 11:18:56 +01:00
Adrian Cheng 0014f68478 Fix Bug #40969 2017-03-23 11:18:56 +01:00
Marek Safar 123daf5e46 Bump cecil 2017-03-23 11:15:38 +01:00
Aaron Bockover 87bb2f5814 csharp: support command line arguments for scripts
This adds a command line argument preprocessor that splits command line
arguments into two groups, delimited by the "standard" `--` "stop
processing" argument, or by the `-s` argument which can be used with
Unix shebang syntax (where the path of the file being executed will
be appended to the command line specified on the shebang line).

- anything before `--` or `-s` will be passed to mcs/csharp as usual
- anything after `--` or `-s` will _not_ be processed by mcs/csharp,
  and will be made available in an `Args` builtin, like `csi`

This _finally_ (after almost 10 years) allows `csharp` to be used for
proper script authoring!

Document the new arguments in the man page. Also remove references to
'gsharp' from the man page.
2017-03-23 10:18:10 +01:00
Marek Safar 4ab98d81cd [System.Data] Fixes tests build with mobile profiles 2017-03-23 10:15:57 +01:00
Marek Safar 6393dc1926 [System.Configuration] Refactor InitForConfiguration to be readable 2017-03-23 07:54:01 +01:00
Vlad Brezae dba2b07309 [runtime] Fix missing abort during abort protected regions
When aborting a thread we set the thread's interruption request and we also increment the global interruption request. If we were trying to abort a thread when it is in an abort protected region, it will just set an interruption deferred and not do anything else (in async_abort_critical). When the thread exited the abort protected region, it was missing the abort request since we didn't increment the global interruption request.

Refactor thread_interruption_requested modifications, making sure we always bump it when requesting an interruption and decrease it when we clear an interruption.
2017-03-23 01:40:13 +02:00
Vlad Brezae 786cbe76a8 [runtime] Rework abort deferring
The problem with previous implementation was that we were not able to account for two pending exceptions at the same time, since when we execute an interruption request we clear all the state and there is no clear way to account for two exceptions at the same time. This means that, if we have a pending abort in a cctor, all exception handling inside the cctor will be broken (for the provided test case we were only throwing the cctor internal exception outside of it).

In order to fix this, we split into two types of interruptions SYNC and ASYNC (in order to separate mainly between abort and pending exceptions). Sync interruptions are interruptions requested by the thread itself (pending exceptions and self aborts) and they are processed as soon as possible. Async interruptions are requested by other threads (abort, interrupt, suspend) and we defer them as we were doing before (we have a deferred interruption if we have an async exception and abort block count is non zero).
2017-03-23 01:40:02 +02:00
Marek Safar 6443cd04c1 [xbuild] Copy csc/mcs GC settings to xbuild script 2017-03-22 23:13:28 +01:00
Chris Hamons 4d1e45d76a AppleTls Support (#4470) 2017-03-22 19:15:02 +01:00
monojenkins 90b11833ff [msvc] Update csproj files 2017-03-22 17:34:31 +01:00
Egor Bogatov 2115cd7394 [System.Data] Integration tests (#4538) 2017-03-22 13:51:57 +01:00
lateralusX 15277e6bd6 Windows msbuild triggers too much to rebuild.
When building mono solution from Visual Studio it correctly handles incremental
builds just rebuilding what's needed. When doing the same from msbuild it rebuilds
to much. This happens due to two different issues.

First, a change in winconfig.h setting up a define for corlib version was not
included in our compare config file script, so diff was detected as a change in
config file causing a replace of config.h triggering a complete rebuild.

Second, once above was fixed there was still a rebuild of mini-amd64.c when not needed.
This was due to a difference in how post build events are handled in Visual Studio
and msbuild. Visual Studio will detect that the complete project won't need to be
rebuild and then it doesn't trigger any of the events. msbuild on the other hand
will trigger events even if nothing needs to be rebuild and that triggered creation of cpu-amd64.h
that in turn will trigger rebuild of mini-amd64.c. Switching from post build event
to a custom build step with proper input/output files will work as expected in both
Visual Studio and msbuild.

Commit also disables the build of test projects that are part of solution
but won't provide any build output. These projects are mainly there to make launching of test
configurations easier and doesn't need to be included in solution build.
2017-03-22 11:52:42 +01:00
EgorBo f53004b171 [System.Data] Fix bug-53217: use AddressFamily.InterNetworkV6 when needed 2017-03-22 10:46:47 +01:00
Zoltan Varga 59083b6912 [runtime] Fix another typo in get_errno_from_g_file_error (). 2017-03-22 04:20:28 -04:00
Zoltan Varga 665ef73634 [runtime] Fix a typo causing an assert in get_errno_from_g_file_error (). Fixes #53684. 2017-03-22 04:17:30 -04:00
Marek Safar fe3454a2de [msvc] Fixes Cecil project update 2017-03-21 23:25:25 +01:00
Zoltan Varga 80e57d368b [runtime] Add some documentation for the offsets stuff. 2017-03-21 16:46:53 -04:00
monojenkins 4771dc97ce [msvc] Update csproj files 2017-03-21 17:29:44 +01:00
Zoltan Varga a0fa08a524 [ppdb] Avoid asserting on ppdb images without a guid heap. 2017-03-21 11:43:28 -04:00
Alexander Köplinger a9c402ffda [System.Web] Fix standalone-runner to return non-zero exit code on failure (#4562)
* [System.Web] Fix standalone-runner to return non-zero exit code on failure

We didn't notice that test runs with standalone-runner.exe failed
because it still exited with 0 in those cases.

Fixed that and the standalone tests that showed up as failed in
System.Web.Extensions (some differences likely from referencesource
code import).

* Fix replacement logic for Consts.cs.in to use Windows paths
2017-03-21 13:04:19 +01:00
Marek Safar c1c09bc78d Bump linker 2017-03-21 12:30:10 +01:00
Marek Safar 4d5f823b0f [System] Fix Process tests on watch 2017-03-20 23:57:31 +01:00
Marek Safar 6c600321a7 [System.Core] Update mobile test 2017-03-20 23:03:57 +01:00
Vlad Brezae 1592e1e3da [runtime] Fix interruption deferring
We were accidentally clearing the interruption deferred flag when exiting from nested abort protected regions.
2017-03-20 23:01:01 +02:00
Alexander Kyte 2811e6d984 Merge pull request #4555 from alexanderkyte/finished_mangler
[runtime] Finish the AOT mangler
2017-03-20 14:52:42 -04:00
monojenkins 496c5871ca [msvc] Update csproj files 2017-03-20 17:54:13 +01:00
Rodrigo Kumpera 6217218134 Merge pull request #4554 from kumpera/cleanup-random-stuff
Remove debug spew plus fix the code from PR #4536
2017-03-20 08:33:43 -07:00
Zoltan Varga 31e3260a36 [arm64] Fix the DISABLE_JIT build. 2017-03-20 07:46:45 -04:00
Vladimir Kazakov 7edc2b4a5f System.Security.Cryptography.X509Certificates enums from .NET Core.
TrustStatus and X509SelectionFlag are missing from .NET Core (https://github.com/dotnet/corefx/issues/17194), hence TrustStatus was taken from .NET Framework and X509SelectionFlag was left untouched.
2017-03-20 12:25:17 +01:00
Zoltan Varga 3ff66ac985 [simd] Add some missing Vector<T> intrinsics. Add some code to print out missing intrinsics when running with -v -v. (#4560) 2017-03-20 06:45:54 -04:00
monojenkins 9bec7d1d33 [msvc] Update csproj files 2017-03-20 11:27:33 +01:00
Zoltan Varga a4806314e1 [x86] Implement OP_EXPAND_I1 by lowering instead of directly to avoid register allocation problems. Increase stack size when simd types are used. (#4557) 2017-03-20 00:16:20 -04:00
Bernhard Urban 11987ed3a8 [interp] allocate storage for value types in runtime_invoke 2017-03-18 19:31:49 +01:00
Bernhard Urban 5d4a9aa7f9 [interp] treat GENERICINST properly on runtime_invoke return 2017-03-18 19:31:49 +01:00
Bernhard Urban a146700e40 [interp] box IntPtr on return of runtime_invoke 2017-03-18 19:31:49 +01:00
Bernhard Urban a9e3ef2e13 [interp] add UnsafeMov intrinsic support 2017-03-18 19:31:49 +01:00
Bernhard Urban a5076ac021 [interp] fix offset for starg_vt insn
fixes an issue in TestDriver, thus enabling some more tests.
2017-03-18 19:31:49 +01:00
Bernhard Urban b715527f92 [interp] remove register keyword hack.
we have 2017.
2017-03-18 19:31:49 +01:00
Bernhard Urban 66a6782051 [interp] call mono_thread_abort after an exception couldn't be handled 2017-03-18 19:31:49 +01:00
Bernhard Urban 11e5c801a2 [interp] don't assert on stack walking if we don't find a frame
e.g. `is_running_protected_wrapper` doesn't necessarily find a matching frame.
2017-03-18 19:31:49 +01:00
Bernhard Urban 7b114d1942 [lldb] update monobt so it understands interpreter frames.
```
(lldb) monobt
* thread #1
  * frame #0: 0x00000001001b236e mono-sgen`interp_transform_call(td=0x00007fff5fbfd080, method=0x0000000100915a90, target_method=0x0000000000000000, domain=0x000000010090b741
    frame #1: 0x00000001001a1c2e mono-sgen`generate(method=0x0000000100915a90, rtm=0x000000010382ac70, is_bb_start="\x01", generic_context=0x0000000100915ad0) + 9454 at tran8
    transforming TestMonoAsyncGenerics::AsyncWithAwait || frame #2: 0x000000010019f553 mono-sgen`mono_interp_transform_method(runtime_method=0x000000010382ac70, context=0x004
    TestMonoAsyncGenerics::AsyncWithAwait @ 0  || frame #3: 0x000000010018a178 mono-sgen`ves_exec_method_with_context(frame=0x00007fff5fbfe290, context=0x00007fff5fbfe3a8) +9
    TestMonoAsyncGenerics::Main @ 12 "pop" || frame #4: 0x000000010018b4b1 mono-sgen`ves_exec_method_with_context(frame=0x00007fff5fbfe420, context=0x00007fff5fbfe3a8) + 5081
    frame #5: 0x0000000100189e43 mono-sgen`mono_interp_runtime_invoke(method=0x000000010090ce38, obj=0x0000000000000000, params=0x00007fff5fbfea40, exc=0x0000000000000000, e0
    frame #6: 0x00000001000164a2 mono-sgen`mono_jit_runtime_invoke(method=0x000000010090ce38, obj=0x0000000000000000, params=0x00007fff5fbfea40, exc=0x0000000000000000, erro1
    frame #7: 0x000000010038b2b5 mono-sgen`do_runtime_invoke(method=0x000000010090ce38, obj=0x0000000000000000, params=0x00007fff5fbfea40, exc=0x0000000000000000, error=0x002
    frame #8: 0x0000000100384e97 mono-sgen`mono_runtime_invoke_checked(method=0x000000010090ce38, obj=0x0000000000000000, params=0x00007fff5fbfea40, error=0x00007fff5fbfeb000
    frame #9: 0x000000010038f335 mono-sgen`do_exec_main_checked(method=0x000000010090ce38, args=0x00000001020003c8, error=0x00007fff5fbfeb00) + 197 at object.c:4672
    frame #10: 0x000000010038dd5c mono-sgen`mono_runtime_exec_main_checked(method=0x000000010090ce38, args=0x00000001020003c8, error=0x00007fff5fbfeb00) + 76 at object.c:4773
    frame #11: 0x000000010038ddbf mono-sgen`mono_runtime_run_main_checked(method=0x000000010090ce38, argc=1, argv=0x00007fff5fbfef68, error=0x00007fff5fbfeb00) + 79 at objec2
    frame #12: 0x00000001000d9a33 mono-sgen`mono_jit_exec(domain=0x000000010090b740, assembly=0x0000000100913610, argc=1, argv=0x00007fff5fbfef68) + 403 at driver.c:1029
    frame #13: 0x00000001000dd9da mono-sgen`main_thread_handler(user_data=0x00007fff5fbfeea0) + 538 at driver.c:1098
    frame #14: 0x00000001000dc21c mono-sgen`mono_main(argc=3, argv=0x00007fff5fbfef58) + 8636 at driver.c:2163
    frame #15: 0x0000000100001b9e mono-sgen`mono_main_with_options(argc=3, argv=0x00007fff5fbfef58) + 46 at main.c:45
    frame #16: 0x00000001000012dd mono-sgen`main(argc=3, argv=0x00007fff5fbfef58) + 77 at main.c:338
    frame #17: 0x00007fffc2e66255 libdyld.dylib`start + 1
    frame #18: 0x00007fffc2e66255 libdyld.dylib`start + 1
```
2017-03-18 08:45:42 +01:00
Zoltan Varga 96fc5f6350 [arm] Fix the DISABLE_JIT build. 2017-03-17 19:05:43 -04:00
Frederik Carlier 1540749175 Make System.Drawing code compatible with .NET Core (#4548) 2017-03-17 23:30:35 +01:00
Alexander Kyte a483c550d7 [runtime] Finish AOT method name mangler 2017-03-17 17:15:55 -04:00
Rodrigo Kumpera 4018527279 [runtime] Remove debug spew. 2017-03-17 13:30:09 -07:00
Rodrigo Kumpera 54a98ba74e [runtime] Remove debug leftover and have mono_assembly_is_problematic_version actually work. 2017-03-17 13:29:57 -07:00
su21 463cf3b5c1 less allocation in Socket (#4516)
* less allocation in Socket

avoid allocate `System.Threading.QueueUserWorkItemCallback` in `SocketAsyncResult.Complete`
avoid allocate `Task` and anonymous function in `Socket.QueueIOSelectorJob`

* update: fix race and use replace static field with in line lambda

* cleanup code

* QueueIOSelectorJob keep async, and provie a fastpath

* SocketAsyncResult: simplify callback code

* add missing line `IOSelect.Add(handle, job)`  :(

* fix typo

* fix compile error
2017-03-17 15:35:41 -04:00
Andi McClure d86c6dce1c Bump version number to 4.9.4 to support automated builders 2017-03-17 11:58:05 -04:00
Marek Safar a333f0685b Add support for xunit tests 2017-03-17 16:01:44 +01:00
Marek Safar 1312784075 [System] Add back empty MonoTouch namespace 2017-03-17 14:08:53 +01:00
Johan Lorensson 1006d04ff6 Merge pull request #4542 from lateralusX/jlorenss/win-fix-unwind-tramp-reg-aot
mono_arch_unwindinfo_install_tramp_unwind_info can only be called for JIT:ed code.
2017-03-17 10:03:22 +01:00
Zoltan Varga 74c2ce1ff8 [jit] Remove support for the separate mono_lmf variable in the JIT, use the mono_lmf_addr () variable instead. The former could be used to generate slighly faster code in managed-to-native wrappers, but its not worth all the complexity it caused. (#4549) 2017-03-17 03:32:52 -04:00
Frederik Carlier 6447228e30 Remove CAS attributes from System.Drawing (#4544) 2017-03-17 00:10:44 +01:00
Aleksey Kliger (λgeek) b8285f3c99 Merge pull request #4453 from lambdageek/bug-49721
[loader] Check strong name when loading from application base. (Fixes #49721)
2017-03-16 19:09:00 -04:00
Zoltan Varga 395814d25f [x86] Disable the usage of mono_lmf on android as a workaround. 2017-03-16 19:06:36 -04:00
Zoltan Varga ec0624edc6 [x86] Remove some incorrect code from method prologs which clobbers the return value. 2017-03-16 18:56:54 -04:00
Alexander Köplinger a715c0daee [corcompare] Fix support for BindableAtribute ctor that takes BindableSupport 2017-03-16 23:46:30 +01:00
Alexander Köplinger 622840da56 Move target for creating monolite package to Mono 2017-03-16 21:38:31 +01:00
Alexander Köplinger c0dd559ee4 Include Mono version in corlib version
This makes it possible to version the runtime<->corlib interface
for each version branch independently and fixes the problem
of monolite getting overwritten by changes in different branches
when corlib version is still the same.

We're moving definition of the corlib version into configure.ac
so we can more easily bake the Mono version into it.
2017-03-16 21:38:31 +01:00
Rodrigo Kumpera ddae67da8a Merge pull request #4536 from kumpera/block-rebind-of-banned-assemblies
Reject rebinds that target one of the banned assemblies.
2017-03-16 15:23:10 -04:00
Aleksey Kliger 99a0b46327 [tests] Separate MONO_PATH directories by PLATFORM_PATH_SEPARATOR 2017-03-16 14:58:06 -04:00
Aleksey Kliger 5a06ca6c04 [mono/tests] Add strong named assembly loading tests
These tests place strong named assemblies on the MONO_PATH and into
MONO_GAC_PREFIX in various configurations and check that when a strong assembly
name  is specified: mono will ignore non-strong named assemblies that come
earlier in the search paths; mono will ignore strong named assemblies that have
the right filename and come earlier in the search path but have an incorrect
strong name.
2017-03-16 13:39:07 -04:00
Rodrigo Kumpera 59e8fa77d7 [tools] Dep check the downloads to avoid the mistake fixed by the previous commit. 2017-03-16 10:26:22 -07:00
Rodrigo Kumpera 09c7afbc75 [runtime] Update the banned version list to include SRDP and SVT. 2017-03-16 10:25:32 -07:00
Alexander Köplinger 15145d0554 [xbuild] Fix make dist broken by a350f8f0f4
Wildcards aren't supported in EXTRA_DISTFILES and it wouldn't work
anyway since we need to enclose the paths with spaces in quotes.
2017-03-16 17:16:58 +01:00
Alexander Köplinger 0af1ea70c2 [WindowsBase] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 5e8abc1c40 [System.Xaml] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger ebbdb78a35 [System.Windows.Forms.DataVisualization] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 00dac826ca [System.Web.Extensions] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger f4a7a5242a [System.Web.ApplicationServices] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger a22bb15e6b [System.Web] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger a82fcb2c9c [System.Transactions] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 1b5338dc5f [System.ServiceModel.Web] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 2e31504f02 [System.ServiceModel.Discovery] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger cd57ffcd04 [System.ServiceModel] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 03c249026e [System.Security] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger f376e49d95 [System.Management] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger cdd571a071 [System.IdentityModel.Selectors] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 882d805b9d [System.IdentityModel] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 8632f59dd2 [System.EnterpriseServices] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 1ba011835d [System.Drawing] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 96db2c2751 [System.DirectoryServices] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 9f1983da90 [System.Design] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 2a927126d3 [System.Data.OracleClient] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger a2b79b241d [System.Data.Linq] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger a6155cbc4a [System.Data] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 85b2056a36 [System.Core] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 44f06623bd [System.Configuration] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger e0e93f396d [System] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 780743d055 [Microsoft.Build] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 881dc69fef [Microsoft.Build.Engine] Rename method parameters to match .NET contract 2017-03-16 13:02:09 +01:00
Alexander Köplinger 7ad842c95c [bcl] Rename variables to avoid conflict with later renames 2017-03-16 13:02:09 +01:00
Marek Safar 4a1c47f4bd [corlib] Update culture data. Fixes #53334 2017-03-16 10:18:12 +01:00
Marek Safar b94bebc69b [corlib] Fixes custom formatter with ";" section separator and zero values 2017-03-16 10:02:04 +01:00
Frederik Carlier b182c70602 Use MD5.Create () instead of new MD5CryptoServiceProvider() 2017-03-16 09:09:50 +01:00
Frederik Carlier 588b905349 Add [In, Out] annotation to points in GdipTransformMatrixPoints 2017-03-16 08:55:56 +01:00
Vincent Povirk 53ac1b026b [amd64] Fix mingw-w64 build. (#4519)
It lacks _In_reads_ and _Inout_.
2017-03-16 00:47:35 +01:00
Rodrigo Kumpera a4bbf29c15 [bcl] Enable tests for the monodroid profile. 2017-03-15 16:32:31 -07:00
Rodrigo Kumpera 0fc77091f3 [bcl] Add Mono.Posix to the monodroid profile. 2017-03-15 16:31:38 -07:00
Rodrigo Kumpera fc662e3ffe [Mono.Posix] Add file that was on the xamarin-android repo so it can be built from mono. 2017-03-15 16:30:34 -07:00
Rodrigo Kumpera c37ef087cf [System] Don't remove test helper needed by the test suite. 2017-03-15 16:28:42 -07:00
Rodrigo Kumpera b1d1a9d662 [corlib] I got a target that can't do satelite assemblies for now. Filed as #53136. 2017-03-15 16:27:17 -07:00
Rodrigo Kumpera b0876880fd [corlib] Disable GetObject_UrlNull on mobile as it depends on remoting. 2017-03-15 16:26:56 -07:00
Rodrigo Kumpera 401e28d28f [corlib] Reenable SafeHandleTest as they now work on Android. 2017-03-15 16:26:34 -07:00
Rodrigo Kumpera 5f5a66ee96 [corlib] Multiple small fixes to tests run on mobile.
DefineDefaultConstructor_Parent_DefaultCtorInaccessible:
	On Mobile, due to the Silverlight CoreCLR sandboxing, MethodInvoke doesn't wrap MethodAccessException in TargetInvocationException.
	Instead of fixing the mobile difference, we adjust the test.

LoadWithPartialName:
	Stop hardcoding the test assembly name otherwise this test will break on every new profile we add.

ReflectionOnlyLoadFrom:
	Don't assume that the test suite was loaded from $CWD.

GetRuntimeDirectory:
	Not all monodroid targets embed assemblies in the same way. So make a reasonable assumption instead.
2017-03-15 16:21:38 -07:00
Rodrigo Kumpera 35405bee31 [corlib] Cleanup tests that depend on SymbolWriter being available for no good reason. 2017-03-15 16:18:20 -07:00
Rodrigo Kumpera 1a17c39b23 [corlib] Cluster all tests that require large file support under the LargeFileSupport category. 2017-03-15 16:15:23 -07:00
Rodrigo Kumpera 067f012082 [bcl] Add build-test-lib target that builds the test lib for the current profile and assembly. 2017-03-15 16:13:21 -07:00
Rodrigo Kumpera d3a4abc745 [configure] Configure properly detects HAVE_LARGE_FILE_SUPPORT on Android. 2017-03-15 16:03:22 -07:00
Vlad Brezae 94c2a5434f [sgen] Fix xmm scanning on mac x86 (#4521)
The MonoContext (which sgen scans) did not have its fpregs populated, even though we were fetching the fpstate.
2017-03-16 00:59:23 +02:00
Zoltan Varga c078f357c6 [aot] Print out more info when a method cannot be AOTed. 2017-03-15 18:33:32 -04:00
Zoltan Varga e98342bf74 [runtime] Fix mono_method_get_name_full () so it works with methods whose signature cannot be loaded. 2017-03-15 18:33:32 -04:00
Rodrigo Kumpera 8a83c3eb2c [tools] Update nuget-hash-extractor to spew the new ban table. 2017-03-15 13:48:08 -07:00
Rodrigo Kumpera 3e220c5b7b [runtime] Reject rebinds that target one of the banned assemblies.
The matching is done by name and version. We don't check pubkey or MVID.
2017-03-15 13:46:56 -07:00
Zoltan Varga 49b2bdeafb Bump ikdasm. 2017-03-15 16:25:20 -04:00
lateralusX c27b70cc43 mono_arch_unwindinfo_install_tramp_unwind_info can only be called for JIT:ed code.
Currently mono_arch_unwindinfo_install_tramp_unwind_info can only be called on
JIT:ed code since it assumes place for unwind info has been allocated behind
code block. When called by AOT:ed code the complete this is have not done and
the unwind info should not be registered with OS for AOT:ed code
(should be part of the image).
2017-03-15 10:18:17 +01:00
Zoltan Varga 847ed21be0 [simd] Fix some problems exposed by the corefx test suite. (#4531) 2017-03-15 05:08:57 -04:00
Zoltan Varga 88a6ae00a2 [simd] Mark Mono.Simd classes as obsolete. 2017-03-15 09:17:11 +01:00
Zoltan Varga 2bf7d1b525 Bump ikdasm. 2017-03-14 16:37:52 -04:00
Aleksey Kliger 01262e9104 [loader] Cleanup add_assemblies_to_domain
1. Don't re-add the domain assemblies to the hashtable on every recursive
   call - they are already in there (we're holding the assemblies_lock, noone
   else can add anything to domain->domain_assemblies); just add them once when
   the hash table is created.
2. When iterating over the referenced assemblies, don't stop at the first NULL.
   a NULL means that referenced assembly hasn't been demanded by anyone yet,
   but there's no reason to assume some other referenced assembly that happens
   to come later in the table hadn't been resolved.  Iterate upto assembly->nreferences.
2017-03-14 15:49:35 -04:00
Alexander Köplinger 294148d27d [tools] Don't install mdb2ppdb by default (#4526) 2017-03-14 19:41:16 +01:00
Aleksey Kliger 0b442e8430 [test-runner] Add --mono-gac-prefix command line option.
Also don't unset the MONO_PATH if a --mono-path isn't passed to the test runner.
2017-03-14 11:40:18 -04:00
Aleksey Kliger e02828877e [mono/tests] Make w32message.cs a normal test-runner test
Use exit codes to communicate success/failure like other test-runner tests.
Get rid of custom build rules.
2017-03-14 11:39:04 -04:00
Aleksey Kliger af7195e349 [loader] Remap public key tokens of framework assemblies when running with --runtime=mobile 2017-03-14 11:39:04 -04:00
Aleksey Kliger 5bc0917df2 [mono/tests] Fix tests when using full or hybrid AOT
* bug-30085 test
  mscrorlib pubKeyToken depends on what we're testing
* bug-17537 test
  AOT the helper assembly so it can be loaded by fullaot runtime
* bug-3903 test
  explicit paths to corlib and System.Core reference assemblies
2017-03-14 11:39:03 -04:00
Aleksey Kliger 1e227ddee1 [loader] In debug output, print the domain search path when loading assemblies. 2017-03-14 11:39:03 -04:00
Aleksey Kliger f58bc6e295 [loader] Requesting an assembly with a strong name should match exactly
If an assembly references another with a strong name, the loader will require
that the strongly named assembly match exactly the requested name (name, version, culture, public
key token).

For assemblies without a strong name, continue Mono's existing behavior.
2017-03-14 11:39:03 -04:00
Aleksey Kliger ae1822075d [loader] Pass predicate callback to mono_assembly_load_from_full
Actually create a new mono_assembly_load_from_predicate () and call that from
the old mono_assembly_load_from_full ().

This function is responsible for creating brand new MonoAssembly* values and
then committing them by calling mono_assembly_invoke_load_hook().  So if we
would like to have a chance to reject a candidate assembly from loading for
some reason, this is the only place we can do it:

* anywhere before the call to mono_assembly_load_from_predicate there is no
  MonoAssembly* yet.
* anywhere after mono_assembly_load_from_predicate returns, the load hook was
  already called (in a plain vanilla Mono, there's an installed load hook
  called mono_domain_fire_assembly_load () which caches the MonoAssembly* in
  the domain that requested the load - after that point we cannot possibly
  consider another MonoImage* for the same MonoAssemblyName - the appdomain
  will always return the cached one).

The next commit will use this predicate to reject some strongly named
assemblies when the candidate assembly doesn't exactly match the wanted
MonoAssemblyName.  (Note that load_from doesn't have the MonoAssemblyName that
was requested, so we'd have to thread /something/ down here - might as well be
a predicate function.)
2017-03-14 11:39:03 -04:00
Aleksey Kliger a21fae83b7 [runtime] Mark mono_assembly_open and mono_assembly_open_full external only
Runtime should use mono_assembly_open_predicate
2017-03-14 11:39:03 -04:00
Aleksey Kliger 092f4c6ac0 [assembly] Add mono_assembly_open_predicate function
This is an extension of mono_assembly_open_full with a user-supplied predicate
that gets a chance to interrogate the candidate MonoAssembly before it is
consider successfully loaded.
2017-03-14 11:39:02 -04:00
Marek Safar a350f8f0f4 [xbuild] Relocate Portable frameworks 2017-03-14 14:56:10 +01:00
Marek Safar da3bd8368b Revert "Bump buildtools to branch that includes portable targets"
This reverts commit 5bb4b3d154.
2017-03-14 14:56:10 +01:00
Bernhard Urban be84042525 [configure] rename "--with-interpreter=yes" to "--enable-interpreter" 2017-03-14 10:59:22 +01:00
Ankit Jain 81129b83c3 Handle windows paths in ResXFileRef, for conversion to string case
- convert the path a little earlier to handle the case for conversion to
  string
- Fixes earlier commit a3195b79f6
- And enable the corresponding test
2017-03-14 09:00:59 +01:00
Zoltan Varga 8b7eee9788 [jit] Add parameter type checks to the SIMD intrinsics to make sure we are handling the proper methods. Fixes #53278. (#4520) 2017-03-13 21:46:46 -04:00
Alexander Köplinger 5bb4b3d154 Bump buildtools to branch that includes portable targets 2017-03-14 00:29:11 +01:00
Zoltan Varga 6f33b62f39 [runtime] Mark array types with more than 32 dimensions as invalid. Move the check for arrays of void into Array.CreateInstance (), since typeof (void).MakeArrayType () is valid. Fixes #53131. (#4514) 2017-03-13 16:02:25 -04:00
Bernhard Urban a28e700ff5 [interp] kill MINT_LDTHISA
not required anymore with new internal ABI
2017-03-13 17:41:31 +01:00
Bernhard Urban ad2d093d06 [interp] allow generic instantiation as argument in runtime_invoke 2017-03-13 17:41:31 +01:00
Bernhard Urban 721ad57069 [interp] more static trampolines 2017-03-13 17:41:31 +01:00
Bernhard Urban c0712cb163 [interp] inflate cee_token properly if it comes from wrapper metadata 2017-03-13 17:41:31 +01:00
Bernhard Urban 64da05d517 [interp] make sure we wrap virtual methods with synchronize wrapper too 2017-03-13 17:41:31 +01:00
Bernhard Urban 5f7db6b93f [interp] clear exception storage in runtime_invoke 2017-03-13 17:41:31 +01:00
Bernhard Urban bae654cbf7 [interp] lock when acquiring memory from a mempool.
`mono_domain_alloc` does that for us. also, use proper locking around
JIT code hashtable.  the interpreter repurpose the JITs hashtable, so
let's use the existing locks.
2017-03-13 17:41:31 +01:00
Bernhard Urban d4513c61d4 [ci] add more steps to interp 2017-03-13 17:41:31 +01:00
Bernhard Urban 1283104761 [tests] update 'make testinterp' target 2017-03-13 17:41:31 +01:00
Bernhard Urban 8fd5b8e0f5 [test-runner] remove duplicated --runtime hanlding 2017-03-13 17:41:31 +01:00
Bernhard Urban 914733cd27 [test-runner] allow passing runtime args 2017-03-13 17:41:31 +01:00
Marek Safar fef19961d7 [System.Windows.Forms] Disable failing test 2017-03-13 09:55:13 +01:00
Marek Safar 78072e093d Bump corefx 2017-03-13 09:44:24 +01:00
Marek Safar a60e3b1497 Bump buildtools 2017-03-13 09:39:50 +01:00
Frederik Carlier 6757632ae7 GDI+ functions: use constant for the library name, fix whitespace (#4515) 2017-03-13 09:15:22 +01:00
Marek Safar 25869d138a [corlib] FileStream::Name needs to include fully qualified normalized name. Fixes #53231 2017-03-12 09:41:23 +01:00
Zoltan Varga 4f187040c6 [jit] Implement RuntimeHelpers.IsReferenceOrContainsReferences intrinsic. Fixes #53153. (#4500) 2017-03-11 23:43:37 -05:00
Jon Purdy ab93bc9a7b [docs] Remove dead metadata APIs. 2017-03-11 15:24:00 -08:00
Jon Purdy b353ba1788 [docs] Remove dead mempool APIs. 2017-03-11 15:24:00 -08:00
Jon Purdy 58ad70577a [docs] Remove dead hash table APIs. 2017-03-11 15:24:00 -08:00
Jon Purdy f6a855df8c [docs] Remove dead GC APIs. 2017-03-11 15:24:00 -08:00
Jon Purdy 067ed199d2 [docs] Remove dead remote wrapper APIs.
They were deleted in d1ace1652b.
2017-03-11 15:24:00 -08:00
Jon Purdy 705d2361ca [docs] Remove dead loader error APIs.
They were deleted in 38cf816b97.
2017-03-11 15:24:00 -08:00
Frederik Carlier ca6d958db0 Remove CAS from System.Drawing unit tests 2017-03-11 20:37:14 +01:00
Marek Safar 69b48401c9 [System.Windows.Forms] Fixes test build failure 2017-03-11 15:21:15 +01:00
Zoltan Varga 51278a7b25 [bcl] Implement RuntimeHelpers.IsReferenceOrContainsReferences () as an icall, so it works even if the intrinsic is disabled. 2017-03-11 11:15:15 +01:00
Ankit Jain a3195b79f6 Handle a file ref, with backslashes, in a .resx, on a non-windows system
File ref of the form:

```xml
  <data name="foo" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\foo.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
```
2017-03-11 11:03:07 +01:00
Alexander Köplinger 572e92c597 [WinForms] Fix Bindable attribute argument to use boolean
Otherwise mono-api-info crashes on System.Windows.Forms.dll with a NotImplementedException.
This is the only place in the codebase where we used `BindableSupport.Yes` instead of `true`.
2017-03-11 01:01:30 +01:00
Marek Safar 1de81ff1da [corlib][Mono.Posix] Remove NunitHelpers.cs reference 2017-03-10 20:36:26 +01:00
Alexis Christoforides 3821e9bead [MacSDK] Another attempt at circumventing signing for Ironlangs build
Roslyn does not support signing on non-Windows, and MSBuild normally refuses to continue.
2017-03-10 13:01:13 -05:00
lateralusX ab66a6156f Fixing checked build after unwind info changes. 2017-03-10 12:26:03 -05:00
Alexis Christoforides eb0e423499 [MacSDK] Use MSBuild to build IronPython/IronRuby. We are deprecating xbuild 2017-03-10 09:31:38 -05:00
Alexis Christoforides 814d37f556 Update Bockbuild 2017-03-10 07:51:36 -05:00
Egor Bogatov ea5c5fe093 Fix [Bug 52795] Infinite loop on MySqlDataReader.ReadAsync() (#4504) 2017-03-10 13:48:59 +01:00
Alexis Christoforides aad9126f5f Update Bockbuild 2017-03-10 05:34:42 -05:00
Johan Lorensson c63aa7cd12 Merge pull request #4444 from lateralusX/jlorenss/windows-unwind-info
Improve unwind support on Windows x64.
2017-03-10 11:16:23 +01:00
Alexis Christoforides f2ba124191 Update Bockbuild 2017-03-10 00:03:36 -05:00
Zoltan Varga 03bd0ea9e6 [arm64] Fix the saving/restoring of fp regs in exception filters, we were saving/restoring them from the incorrect position in MonoContext.fregs. (#4499) 2017-03-09 23:35:04 -05:00
Zoltan Varga 0f2b159ed9 [runtime] Add a test to verify that pedump works. (#4486) 2017-03-09 23:03:29 -05:00
Alexis Christoforides c12b559df3 Update Bockbuild 2017-03-09 22:43:48 -05:00
Alexis Christoforides 420b6c3145 [MacSDK] Fix Ironlangs build with latest MSBuild 2017-03-09 21:23:47 -05:00
Rodrigo Kumpera 1bad3716e3 Merge pull request #4494 from kumpera/important-android-fixes
[runtime] Make sure we use lower numbered signals on Android.
2017-03-09 13:14:35 -08:00
Jon Purdy a4a794266d [api] Remove dead mono_load_image API. 2017-03-09 12:48:46 -08:00
Ludovic Henry 65025fea2c [socket] ret might not have been initialized (#4495) 2017-03-09 13:35:04 -05:00
Alexander Köplinger 982646c232 [Mono.Options] Add missing test file to test sources
It was missed in c1b9fc566a
2017-03-09 19:25:33 +01:00
monojenkins 65cddd7727 [msvc] Update csproj files (#4479) 2017-03-09 19:22:15 +01:00
Marek Habersack 21dec72083 [mkbundle] Encode directory separator character on Windows (#4493)
When storing satellite assemblies, mkbundle prefixes their names with a
directory name derived from the language/locale of the assembly. It uses the
platform's default directory separator character which on Windows defaults to
'\' and that causes problems when building such a bundle on Windows since \ is
an escape sequence prefix inside strings and not escaping it with another \
leads to gcc errors when building the genrated source.

This commit fixes the problem by quoting the directory separator character
properly on Windows.

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=52845
2017-03-09 10:25:08 -05:00
Alexander Köplinger eff552d9bd [ci] Remove ppc64el checks from run-test-default.sh
This was initially done so we didn't get orange builds
when ppc64el was in the same job as our other archs.

ppc64el was since moved into a separate job so we can
stop skipping the test suites.

Also fixed badges in README.md for ppc64el and s390x
2017-03-09 15:16:03 +01:00
lateralusX 6218be7200 Shorten function name length for static functions. 2017-03-09 15:10:11 +01:00
Marek Safar d772d6a0e3 [mcs] Codegen for auto-property backing field initialization used as assignment. Fixes #53166 2017-03-09 15:06:49 +01:00
Daniel C. Weber eea2d3e250 [Mono.Posix] UnixSIgnal.WaitOne() doesn't block for 0 timeout (#4489)
For timeouts of 0 milliseconds, WaitOne may produce incorrect results. In case of timeout, the result of WaitAny denotes the amount of milliseconds that have timed out. WaitOne relies on WaitAny and interprets the result falsely as the index of the completed handle. This change introduces a check on the timeout and returns `IsSet` when the handle is not allowed to block.

This is in accordance to Microsofts [documentation of WaitOne](https://msdn.microsoft.com/de-de/library/cc189983(v=vs.110).aspx) which states "If millisecondsTimeout is zero, the method does not block. It tests the state of the wait handles and returns immediately.". 

[Here](https://github.com/StephenCleary/AsyncEx.Interop.WaitHandles/blob/master/src/Nito.AsyncEx.Interop.WaitHandles/WaitHandleInterop.cs#L51) is an example of some code relying on correct output of `WaitOne(0)` that is effectively broken by the current behaviour.
2017-03-08 21:09:50 -05:00
Rodrigo Kumpera 3a5adbd2af [runtime] Make sure we use lower numbered signals on Android.
Android on 32bits arm shipped broken headers that made sigset_t be 32 bits instead of 64.

This means that it's not possible to use signals whose value are >= 32. The default implementation
uses RT signals when available (and they are on Android). But RT signals don't work as expected
as their value is >= 32.

This fix hardcodes some safe signals on Android and add asserts about their values to avoid regressions.

See 5005c6f3fb for more details.
2017-03-08 15:34:38 -08:00
Bernhard Urban d455c0d234 [interp] remove g_error call
can hit this case in racy code (e.g. tests/thread5.cs)
2017-03-08 23:02:51 +01:00
Bernhard Urban 4339c540ca [interp] fix another data.klass access. due to generics it has to be resolved with a runtime helper 2017-03-08 23:02:51 +01:00
Bernhard Urban 6504758616 [interp] support stelem for g{,u}int64 2017-03-08 23:02:51 +01:00
Bernhard Urban 3a3baaf72a [interp] pass single fp correctly to icall trampoline
add test to basic-math.cs that tests this specifically.
2017-03-08 23:02:51 +01:00
Bernhard Urban eda8722273 [interp] fix type init exception propagation for methods that trigger static constructors 2017-03-08 23:02:51 +01:00
Bernhard Urban 392de95a84 [interp] support non-empty stack in switch branches 2017-03-08 23:02:51 +01:00
Bernhard Urban ceb5151a23 [interp] fix for ldflda unsafe corner case 2017-03-08 23:02:51 +01:00
Bernhard Urban b5ea5215ef [interp] propogate OOM exception on array instantiation 2017-03-08 23:02:51 +01:00
Bernhard Urban 0b7b9d2bff [exceptions.cs] enable one more test 2017-03-08 23:02:51 +01:00
Bernhard Urban b9d5083353 [interp] respect lower_bound on array access and share behaviour with .Set, .Get and .Address 2017-03-08 23:02:51 +01:00
Bernhard Urban ddbea4b85a [interp] throw overflow exception on long to ulong cast where long is negative 2017-03-08 23:02:51 +01:00
Bernhard Urban 52c9310997 [interp] throw overflow exception on ulong to long cast where ulong is too large to fit in long 2017-03-08 23:02:51 +01:00
Bernhard Urban 3ffd7c6ca8 [interp] throw overflow exception on (0/-1) 2017-03-08 23:02:51 +01:00
Bernhard Urban b9480403b5 [interp] fix overflow corner cases for integer 2017-03-08 23:02:51 +01:00
Bernhard Urban 4b393c4e68 [interp] fix a mem leak in transform 2017-03-08 23:02:51 +01:00
Bernhard Urban 0560b20dad [interp] allocate one more slot for tracking stack types
due to the way basic block handling is done in the interpreter, it can
happen that we have one additional element on the stack (as opposed to
what metadata tells us)
2017-03-08 23:02:51 +01:00
Bernhard Urban 548e5ad0f7 [makefile] cleanup richeck target 2017-03-08 23:02:51 +01:00
Bernhard Urban cc82f7647f [interp] support stelem for guint8 2017-03-08 23:02:51 +01:00
Bernhard Urban 9e0e78ad64 [interp] support reference case for unbox.any 2017-03-08 23:02:51 +01:00
Bernhard Urban b22850efd7 [interp] remove STTHIS completly. 2017-03-08 23:02:51 +01:00
Bernhard Urban b2a93db718 [interp] throw exceptions from icalls 2017-03-08 23:02:51 +01:00
Bernhard Urban cd1797fac9 [interp] proper overflowcheck for size passed to cee_newarr 2017-03-08 23:02:51 +01:00
Bernhard Urban fd8a5f9ebf [interp] throw NRE in mint_vcall insn if receiver is null 2017-03-08 23:02:51 +01:00
Bernhard Urban 8cdf86ee69 [interp] respect generic context for cee_sizeof 2017-03-08 23:02:51 +01:00
Bernhard Urban fa171c4369 [interp] set proper type info for cee_ldtoken bytecode 2017-03-08 23:02:51 +01:00
Bernhard Urban 78fb960c6a [interp] refactor Array::Address, so that readonly. prefix is respected properly 2017-03-08 23:02:51 +01:00
Bernhard Urban 243d65d765 [interp] cee_{stfld,ldfld{,a}} can access static fields too 2017-03-08 23:02:51 +01:00
Bernhard Urban 9862d66925 [interp] fix cee_initobj for reference type 2017-03-08 23:02:51 +01:00
Bernhard Urban a2a647ca37 [interp] implement cee_cpobj 2017-03-08 23:02:51 +01:00
Bernhard Urban fa7f66c939 [interp] transform all kind of clauses
still need to handle filter clauses correctly during stack walking.
2017-03-08 23:02:51 +01:00
Bernhard Urban c6ceaa11df [interp] clear storage for sp, vt_sp and locals properly 2017-03-08 23:02:51 +01:00
Bernhard Urban 396ea09438 [interp] implement cee_unbox and cee_ldobj correctly
unbox is supposed to push a managed pointer on the stack and ldobj does
the actual value copy.  unbox_any is basically unbox+ldobj according to
the spec.

fixes random crashes in test_0_regress_80622:iltests.il
2017-03-08 23:02:51 +01:00
Bernhard Urban 722e5ff2c5 [interp] fix issues around conv.ovf.* bytecodes 2017-03-08 23:02:51 +01:00
Bernhard Urban cd8880b0c3 [interp] fix localloc instruction, storage must be cleared 2017-03-08 23:02:51 +01:00
Bernhard Urban 6761073b2a [interp] clear locals storage also on pointer type 2017-03-08 23:02:51 +01:00
Bernhard Urban d46883ac2d [interp] add iltests.exe to regression suite and mark crashing tests 2017-03-08 23:02:51 +01:00
Bernhard Urban d38d6580e2 [interp] add interpreter specific create_trampoline callback 2017-03-08 23:02:51 +01:00
Bernhard Urban 2889a73335 [generics.cs] enable one more test for interpreter 2017-03-08 23:02:51 +01:00
Bernhard Urban e1c694a6c6 [interp] implement constrained calls to interface methods correctly
compare with 9adc7023e6
2017-03-08 23:02:51 +01:00
Bernhard Urban c013b533f2 [interp] support readonly. prefix for ldelema 2017-03-08 23:02:51 +01:00
Bernhard Urban 5a5cca1bc0 [interp] respect variance in interface dispatch 2017-03-08 23:02:51 +01:00
Bernhard Urban 8112950205 [interp] inflate also on CEE_CALL etc.
also, remove weird hack for delegate.invoke ()
2017-03-08 23:02:51 +01:00
Zoltan Varga d3d1b2d56a [offsets-tool] Remove dependencies on android directory layout by adding a --targetdir=dir argument argument which points to the mono build directory corresponding to the target abi. Only allow one --abi= argument on android. (#4487) 2017-03-08 11:57:31 -05:00
Marek Safar b85b691a1a [System] Collections from CoreFX 2017-03-08 14:26:27 +01:00
Marek Safar 1651cf1ae3 Bump corefx 2017-03-08 14:26:27 +01:00
Alexander Köplinger 2c9e4379c9 [ci] Check if X server is available before running WinForms tests (#4477)
This should hopefully "fix" the mass fails in the WinForms
tests we sometimes see in CI.

We're using the simplest WinForms code that invokes the XplatUI
and causes the X connection to be established, if this fails
then something is seriously wrong and we skip the WinForms tests.
2017-03-08 12:48:28 +01:00
Zoltan Varga ed12a1d4da [arm] Implement aot support for handler block trampolines. 2017-03-07 20:34:51 -05:00
Zoltan Varga 81a4224c7d [arm64] Implement aot support for handler block trampolines. 2017-03-07 18:20:12 -05:00
Alexander Kyte b0b4fb685a Merge pull request #4481 from migueldeicaza/master
[mkbundle] Fixes the embedding of dependency assemblies + test
2017-03-07 13:26:34 -05:00
Zoltan Varga 15deb5b223 [runtime] Fix pedump. 2017-03-07 12:24:50 -05:00
Frederik Carlier 3ad43b66e7 RFI - Support building System.Drawing for NETCOREAPP2.0 (#4483) 2017-03-07 11:26:38 +01:00
Aleksey Kliger abf1a37e2e [mono/tests] Don't use -lib:<dir> use -r:<dir>/asm.dll for framework assemblies
Apparently Roslyn looks in -lib directories only if it doesn't find the needed
assembly in MONO_PATH first.  On the other hand, using a full path with -r will
take priority over the assemblies in system directories.
2017-03-06 18:22:19 -05:00
Aleksey Kliger 2c50197c33 [mini] Run tests with --runtime=mobile for testing_aot_full profile 2017-03-06 18:22:19 -05:00
Aleksey Kliger 123e545dee [runtime] Redirect mobile System.Net.Http to version 4.0.0.0
per mcs/class/System.Net.Http/Assembly/AssemblyInfo.cs
our System.Net.Http AssemblyVersion is 4.0.0.0 when using mobile.
2017-03-06 18:22:19 -05:00
Marek Safar fb14f43a98 [Mono.Options] Update documentation build 2017-03-07 00:01:42 +01:00
Jonathan Pryor c1b9fc566a [Mono.Options] Add Mono.Options.Command, .CommandSet
Mono.Options.CommandSet allows easily having separate commands and
associated command options, allowing creation of a *suite* along the
lines of **git**(1), **svn**(1), etc.

CommandSet allows intermixing plain text strings for `--help` output,
Option values -- as supported by OptionSet -- and Command instances,
which have a name, optional help text, and an optional OptionSet.

	var suite = new CommandSet ("suite-name") {
		// Use strings and option values, as with OptionSet
		"usage: suite-name COMMAND [OPTIONS]+",
		{ "v:", "verbosity", (int? v) => Verbosity = v.HasValue ? v.Value : Verbosity+1 },
		// Commands may also be specified
		new Command ("command-name", "command help") {
			Options = new OptionSet {/*...*/},
			Run     = args => { /*...*/},
		},
		new MyCommandSubclass (),
	};
	suite.Run (new string[]{...});

CommandSet provides a `help` command, and forwards `help COMMAND`
to the registered Command instance by invoking Command.Invoke()
with `--help` as an option.
2017-03-06 23:37:55 +01:00
Miguel de Icaza 62de061fb2 [mkbundle] Fixes the embedding of dependency assemblies + test 2017-03-06 14:39:23 -05:00
Zoltan Varga 8c7b88f1aa Fix the build. 2017-03-06 13:12:11 -05:00
Aleksey Kliger 6f2cbfaade [coop handles] Assert if interior ptr handle passed to mono_gchandle_from_handle 2017-03-06 13:00:27 -05:00
Aleksey Kliger aaa5b33e18 [coop handles] Use a bitmap per HandleChunk to track interior ptr handles
instead of using a flag byte in each HandleChunkElem.
2017-03-06 13:00:27 -05:00
Aleksey Kliger 6ce41773fb [reflection] Use coop handles for MonoMethodInfo.get_method_info and MonoPropertyInfo.get_property_info 2017-03-06 13:00:27 -05:00
Aleksey Kliger af0192d09a [marshal] Pin valuetype ref icall arguments.
There are now 4 kinds of arguments to icalls:
  1. Plain old values like 'int', 'bool', etc.  Passed from the wrapper to the
     icall as is.
  2. Objects in the managed heap.  Passed using coop handles.
  3. 'out' objects in the managed heap.  A NULL coop handle is passed in
     and its final value is written back out to the caller's out argument.
  4. Value types passed by 'ref' or 'out'.  An "interior" coop handle is created which has
     the effect of pinning the object into which the ref points (if it points
     to the stack, nothign happens).  The argument is passed to the icall as a
     raw reference (MonoFoo*, not MonoFooHandle).  The ref will be unpinned
     when the icall wrapper returns.
2017-03-06 13:00:27 -05:00
Aleksey Kliger fbdf874ee5 [coop handles] Add handles for interior pointers / valuetype handles
- Call mono_handle_stack_scan for both the precise and the imprecise gc scans.
- For now assert during scan that all handles are to the beginning of an
  object.
- Add TYPED_VALUE_HANDLE_DECL Macro to declare valuetype handles:
     TYPED_VALUE_HANDLE_DECL (MonoMethodInfo);
     /* Declare MonoMethodInfoValueHandle and MonoMethodInfoValueHandleOut */
- Add MONO_HANDLE_NEW_GET_VALPTR (h, type, field) macro to create a new handle that
  points to "field" (of type "type") in the object "h".
2017-03-06 13:00:27 -05:00
Frederik Carlier d1be740678 Make System.Drawing unit tests use Assert.Throws instead of [ExpectedException] (#4476)
* Use Assert.Throws<> intstead of ExpectedException

* System.Drawing.Tests: Use Assert.Throws instead of ExpectedException
2017-03-06 18:12:35 +01:00
Marek Safar 725d5fdcc2 [resx2sr] Handle duplicate keys 2017-03-06 15:52:42 +01:00
Bernhard Urban 7d1d8f51d8 [sgen] use memmove as src and dst can overlap
valgrind said this on `mcs --version`:

```
==807== Thread 1:
==807== Source and destination overlap in memcpy(0x413f050, 0x413f050,
8)
==807==    at 0x4C32513: memcpy@@GLIBC_2.14 (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==807==    by 0x7FB6DD: sgen_qsort_rec (sgen-qsort.c:76)
==807==    by 0x7FB8CC: sgen_qsort (sgen-qsort.c:118)
==807==    by 0x7ED834: major_free_swept_blocks (sgen-marksweep.c:2136)
==807==    by 0x7F0590: sgen_memgov_calculate_minor_collection_allowance
(sgen-memory-governor.c:114)
==807==    by 0x7F0D2E: sgen_memgov_major_collection_end
(sgen-memory-governor.c:278)
==807==    by 0x7A6C71: major_finish_collection (sgen-gc.c:2116)
==807==    by 0x7A6E23: major_do_collection (sgen-gc.c:2158)
==807==    by 0x7A7464: sgen_perform_collection (sgen-gc.c:2355)
==807==    by 0x7A85AF: sgen_gc_collect (sgen-gc.c:2854)
==807==    by 0x77C022: mono_gc_collect (sgen-mono.c:2574)
==807==    by 0x726A18: mono_domain_finalize (gc.c:439)
==807==
==807== Source and destination overlap in memcpy(0x413f078, 0x413f078,
8)
==807==    at 0x4C32513: memcpy@@GLIBC_2.14 (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==807==    by 0x7FB6DD: sgen_qsort_rec (sgen-qsort.c:76)
==807==    by 0x7FB798: sgen_qsort_rec (sgen-qsort.c:92)
==807==    by 0x7FB8CC: sgen_qsort (sgen-qsort.c:118)
==807==    by 0x7ED834: major_free_swept_blocks (sgen-marksweep.c:2136)
==807==    by 0x7F0590: sgen_memgov_calculate_minor_collection_allowance
(sgen-memory-governor.c:114)
==807==    by 0x7F0D2E: sgen_memgov_major_collection_end
(sgen-memory-governor.c:278)
==807==    by 0x7A6C71: major_finish_collection (sgen-gc.c:2116)
==807==    by 0x7A6E23: major_do_collection (sgen-gc.c:2158)
==807==    by 0x7A7464: sgen_perform_collection (sgen-gc.c:2355)
==807==    by 0x7A85AF: sgen_gc_collect (sgen-gc.c:2854)
==807==    by 0x77C022: mono_gc_collect (sgen-mono.c:2574)
==807==
==807== Source and destination overlap in memcpy(0x413f088, 0x413f088,
8)
==807==    at 0x4C32513: memcpy@@GLIBC_2.14 (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==807==    by 0x7FB6DD: sgen_qsort_rec (sgen-qsort.c:76)
==807==    by 0x7FB798: sgen_qsort_rec (sgen-qsort.c:92)
==807==    by 0x7FB798: sgen_qsort_rec (sgen-qsort.c:92)
==807==    by 0x7FB8CC: sgen_qsort (sgen-qsort.c:118)
==807==    by 0x7ED834: major_free_swept_blocks (sgen-marksweep.c:2136)
==807==    by 0x7F0590: sgen_memgov_calculate_minor_collection_allowance
(sgen-memory-governor.c:114)
==807==    by 0x7F0D2E: sgen_memgov_major_collection_end
(sgen-memory-governor.c:278)
==807==    by 0x7A6C71: major_finish_collection (sgen-gc.c:2116)
==807==    by 0x7A6E23: major_do_collection (sgen-gc.c:2158)
==807==    by 0x7A7464: sgen_perform_collection (sgen-gc.c:2355)
==807==    by 0x7A85AF: sgen_gc_collect (sgen-gc.c:2854)
```
2017-03-06 13:09:31 +01:00
Alexander Köplinger fb4d198131 [cert-sync] Don't import into BTLS store if BTLS is not available (#4475)
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=53015
2017-03-06 12:06:55 +01:00
Vladimir Kazakov b39878bbda Finalize the implementation of SignedXml.ComputeSignature(). (#4452)
* Finalize the implementation of SignedXml.ComputeSignature().

The implementation was taken from Reference Source, which makes the behaviour of this method the same as in .NET Framework, as well as makes it possible to use custom signature descriptions.
2017-03-06 11:12:04 +01:00
Zoltan Varga 690c34df5f [jit] Fix an assert in mono_unwind_ops_encode_full () caused by an off-by-one error. Fixes #53066. 2017-03-06 02:31:49 -05:00
Zoltan Varga b37a2639e9 [arm64] Fix the passing of small arguments on the stack in the gsharedvt trampoline, the calculation of their stack offset was incorrect in two places. Fixes #52866. 2017-03-05 00:25:43 -05:00
monojenkins 6bb074bbfb [msvc] Update csproj files (#4474) 2017-03-04 22:52:47 +01:00
Vincent Povirk a56212b5ae [metadata] Fix a possible crash when looking up a p/invoke function. (#4471)
It's possible for two threads to modify the same MonoMethodPInvoke.addr
in mono_lookup_pinvoke_call, with one thread setting it to NULL inside the
loop, and the other thread having completed the loop and expecting it to
be non-NULL.

Use an intermediate variable to prevent addr becoming non-NULL.
2017-03-04 12:03:56 -05:00
Ludovic Henry b85e7c862b [corert] Import System.Threading.ThreadPoolBoundHandle 2017-03-03 19:15:36 -05:00
Ludovic Henry b41347b9f4 [corert] Import System.Diagnostics.Debug 2017-03-03 15:28:51 -05:00
Marek Safar 875ab8db4c [System.Core] Collections from corefx 2017-03-03 17:16:31 +01:00
Aleksey Kliger 3e4783c04b [mono/tests] run the managed test runner using TOOLS_RUNTIME
The test runner itself should use the tools runtime, but the AOT step and the
tests themselves will be launched in the profile that's being tested.
2017-03-03 09:46:46 -05:00
Aleksey Kliger 9547921445 [fullaot] configure.ac: pass --runtime=mobile to AOT_{BUILD,RUN}_FLAGS
For the profiles where we compile the BCL with -d:MOBILE, (where the
`[assembly: AssemblyVersion (Consts.FxVersion)]` attribute ends up pointing to
the mobile version) make sure we AOT and run the tests using the mobile
runtime.  This ensures that for the framework assemblies the version number in
the assembly matches the version number that the internal runtime remapping (
`mono/metadata/assembly.c` `framework_assemblies` array)
2017-03-03 09:46:46 -05:00
Ludovic Henry 5eb363dbf1 [threads] Remove ThreadState_StopRequested (#4462) 2017-03-02 21:26:00 -05:00
Zoltan Varga 3f3be880fa [jit] Remove some duplicate declarations. 2017-03-02 19:45:10 -05:00
Zoltan Varga 1a07a83f17 [jit] Fix MethodAccessExceptions, the caller and callee were switched. (#4465) 2017-03-02 19:21:08 -05:00
Ludovic Henry 30d60224a8 [threads] Remove mono_threads_create_thread (#4411) 2017-03-02 18:47:41 -05:00
Zoltan Varga c667ba8f62 [runtime] Fix an infinite loop in the runtime class init code. (#4455)
The following can happen:
* Thread T1 starts initialization of C1
* Thread T2 starts initialization of C2
* T2 starts initialization of C1, it gets blocked on T1.
* T1 finishes initializing C1.
* T1 starts initialization of C3.
* T1 starts initialization of C2. It sees that T2 is
  still blocked on T1, but its not actually blocked, since
  C1 is finished. Still, we record that T1 is blocked.
* T3 starts initialization of C2, it gets into an infinite
  loop in the while loop, since the blocked_thread_hash
  now indicates that T1 and T2 are blocked on each other.

The solution is to not mark a thread as blocked, if its waiting
for a thread which is waiting on a finished lock. Fixes hangs
when running csc.
2017-03-02 16:08:00 -05:00
Ludovic Henry a5624bf9ea [threads] Remove dead field cached_culture_info (#4410) 2017-03-02 16:06:27 -05:00
Johan Lorensson 5134b17082 Fixes to build libmono with disabled JIT. (#4421)
Current mono build on (at least Windows) fails if build with disabled JIT
since the .def file used when building libmono, mono-2.0-sgen.dll, exports
a couple of symbols missing when DISABLE_JIT is defined.

Turns out that these methods have been incorrectly exported and should not
be part of the public API surface. This commit removes MONO_API for the
methods incorrectly marked:

mono_emit_native_call
mono_inst_name
mono_replace_ins

It also removes them from the .def files so they won't be exported in the
mono runtime DLL on Windows.

For mono_set_break_policy an empty stub will be added since it is considered
being a public API.

The above support is primarily used on none desktop Windows platforms
when building mono runtime module without JIT support.

This commit also fix a problem introduced in tramp-amd64.c by commit
https://github.com/mono/mono/commit/4281399ba4b7c44a30fa2c2a314a470260bb3eb1
causing it to get duplicated definitions of mono_arch_get_enter_icall_trampoline
when DISABLE_JIT has been defined.
2017-03-02 15:09:19 -05:00
Rodrigo Kumpera a19175129f Merge pull request #4454 from kumpera/allow_sioc_with_managed_impl
Allow banned assemblies with LoaderFrom
2017-03-02 14:45:00 -05:00
Nikolay Amiantov c6de69eb21 Find more libraries via dllmap (#4451)
This allows centralized configuration of library paths. For instance,
previously setting path to libgtk-x11-2.0 won't make all parts of Mono use
provided library.
2017-03-02 20:28:07 +01:00
powerctrl f9e87491df Change clock source to CLOCK_MONOTONIC in 'pthread_cond_timedwait'
Wait functions for Mutex, Semaphore and Condition (like pthread_cond_timedwait) for 'task' synchronisation in Linux uses CLOCK_REALTIME by default,
this creates many problems where a process changes time. e.g. Command line utility < date -s "desired date and time" >
A thread may be blocked for a more\less time depending upon time change. It is always desirable to use clock source immune to such changes
However, it is not possible to change clock source for mutex and semaphore wait functions in Linux. So changing it for condition only

This can be seen by a simple application if you make a simple timer using System.Timers.Timer and print time stamp every regular interval say 2 seconds, now if time shifts in the system for whatever reason ( you can do this in Linux by <sudo date -s "Wed Oct 26 20:25:24 IST 2016"> put desired time in quotes), this print stops coming for the offset time duration.

The reason behind this is the call to 'pthread_cond_timedwait' function, by Timer class which uses it to sleep for timeout duration. Now this function uses CLOCK_REALTIME which can be changed, so if you change this clock, a thread will be blocked for the unexpected time. So using CLOCK_MONOTONIC removes the error.

There are many embedded systems which do not have RTC and rely upon the external time like systems using GPS or set top box. So this fix is inevitable for them, at least for condition variable wait.

This is the sample code
using System;
using System.Timers;

public class Example
{
	private static System.Timers.Timer aTimer;

	public static void Main()
	{
		SetTimer();

		Console.WriteLine("\nPress the Enter key to exit the application...\n");
		Console.WriteLine("The application started at {0:HH:mm:ss.fff}", DateTime.Now);
		Console.ReadLine();
		aTimer.Stop();
		aTimer.Dispose();

		Console.WriteLine("Terminating the application...");
	}

	private static void SetTimer()
	{
		// Create a timer with a two second interval.
		aTimer = new System.Timers.Timer(2000);
		// Hook up the Elapsed event for the timer.
		//((System.ComponentModel.ISupportInitialize)(aTimer)).BeginInit();
		aTimer.Elapsed += OnTimedEvent;
		//((System.ComponentModel.ISupportInitialize)(aTimer)).EndInit();
		aTimer.AutoReset = true;
		aTimer.Enabled = true;
	}

	private static void OnTimedEvent(Object source, ElapsedEventArgs e)
	{
		Console.WriteLine("__The Elapsed event was raised at {0:HH:mm:ss.fff}",
		                  e.SignalTime);
	}
}

This updates and merge https://github.com/mono/mono/pull/3828
2017-03-02 14:20:27 -05:00
monojenkins eec02ff936 [msvc] Update csproj files (#4461) 2017-03-02 18:55:37 +01:00
Marek Safar 86aa29ba9c Bump cecil 2017-03-02 17:56:05 +01:00
Ludovic Henry 3f86444112 [threads] Remove mono_threads_suspend_needs_abort_syscall (#4450) 2017-03-02 09:55:31 -05:00
lateralusX eca868c73c Smaller code formatting changes. 2017-03-02 12:36:11 +01:00
Zoltan Varga e71a7f33ef [runtime] Cleanup the debugger header files. (#4459)
* Rename debug-mono-debugger.h to debug-internals.h.
* Move the internal debug structures to debug-internals.h from debug-mono-symfile.h.
2017-03-02 06:22:06 -05:00
Rodrigo Kumpera d2a6ce3a93 Merge pull request #4418 from kumpera/fix_gclass_recording_on_failure
[loader] When loading the parent of a GTD fails. We must disable gclass recording for it.
2017-03-01 18:15:56 -05:00
Zoltan Varga 4d7109cceb [runtime] Use mono_debug_method_lookup_location () instead of mono_debug_symfile_lookup_location (), the latter doesn't support portable pdb files. Use mono_debug_free_source_location () for freeing. Fixes #52899. (#4457) 2017-03-01 18:05:51 -05:00
Marek Safar f6b11e2213 [corlib][System] Concurrent collections from corefx 2017-03-01 23:35:15 +01:00
Ludovic Henry d01c819b05 [threads] Remove unused mono_thread_internal_stop (#4449) 2017-03-01 14:19:58 -05:00
Rodrigo Kumpera 8059fb5c5c [loader] Revert allowing SIOC 4.3. This is fine for now as we support LoadFrom as a work-around. 2017-03-01 10:34:47 -08:00
Rodrigo Kumpera 2b10be3758 [loader] Pass LoadFrom down to image loading so we can make decisions based on that. 2017-03-01 10:17:32 -08:00
Rodrigo Kumpera 16e5b3dbf8 Pass LoadFrom info down to assembly loading. 2017-03-01 09:48:33 -08:00
Rodrigo Kumpera 8b671a8c31 Merge pull request #4373 from NattyNarwhal/haiku
Restore Haiku support
2017-03-01 12:08:38 -05:00
Rodrigo Kumpera 5aa5218a13 [runtime] SIOC 4.3.0 has a managed impl that works under mono. Don't ignore it. 2017-02-28 16:27:40 -08:00
Rodrigo Kumpera 9a09cb3ca5 [tools] Update nuget hash extractor so we don't block SIOC 4.3.0. 2017-02-28 16:27:14 -08:00
Bernhard Urban f9dcaa74a9 [interpreter] rename interpreter to interp
for folks without autocompletion :P
2017-02-28 22:59:28 +01:00
Bernhard Urban 271f003d33 [generics.cs] enable more testcases for interpreter 2017-02-28 22:59:28 +01:00
Bernhard Urban b5a4413ca9 [interpreter] use explicit addressing for stack slots 2017-02-28 22:59:28 +01:00
Bernhard Urban 78da0216d2 [interpreter] add basic-vectors.cs to richeck target 2017-02-28 22:59:28 +01:00
Bernhard Urban f39517dcc9 [interpreter] add {exceptions,devirtualization,basic-simd}.cs to richeck target 2017-02-28 22:59:28 +01:00
Bernhard Urban a9fc05d4af [interpreter] add floating point support to icall trampoline, add basic-math.cs to richeck target 2017-02-28 22:59:28 +01:00
Bernhard Urban 9c630f56ce [interpreter] add arrays.cs to richeck target 2017-02-28 22:59:28 +01:00
Bernhard Urban 57172b4f19 [objects.cs] enable last two remaining tests for interpreter
\o/
2017-02-28 22:59:28 +01:00
Bernhard Urban e6de93e0c3 [interpreter] fix array built-ins wrt. multiarray access 2017-02-28 22:59:28 +01:00
Bernhard Urban 8946cb628f [interpreter] fix metadata access for ldtoken insn in wrappers 2017-02-28 22:59:28 +01:00
Bernhard Urban 29455cce9b [interpreter] implement ref type for ldelem bytecode 2017-02-28 22:59:28 +01:00
Bernhard Urban c0eb4ba374 [interpreter] install stack walking callback 2017-02-28 22:59:28 +01:00
Bernhard Urban a5aa5a1354 [interpreter] it can happen that we have the address of a enum on the stack, and we need to dereference it before we box it. 2017-02-28 22:59:28 +01:00
Bernhard Urban 5b30a15806 [interpreter] allow generic inst type in icall trampoline 2017-02-28 22:59:28 +01:00
Bernhard Urban 550d7b0095 [interpreter] if unboxing is required on virtcall, point into object instead of copying 2017-02-28 22:59:28 +01:00
Bernhard Urban 4accf0d718 [generics.cs] test calling an interface, that's implemented by a generic value type 2017-02-28 22:59:28 +01:00
Bernhard Urban 1e7d4e1401 [interpreter] properly inflate method on generic virtual call 2017-02-28 22:59:28 +01:00
Bernhard Urban 02782549c3 [interpreter] inflate method signature for delegate.invoke () 2017-02-28 22:59:28 +01:00
Bernhard Urban 3f6f50317d [interpreter] inflate signature for calli with proper generic_context 2017-02-28 22:59:28 +01:00
Bernhard Urban 959d68eacc [object/interpreter] add trap for future pitfalls 2017-02-28 22:59:28 +01:00
Bernhard Urban bf71c7a73c [interpreter] add init_delegate callback
and set `method` field in delegate
2017-02-28 22:59:28 +01:00
Bernhard Urban bc59e605dd [interpreter] use jit icall for delegate ctor 2017-02-28 22:59:28 +01:00
Bernhard Urban 159153b539 [trampolines] make sure no delegate trampoline is created in interpreter mode 2017-02-28 22:59:28 +01:00
Bernhard Urban 84e9a10987 [objects.cs] testcase for delegate with instance method that uses `this' 2017-02-28 22:59:28 +01:00
Bernhard Urban ca8f94773d [interpreter] pop extra arg in CEE_MONO_CALLI_EXTRA_ARG 2017-02-28 22:59:28 +01:00
Rodrigo Kumpera f14b6234e4 Merge pull request #4440 from kumpera/fix-assembly-remapping
[runtime] Fix assembly remapping by using a hashtable. Fixes #52846 and #52743
2017-02-28 12:23:26 -08:00
monojenkins 66d987e38b [msvc] Update csproj files 2017-02-28 17:37:29 +01:00
lateralusX d135465fba Improve unwind support on Windows x64.
This commit improves the unwind support on Windows x64 by implementing a number
of missing features. It also adds support for out of proc function table callback
module on older OS versions and switch to different function table methods
(growable function tables) on Win8/Win2012Server and later OS versions.

Commit aligns more to the windows x64 prolog/epilog ABI, but since mono
uses negative offsets from frame pointer while x64 windows uses positive, it is
not possible to do a 100% "correct" representation in the prolog, but if we don’t
give the OS unwinder the full unwind metadata in the frame pointer use case,
we can trick unwinder to do the right thing presenting correct callstacks in
debuggers.

Commit includes representation of windows unwind info in mono's unwind data
using extensions to better integrate windows specific unwind info in
areas currently not supported (like trampolines). It will also be easier to implement
unwind info in full AOT objects in the future, if windows specific unwind data is
included in mono’s unwind data structures.

On Win8/Win2012Server and later OS versions, all function table data is registered
using growable function tables giving full support for callstacks on live debug targets
and crash dumps. On previous OS versions function table callbacks are used together
with an out of proc module. This works for live debugging in WinDBG and Visual Studio
(if right permissions are given to the debuggers to load out of proc unwind module).
Crash dumps works as expected in WinDBG but currently not in Visual Studio for older OS
versions using callback support. If that use case needs to be supported it needs to be
solved in a separate PR, but since we support crash dumps in Visual Studio on later OS
versions and in WinDBG on earlier, it is still possible to analyze crash dumps by picking
the right tool.

Debuggers needs some additional information to work with function table callbacks out of proc
modules (NOTE, this is NOT needed on Win8/Win2012Server and later).

WinDBG:

To just do live debugging, it is possible to run the following command in WinDBG,

settings set EngineInitialization.VerifyFunctionTableCallbacks=false

To do crash dump analysis the following registry key needs to be set,

HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\KnownFunctionTableDlls

Add the full path to mono-2.0-dac-sgen.dll matching the mono-2.0-sgen.dll as a 32-bit REG_DWORD.

NOTE, adding the registry key removes the need to set the setting.

Visual Studio:

To do live debugging, set the same registry key as WinDBG use case.
2017-02-28 14:52:41 +01:00
Vlad Brezae d899b02874 Merge pull request #4381 from BrzVlad/feature-generational-hash
[sgen] Generational MonoGHashTable
2017-02-28 14:30:18 +02:00
Rodrigo Kumpera 5e0d39a8a1 [runtime] Fix assembly remapping by using a hashtable. Fixes #52846 and #52743
In multiple occasions we had bugs due to framework_assemblies not being correctly sorted.

Instead of just fixing the ordering again, I'm moving it a hashtable so future generations won't have to fix this for System.SpaceTravel.dll.
2017-02-27 16:46:00 -08:00
Alexander Köplinger 2a239b5205 [System] Add regression test for Bugzilla 10899 (#4401)
Even though I couldn't repro the bug I thought it'd still be a
good idea to at least add some basic coverage with non-Latin chars.
2017-02-27 23:43:56 +01:00
Andi McClure c2c4503360 Merge pull request #4438 from xmcclure/monodis-fix
Fix monodis
2017-02-27 16:00:48 -05:00
Andi McClure 0c38b2846a Fix monodis
monodis was not calling the mono_tls_init_runtime_keys function, which
was causing it to crash the first time it attempted to access the
current domain (ie almost immediately).
2017-02-27 15:54:05 -05:00
Rodrigo Kumpera 6025544e01 Merge pull request #4433 from kumpera/android-fixes
Fix a few issues on Android
2017-02-27 15:46:03 -05:00
Rodrigo Kumpera 34012db895 [jit] Rewrite some logging to work on embedded systems. 2017-02-27 12:45:29 -08:00
Rodrigo Kumpera f35595be4d [jit] Fix LMF codegen on android arm64.
Android doesn't have fast tls either, so we must use the jit_tls variant.
2017-02-27 12:45:28 -08:00
Rodrigo Kumpera e461b821b1 [alias-analysis] Ignore addresses taken of volatile variables.
Volatile variables should be ignored by AA as, by design, we can't
properly tell whether removing indirection is safe or not.

This shows up when handling the LMF var in some cases.
2017-02-27 12:45:19 -08:00
Aleksey Kliger (λgeek) b7f7f8c40d [runtime] Mark mono_error_init external only. (#4437)
Runtime should use the error_init() from mono/utils/mono-error-internals.h
2017-02-27 15:08:48 -05:00
Vlad Brezae cb21cf2519 Merge pull request #4434 from BrzVlad/fix-unload-hang
[threads] Don't ignore abort requests in abort protected blocks
2017-02-27 22:05:27 +02:00
Marek Safar f88093694b Update ms-test-suite 2017-02-27 18:20:45 +01:00
Marek Safar 91cd0472de [System.Numerics] Use corefx implementation 2017-02-27 18:20:45 +01:00
Rodrigo Kumpera f89d6b0c76 Merge pull request #4431 from vkargov/vk-leaking-points
[runtime] Fix memory leak in mono_save_seq_point_info().
2017-02-27 11:34:02 -05:00
Calvin 530ad57bc9 Haiku hrev50954 makes this ifdef unnecessary 2017-02-27 11:27:55 -04:00
Calvin 8120d7baad More proper detection of reset_priority, make stub for Haiku 2017-02-27 11:27:53 -04:00
Calvin 79f69c8cd7 Fix eglibc configure script on Haiku
Now properly recognizes -ltextencoding
2017-02-27 11:27:52 -04:00
Calvin 52d4b9dcb7 Improve build and configure
* detect sys/errno.h

* Fix errenous LIBS in haiku

* use HAVE_MINCORE
2017-02-27 11:27:51 -04:00
Calvin 3e2a367d91 Polish on configure script
* Set boehm to disabled

* Set threading to use pthreads, not __thread
  (causes static TLS issues)

* Add the library needs for locale
  (FIXME: does this apply to eglib?)
2017-02-27 11:27:50 -04:00
Calvin 68c190b1d6 Get Mono running further on Haiku by fixing proclib/threads
* proclib: Adapted Andreas' code to the refactored proclib.
  Allocates ahead of time.

* threads: pthread_setschedparam is semantically different on Haiku,
  because it returns positive numbers on success. Handle this
  difference.

With these changes, Mono can now get to the point Roslyn runs, and
fails immediately due to lack of stack walking.
2017-02-27 11:27:49 -04:00
Calvin ce4977fd6c Get support libraries compiling
These return no-ops, but its enough to make it happy
2017-02-27 11:27:47 -04:00
Calvin 487b036c28 Restore Haiku support
Much of the code was bitrotting as refactors were done. With this,
mono-sgen can be compiled. Code in support/ is still broken,
however. The compiled binary hasn't been tested yet as a result.

Run configure as: LIBS=-ltextencoding ./configure --disable-boehm

boehm looks to be a mess to port and diverged from upstream making
integration of Haiku support difficult. For now, SGen should be OK.
2017-02-27 11:27:46 -04:00
Vlad Brezae bc25f308ca [threads] Don't ignore abort requests in abort protected blocks
Either interrupt or set the interrupt_deferred flag, so the thread can handle the request later in the future. Otherwise we are left with a thread that has an AbortRequested set on its state that it is never processed and future abort requests are ignored due to the presence of this flag.
2017-02-25 02:59:14 +02:00
Vladimir Kargov 7dc414e181 [runtime] Fix memory leak in mono_save_seq_point_info(). 2017-02-24 13:43:44 -08:00
Zoltan Varga 655ac68c8a [runtime] Speed up mono_icall_start()/mono_icall_end() a bit by using inline versions of the MonoError functions. (#4424) 2017-02-24 12:16:15 -05:00
Aleksey Kliger (λgeek) 5c11fe6475 [runtime] Call error_init instead of mono_error_init (#4425)
Use the error_init macro instead of the mono_error_init function to avoid the
function call overhead.
2017-02-24 12:15:33 -05:00
Zoltan Varga 6a8c21d3ea [runtime] Add fastpaths to the stelem wrappers for the case when the array element type and the value type are the same. (#4427) 2017-02-24 11:24:31 -05:00
Marek Safar de9d6af30d [Mono.Data.Sqlite] Add test for b78f4f6e5f 2017-02-24 16:31:54 +01:00
Marek Safar 7584a761ba [Mono.Data.Sqlite] Change default datetime convert format to excluded datetime kind. Fixes #46929 2017-02-24 16:18:43 +01:00
Alexander Köplinger 244d35f301 Revert "[Facades] Build netstandard.dll with net_4_x profile by default"
It broke the build.
2017-02-24 14:28:00 +01:00
Ludovic Henry 98a369ffa9 [threads] Fix async call in coop (#4423)
We would observe crashes like the following:

```
 * Assertion at mono-threads.c:1009, condition `mono_thread_info_run_state (info) == STATE_ASYNC_SUSPENDED' not met

 Debug info from gdb:

 [New LWP 26793]
 [New LWP 26792]
 [Thread debugging using libthread_db enabled]
 Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
 0x00002b0ff3481ee9 in waitpid () from /lib/x86_64-linux-gnu/libpthread.so.0
   Id   Target Id         Frame
   3    Thread 0x2b0ff3e6c700 (LWP 26792) "SGen worker" 0x00002b0ff347e414 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib/x86_64-linux-gnu/libpthread.so.0
   2    Thread 0x2b0ff633e700 (LWP 26793) "Finalizer" 0x00002b0ff347e414 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib/x86_64-linux-gnu/libpthread.so.0
 * 1    Thread 0x2b0ff2b67c40 (LWP 26780) "mono" 0x00002b0ff3481ee9 in waitpid () from /lib/x86_64-linux-gnu/libpthread.so.0

 Thread 3 (Thread 0x2b0ff3e6c700 (LWP 26792)):
 #0  0x00002b0ff347e414 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib/x86_64-linux-gnu/libpthread.so.0
 #1  0x0000000000661bdf in mono_os_cond_wait (mutex=0x9dee40 <lock>, cond=0x9dee00 <work_cond>) at ../../mono/utils/mono-os-mutex.h:146
 #2  thread_func (thread_data=0x2b0ff2bcb008) at sgen-thread-pool.c:129
 #3  0x00002b0ff347a182 in start_thread () from /lib/x86_64-linux-gnu/libpthread.so.0
 #4  0x00002b0ff39a130d in clone () from /lib/x86_64-linux-gnu/libc.so.6

 Thread 2 (Thread 0x2b0ff633e700 (LWP 26793)):
 #0  0x00002b0ff347e414 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib/x86_64-linux-gnu/libpthread.so.0
 #1  0x00000000005caff3 in mono_os_cond_wait (mutex=<optimized out>, cond=<optimized out>) at ../../mono/utils/mono-os-mutex.h:146
 #2  mono_coop_cond_wait (mutex=<optimized out>, cond=<optimized out>) at ../../mono/utils/mono-coop-mutex.h:87
 #3  mono_threadpool_io_remove_socket (fd=134239440) at threadpool-io.c:628
 #4  0x00000000005ae4f4 in ves_icall_System_Net_Sockets_Socket_Close_internal (sock=42, werror=<optimized out>) at w32socket.c:708
 #5  0x0000000041e8101f in ?? ()
 #6  0x00002b1014abe070 in ?? ()
 #7  0x0000000001615860 in ?? ()
 #8  0x0000000001615860 in ?? ()
 #9  0x0000000000000000 in ?? ()

 Thread 1 (Thread 0x2b0ff2b67c40 (LWP 26780)):
 #0  0x00002b0ff3481ee9 in waitpid () from /lib/x86_64-linux-gnu/libpthread.so.0
 #1  0x00000000004ac5e6 in mono_handle_native_crash (signal=<optimized out>, ctx=<optimized out>, info=<optimized out>) at mini-exceptions.c:2557
 #2  <signal handler called>
 #3  0x00002b0ff38dcf79 in raise () from /lib/x86_64-linux-gnu/libc.so.6
 #4  0x00002b0ff38e0388 in abort () from /lib/x86_64-linux-gnu/libc.so.6
 #5  0x000000000066b459 in mono_log_write_logfile (log_domain=<optimized out>, level=<optimized out>, hdr=<optimized out>, message=<optimized out>) at mono-log-common.c:137
 #6  0x00000000006805e0 in monoeg_g_logv (log_domain=log_domain@entry=0x0, log_level=log_level@entry=G_LOG_LEVEL_ERROR, format=<optimized out>, args=args@entry=0x7ffc7324ea78) at goutput.c:115
 #7  0x0000000000680736 in monoeg_assertion_message (format=<optimized out>) at goutput.c:135
 #8  0x00000000006759b8 in mono_thread_info_setup_async_call (info=info@entry=0x2b0ff80008c0, target_func=target_func@entry=0x5bac20 <suspend_for_shutdown_async_call>, user_data=user_data@entry=0x0) at mono-threads.c:1009
 #9  0x00000000005bad50 in suspend_for_shutdown_critical (info=info@entry=0x2b0ff80008c0, unused=unused@entry=0x0) at threads.c:5019
 #10 0x00000000006763ae in mono_thread_info_safe_suspend_and_run (id=47347555100416, interrupt_kernel=interrupt_kernel@entry=0, callback=callback@entry=0x5bad40 <suspend_for_shutdown_critical>, user_data=user_data@entry=0x0) at mono-threads.c:979
 #11 0x00000000005c2e71 in mono_thread_internal_suspend_for_shutdown (thread=<optimized out>) at threads.c:5028
 #12 0x00000000005e9100 in mono_gc_cleanup () at gc.c:1015
 #13 0x00000000005e108e in mono_runtime_cleanup (domain=domain@entry=0x1615860) at appdomain.c:423
 #14 0x00000000004228cb in mini_cleanup (domain=0x1615860) at mini-runtime.c:4111
 #15 0x000000000047b99f in mono_main (argc=10, argv=<optimized out>) at driver.c:2167
 #16 0x00000000004200db in mono_main_with_options (argv=0x7ffc7324ef68, argc=10) at main.c:45
 #17 main (argc=10, argv=0x7ffc7324ef68) at main.c:338

 =================================================================
 Got a SIGABRT while executing native code. This usually indicates
 a fatal error in the mono runtime or one of the native libraries
 used by your application.
 =================================================================
```
2017-02-24 08:19:10 -05:00
Ludovic Henry 4fb9e11be7 [hybrid] Fix more tests run 2017-02-24 08:02:39 -05:00
Ludovic Henry 874d6d4481 [hybrid] Enable COM, Remoting and AppDomains runtime support 2017-02-24 08:02:39 -05:00
Alexander Köplinger caaad87769 [Facades] Build netstandard.dll with net_4_x profile by default 2017-02-24 12:53:10 +01:00
Marek Safar bafdce393e [mcs] Update 995e5620fb to do actual comparison 2017-02-24 10:01:01 +01:00
monojenkins 5927c87748 [msvc] Update csproj files 2017-02-24 08:22:12 +01:00
Zoltan Varga 491730fbc3 [jit] Remove an #ifdef ENABLE_LLVM from mini-os.h, the cross-compile genmdesc.pl can't handle it. 2017-02-23 17:26:55 -05:00
Rodrigo Kumpera 26748dcdbf Merge pull request #4419 from BrzVlad/fix-oom-nre
[sgen] Fix oom nre
2017-02-23 13:14:23 -08:00
Zoltan Varga b36c8440d3 [linker] Update the mscorlib descriptor with missing generic interfaces. 2017-02-23 15:37:23 -05:00
Alexis Christoforides 6d107fdeca Update Bockbuild 2017-02-23 15:13:36 -05:00
Alexander Köplinger a7bed9a7fc Force LF line endings for .sources and Makefiles too
This should fix the Windows build.
2017-02-23 16:38:52 +01:00
Marek Safar 995e5620fb [mcs] Use correct types comparer for comparing hidden imported interface members. Fixes #51522 2017-02-23 16:14:23 +01:00
Alexander Köplinger 8d0e921d8b Fix Windows build due to line ending changes in sed
The recent sed update in cygwin [1] changed the way sed handles
carriage returns. This meant that every .in file we processed
still contained CR, which doesn't work for .sh files.

Force LF line endings for those files (and also other shell scripts).

[1] https://cygwin.com/ml/cygwin-announce/2017-02/msg00036.html
2017-02-23 14:21:55 +01:00
Marek Safar f1fa4ecd4d [mcs] Emit leave for redirected jumps out of rewritten finally exit scope. Fixes #52599 2017-02-23 12:30:42 +01:00
Marek Safar 421088dfce [System] Tweak socket test 2017-02-23 12:30:42 +01:00
Marek Safar 8e7cae914b Fixes windows po/ build 2017-02-23 11:34:45 +01:00
Marek Safar a5f5ca7e4b [System] Update flaky test 2017-02-23 11:08:14 +01:00
Egor Bogatov 368c02f522 [System.Data] referencesource -> corefx: ProviderBase & SqlClient stuff (#4383)
* [System.Data] referencesource -> corefx

* [System.Data] referencesource -> corefx

* [System.Data] corefx migration, fix ActivityCorrelator

* [System.Data] use DbProviderFactory, DbConnectionPoolGroupProviderInfo, OperationAbortedException from corefx
2017-02-23 01:02:54 +01:00
Vlad Brezae 0fc4608b1b [sgen] Throw OOM also from the managed allocator
Allocation functions from object.c correctly throw OOM when sgen allocation returns NULL. When allocating with the managed allocator we invoke sgen directly (as a fallback) and we didn't handle the NULL return case.

Fixes #52437
2017-02-23 01:33:09 +02:00
Vlad Brezae 8d3e2a3c82 [sgen] Rename confusing variable 2017-02-23 00:56:29 +02:00
Vlad Brezae 8fdae0685f Merge pull request #4403 from BrzVlad/fix-workers-par-context
[sgen] Lock around worker start, not only finishing
2017-02-23 00:35:22 +02:00
Rodrigo Kumpera ef88a33d1c [loader] When loading the parent of a GTD fails. We must disable gclass recording for it.
mono_class_create_from_typedef: When loading a GTD, we track what ginsts' of it were loaded in the meanwhile
so we can fix some information that will be wrong (such as if it's a VT or not).

Were not stopping the recording when a GTD type failed to load its parent. This would result in *A LOT* of ginsts
being captured and would cause issues during domain unload.
2017-02-22 14:24:28 -08:00
Zoltan Varga cb947b7a56 [arm] Fix the passing of structs with 8 byte alignment with llvm on armeabi, they need to be passed as an int64 array to let llvm know that it might need to insert a dummy argument so they are passed in a even register pair. Fixes #52548. 2017-02-22 15:08:41 -05:00
Ludovic Henry 25a554dc6b [threads] Ensure we have balanced appdomain push/pop when attaching the thread on shutdown (#4416) 2017-02-22 14:55:59 -05:00
Marek Safar f03f5bf483 Bump corefx 2017-02-22 20:20:36 +01:00
Zoltan Varga 53925041e1 [runtime] Use TARGET_WIN32 instead of HOST_WIN32 when setting calling conventions, so cross compilers running on windows do the right thing. (#4412) 2017-02-22 12:49:10 -05:00
Zoltan Varga 9389d44cba [runtime] Fix mono_bitset_count () so it works on win64 as well. (#4413) 2017-02-22 12:47:47 -05:00
Marek Safar e1328b4a36 Bump ikvm 2017-02-22 11:19:49 +01:00
Marek Safar 16dd36fe77 [System] Test fix for watch 2017-02-22 10:35:55 +01:00
Ludovic Henry f8f323d671 [Process] Fix NonChildProcessWaitForExit Exited callback (#4409) 2017-02-21 18:42:42 -05:00
Alexis Christoforides 4c4176ac3f Update bockbuild 2017-02-21 18:21:56 -05:00
Rodrigo Kumpera 46a0e22cc5 Merge pull request #4380 from alexanderkyte/conflicting_attrs
[runtime] Fail gracefully when method has conflicting attributes
2017-02-21 16:45:51 -05:00
Zoltan Varga a794f55d16 [jit] Remove some dead code. 2017-02-21 16:05:00 -05:00
Ludovic Henry 0d2d3266b7 [threadpool] Do not swallow exception in RegisterWaitForSingleObject callback (#4408) 2017-02-21 15:34:03 -05:00
Alexis Christoforides 3d7713edcc Update bockbuild 2017-02-21 14:41:24 -05:00
Marek Safar f786b0d001 Revert "[configure] Remove mcs endianess check (it shouldn't be needed)"
This reverts commit 9aa9822808.
2017-02-21 19:50:17 +01:00
Alexis Christoforides 3ab1a56f73 Merge pull request #4169 from evincarofautumn/fix-xmm-scanning-mac-x86
Fix XMM scanning on Mac x86.
2017-02-21 13:41:23 -05:00
Marek Safar c51a8e79ef Bump cecil 2017-02-21 17:59:14 +01:00
monojenkins 77779a3798 [msvc] Update csproj files 2017-02-21 17:34:50 +01:00
Edward Betts 539a6580da correct spelling mistakes (#4405) 2017-02-21 12:03:07 +01:00
Marek Safar 4ccd94d7cc [mcs] Add codegen for null operator on result of awaited instance expression of property access. Fixes #52578 2017-02-21 11:57:44 +01:00
Marek Safar 9aa9822808 [configure] Remove mcs endianess check (it shouldn't be needed) 2017-02-21 11:57:44 +01:00
Marek Safar bc209e41d7 [Microsoft.CSharp] Replaced with CoreFX implementation 2017-02-21 10:07:24 +01:00
Marek Safar 4ebb99f7a2 Merge pull request #4398 from marek-safar/mono.csharp
[Mono.CSharp] Remove type conflicts with mscorlib types. Fixes #52590
2017-02-20 17:26:47 +01:00
Marek Safar 1171b0c1c0 Bump corefx 2017-02-20 17:16:02 +01:00
Marek Safar 70deea8dde [mcs] Inflate constraints of compiler generated proxy base call methods. Fixes #52294 2017-02-20 17:14:40 +01:00
Vlad Brezae c5efaeb498 [sgen] Lock around worker start, not only finishing
If we don't take the finished_lock when starting workers, the workers that we started could have already finished the work and switch to non-parallel context before we are even able to signal all of them.
2017-02-20 18:11:52 +02:00
Vlad Brezae ea9d8f02a9 [runtime] Use proper hash function for key_gc hashes
If the key gets moved by the GC and we only hash based on current address, we are left with invalid hashing.
2017-02-20 14:33:28 +02:00
Vlad Brezae 79c1053d83 [runtime] Counter for max hashtable chain length 2017-02-20 14:24:27 +02:00
Vlad Brezae 1339280bf5 Revert "[Utils] Use g_direct_equal if NULL is passed in as the equals function"
This reverts commit 914ecbcfec.

Having equal_func NULL is an optimization to avoid unnecessary calls.
2017-02-20 14:24:26 +02:00
Vlad Brezae 5d373fb3e2 [sgen] Include optimization for arm/arm64 targets 2017-02-20 14:24:26 +02:00
Vlad Brezae 09e456bd98 [runtime] Avoid equal calls in MonoGHashTable
mono_g_hash_table_find_slot is very hot.
2017-02-20 14:24:25 +02:00
Vlad Brezae dd4c3c2277 [runtime] Use better hashing for refobject_hash 2017-02-20 14:24:25 +02:00
Vlad Brezae 4f1a64acb0 [runtime] Reduce collisions with open addressing hashes
In some hashtables we add multiple elements with the same hash. If we use only the address for hashing they would cluster since they are likely to have close addresses.
2017-02-20 14:24:24 +02:00
Vlad Brezae 779d417c8f [sgen] Generational mono g hashtable
We mark cards when storing in hashtables. During minors, instead of scanning the entire tables, we only scan the sections for the dirty cards. In order to simplify the implementation we split into separate key/value tables.

To achieve this, instead of using an user descriptor for the hashtable structure, we directly register the tables and we create a new type of root descriptor for it to teach sgen how to find pointers in it. In addition to the precise scan of the root, which is done during majors, we also support a remset scan for it. We expect all roots registered as ROOT_TYPE_WBARRIER, to use this new descriptor (ROOT_DESC_VECTOR). In order for a root descriptor to be in the ROOT_TYPE_WBARRIER category, it has to have a defined remset scan mode.
2017-02-20 14:24:23 +02:00
Marek Safar 765b41d0eb [Mono.CSharp] Simplify .sources structure 2017-02-20 09:49:19 +01:00
Alexander Kyte a26b7f61fe [runtime] Fail gracefully when method has conflicting attributes 2017-02-19 19:44:13 -05:00
Zoltan Varga 15a6c8a875 [jit] Fix support for gsharedvt constrained calls which return enums. Fixes #52600. 2017-02-18 16:37:10 -05:00
Ludovic Henry cd1fb04733 [threadpool] Let the runtime abort and wait for threads on shutdown (#4348)
* [threadpool] Let the runtime abort and wait for threads on shutdown

We would previously have the threadpool abort and wait for its threads during runtime shutdown, but it would tend to be buggy or leaky. The runtime already takes care of aborting and waiting all the other threads, so we simply also let it take care of the threadpool threads.

* [threadpool] Wake up all parked threads on shutdown

This fixes a hang at shutdown, where one or more threadpool threads might not be unparked and only exit after the timeout, delaying runtime shutdown.
2017-02-17 14:47:24 -05:00
Ankit Jain b495a722fe [xbuild] Show the deprecation notice with logo, and so hide it with (#4399)
`/nologo`. It is not controlled by logging levels now.
But we also show the deprecation notice if we couldn't parse
the arguments, which would be more likely to be noticed by a user.
2017-02-17 13:32:13 -05:00
Vlad Brezae cb44ebe851 [sgen] Move some cardtable functions to sgen 2017-02-17 18:03:47 +02:00
Vlad Brezae 721a1200e4 [runtime] Open addressing for MonoGHashTable
Some whitespace and other cleanup fixes
2017-02-17 18:03:45 +02:00
Ludovic Henry f18e9a35e7 [ProcessTest] Ensure we enable raising Exited event (#4397) 2017-02-17 09:23:39 -05:00
Marek Safar f50619864a [Mono.CSharp] Remove type conflicts with mscorlib types. Fixes #52590 2017-02-17 14:50:47 +01:00
Jonathan Pryor 2fc85bb367 Merge pull request #4396 from radical/xbuild-deprec-fix
[xbuild] Don't show the deprecation notice for minimal or quiet logging
2017-02-16 17:17:37 -05:00
Bernhard Urban 4281399ba4 [interpreter] move interpreter specific trampoline definition to mini.h, also move trampoline outside of DISABLE_JIT guard 2017-02-16 23:09:38 +01:00
Bernhard Urban bdc40b7009 [interpreter] clean up exported symbols and header organization 2017-02-16 23:09:38 +01:00
Bernhard Urban 6a1bc81524 [interpreter] remove temporary generic-interp.cs, and use Category attribute to disable testcases that fail with the interpreter
add objects.cs as well and disable test cases accordingly.
2017-02-16 23:09:38 +01:00
Bernhard Urban f0e2ab213d [interpreter] respect Category Attribute for --regression tests 2017-02-16 23:09:38 +01:00
Bernhard Urban 5f6f7b17bc [interpreter] hacky implementation for create_method_pointer
not quite sure yet what the requirements are, but this works now for
executing a simple hello world :-) in metadata/gc.c we use this
interface to call the Finalize method on objects.
2017-02-16 23:09:38 +01:00
Bernhard Urban a26da0742b [interpreter] force vtable setup before method lookup 2017-02-16 23:09:38 +01:00
Bernhard Urban 5a20b20939 [interpreter] skip boxing if it's already a non-valuetype 2017-02-16 23:09:38 +01:00
Bernhard Urban 27b511e9e8 [interpreter] fix misc type resolving issues 2017-02-16 23:09:38 +01:00
Bernhard Urban 9c4c68f6c0 [interpreter] pop from value type stack when loading field from value type 2017-02-16 23:09:38 +01:00
Bernhard Urban 66f515c6e6 [interpreter] fix off-by-one errors around loading and storing args 2017-02-16 23:09:38 +01:00
Bernhard Urban 36506fd65b [interpreter] implement constrained.callvirt insn 2017-02-16 23:09:38 +01:00
Bernhard Urban 4b6221f88e [interpreter] special casing for string objects 2017-02-16 23:09:38 +01:00
Bernhard Urban 1d38766f1d [interpreter] implement {st,ld}elem for value types 2017-02-16 23:09:38 +01:00
Bernhard Urban 04fd965bc6 [interpreter] use runtime helper to unbox `this' 2017-02-16 23:09:38 +01:00
Bernhard Urban 42d14faddb [interpreter] make mint_{ldind_i,box} so that it can also operate on elements deeper on the stack 2017-02-16 23:09:38 +01:00
Bernhard Urban 1be92405d9 [interpreter] allow value types to be passed in interp->native transition and up to six args
won't work for windows.
2017-02-16 23:09:38 +01:00
Bernhard Urban 2e591671a4 [interpreter] simplify {ld,st}sfld insns and use runtime helpers 2017-02-16 23:09:38 +01:00
Bernhard Urban 2b8362fa4a [interpreter] be more verbose for debugging 2017-02-16 23:09:38 +01:00
Bernhard Urban 069b2287b0 [interpreter] respect GENERICINST in stackval_from_data 2017-02-16 23:09:38 +01:00
Bernhard Urban 65a94cb15f [interpreter] use mono_value_copy instead of doing a manual memcpy. 2017-02-16 23:09:38 +01:00
Bernhard Urban daae700d53 [interpreter] add more regression tests to generics-interp.cs 2017-02-16 23:09:38 +01:00
Bernhard Urban 8d11edbb18 [driver] allow --interpreter for regular execution 2017-02-16 23:09:38 +01:00
Ankit Jain 0d08e2b3fb [xbuild] Don't show the deprecation notice for minimal or quiet logging
.. levels. This is useful for scripts that might depend on minimal/quiet
levels, to parse output of a specific target execution, eg.
Xamarin.Android .
2017-02-16 16:57:07 -05:00
Ludovic Henry 3c31172e41 [threadpool] Extract ThreadPoolDomain creation from tpdomain_get 2017-02-16 15:36:44 -05:00
Ludovic Henry 804044e4bd [threadpool] Make sure we check if the runtime is shutting down in case of interruption 2017-02-16 15:36:44 -05:00
Ludovic Henry ad4eb74c6f [threadpool] Make ThreadPoolWorker staticaly allocated 2017-02-16 15:36:44 -05:00
Ludovic Henry f48449d629 [threadpool] Make ThreadPool global variable staticaly allocated
We wouldn't free it on cleanup, so we would end up leaking it anyway.
2017-02-16 15:36:44 -05:00
Aleksey Kliger 28e8525372 [w2file] Fix shutdown assert in checked mode
console_close triggered a MONO_REQ_GC_SAFE_MODE assert in checked mode on
because the console handles were unref'd which caused them to close.

Until w32handle is coop-aware, just transition to GC unsafe mode (a noop if
it's already in unsafe) in these callbacks.
2017-02-16 13:45:00 -05:00
Aleksey Kliger ed1d25225b [w32file] Transition to GC safe mode when file handles unref'd.
And don't transition around calls to mono_w32file_close which does its own coop transition
2017-02-16 13:45:00 -05:00
Aleksey Kliger 2166f0315a [checked] Include file and line number in thread state assertions. 2017-02-16 13:45:00 -05:00
Alexander Köplinger f0945bf7f6 Revert "[ci] Temporarily use http url to download server until cert is fixed"
This reverts commit 9281d4a7e6.

SSL works again now on the download server
2017-02-16 19:40:35 +01:00
Ludovic Henry b6f511dc16 [process] Allocate a handle even for non-child processes (#4393) 2017-02-16 13:10:33 -05:00
Rodrigo Kumpera deda0b8d8c Merge pull request #4385 from mono/work-btls-02152017
[btls]: Make configure fail when building on Android without '--with-btls-android-ndk'
2017-02-16 09:42:57 -08:00
monojenkins cb0267cf43 [msvc] Update csproj files (#4395) 2017-02-16 17:35:07 +01:00
Ludovic Henry e697335417 [treadpool] Fix flaky System.Threading.ThreadTest.SetNameInThreadPoolThread test (#4392) 2017-02-16 07:20:41 -05:00
Ludovic Henry ff5956eacb [socket] Add EPROTOTYPE error case (#4391)
Fixes bug https://bugzilla.xamarin.com/show_bug.cgi?id=52549
2017-02-16 07:18:12 -05:00
Rodrigo Kumpera fd6829c5b9 Merge pull request #4376 from kumpera/test-hardneing
Disable some flaky tests and harden another one.
2017-02-16 01:01:33 -08:00
Alexander Köplinger ed685e8b76 [System] Fix failing ClientWebSocket test
The wrong part of the ifdef was deleted in a4df7d4923,
we need to InvalidOperationException instead of PNSE.
2017-02-16 02:58:43 +01:00
Ludovic Henry b7f2b467d6 [socket] Fix bad parameter passed to select (#4390)
If fd is equals to FD_SETSIZE, then we pass (FD_SETSIZE + 1) as first parameter to select, making it return EINVAL.
2017-02-15 20:56:49 -05:00
Alexander Köplinger 1063240b86 Merge pull request #4386 from akoeplinger/fix-netstandard
Fix netstandard facade build and remove the NETSTANDARD ifdef from profiles
2017-02-16 02:55:45 +01:00
Ludovic Henry 5f7e9663af [socket] Fix race on SocketAsyncResult (#4389)
It might be possible that the callback modifies the current SocketAsyncResult via the Init method. We observe it with AcceptAsync with a ReceiveAsync in the callback.
2017-02-15 20:46:26 -05:00
Marek Safar a4df7d4923 [System] Fixes failing tests on mobile 2017-02-16 00:04:19 +01:00
Rodrigo Kumpera aaf7b009c0 [corlib] Assert of wait failure. 2017-02-15 14:34:29 -08:00
Rodrigo Kumpera a6c34bea95 [configure.ac] Don't set TARGET_ANDROID when cross compiling to non-android linux. 2017-02-15 14:31:39 -08:00
Rodrigo Kumpera 36f29ca619 [configure.ac] Don't check for getpwnam_r and getpwuid_r on android as AC_CHECK_FUNCS incorrectly detects them on Android. 2017-02-15 14:30:29 -08:00
Alexander Köplinger 75702b65c9 [bcl] Remove the NETSTANDARD ifdef from profiles
We're always using the code now and will deal with the
differences to .NET 4.x by producing reference assemblies.
2017-02-15 19:53:59 +01:00
Alexander Köplinger b50ac20959 [Facades] Fix netstandard facade build 2017-02-15 19:33:25 +01:00
Martin Baulig c363aae8d1 [btls]: Make configure fail when building on Android without '--with-btls-android-ndk'.
When building on Android with BTLS support, the '--with-btls-android-ndk' argument
is required to teach the underlying cmake the NDK location.  Fixes #52511.
2017-02-15 19:13:58 +01:00
monojenkins 6e89ac3b20 [msvc] Update csproj files (#4384) 2017-02-15 17:33:08 +01:00
Marek Safar 85f0de201f [mcs] lifted binary operator for decimal arguments need to call user operator for comparison. Fixes #52086 2017-02-15 17:20:29 +01:00
Alexander Köplinger b117a53b8f [man] Remove outdated version numbers (#4382)
We haven't been consistent in keeping those version numbers
up to date as we bump Mono's version so it's less confusing
to not show them in the manual pages.

`mono --version` is and has been the source of truth.
2017-02-15 17:01:34 +01:00
Marek Safar 09d49bbe57 [mcs] Always resolve new initializers with conditional access receivers enabled. Fixes #52340 2017-02-15 14:36:03 +01:00
Marek Safar e98d3b9ca2 [System.Net.Http] Add Transfer-Encoding: chunked special handling. Fixes #47599 2017-02-15 13:10:43 +01:00
Marek Safar b472a0391c Merge pull request #4371 from marek-safar/cecil-update
Cecil update
2017-02-15 12:07:58 +01:00
Marek Safar 0605fe6928 [Mono.CodeContracts] Read debug symbols only when they are going to be used 2017-02-15 08:57:52 +01:00
Marek Safar 1e1016775e Cecil update 2017-02-15 08:57:51 +01:00
Rodrigo Kumpera 779b5e8aed [corlib] Rewrite the timer tests to something that can actually be verified. 2017-02-14 16:33:28 -08:00
Alexander Köplinger 17c5a00c59 [System.ServiceModel.Internals] Use the mobile sources for testing_aot_full and orbis profile (#4378) 2017-02-14 22:13:47 +01:00
Aleksey Kliger 965750f13a [w32file] transition to GC unsafe in file handle close callbacks.
Followup to last commit (f238640c9f).
We need to transition to unsafe to call file_share_release and the _wapi_
functions, and then back to safe to call close(2).
2017-02-14 12:39:59 -05:00
Aleksey Kliger (λgeek) f238640c9f [w32file] Push coop transitions into functions, closer to syscalls (#4370)
* [w32file] Push coop transitions into functions, closer to syscalls

Previous the coop transitions happened in the icalls and high level
platform-independent functions.  Now they surround syscalls and platform API
calls, instead.

(Among other benefits, this fixes a problem where MoveFile on unix was
implemented in some circumstances in terms of CopyFile which resulted in an
illegal coop transition from blocking to blocking.)

* There is a FIXME with `mono_w32handle_new_fd` and `mono_w32handle_close`: the w32handle API is not coop-friendly yet, so we have to switch to gc safe mode around calls to `w32handle_new_fd` and `w32handle_close`.  In the case of `w32handle_close`, it calls back into the w32file functions `pipe_close`, `console_close` and `file_close`.  So the calls to `close(2)` inside those functions are not surrounded by transitions to GC safe mode - instead they require that we're already in safe mode (as is the case when they're called from w32handle).
2017-02-14 11:41:38 -05:00
Neale Ferguson 16edc1e552 Fix DateTime.Now and CurrentTimeToUtc during DST transition time (#4172)
* During the ambiguous hour .NET will return the DST version of the time whereas mono is returning the base time. Rather than use the transitions array we look up the Adjustment rules (which are created from the transition rules in the first place).

In addition, CurrentTimeToUtc() also has problems around the transition time.

Added test and fixed another.

Fixes #43805.

* Despite the tutorial on msdn about daylight saving time, .NET interprets the 'ambiguous' hour of DST as being DST rather than standard time which is what mono did.
2017-02-14 14:47:21 +01:00
Rodrigo Kumpera 769d2a66b7 [corlib] Harden a GC test against possible false pinnig. 2017-02-13 21:51:55 -08:00
Rodrigo Kumpera cd7a379d4d [corlib] Disable broken tests that depend on crazy precise scheduling and system timers.
The disabled tests assume perfect scheduling and non-coalescing system timers. Neither exists
on OSX Sierra, iOS or Android. This tests fail there regularly.
2017-02-13 21:38:52 -08:00
mathieubourgeois 516e1cf793 Fix when() clause cutting stack traces when filtering doesn't succeed (fix for 46661) (#4328)
* * [exceptions] When encountering a filter (when) clause, don't setup the stack trace before we know if the filter is going to work. Otherwise, any exception that isn't blocked by the when clause will have its stack trace cut at the point of the parent of the function containing the when clause
* Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=46661

* + Added test case for bug 46661
2017-02-13 21:53:05 -05:00
Alexander Köplinger 4e54ac3d4b [Facades] Update netstandard facade to latest
Includes latest changes from dotnet/standard repo.
2017-02-14 03:42:43 +01:00
Vincent Povirk 35ffcbc1a3 [tests] Fix out of tree build. (#4372) 2017-02-14 00:26:39 +01:00
Alexis Christoforides c283d07830 [MacSDK] Updated location of bundled PCL assemblies 2017-02-13 18:13:23 -05:00
Alexis Christoforides d14339d661 Bump Bockbuild 2017-02-13 17:22:07 -05:00
Alexis Christoforides 466765f73f [MacSDK] Switch back to xbuild for IronPython build. MSBuild seems to be having trouble 2017-02-13 17:05:59 -05:00
Alexis Christoforides 9887662433 Bump Bockbuild 2017-02-13 17:05:59 -05:00
Marek Safar e4bd4dbb15 [System.Net.Http] Allow re-sending StreamContent. Fixes #52448 2017-02-13 22:38:15 +01:00
Zoltan Varga 7bfb9bcb78 [jit] Disable llvm for overly complex methods, to avoid compilation slowdowns. Fixes #52475. 2017-02-13 14:35:51 -05:00
Zoltan Varga 764de0ed5d [ssa] Fix an assertion if the buffer used to keep renaming history gets full. 2017-02-13 14:35:51 -05:00
Alexis Christoforides 2fb5b32d59 Bump Bockbuild 2017-02-13 14:19:02 -05:00
Alexis Christoforides 6a5690b9af Bump bockbuild 2017-02-13 13:47:00 -05:00
Alexis Christoforides 9433d2c80a Bump bockbuild 2017-02-13 09:56:11 -05:00
Alexis Christoforides f7f2aadc63 Bump bockbuild 2017-02-13 08:29:39 -05:00
Alexis Christoforides 85b89a1f4c [MacSDK] updates 2017-02-13 07:47:46 -05:00
Alexis Christoforides ac10f4e562 [MacSDK] Update F# 2017-02-13 07:47:46 -05:00
Marek Safar aad8adc02d [System] Fixes failing tests on watch 2017-02-13 12:50:12 +01:00
Alexis Christoforides cfd8ee350b Bump bockbuild 2017-02-13 06:37:41 -05:00
Alexis Christoforides eedeb428d6 [MacSDK] Use full Mono version, incl. build number in build
Also add a VERSION file in the package.
2017-02-13 06:35:02 -05:00
Alexis Christoforides 7100d93117 [MacSDK] Update MSBuild 2017-02-13 06:35:02 -05:00
Alexis Christoforides 7e96bcfa38 Move Mac package command to scripts so that it's available without configuring 2017-02-13 06:35:02 -05:00
Marek Safar 611f3eea3e [System.ServiceModel] Disable unreliable test 2017-02-13 10:09:01 +01:00
Marek Safar eaeadc3cdd Bump roslyn to rc4 2017-02-13 09:15:25 +01:00
Ludovic Henry fa4c0b6af3 [finalizer] Suspend finalizer thread on after shutdown timeout (#4363)
Fixes bug https://bugzilla.xamarin.com/show_bug.cgi?id=52429
2017-02-12 11:10:42 -05:00
Zoltan Varga 7da0d3c26b [runtime] Remove an obsolete option from --help=devel. 2017-02-10 23:41:45 -05:00
Alexander Köplinger b17ddc5c15 [tools] Install pdb files for security tools (#4364)
We don't use the global executable.make install logic for the tools
in security so we missed updating this to copy .pdb's as well.
2017-02-10 20:56:08 +01:00
Bernhard Urban 6c856a2dce [exceptions] introduce suspend-on-native-crash that suspends on every native crash
not just `SIGSEGV`. rename `suspend-on-sigsegv` but keep it as an alias around.
2017-02-10 19:55:30 +01:00
Zoltan Varga 8e49b6eb26 [runtime] Avoid holding the init lock while calling the cctor in mono_runtime_class_init (), its not needed any more. (#4361) 2017-02-10 13:47:23 -05:00
monojenkins 28173013b5 [msvc] Update csproj files 2017-02-10 18:02:08 +01:00
Alexis Christoforides 2436b702f9 Bump bockbuild 2017-02-10 11:27:31 -05:00
Marek Safar 97ad3a34d9 [System.Data] Add RESX_RESOURCE_STRING 2017-02-10 16:03:48 +01:00
Eberhard Beilharz 82974a28da [swf] Fix pasting of Unicode text
Previously pasting of Unicode text, e.g. from LibreOffice, resulted in
question marks being displayed.

This fixes Xamarin-7359.

Change-Id: I78ec4cb1bbbd0e14da91d06a6fc517bc5c91e135
2017-02-10 11:39:09 +01:00
Marek Safar 2ac4e6a5c8 [System] CodeDom from CoreFX 2017-02-10 08:54:32 +01:00
Alexis Christoforides cc8d9648c0 Bump bockbuild 2017-02-09 23:52:15 -05:00
Alexis Christoforides 95ac41a19b "WIP (auto-committed by bockbuild)" 2017-02-09 23:29:52 -05:00
Alexis Christoforides f26e4b2f6e Bump Bockbuild 2017-02-09 23:04:40 -05:00
Ludovic Henry 9393226b12 [threads] Make OSEvent alertable to fix bug #51653 (#4347) 2017-02-09 22:02:43 -05:00
Alexis Christoforides 924d93d1c5 Bump bockbuild 2017-02-09 19:00:55 -05:00
Ludovic Henry ecf2510108 [process] Improve error message for inaccessible process (#4354)
Fixes bug https://bugzilla.xamarin.com/show_bug.cgi?id=51561
2017-02-09 14:57:59 -05:00
Alexander Köplinger 12b44a0e94 [Mono.Security] Check NewLocalMachinePath too for deciding if store is machine store (#4357)
The code in X509Store only checked the legacy X509StoreManager.LocalMachinePath
when deciding whether CspProviderFlags.UseMachineKeyStore should be
set when dealing with private keys.

However, with BTLS we now also have X509StoreManager.NewLocalMachinePath.

This caused an issue/regression in the recent 4.8 builds that
started importing into the BTLS cert store when using cert-sync:
https://github.com/mono/mono/commit/968c60a0f32c7a4c92568c3feda7503f99b98c94

Because cert-sync is ran at package installation time as root
on Linux we would erroneously not pass UseMachineKeyStore (because
the paths between legacy and BTLS store are different), which in turn
causes KeyPairPersistence to look into the user directory, e.g.
~/.config/.mono/keypairs. Since on a clean machine that directory
hierarchy doesn't exist, it goes on and creates it -> we now have
the ~/.config directory owned by root which means a normal user
application can't write to it anymore (like NuGet) and crashes.

The fix is to check for the BTLS store path as well so KeyPairPersistence
uses the machine path and ~/.config is not created on package installation.

See e.g. https://github.com/travis-ci/travis-ci/issues/7271
2017-02-09 18:30:53 +01:00
Marek Safar 686fae761c [build] Add simple target for easier corefx strings updating 2017-02-09 17:12:43 +01:00
Rodrigo Kumpera 3b2913ca03 Merge pull request #4248 from Unity-Technologies/boehm-gc-alloc-fixed
Implement mono_gc_alloc_fixed/mono_gc_free_fixed on Boehm to match SGen
2017-02-08 22:11:25 -08:00
Ludovic Henry 41fced547f [process] Fix Process.GetProcessesByName (#4351)
To get a process by name, we need to access the other process ProcessName, but it can fails on non-win32 platforms. This failure wouldn't be caught in the referencesource implementation trigerring this bug.

The exception we would observe would be:
 Unhandled Exception:
 System.InvalidOperationException: Process has exited, so the requested information is not available.
   at System.Diagnostics.Process.get_ProcessName () [0x0002d] in /Users/alexander/dev/mono/mcs/class/System/System.Diagnostics/Process.cs:336
   at (wrapper remoting-invoke-with-check) System.Diagnostics.Process:get_ProcessName ()
   at Program.Main (System.String[] args) [0x0003b] in <9c838a66cdc44c81b38c974edcc9c029>:0
 [ERROR] FATAL UNHANDLED EXCEPTION: System.InvalidOperationException: Process has exited, so the requested information is not available.
   at System.Diagnostics.Process.get_ProcessName () [0x0002d] in /Users/alexander/dev/mono/mcs/class/System/System.Diagnostics/Process.cs:336
   at (wrapper remoting-invoke-with-check) System.Diagnostics.Process:get_ProcessName ()
   at Program.Main (System.String[] args) [0x0003b] in <9c838a66cdc44c81b38c974edcc9c029>:0

Fixes bug https://bugzilla.xamarin.com/show_bug.cgi?id=52345
2017-02-08 22:29:03 -05:00
Zoltan Varga 9780c4d801 [runtime] Fix the reflected type of Delegate.Method if the method is an inherited virtual method. Fixes #39444. (#4353) 2017-02-08 22:25:18 -05:00
Ludovic Henry 82bcac8efa [threads] Allow resetting the name of a threadpool thread (#4350)
Fixes bug https://bugzilla.xamarin.com/show_bug.cgi?id=47221
2017-02-08 21:12:44 -05:00
Zoltan Varga 6df483ca43 [runtime] Add a cache for generic array helper wrappers to reduce the number created. This works because there are a lot of duplicates due to the fact that the interfaces passed to setup_generic_array_ifaces () have the same context. (#4343) 2017-02-08 18:16:09 -05:00
Zoltan Varga 740380de09 [jit] Remove the MONO_INIT_VARINFO macro, its only used in one place. (#4349) 2017-02-08 18:11:53 -05:00
Martin Baulig 8b18c84289 [btls]: Fix MonoBtlsX509Store.cs.AddTrustedRoots(). (#4340)
This internal method is only called from Mono.Btls.Interface.BtlsStore
and used by the web-tests.

Call MonoBtlsProvider.SetupCertificateStore(store) to make its
behavior consistent with the internal implementation.
2017-02-08 17:12:02 +01:00
Ludovic Henry d46d59e019 Revert "[threads] Make OSEvent alertable to fix bug #51653" (#4346) 2017-02-08 10:33:22 -05:00
Ludovic Henry 63aec27545 [threads] Make OSEvent alertable to fix bug #51653 (#4341) 2017-02-08 10:01:08 -05:00
Martin Baulig 4c6c6f0ef8 [btls]: Fix MonoBtlsProvider.SetupCertificateStore(MonoTlsSettings,bool). (#4337)
* When 'settings != null' and 'settings.CertificateSearchPaths == null',
  then we add the default paths, including the 'settings.TrustAnchors'.
  This applies to all platforms, including Android.

* In MonoBtlsContext, we can now simply call
  MonoTlsProvider.SetupCertificateStore(MonoTlsSettings,bool) instead of
  having a custom version of it.
2017-02-08 14:33:47 +01:00
Niklas Therning 1894134817 Merge pull request #4335 from ntherning/skip-unwind-info-functions-on-windows-with-disabled-jit
Skip unwind info functions on Windows when JIT is disabled
2017-02-08 11:18:55 +01:00
Niklas Therning 8bbf58446d Merge pull request #4333 from ntherning/Mono-Posix-Stdlib-do-not-clobber-Marshal.GetLastWin32Error
Make sure Stdlib.GetLastError() never clobbers Marshal.GetLastWin32Error()
2017-02-08 11:16:17 +01:00
Marek Safar 5ceccbe744 Bump corefx 2017-02-08 08:10:12 +01:00
Zoltan Varga 202a99c4eb [lldb] Avoid a crash with the mono_tramp_info_register () call in load_aot_module (). 2017-02-07 22:03:43 -05:00
Zoltan Varga a878333ecd [sdb] Add an attach test, not yet enabled. 2017-02-07 18:35:27 -05:00
Marek Safar aeabef2ae6 [xbuild] Add deprecation warning 2017-02-07 23:27:52 +01:00
Alexander Köplinger 9281d4a7e6 [ci] Temporarily use http url to download server until cert is fixed 2017-02-07 22:50:36 +01:00
Martin Baulig d3aa5f9504 [btls]: MonoBtlsError.GetError(out string, out int) returns 0, not null. (#4338) 2017-02-07 22:24:02 +01:00
Ludovic Henry ede498bb6f [threadpool] Fix hang on threadpool cleanup (#4330)
Waiting for the threadpool threads to exit on shutdown triggers a hand. The simplest solution is to not wait for them, and let the OS clean them up.

This is not an ideal solution, but this is to fix a months-long chase for this bug, and to release a less-buggy monthly release.
2017-02-07 15:09:47 -05:00
Zoltan Varga 38ceab1547 [runtime] Add a workaround for #50529 by locking around pthread_create()/pthread_join () calls so they can't happen at the same time. (#4332) 2017-02-07 14:35:50 -05:00
monojenkins 1ce00698ff [msvc] Update csproj files (#4336) 2017-02-07 17:36:06 +01:00
Niklas Therning ce46242d2c Skip unwind info functions on Windows when JIT is disabled
mono_arch_code_chunk_new()/mono_arch_code_chunk_destroy() are not compiled in
on Windows when DISABLED_JIT is defined.
code_manager_chunk_new()/code_manager_chunk_destroy() in mini-runtime.c, which
use these functions, will however be compiled in on Windows regardless of
whether DISABLED_JIT is defined or not. This causes linking failures due to
missing mono_arch_code_chunk_new()/mono_arch_code_chunk_destroy() symbols when
building on Windows and DISABLE_JIT is defined.
2017-02-07 15:09:03 +01:00
Niklas Therning bb3db1248b Merge pull request #4334 from ntherning/exclude-mono_w32socket_disconnect-on-non-desktop-uwp
Exclude mono_w32socket_disconnect() on unsupported Windows families
2017-02-07 15:00:34 +01:00
Niklas Therning 08f1fdcf14 Exclude mono_w32socket_disconnect() on unsupported Windows families 2017-02-07 10:22:15 +01:00
Marek Safar 76f89cdb64 [corlib] Update TimeZoneTest ios simulator check 2017-02-07 10:22:01 +01:00
Niklas Therning 0311475c60 Make sure Stdlib.GetLastError() never clobbers Marshal.GetLastWin32Error() 2017-02-07 09:45:06 +01:00
Niklas Therning f2f19e9503 Temp fix for broken TimeZoneInfo on Windows families without registry access
Band aid fix until we can switch to CoreRT's implementation.
2017-02-07 09:22:43 +01:00
Vladimir Kargov 2282f874a7 [tests] Remove a misplaced backslash in a grep expression. 2017-02-06 15:51:28 -08:00
Vladimir Kargov f23af186aa [runtime] Skip non-SSA variables in Abcrem. 2017-02-06 15:51:27 -08:00
Vladimir Kargov e8efa63b23 [runtime] Add the MONO_INS_FOR_EACH_REG macro. 2017-02-06 15:51:26 -08:00
Vladimir Kargov 17fe3de8e0 [runtime] Mark the correct parent contexts as recursive for recursive definitions in Abcrem. 2017-02-06 15:51:25 -08:00
Andi McClure c4034198f8 Remove comment from Thread.cs describing field removed in 4.8 2017-02-06 17:33:48 -05:00
Martin Baulig 7b847a8d61 Remove debugging spew in MonoBtlsX509LookupMonoCollection.cs. 2017-02-06 23:28:26 +01:00
Zoltan Varga 1c3c4d86b3 [arm] Use TARGET_IOS instead of __APPLE__ so we don't use the ios abi when cross compiling from osx to android. 2017-02-06 17:26:05 -05:00
Martin Baulig 4ecb683985 [btls]: Add option to specify the certificate search paths. (#4318)
* [btls]: Add option to specify the certificate search paths.

* MonoTlsSettings.CertificateSearchPaths: new property.

Valid values are

- @default - add default search paths
- @user - add default user search path
- @machine - add default machine search path
- @trust - add 'MonoTlsSettings.TrustedRoots'
- @pem:<directory> - custom directory containing certificates in PEM format
- @der:<directory> - same, in DER format

* Make it internal for the moment.

* Cosmetic; use "?.".
2017-02-06 23:18:21 +01:00
Vlad Brezae 17c867e883 [sgen] Don't assert when suspending detaching thread (#4292)
This means that the thread will be part of the stw (not skipped), so if the stack pointer is not between the expected ranges we dont scan the thread. In other parts of the runtime, suspending here is handled by the suspend_can_continue flag.
2017-02-06 14:20:21 -05:00
Jonathan Chambers 863ddf25bf Implement mono_gc_alloc_fixed on Boehm to be uncollectable. This matches SGen behavior and avoids needing to register fixed allocated memory as a root. 2017-01-17 15:59:44 -05:00
Jon Purdy a4d4872884 Fix XMM scanning on Mac x86.
MONO_CONTEXT_GET_CURRENT needed to be updated.
2016-12-16 16:15:55 -08:00
5674 changed files with 253345 additions and 118098 deletions

No files matched your search

+9 -4
View File
@@ -7,7 +7,6 @@
[submodule "external/cecil"]
path = external/cecil
url = git://github.com/mono/cecil.git
branch = mono-2017-02
[submodule "external/rx"]
path = external/rx
url = git://github.com/mono/rx.git
@@ -21,9 +20,6 @@
[submodule "external/reference-assemblies"]
path = external/binary-reference-assemblies
url = git://github.com/mono/reference-assemblies.git
[submodule "external/Lucene.Net.Light"]
path = external/Lucene.Net.Light
url = git://github.com/mono/Lucene.Net.Light.git
[submodule "external/nunit-lite"]
path = external/nunit-lite
url = git://github.com/mono/NUnitLite.git
@@ -56,3 +52,12 @@
[submodule "external/corert"]
path = external/corert
url = git://github.com/mono/corert.git
[submodule "external/xunit-binaries"]
path = external/xunit-binaries
url = git://github.com/mono/xunit-binaries.git
[submodule "external/api-doc-tools"]
path = external/api-doc-tools
url = git://github.com/mono/api-doc-tools.git
[submodule "external/api-snapshot"]
path = external/api-snapshot
url = git://github.com/mono/api-snapshot.git
+1 -9
View File
@@ -45,22 +45,14 @@ dist-hook:
rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'`
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'`
mac-sdk-package:
external/bockbuild/bb MacSDK --package
pkgconfigdir = $(libdir)/pkgconfig
noinst_DATA = mono-uninstalled.pc
DISTCLEANFILES= mono-uninstalled.pc
# building with monolite
mcslib = $(mcs_topdir)/class/lib
monolite_url = https://download.mono-project.com/monolite/monolite-$(MONO_CORLIB_VERSION)-latest.tar.gz
.PHONY: get-monolite-latest
get-monolite-latest:
-rm -fr $(mcslib)/monolite/$(MONO_CORLIB_VERSION)
-mkdir -p $(mcslib)/monolite
cd $(mcslib) && { (wget -O- $(monolite_url) || curl -L $(monolite_url)) | gzip -d | tar xf - ; }
cd $(mcslib) && mv -f monolite-* monolite/$(MONO_CORLIB_VERSION)
$(MAKE) -C $(mcs_topdir)/class get-monolite-latest
if BITCODE
BITCODE_CHECK=yes
+8 -9
View File
@@ -29,6 +29,7 @@ The Mono project is part of the [.NET Foundation](http://www.dotnetfoundation.or
| Windows | amd64 | [![windows-amd64][15]][16] |
| Windows | i386 | [![windows-amd64][17]][18] |
| CentOS | s390x (cs) | [![centos-s390x][19]][20] |
| Debian 8 | ppc64el (cs) | [![debian-8-ppc64el][21]][22]|
_(cs) = community supported architecture_
@@ -50,8 +51,10 @@ _(cs) = community supported architecture_
[16]: https://jenkins.mono-project.com/job/z/label=w64/
[17]: https://jenkins.mono-project.com/job/z/label=w32/badge/icon
[18]: https://jenkins.mono-project.com/job/z/label=w32/
[19]: https://jenkins.mono-project.com/job/z/label=centos-s390x/badge/icon
[20]: https://jenkins.mono-project.com/job/z/label=centos-s390x
[19]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=centos-s390x/badge/icon
[20]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=centos-s390x
[21]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-8-ppc64el/badge/icon
[22]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-8-ppc64el
Compilation and Installation
============================
@@ -190,22 +193,18 @@ disable the compilation of a Mono runtime with the SGen garbage
collector.
* On platforms that support it, after building Mono, you will have
both a `mono` binary and a `mono-sgen` binary. `mono` uses Boehm,
both a `mono-boehm` binary and a `mono-sgen` binary. `mono-boehm` uses Boehm,
while `mono-sgen` uses the Simple Generational GC.
* `--with-gc=[included, boehm, none]` - Selects the default Boehm
* `--with-libgc=[included, none]` - Selects the default Boehm
garbage collector engine to use.
* *included*: (*slightly modified Boehm GC*) This is the default
value for the Boehm GC, and it's the most feature complete, it will
allow Mono to use typed allocations and support the debugger.
* *boehm*: This is used to use a system-install Boehm GC, it is
useful to test new features available in Boehm GC, but we do not
recommend that people use this, as it disables a few features.
* *none*:
Disables the inclusion of a garbage collector.
Disables the inclusion of a Boehm garbage collector.
* This defaults to `included`.
+1 -1
View File
@@ -18,7 +18,7 @@
{
"name": "ms-test-suite",
"url": "[email protected]:xamarin/ms-test-suite.git",
"rev": "55b6637eb1de61c743323ec82db1e0cadfee5b32",
"rev": "73c155f76b55839f26ba707d6d40091060e4f5d8",
"remote-branch": "origin/master",
"branch": "master",
"directory": "ms-test-suite"
+117 -77
View File
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
#AC_PREREQ([2.62])
AC_INIT(mono, [5.0.1],
AC_INIT(mono, [5.3.0],
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
AC_CONFIG_SRCDIR([README.md])
@@ -40,7 +40,7 @@ MONO_VERSION_BUILD=`echo $VERSION | cut -d . -f 3`
# This can be reset to 0 when Mono's version number is bumped
# since it's part of the corlib version (the prefix '1' in the full
# version number is to ensure the number isn't treated as octal in C)
MONO_CORLIB_COUNTER=0
MONO_CORLIB_COUNTER=2
MONO_CORLIB_VERSION=`printf "1%02d%02d%02d%03d" $MONO_VERSION_MAJOR $MONO_VERSION_MINOR $MONO_VERSION_BUILD $MONO_CORLIB_COUNTER`
AC_DEFINE_UNQUOTED(MONO_CORLIB_VERSION,$MONO_CORLIB_VERSION,[Version of the corlib-runtime interface])
@@ -233,9 +233,6 @@ case "$host" in
CFLAGS="$CFLAGS -DPAGE_SIZE=4096 -DS_IWRITE=S_IWUSR"
CXXFLAGS="$CXXFLAGS -DPAGE_SIZE=4096 -DS_IWRITE=S_IWUSR"
# The configure check can't detect this
AC_DEFINE(HAVE_LARGE_FILE_SUPPORT, 1, [Have large file support])
# to bypass the underscore linker check, can't work when cross-compiling
mono_cv_uscore=yes
mono_cv_clang=no
@@ -351,9 +348,13 @@ case "$host" in
CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_THREAD_SAFE"
libmono_cflags="-D_REENTRANT -D_THREAD_SAFE"
libdl=
LIBS="$LIBS -lnetwork"
LIBS="$LIBS -lnetwork -ltextencoding"
need_link_unlink=yes
AC_DEFINE(PTHREAD_POINTER_ID)
dnl Haiku does not support static TLS with __thread
with_tls=pthread
dnl Boehm is too much work to backport Haiku support for
support_boehm=no
libgc_threads=pthreads
use_sigposix=yes
;;
@@ -875,9 +876,9 @@ elif test x$with_runtime_preset = xfullaot; then
mono_feature_disable_reflection_emit='yes'
mono_feature_disable_appdomains='yes'
AOT_BUILD_FLAGS="-O=gsharedvt --aot=full,$INVARIANT_AOT_OPTIONS"
AOT_BUILD_FLAGS="--runtime=mobile -O=gsharedvt --aot=full,$INVARIANT_AOT_OPTIONS"
AOT_RUN_FLAGS="--full-aot"
AOT_RUN_FLAGS="--runtime=mobile --full-aot"
elif test x$with_runtime_preset = xbitcode; then
DISABLE_MCS_DOCS_default=yes
with_testing_aot_full_default=yes
@@ -892,19 +893,15 @@ elif test x$with_runtime_preset = xbitcode; then
mono_feature_disable_reflection_emit='yes'
mono_feature_disable_appdomains='yes'
AOT_BUILD_FLAGS="--aot=llvmonly,$INVARIANT_AOT_OPTIONS"
AOT_RUN_FLAGS="--llvmonly"
AOT_BUILD_FLAGS="--runtime=mobile --aot=llvmonly,$INVARIANT_AOT_OPTIONS"
AOT_RUN_FLAGS="--runtime=mobile --llvmonly"
elif test x$with_runtime_preset = xhybridaot; then
DISABLE_MCS_DOCS_default=yes
with_testing_aot_hybrid_default=yes
TEST_PROFILE=testing_aot_hybrid
mono_feature_disable_com='yes'
mono_feature_disable_remoting='yes'
mono_feature_disable_appdomains='yes'
AOT_BUILD_FLAGS="--aot=hybrid,$INVARIANT_AOT_OPTIONS"
AOT_RUN_FLAGS="--hybrid-aot"
AOT_BUILD_FLAGS="--runtime=mobile --aot=hybrid,$INVARIANT_AOT_OPTIONS"
AOT_RUN_FLAGS="--runtime=mobile --hybrid-aot"
elif test x$with_runtime_preset = xaot; then
with_profile4_x_default=yes
@@ -923,8 +920,8 @@ elif test x$with_runtime_preset = xwinaot; then
mono_feature_disable_reflection_emit='yes'
mono_feature_disable_appdomains='yes'
AOT_BUILD_FLAGS="--aot=full,$INVARIANT_AOT_OPTIONS"
AOT_RUN_FLAGS="--full-aot"
AOT_BUILD_FLAGS="--runtime=mobile --aot=full,$INVARIANT_AOT_OPTIONS"
AOT_RUN_FLAGS="--runtime=mobile --full-aot"
elif test x$with_runtime_preset = xorbis; then
DISABLE_MCS_DOCS_default=yes
with_orbis_default=yes
@@ -936,8 +933,8 @@ elif test x$with_runtime_preset = xorbis; then
mono_feature_disable_reflection_emit='yes'
mono_feature_disable_appdomains='yes'
AOT_BUILD_FLAGS="--aot=full,$INVARIANT_AOT_OPTIONS"
AOT_RUN_FLAGS="--full-aot"
AOT_BUILD_FLAGS="--runtime=mobile --aot=full,$INVARIANT_AOT_OPTIONS"
AOT_RUN_FLAGS="--runtime=mobile --full-aot"
else
with_profile4_x_default=yes
fi
@@ -1034,25 +1031,25 @@ AC_SUBST(DEFAULT_PROFILE)
if test x$USE_NLS = xprofile_default; then
if test x$host_darwin = xyes; then
# We make the default value for USE_NLS
# "no" on OSX because it isn't available on most
# default OSX installs. The most common configurations will
# all disable it, so this saves us typing.
USE_NLS=no
AC_SUBST([USE_NLS])
AC_MSG_RESULT([$USE_NLS])
else
USE_NLS=yes
AC_SUBST([USE_NLS])
AC_MSG_RESULT([$USE_NLS])
fi
AC_MSG_CHECKING([NLS used])
# We make the default value for USE_NLS
# "no" on OSX because it isn't available on most
# default OSX installs. The most common configurations will
# all disable it, so this saves us typing.
if test x$host_darwin = xyes; then
USE_NLS=no;
else
USE_NLS=yes;
fi
AC_SUBST([USE_NLS])
AC_MSG_RESULT([$USE_NLS])
fi
AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems.
LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier,
reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, assembly_remapping, shared_perfcounters, remoting,
reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, desktop_loader, shared_perfcounters, remoting,
security, lldb, mdb, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying.],
[
for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
@@ -1173,9 +1170,10 @@ if test "x$mono_feature_disable_normalization" = "xyes"; then
AC_MSG_NOTICE([Disabled String normalization support.])
fi
if test "x$mono_feature_disable_assembly_remapping" = "xyes"; then
AC_DEFINE(DISABLE_ASSEMBLY_REMAPPING, 1, [Disable assembly remapping.])
AC_MSG_NOTICE([Disabled Assembly remapping.])
#TODO: remove assembly_remapping feature name once everyone is using desktop_loader
if test "x$mono_feature_disable_assembly_remapping" = "xyes" || test "x$mono_feature_disable_desktop_loader" = "xyes"; then
AC_DEFINE(DISABLE_DESKTOP_LOADER, 1, [Disable desktop assembly loader semantics.])
AC_MSG_NOTICE([Disabled desktop assembly loader semantics.])
fi
if test "x$mono_feature_disable_shared_perfcounters" = "xyes"; then
@@ -1277,7 +1275,7 @@ dnl
dnl Boehm GC configuration
dnl
AC_ARG_WITH(libgc, [ --with-gc=included,none Controls the Boehm GC config, default=included],[libgc=$with_gc],[libgc=included])
AC_ARG_WITH(libgc, [ --with-libgc=included,none Controls the Boehm GC config, default=included],[libgc=$with_gc],[libgc=included])
AC_ARG_ENABLE(boehm, [ --disable-boehm Disable the Boehm GC.], support_boehm=$enableval,support_boehm=${support_boehm:-yes})
AM_CONDITIONAL(SUPPORT_BOEHM, test x$support_boehm = xyes)
@@ -1325,7 +1323,7 @@ if test "x$support_boehm" = "xyes"; then
;;
xsgen)
AC_MSG_WARN("Use --with-sgen instead, --with-gc= controls Boehm configuration")
AC_MSG_WARN("Use --with-sgen instead, --with-libgc= controls Boehm configuration")
;;
xnone)
@@ -1335,7 +1333,7 @@ if test "x$support_boehm" = "xyes"; then
gc_msg="none"
;;
*)
AC_MSG_ERROR([Invalid argument to --with-gc.])
AC_MSG_ERROR([Invalid argument to --with-libgc.])
;;
esac
@@ -1449,8 +1447,6 @@ if test x$host_win32 = xno; then
AC_CHECK_FUNCS(getgrgid_r)
AC_CHECK_FUNCS(getgrnam_r)
AC_CHECK_FUNCS(getpwnam_r)
AC_CHECK_FUNCS(getpwuid_r)
AC_CHECK_FUNCS(getresuid)
AC_CHECK_FUNCS(setresuid)
AC_CHECK_FUNCS(kqueue)
@@ -1471,6 +1467,11 @@ if test x$host_win32 = xno; then
AC_CHECK_FUNCS(sched_setaffinity)
AC_CHECK_FUNCS(sched_getcpu)
if test x$platform_android != xyes; then
AC_CHECK_FUNCS(getpwnam_r)
AC_CHECK_FUNCS(getpwuid_r)
fi
dnl ****************************************************************
dnl *** Check for sched_setaffinity from glibc versions before ***
dnl *** 2.3.4. The older versions of the function only take 2 ***
@@ -1931,6 +1932,10 @@ if test x$host_win32 = xno; then
# and libpthread does not exist
#
case "${host}" in
*-*-*haiku*)
dnl Haiku has pthread in libroot (libc equiv)
AC_CHECK_LIB(pthread, main, LIBS="$LIBS")
;;
*-*-*freebsd*)
AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
;;
@@ -2340,6 +2345,10 @@ if test x$host_win32 = xno; then
AC_MSG_RESULT(no)
])
dnl **********************************
dnl *** Checks for proclib ***
dnl **********************************
AC_CHECK_HEADER(sys/errno.h, [AC_DEFINE(HAVE_SYS_ERRNO_H, 1, Define to 1 if you have the <sys/errno.h> header file.)])
dnl **********************************
dnl *** Checks for MonoPosixHelper ***
dnl **********************************
@@ -3153,15 +3162,6 @@ case "$host" in
;;
esac
;;
ia64-*-*)
TARGET=IA64
arch_target=ia64
ACCESS_UNALIGNED="no"
LIBC="libc.so.6.1"
INTL="libc.so.6.1"
AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)])
libmono_ldflags="-lunwind"
;;
sparc*-*-*)
if test "x$ac_cv_sizeof_void_p" = "x8"; then
TARGET=SPARC64
@@ -3226,6 +3226,14 @@ case "$host" in
ACCESS_UNALIGNED="no"
AOT_SUPPORTED="yes"
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
BTLS_SUPPORTED=yes
BTLS_PLATFORM=arm
AC_CHECK_HEADER(stdalign.h,[],[BTLS_SUPPORTED=no])
case "$target" in
arm*-linux*-gnueabi)
BTLS_PLATFORM=armsoft
;;
esac
;;
arm*-netbsd*-eabi*)
TARGET=ARM;
@@ -3246,6 +3254,9 @@ case "$host" in
arch_target=arm64
boehm_supported=false
AOT_SUPPORTED="yes"
BTLS_SUPPORTED=yes
BTLS_PLATFORM=aarch64
AC_CHECK_HEADER(stdalign.h,[],[BTLS_SUPPORTED=no])
;;
s390x-*-linux*)
TARGET=S390X;
@@ -3333,7 +3344,6 @@ if test "x$host" != "x$target"; then
TARGET=ARM;
arch_target=arm;
AC_DEFINE(TARGET_ARM, 1, [...])
AC_DEFINE(TARGET_ANDROID, 1, [...])
ACCESS_UNALIGNED="no"
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
# Can't use tls, since it depends on the runtime detection of tls offsets
@@ -3346,6 +3356,11 @@ if test "x$host" != "x$target"; then
CPPFLAGS="$CPPFLAGS"
;;
armv5-*-linux-androideabi*)
AC_DEFINE(TARGET_ANDROID, 1, [...])
CPPFLAGS="$CPPFLAGS"
;;
*-linux-androideabi*)
AC_DEFINE(TARGET_ANDROID, 1, [...])
CPPFLAGS="$CPPFLAGS"
;;
esac
@@ -3365,23 +3380,33 @@ if test "x$host" != "x$target"; then
TARGET=X86;
arch_target=x86;
AC_DEFINE(TARGET_X86, 1, [...])
AC_DEFINE(TARGET_ANDROID, 1, [...])
CPPFLAGS="$CPPFLAGS"
# Can't use tls, since it depends on the runtime detection of tls offsets
# in mono-compiler.h
with_tls=pthread
target_mach=no
case "$target" in
*-linux-android*)
AC_DEFINE(TARGET_ANDROID, 1, [...])
;;
esac
;;
x86_64*-linux-*)
TARGET=AMD64;
arch_target=amd64;
AC_DEFINE(TARGET_AMD64, 1, [...])
AC_DEFINE(TARGET_ANDROID, 1, [...])
CPPFLAGS="$CPPFLAGS"
# Can't use tls, since it depends on the runtime detection of tls offsets
# in mono-compiler.h
with_tls=pthread
target_mach=no
case "$target" in
*-linux-android*)
AC_DEFINE(TARGET_ANDROID, 1, [...])
;;
esac
;;
x86_64-ps4-freebsd)
TARGET=AMD64;
@@ -3400,12 +3425,16 @@ if test "x$host" != "x$target"; then
TARGET=ARM64;
arch_target=arm64;
AC_DEFINE(TARGET_ARM64, 1, [...])
AC_DEFINE(TARGET_ANDROID, 1, [...])
CPPFLAGS="$CPPFLAGS"
# Can't use tls, since it depends on the runtime detection of tls offsets
# in mono-compiler.h
with_tls=pthread
target_mach=no
case "$target" in
*-linux-android*)
AC_DEFINE(TARGET_ANDROID, 1, [...])
;;
esac
;;
aarch64-*)
TARGET=ARM64
@@ -3441,9 +3470,6 @@ S390X)
MIPS)
AC_DEFINE(TARGET_MIPS, 1, [...])
;;
IA64)
AC_DEFINE(TARGET_IA64, 1, [...])
;;
SPARC)
AC_DEFINE(TARGET_SPARC, 1, [...])
;;
@@ -3478,9 +3504,6 @@ S390X)
MIPS)
AC_DEFINE(HOST_MIPS, 1, [...])
;;
IA64)
AC_DEFINE(HOST_IA64, 1, [...])
;;
SPARC)
AC_DEFINE(HOST_SPARC, 1, [...])
;;
@@ -3599,13 +3622,13 @@ if test "x$have_deprecated" = "xyes"; then
AC_DEFINE(HAVE_DEPRECATED, 1, [Support for the deprecated attribute])
fi
AC_ARG_WITH(interpreter, [ --with-interpreter=yes|no Interpreter, default=no],[buildinterpreter=$with_interpreter],[buildinterpreter=no])
if test "x$buildinterpreter" = "xyes"; then
AC_DEFINE(ENABLE_INTERPRETER, 1, [Enable interpreter in the runtime.])
AC_MSG_NOTICE([Enable interpreter in the runtime.])
AC_ARG_ENABLE(interpreter, [ --enable-interpreter Enable Interpreter], enable_interpreter=$enableval, enable_interpreter=no)
if test "x$enable_interpreter" = "xyes"; then
AC_DEFINE(ENABLE_INTERPRETER, 1, [Enable Interpreter])
fi
AM_CONDITIONAL([ENABLE_INTERPRETER], [test x$buildinterpreter != xno])
AM_CONDITIONAL(ENABLE_INTERPRETER, [test x$enable_interpreter = xyes])
dnl
@@ -4068,8 +4091,6 @@ dnl **************
AC_ARG_ENABLE(btls, [ --disable-btls Disable the BoringTls provider], enable_btls=$enableval, enable_btls=$BTLS_SUPPORTED)
AC_ARG_WITH(btls_android_ndk, [ --with-btls-android-ndk Android NDK for BoringTls])
AC_ARG_ENABLE(dynamic-btls, [ --enable-dynamic-btls Place the BTLS provider into a separate shared library/archive.], enable_dynamic_btls=$enableval, enable_dynamic_btls=no)
AM_CONDITIONAL(BTLS, test x$enable_btls = xyes)
btls_android=no
@@ -4098,6 +4119,16 @@ if test "x$enable_btls" = "xyes"; then
x86_64)
btls_arch=x86_64
;;
arm)
btls_arch=arm
;;
armsoft)
btls_arch=arm
btls_cflags="-DOPENSSL_NO_ASM=1"
;;
aarch64)
btls_arch=aarch64
;;
android-armv5)
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=12"
;;
@@ -4125,6 +4156,8 @@ if test "x$enable_btls" = "xyes"; then
BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=$BTLS_ROOT/util/android-cmake/android.toolchain.cmake"
if test "x$with_btls_android_ndk" != "x"; then
BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DANDROID_NDK=\"$with_btls_android_ndk\""
else
AC_MSG_ERROR([Need to pass the --with-btls-android-ndk argument when building with BTLS support on Android.])
fi
fi
@@ -4163,7 +4196,6 @@ AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
AM_CONDITIONAL(SPARC64, test x$TARGET = xSPARC64)
AM_CONDITIONAL(X86, test x$TARGET = xX86)
AM_CONDITIONAL(AMD64, test x$TARGET = xAMD64)
AM_CONDITIONAL(IA64, test x$TARGET = xIA64)
AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
AM_CONDITIONAL(POWERPC64, test x$TARGET = xPOWERPC64)
@@ -4199,7 +4231,7 @@ AC_SUBST(mono_build_root)
mono_runtime=mono/mini/mono
AC_SUBST(mono_runtime)
CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.0.0/tools/csc.exe
CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.3.0/tools/csc.exe
if test $csc_compiler = mcs; then
CSC=$mcs_topdir/class/lib/build/mcs.exe
@@ -4406,13 +4438,12 @@ mono/arch/sparc/Makefile
mono/arch/s390x/Makefile
mono/arch/arm/Makefile
mono/arch/arm64/Makefile
mono/arch/ia64/Makefile
mono/arch/mips/Makefile
mono/sgen/Makefile
mono/tests/Makefile
mono/tests/tests-config
mono/tests/assemblyresolve/Makefile
mono/tests/gc-descriptors/Makefile
mono/tests/testing_gac/Makefile
mono/unit-tests/Makefile
mono/benchmark/Makefile
mono/mini/Makefile
@@ -4526,7 +4557,19 @@ fi
echo "MONO_CORLIB_VERSION = $MONO_CORLIB_VERSION" >> $mcs_topdir/build/config.make
if test x$host_darwin = xyes; then
echo "PLATFORM = darwin" >> $mcs_topdir/build/config.make
echo "BUILD_PLATFORM = darwin" >> $mcs_topdir/build/config.make
elif test x$host_win32 = xyes; then
echo "BUILD_PLATFORM = win32" >> $mcs_topdir/build/config.make
else
echo "BUILD_PLATFORM = linux" >> $mcs_topdir/build/config.make
fi
if test x$host_darwin = xyes; then
echo "HOST_PLATFORM ?= darwin" >> $mcs_topdir/build/config.make
elif test x$host_win32 = xyes; then
echo "HOST_PLATFORM ?= win32" >> $mcs_topdir/build/config.make
else
echo "HOST_PLATFORM ?= linux" >> $mcs_topdir/build/config.make
fi
if test "x$PLATFORM_AOT_SUFFIX" != "x"; then
@@ -4568,9 +4611,6 @@ fi
if test "x$enable_btls" = "xyes"; then
echo "HAVE_BTLS=1" >> $srcdir/$mcsdir/build/config.make
if test "x$enable_dynamic_btls" = "xyes"; then
echo "HAVE_DYNAMIC_BTLS=1" >> $srcdir/$mcsdir/build/config.make
fi
fi
fi
@@ -4602,7 +4642,7 @@ echo "
BigArrays: $enable_big_arrays
DTrace: $enable_dtrace
LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm)
Interpreter: $buildinterpreter
Interpreter: $enable_interpreter
Libraries:
.NET 4.x: $with_profile4_x
+6
View File
@@ -18,8 +18,14 @@
<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
<dllmap dll="libX11" target="@X11@" os="!windows" />
<dllmap dll="libgdk-x11-2.0" target="@GDKX11@" os="!windows"/>
<dllmap dll="libgdk_pixbuf-2.0" target="libgdk_pixbuf-2.0.so.0" os="!windows"/>
<dllmap dll="libgtk-x11-2.0" target="@GTKX11@" os="!windows"/>
<dllmap dll="libglib-2.0" target="libglib-2.0.so.0" os="!windows"/>
<dllmap dll="libgobject-2.0" target="libgobject-2.0.so.0" os="!windows"/>
<dllmap dll="libgnomeui-2" target="libgnomeui-2.so.0" os="!windows"/>
<dllmap dll="librsvg-2" target="librsvg-2.so.2" os="!windows"/>
<dllmap dll="libXinerama" target="@XINERAMA@" os="!windows" />
<dllmap dll="libasound" target="libasound.so.2" os="!windows" />
<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
<dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="osx"/>
<dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
+27 -4
View File
@@ -9,16 +9,38 @@ def print_frames(thread, num_frames, current_thread):
for frame in thread.frames[:+num_frames]:
pc = str(frame.addr)
fmt = ' %c %s'
var = frame
if pc[0] == '0':
function_name = frame.GetFunctionName()
if function_name == "ves_exec_method_with_context":
try:
s = 'frame->runtime_method->method'
klassname = frame.EvaluateExpression('(char*) ' + s + '->klass->name').summary[1:-1]
methodname = frame.EvaluateExpression('(char*) ' + s + '->name').summary[1:-1]
ipoffset = frame.EvaluateExpression('ip').GetValueAsUnsigned()
insn = ''
if ipoffset != 0:
ipoffset -= frame.EvaluateExpression('rtm->code').GetValueAsUnsigned()
insn = "\"" + frame.EvaluateExpression('mono_interp_opname [*ip]').summary[1:-1] + "\""
var = '%s::%s @ %d %s || %s' % (klassname, methodname, ipoffset, insn, frame)
except Exception as e:
print "DBG: execfail:" + str(e)
elif function_name == "mono_interp_transform_method":
try:
s = 'runtime_method->method'
klassname = frame.EvaluateExpression('(char*) ' + s + '->klass->name').summary[1:-1]
methodname = frame.EvaluateExpression('(char*) ' + s + '->name').summary[1:-1]
var = 'transforming %s::%s || %s' % (klassname, methodname, frame)
except Exception as e:
print "DBG: transformfail:" + str(e)
elif pc[0] == '0':
try:
framestr = frame.EvaluateExpression('(char*)mono_pmip((void*)%s)' % pc).summary[1:-1]
var = 'frame #%i: %s%s' % (frame.idx, pc, framestr)
except:
pass
print fmt % ('*' if current_thread and frame.idx == selected_frame.idx else ' ', var)
print ' %c %s' % ('*' if current_thread and frame.idx == selected_frame.idx else ' ', var)
def monobt(debugger, command, result, dict):
opts = {'all_bt': False, 'num_frames': None}
@@ -53,4 +75,5 @@ def __lldb_init_module (debugger, dict):
# This initializer is being run from LLDB in the embedded command interpreter
# Add any commands contained in this module to LLDB
debugger.HandleCommand('command script add -f monobt.monobt monobt')
print '"monobt" command installed'
debugger.HandleCommand('command alias mbt monobt')
print '"monobt" command installed'
+2 -2
View File
@@ -86,7 +86,7 @@ LOCK RULES
Simple locks:
Can be acquired at any point regardless of which locks are taken or not.
No other locks can be acquired or released while holding a simple lock.
Reentrancy is not recomended. (warning)
Reentrancy is not recommended. (warning)
Simple locks are leaf locks on the lock lattice.
Complex locks:
@@ -129,7 +129,7 @@ ERROR: tried to acquire lock DomainLock at mono_domain_code_reserve_align while
WARNING: tried to acquire lock ImageDataLock at mono_image_init_name_cache while holding ImageDataLock at mono_class_from_name
WARNING: tried to acquire lock ImageDataLock at mono_image_init_name_cache while holding ImageDataLock at mono_image_add_to_name_cache
Both of those happen when filling up the name_cache, as it needs to alloc image memory.
This one is fixable by spliting mono_image_init_name_cache into a locked and an unlocked variants and calling them appropriatedly.
This one is fixable by splitting mono_image_init_name_cache into a locked and an unlocked variants and calling them appropriately.
*/
+1 -1
View File
@@ -87,7 +87,7 @@ mono-file-formats.zip: mono-file-formats.tree
mono-file-formats.tree: $(srcdir)/docs.make $(srcdir)/Makefile.am $(srcdir)/deploy/.stamp
$(TOOL_MAKE) $@
deploy/.stamp: convert.exe Makefile.am
deploy/.stamp: convert.exe Makefile.am exdoc
$(mkdir_p) html
runtimedir=`cd ../runtime && pwd`; export runtimedir; \
MONO_PATH=$(CLASS) perl $(srcdir)/exdoc -h $(srcdir) -t . $(srcdir)/../mono/*/*.c
+4 -4
View File
@@ -26,7 +26,7 @@ some combination of the two.
To be clearer, and give an idea of what the algorithm can and
cannot do without describing it in detail... keep in mind that
only "redunant" checks cannot be removed. By "redundant", I
only "redundant" checks cannot be removed. By "redundant", I
mean "already explicitly checked" in the method code.
Unfortunately, analyzing complex expressions is not so easy
@@ -136,7 +136,7 @@ some combination of the two.
In the first case, the BB has exactly two exit BBs, and their
execution conditions are easy to get from the condition of the
branch (see the "get_relation_from_branch_instruction"
function, and expecially the end of "analyze_block" in
function, and especially the end of "analyze_block" in
abcremoval.c.
If there is a switch, the jump condition of every exit BB is
@@ -303,7 +303,7 @@ some combination of the two.
each BB tried to examine all possible conditions between all
variables, filling a sort of "evaluation matrix". The problem
was that the complexity of this evaluation was quadratic (or
worse) on the number of variables, and that many wariables
worse) on the number of variables, and that many variables
were examined even if they were not involved in any array
access.
@@ -332,7 +332,7 @@ some combination of the two.
[1b] Prepare the evaluation graph (empty)
[1b] Summarize each varible definition, and put
[1b] Summarize each variable definition, and put
the resulting relations in the evaluation
graph
+6 -4
View File
@@ -19,7 +19,7 @@ ENUM_VALUES_PER_LINE = 1
EXCLUDE_SYMLINKS = NO
EXPAND_ONLY_PREDEF = NO
EXTENSION_MAPPING = c=C h=C
EXTRACT_ALL = YES
EXTRACT_ALL = NO
EXTRACT_STATIC = YES
EXT_LINKS_IN_WINDOW = NO
FILE_PATTERNS = *.c *.h
@@ -27,9 +27,9 @@ FULL_PATH_NAMES = YES
GENERATE_BUGLIST = YES
GENERATE_DEPRECATEDLIST = YES
GENERATE_HTML = YES
GENERATE_PERLMOD = YES
GENERATE_LEGEND = YES
GENERATE_TESTLIST = YES
GENERATE_PERLMOD = NO
GENERATE_TESTLIST = NO
GENERATE_TODOLIST = YES
GENERATE_TREEVIEW = YES
GRAPHICAL_HIERARCHY = YES
@@ -60,6 +60,7 @@ MULTILINE_CPP_IS_BRIEF = NO
OPTIMIZE_OUTPUT_FOR_C = YES
OUTPUT_DIRECTORY = doxygen-output
OUTPUT_LANGUAGE = English
PREDEFINED = "HAVE_SGEN_GC="
PROJECT_NAME = "Mono"
QT_AUTOBRIEF = NO
QUIET = NO
@@ -77,6 +78,7 @@ SHOW_USED_FILES = YES
SKIP_FUNCTION_MACROS = YES
SORT_BRIEF_DOCS = YES
SORT_GROUP_NAMES = YES
SORT_MEMBER_DOCS = YES
SOURCE_BROWSER = YES
SOURCE_TOOLTIPS = YES
STRIP_CODE_COMMENTS = NO
@@ -89,4 +91,4 @@ VERBATIM_HEADERS = YES
WARNINGS = YES
WARN_IF_DOC_ERROR = YES
WARN_IF_UNDOCUMENTED = YES
WARN_NO_PARAMDOC = NO
WARN_NO_PARAMDOC = YES
+436 -259
View File
@@ -1,91 +1,295 @@
#!/usr/bin/perl
if ($ARGV[0] eq "-h"){
$sourcedir = $ARGV[1];
$dir = $sourcedir;
$html = 1;
shift @ARGV;
shift @ARGV;
}
open (FILE, "$dir/api-style.css" || die "Did not find $dir/api-style.css");
while (<FILE>){
$css = $css . $_;
use warnings;
use strict;
use Getopt::Long;
use Pod::Usage;
# Options
my $HELP = 0;
my $SOURCE_DIR = '';
my $TARGET_DIR = '';
my $WARNINGS = 0;
GetOptions(
"help" => \$HELP,
"html|h=s" => \$SOURCE_DIR,
"target|t=s" => \$TARGET_DIR,
"warnings|W" => \$WARNINGS,
) or pod2usage(1);
pod2usage(0) if $HELP;
exdoc();
#
# Main entry point.
#
sub exdoc {
my %templates = ();
my %docs = ();
my $stylesheet = load_stylesheet($SOURCE_DIR);
load_templates($SOURCE_DIR, \%templates);
process_source_files(\%docs);
merge(\%docs, \%templates, \$stylesheet);
}
if ($ARGV[0] eq "-t"){
$dir = $ARGV[1];
shift @ARGV;
#
# Load CSS stylesheet.
#
sub load_stylesheet {
my ($dir_path) = @_;
my $file_path = "$dir_path/api-style.css";
open (my $file, '<', $file_path) or die "Could not open $file_path";
local $/;
my $contents = <$file>;
close $file;
return $contents;
}
if ($html){
opendir (D, "$sourcedir/sources/") || die "Can not open $dir";
while ($n = readdir (D)){
if ($n =~ /mono-api-.*\.html$/){
open (IN, "$sourcedir/sources/$n") || die "Can not open $n";
$files[$filecount] = $n;
while (<IN>){
@files_content[$filecount] .= $_;
if (/name="api:(.*?)"/){
$_ =~ s/.*name="api:(\w+?)".*/\1/;
$apis[$filecount] .= "$_";
}
}
$filecount++;
close IN;
}
#
# Load HTML templates.
#
sub load_templates {
my ($dir_path, $templates) = @_;
opendir (my $dir, "$dir_path/sources/") or die "Could not open $dir_path";
while (my $file_name = readdir ($dir)) {
next if $file_name !~ /mono-api-.*\.html$/;
open (my $file, "$dir_path/sources/$file_name") or die "Could not open $file_name";
my $contents = '';
my @api = ();
while (<$file>) {
$contents .= $_;
if (/name="api:(.*?)"/) {
s/.*name="api:(\w+?)".*/$1/;
push @api, $_;
}
}
close $file;
$templates->{$file_name}->{contents} = $contents;
$templates->{$file_name}->{api} = \@api;
}
closedir $dir;
}
#
# Extract documentation from all source files.
#
sub process_source_files {
my ($docs) = @_;
for my $file_path (@ARGV) {
process_source_file($file_path, $docs);
}
}
while (<ARGV>){
if (/\/\*\* *\n/){
&process_doc;
} else {
#print "IGNORING: $_";
}
#
# Extract documentation from a single source file.
#
sub process_source_file {
my ($file_path, $docs) = @_;
open (my $file, '<', $file_path) or die "Could not open $file_path";
while (<$file>) {
next if (!/\/\*\* *\n/);
process_function($file, $file_path, $docs);
}
close $file;
}
if ($html){
for ($f = 0; $f < $filecount; $f++){
$name = $files[$f];
open (OUT, "> $dir/html/$name") || die "Can not create $dir/html/$name";
print "Merging: $name\n";
print OUT<<EOF;
#
# Extract documentation from a single function.
#
sub process_function {
my ($file, $file_path, $docs) = @_;
my $PARAMETER_SECTION = 0;
my $BODY_SECTION = 1;
my $RETURN_SECTION = 2;
my $section = $PARAMETER_SECTION;
my $name = do {
$_ = <$file>;
chomp;
s/^ \* //;
s/:$//;
$_
};
# Ignore irrelevant functions, and those with the wrong doc format.
return if $name !~ /^mono_\w+$/;
my $deprecated;
my @parameters = ();
my $body = '';
my $returns = '';
my $prototype = '';
while (<$file>) {
# We've reached the last line in the documentation block.
if (/^ \*\*?\//) {
# Grab function prototype.
while (<$file>) {
$prototype .= $_;
last if /\{/;
}
# Clean up prototype.
$prototype = do {
$_ = $prototype;
# Strip braces and trailing whitespace.
s/{//;
s/ +$//;
# Turn "Type * xxx" into "Type* xxx"
s/^(\w+)\W+\*/$1*/;
$_;
};
# Process formatting within sections.
for my $parameter (@parameters) {
process_formatting(\$parameter->{description}, $file_path, $.);
}
process_formatting(\$returns, $file_path, $.);
process_formatting(\$body, $file_path, $.);
if (defined($deprecated)) {
process_formatting(\$deprecated, $file_path, $.);
}
$body =~ s/\n/ /g;
if (exists($docs->{body}->{$name})) {
my $origin = $docs->{origin}->{$name};
if ($WARNINGS) {
warn
"$file_path:$.: Redundant documentation for $name\n",
"$origin->{file}:$origin->{line}: Previously defined here\n";
}
}
$docs->{origin}->{$name} = { file => $file_path, line => $. };
$docs->{body}->{$name} = $body;
$docs->{parameters}->{$name} = \@parameters;
$docs->{deprecated}->{$name} = $deprecated if defined $deprecated;
$docs->{return}->{$name} = $returns;
$docs->{prototype}->{$name} = $prototype;
last;
}
# Strip newlines and asterisk prefix.
chomp;
s/^ +\*//;
# Replace blank lines with paragraph breaks.
$_ = '<p>' if /^\s*$/;
if ($section == $PARAMETER_SECTION) {
if (/\s*\\param +(\w+)(.*)/) {
# print "$file_path:$.: warning: Got parameter $1\n";
push @parameters, { name => $1, description => $2 };
} elsif (/\s*\\deprecated(.*)/) {
# print "$file_path:$.: warning: Got deprecated annotation\n";
$deprecated = $1;
} elsif (/\s*(\w+):(.*)/) {
if ($1 eq 'deprecated') {
warn "$file_path:$.: Old-style monodoc notation 'deprecated:' used\n"
if $WARNINGS;
$deprecated = $2;
} else {
warn "$file_path:$.: Old-style monodoc notation 'param:' used\n"
if $WARNINGS;
push @parameters, { name => $1, description => $2 };
}
} else {
# $body = "\t$_\n";
$section = $BODY_SECTION;
redo;
}
} elsif ($section == $BODY_SECTION) {
if (s/(Returns?:\s*|\\returns?\s*)//) {
$returns = "\t$_\n";
$section = $RETURN_SECTION;
} else {
$body .= "\n\t$_";
}
} elsif ($section == $RETURN_SECTION) {
$returns .= "\n\t$_";
} else {
die "Invalid section $section\n";
}
}
}
#
# Substitute formatting within documentation text.
#
sub process_formatting {
my ($content, $file_path, $current_line) = @_;
$_ = $$content;
# Constants
s{NULL}{<code>NULL</code>}g;
s{TRUE}{<code>TRUE</code>}g;
s{FALSE}{<code>FALSE</code>}g;
# Parameters
warn "$file_path:$current_line: Old-style monodoc notation '\@param' used\n"
if s{@(\w+)}{<i>$1</i>}g && $WARNINGS;
s{\\p +(\w+)}{<i>$1</i>}g;
# Code
warn "$file_path:$current_line: Old-style monodoc notation '#code' used\n"
if s{#(\w+)}{<code>$1</code>}g && $WARNINGS;
warn "$file_path:$current_line: Old-style monodoc notation '`code`' used\n"
if s{\`((?!api:)[:.\w\*]+)\`}{<code>$1</code>}g && $WARNINGS;
s{\\c +(\S+(?<![.,:;]))}{<code>$1</code>}g;
$$content = $_;
}
#
# Merge templates with stylesheet and documentation extracted from sources.
#
sub merge {
my ($docs, $templates, $stylesheet) = @_;
my $last = '';
for my $name (keys %$templates) {
open (my $output_file, '>', "$TARGET_DIR/html/$name")
or die "Could not create $TARGET_DIR/html/$name";
print "Merging: $name\n";
print $output_file <<EOF;
<?xml version="1.0" encoding="utf-8"?>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>$name</title>
<style type="text/css">
$css
$stylesheet
</style>
</head>
<body>
<div class="mapi-docs">
EOF
@a = split (/\n/, $files_content[$f]);
$strikeextra = "";
$api_shown = 0;
for ($ai = 0; $ai < $#a; $ai++){
$line = $a[$ai];
($api,$caption) = $line =~ /<h4><a name=\"api:(\w+)\">(\w+)<\/a><\/h4>/;
if ($api ne ""){
if ($api_shown == 1){
print OUT "</div> <!-- class=mapi -->\n\n";
if ($deprecated{$api}){
$strike = "mapi-strike";
$strikeextra = "</div><br><div class='mapi-deprecated'><b>Deprecated:</b> " . $deprecated{$api};
} else {
$strike = "";
$strikeextra = "";
}
}
$api_shown = 1;
$proto = $prototype{$api};
if ($proto eq ""){
$proto = "$api";
}
my @a = split (/\n/, $templates->{$name}->{contents});
my $strike = '';
my $strikeextra = '';
my $api_shown = 0;
for (my $ai = 0; $ai < $#a; $ai++) {
my $line = $a[$ai];
if (my ($api, $caption) = ($line =~ /<h4><a name=\"api:(\w+)\">(\w+)<\/a><\/h4>/)) {
if ($api_shown == 1) {
print $output_file "</div> <!-- class=mapi -->\n\n";
if ($docs->{deprecated}->{$api}) {
$strike = "mapi-strike";
$strikeextra = "</div><br><div class='mapi-deprecated'><b>Deprecated:</b> " . $docs->{deprecated}->{$api};
} else {
$strike = "";
$strikeextra = "";
}
}
$api_shown = 1;
my $proto = $docs->{prototype}->{$api} // $api;
print OUT<<EOF;
print $output_file <<EOF;
<a name="api:$api"></a>
<div class="mapi">
<div class="mapi-entry $strike"><code>$api$strikeextra</code></div>
@@ -98,228 +302,201 @@ EOF
<div class="mapi-prototype">$proto</div>
<p>
EOF
$ppars = $arguments{$api};
if ($ppars ne "" && (!($ppars =~ /^[ \t]+$/))){
print OUT " <div class=\"mapi-section\">Parameters</div>\n";
print OUT " <table class=\"mapi-parameters\"><tbody>".${arguments{$api}}."</tbody></table>";
}
&opt_print ("Return value", $returns{$api}, 0);
&opt_print ("Description", $bodies{$api}, 0);
print OUT " </div><!--mapi-description-->\n </div><!--height container-->\n";
} else {
if ($line =~ /@API_IDX@/){
$apis_toc = &create_toc ($apis[$f]);
$line =~ s/\@API_IDX\@/$apis_toc/;
}
if ($line =~ /^<h4/){
print OUT "</div>\n";
$api_shown = 0;
}
if ($line =~ /`/){
}
print OUT "$line\n";
}
}
print OUT<<EOF;
</div>
</body>
</html>
EOF
close OUT;
system ("$ENV{runtimedir}/mono-wrapper convert.exe $dir/html/$name $dir/html/x-$name");
if (exists ($docs->{parameters}->{$api})) {
my $ppars = $docs->{parameters}->{$api};
if (@$ppars) {
print $output_file
" <div class=\"mapi-section\">Parameters</div>\n",
" <table class=\"mapi-parameters\"><tbody>",
render_parameters($ppars),
"</tbody></table>";
}
}
opt_print ($output_file, "Return value", $docs->{return}->{$api});
opt_print ($output_file, "Description", $docs->{body}->{$api});
print $output_file " </div><!--mapi-description-->\n </div><!--height container-->\n";
} else {
if ($line =~ /\@API_IDX\@/) {
my $apis_toc = create_toc ($docs, $templates->{$name}->{api});
$line =~ s/\@API_IDX\@/$apis_toc/;
}
if ($line =~ /^<h4/) {
print $output_file "</div>\n";
$api_shown = 0;
}
if ($line =~ /`/) {
}
print $output_file "$line\n";
}
}
print $output_file
" </div>",
"</body>",
"</html>";
close $output_file;
system ("$ENV{runtimedir}/mono-wrapper convert.exe $TARGET_DIR/html/$name $TARGET_DIR/html/x-$name");
# clean up the mess that AgilityPack does, it CDATAs our CSS
open HACK, "$dir/html/x-$name" || die "Could not open $dir/html/x-$name";
open HACKOUT, ">$dir/deploy/$name" || die "Could not open output";
# Clean up the mess that AgilityPack makes (it CDATAs our CSS).
open (my $hack_input, '<', "$TARGET_DIR/html/x-$name")
or die "Could not open $TARGET_DIR/html/x-$name";
open (my $hack_output, '>', "$TARGET_DIR/deploy/$name")
or die "Could not open output";
$line = 0;
$doprint = 0;
while (<HACK>){
print HACKOUT $last if ($doprint);
$line++;
s/^\/\/<!\[CDATA\[//;
s/^\/\/\]\]>\/\///;
my $line = 0;
my $doprint = 0;
while (<$hack_input>) {
print $hack_output $last if ($doprint);
$line++;
s/^\/\/<!\[CDATA\[//;
s/^\/\/\]\]>\/\///;
# Remove the junk <span> wrapper generated by AgilityPack
if ($line==1){
s/<span>//;
}
if (/<style type/){
# Replace the CSS in the XHTML output with the original CSS
print HACKOUT $_;
print HACKOUT $css;
while (<HACK>){
last if (/<\/style>/);
}
}
$last = $_;
$doprint = 1;
}
if (!($last =~ /span/)){
print HACKOUT $last;
}
#system ("cp.exe $dir/html/$name $dir/deploy/$name");
# Remove the junk <span> wrapper generated by AgilityPack.
if ($line==1) {
s/<span>//;
}
if (/<style type/) {
# Replace the CSS in the XHTML output with the original CSS.
print $hack_output $_;
print $hack_output $$stylesheet;
while (<$hack_input>) {
last if (/<\/style>/);
}
}
$last = $_;
$doprint = 1;
}
if (!($last =~ /span/)) {
print $hack_output $last;
}
# system ("cp.exe $TARGET_DIR/html/$name $TARGET_DIR/deploy/$name");
}
}
sub process_doc {
$doc = "";
$func = <>;
chop $func;
$func =~ s/^ \* //;
$func =~ s/:$//;
print "Function: $func\n" if (!$html);
$args = "";
$inbody = 0;
$returns = "";
$body = "";
$functions[$fn++] = $func;
$deprecated = 0;
# Process arguments
while (<>){
s/NULL/<code>NULL<\/code>/g;
s/TRUE/<code>TRUE<\/code>/g;
s/FALSE/<code>FALSE<\/code>/g;
if (/^ \*\*?\//){
$body =~ s/@(\w+)/<i>\1<\/i>/g;
$returns =~ s/@(\w+)/<i>\1<\/i>/g;
$args =~ s/@(\w+)/<i>\1<\/i>/g;
$body =~ s/#(\w+)/<code>\1<\/code>/g;
$returns =~ s/#(\w+)/<code>\1<\/code>/g;
$args =~ s/#(\w+)/<code>\1<\/code>/g;
$returns =~ s/\`([:.\w\*]+)\`/<code>\1<\/code>/g;
$args =~ s/\`([:.\w\*]+)\`/<code>\1<\/code>/g;
$body =~ s/\`([:.\w\*]+)\`/<code>\1<\/code>/g;
$body =~ s/\n/ /;
$bodies{$func} = $body;
$arguments{$func} = $args;
$deprecated{$func} = $deprecated;
$returns{$func} = $returns;
$proto = "";
while (<>){
$proto .= $_;
last if (/\{/);
}
$proto =~ s/{//;
# clean it up a little, remove newlines, empty space at end
$proto =~ s/ +$//;
# Turn "Type * xxx" into "Type* xxx"
$proto =~ s/^(\w+)\W+\*/\1\*/;
$prototype{$func} = $proto;
return;
}
chop;
s/^\ \*//;
$_ = "<p>" if (/^\s*$/);
if ($inbody == 0){
if (/\s*(\w+):(.*)/){
if ($1 eq "deprecated"){
$deprecated = $2;
} else {
#$args .= "<dt><i>$1:</i></dt><dd>$2</dd>";
$args .= "<tr><td><i>$1</i><td>$2</td></td></tr>";
}
} else {
$body = "\t$_\n";
$inbody = 1;
}
} elsif ($inbody == 1) {
if (/Returns?:/){
s/Returns?://;
$returns = "\t$_\n";
$inbody = 2;
} else {
$body .= "\n\t$_";
}
} else {
$returns .= "\n\t$_";
}
}
}
sub create_toc {
my ($apis_listed) = @_;
my ($docs, $apis_listed) = @_;
my $type_size = 0;
my $name_size = 0;
my $ret, $xname, $args, $line;
$apis_toc = "";
my ($ret, $xname, $args);
my $apis_toc = "";
# Try to align things, so compute type size, method size, and arguments
foreach $line (split /\n/, $apis_listed){
$p = $prototype{$line};
($ret, $xname, $args) = $p =~ /(.*)\n(\w+)[ \t](.*)/;
$tl = length ($ret);
$pl = length ($xname);
$type_size = $tl if ($tl > $type_size);
$name_size = $pl if ($pl > $name_size);
# Try to align things; compute type size, method size, and arguments.
foreach my $line (split /\n/, $apis_listed) {
if (exists ($docs->{prototype}->{$line})) {
my $p = $docs->{prototype}->{$line};
if (my ($ret, $xname, $args) = ($p =~ /(.*)\n(\w+)[ \t](.*)/)) {
my $tl = length ($ret);
my $pl = length ($xname);
$type_size = $tl if ($tl > $type_size);
$name_size = $pl if ($pl > $name_size);
}
}
}
$type_size++;
$name_size++;
foreach $line (split /\n/, $apis_listed){
chop;
$p = $prototype{$line};
($ret, $xname, $args) = $p =~ /(.*)\n(\w+)[ \t](.*)/;
if ($xname eq ""){
$xname = $line;
}
$rspace = " " x ($type_size - length ($ret));
$nspace = " " x ($name_size - length ($xname));
$args = &format ($args, length ($ret . $rspace . $xname . $nspace), 60);
$apis_toc .= "$ret$rspace<a href=\"\#api:$line\">$xname</a>$nspace$args\n";
foreach my $line (split /\n/, $apis_listed) {
chomp($line);
if (exists($docs->{prototype}->{$line})) {
my $p = $docs->{prototype}->{$line};
if (my ($ret, $xname, $args) = ($p =~ /(.*)\n(\w+)[ \t](.*)/)) {
$xname = $line if $xname eq "";
my $rspace = " " x ($type_size - length ($ret));
my $nspace = " " x ($name_size - length ($xname));
$args = wrap ($args, length ($ret . $rspace . $xname . $nspace), 60);
$apis_toc .= "$ret$rspace<a href=\"\#api:$line\">$xname</a>$nspace$args\n";
}
}
}
return $apis_toc;
}
#
# Formats the rest of the arguments in a way that will fit in N columns
#
sub format {
sub wrap {
my ($args, $size, $limit) = @_;
my $sret = "";
# return $args if ((length (args) + size) < $limit);
# return $args if ((length (args) + size) < $limit);
$remain = $limit - $size;
@sa = split /,/, $args;
$linelen = $size;
foreach $arg (@sa){
if ($sret eq ""){
$sret = $arg . ", ";
$linelen += length ($sret);
} else {
if ($linelen + length ($arg) < $limit){
$sret .= "FITS" . $arg . ", ";
} else {
$newline = " " x ($size) . $arg . ", ";
$linelen = length ($newline);
$sret .= "\n" . $newline;
}
}
my $remain = $limit - $size;
my @sa = split /,/, $args;
my $linelen = $size;
foreach my $arg (@sa) {
if ($sret eq "") {
$sret = $arg . ", ";
$linelen += length ($sret);
} else {
if ($linelen + length ($arg) < $limit) {
$sret .= "FITS" . $arg . ", ";
} else {
my $newline = " " x ($size) . $arg . ", ";
my $linelen = length ($newline);
$sret .= "\n" . $newline;
}
}
}
$sret =~ s/, $/;/;
return $sret;
}
#
# Print a section if non-empty.
#
sub opt_print {
my ($caption, $opttext, $quote) = @_;
if ($opttext ne "" && (!($opttext =~ /^[ \t]+$/))){
print OUT " <div class=\"mapi-section\">$caption</div>\n";
print OUT " <div>$opttext</div>\n";
my ($output, $caption, $opttext) = @_;
if (defined($opttext) && $opttext ne '' && $opttext !~ /^[ \t]+$/) {
print $output
" <div class=\"mapi-section\">$caption</div>\n",
" <div>$opttext</div>\n";
}
}
#
# Render parameter information as table.
#
sub render_parameters {
my ($parameters) = @_;
my $result = '';
for my $parameter (@$parameters) {
$result .= "<tr><td><i>$parameter->{name}</i></td><td>$parameter->{description}</td></tr>";
}
return $result;
}
__END__
=head1 NAME
exdoc - Compiles API docs from Mono sources and HTML templates.
=head1 SYNOPSIS
exdoc [OPTIONS] [FILE...]
=head1 OPTIONS
=over 4
=item B<--help>
Print this help message.
=item B<--html> I<DIR>, B<-h> I<DIR>
Use I<DIR> as the input path for HTML sources.
=item B<--target> I<DIR>, B<-t> I<DIR>
Use I<DIR> as the target path for output.
=item B<--warnings>, B<-W>
Enable warnings about documentation errors.
=back
=head1 DESCRIPTION
Reads HTML templates and C sources, extracting documentation from the sources and splicing it into the templates.
=cut
-1
View File
@@ -27,7 +27,6 @@ typedef enum {
<h3>Opening and closing MonoImages</h3>
<h4><a name="api:mono_load_image">mono_load_image</a></h4>
<h4><a name="api:mono_image_open">mono_image_open</a></h4>
<h4><a name="api:mono_image_open_full">mono_image_open_full</a></h4>
<h4><a name="api:mono_image_open_from_data">mono_image_open_from_data</a></h4>
-44
View File
@@ -40,7 +40,6 @@
<h4><a name="api:mono_marshal_get_delegate_invoke">mono_marshal_get_delegate_invoke</a></h4>
<h4><a name="api:mono_marshal_get_icall_wrapper">mono_marshal_get_icall_wrapper</a></h4>
<h4><a name="api:mono_marshal_get_isinst">mono_marshal_get_isinst</a></h4>
<h4><a name="api:mono_marshal_get_ldfld_remote_wrapper">mono_marshal_get_ldfld_remote_wrapper</a></h4>
<h4><a name="api:mono_marshal_get_ldfld_wrapper">mono_marshal_get_ldfld_wrapper</a></h4>
<h4><a name="api:mono_marshal_get_managed_wrapper">mono_marshal_get_managed_wrapper</a></h4>
<h4><a name="api:mono_marshal_get_native_wrapper">mono_marshal_get_native_wrapper</a></h4>
@@ -51,7 +50,6 @@
<h4><a name="api:mono_marshal_get_remoting_invoke_with_check">mono_marshal_get_remoting_invoke_with_check</a></h4>
<h4><a name="api:mono_marshal_get_runtime_invoke">mono_marshal_get_runtime_invoke</a></h4>
<h4><a name="api:mono_marshal_get_stelemref">mono_marshal_get_stelemref</a></h4>
<h4><a name="api:mono_marshal_get_stfld_remote_wrapper">mono_marshal_get_stfld_remote_wrapper</a></h4>
<h4><a name="api:mono_marshal_get_stfld_wrapper">mono_marshal_get_stfld_wrapper</a></h4>
<h4><a name="api:mono_marshal_get_struct_to_ptr">mono_marshal_get_struct_to_ptr</a></h4>
<h4><a name="api:mono_marshal_get_synchronized_wrapper">mono_marshal_get_synchronized_wrapper</a></h4>
@@ -59,47 +57,9 @@
<h4><a name="api:mono_marshal_get_xappdomain_invoke">mono_marshal_get_xappdomain_invoke</a></h4>
<h4><a name="api:mono_marshal_load_type_info">mono_marshal_load_type_info</a></h4>
<h4><a name="api:mono_marshal_method_from_wrapper">mono_marshal_method_from_wrapper</a></h4>
<h4><a name="api:mono_marshal_realloc">mono_marshal_realloc</a></h4>
<h4><a name="api:mono_marshal_set_last_error">mono_marshal_set_last_error</a></h4>
<h4><a name="api:mono_marshal_type_size">mono_marshal_type_size</a></h4>
<h2>Metadata Loading Errors</h2>
<p>The routines in this section are used to cope with errors
during metadata loading. Errors in metadata handling can
happen for many reason, and these include (this is not an
exhaustive list).
<ul>
<li>An assembly referenced is missing.
<li>Fields referenced are missing.
<li>Methods referenced are missing.
</ul>
<p>The <tt>mono_loader_set_*</tt> routines are invoked during
metadata loading to flag that an error has happened. The
class loading errros are flagged in a per-thread basis.
<P>In various spots in the runtime the
<tt>mono_loader_get_last_error</tt> routine is called to check
if there was a problem, and then errors are propagated upwards
on the stack until we reach a point where an exception can be
raised and no runtime locks are held.
<p>The <tt>mono_loader_error_prepare_exception</tt> takes a
<tt>MonoLoaderError</tt> structure (the value returned from
<tt>mono_loader_get_last_error</tt>), turns that into an
exception and clears the error condition from the current
thread.
<h4><a name="api:mono_loader_set_error_field_load">mono_loader_set_error_field_load</a></h4>
<h4><a name="api:mono_loader_set_error_method_load">mono_loader_set_error_method_load</a></h4>
<h4><a name="api:mono_loader_set_error_type_load">mono_loader_set_error_type_load</a></h4>
<h4><a name="api:mono_loader_get_last_error">mono_loader_get_last_error</a></h4>
<h4><a name="api:mono_loader_clear_error">mono_loader_clear_error</a></h4>
<h4><a name="api:mono_loader_error_prepare_exception">mono_loader_error_prepare_exception</a></h4>
<h2>Metadata Loader Locking: Internals</h2>
<p>The locking functions here are used by code in class.c and
@@ -114,10 +74,6 @@
<p>The internal interface of the Mono GC is the interface used
between the runtime engine and the garbage collector.
<h4><a name="api:mono_gc_disable">mono_gc_disable</a></h4>
<h4><a name="api:mono_gc_enable">mono_gc_enable</a></h4>
<h4><a name="api:mono_gc_start_world">mono_gc_start_world</a></h4>
<h4><a name="api:mono_gc_stop_world">mono_gc_stop_world</a></h4>
<h4><a name="api:mono_gc_alloc_fixed">mono_gc_alloc_fixed</a></h4>
<h4><a name="api:mono_gc_free_fixed">mono_gc_free_fixed</a></h4>
<h4><a name="api:mono_gc_make_descr_from_bitmap">mono_gc_make_descr_from_bitmap</a></h4>
-8
View File
@@ -31,17 +31,12 @@
<h4><a name="api:mono_g_hash_table_destroy">mono_g_hash_table_destroy</a></h4>
<h4><a name="api:mono_g_hash_table_foreach">mono_g_hash_table_foreach</a></h4>
<h4><a name="api:mono_g_hash_table_foreach_remove">mono_g_hash_table_foreach_remove</a></h4>
<h4><a name="api:mono_g_hash_table_foreach_steal">mono_g_hash_table_foreach_steal</a></h4>
<h4><a name="api:mono_g_hash_table_insert">mono_g_hash_table_insert</a></h4>
<h4><a name="api:mono_g_hash_table_lookup">mono_g_hash_table_lookup</a></h4>
<h4><a name="api:mono_g_hash_table_lookup_extended">mono_g_hash_table_lookup_extended</a></h4>
<h4><a name="api:mono_g_hash_table_new">mono_g_hash_table_new</a></h4>
<h4><a name="api:mono_g_hash_table_new_full">mono_g_hash_table_new_full</a></h4>
<h4><a name="api:mono_g_hash_table_remap">mono_g_hash_table_remap</a></h4>
<h4><a name="api:mono_g_hash_table_remove">mono_g_hash_table_remove</a></h4>
<h4><a name="api:mono_g_hash_table_replace">mono_g_hash_table_replace</a></h4>
<h4><a name="api:mono_g_hash_table_size">mono_g_hash_table_size</a></h4>
<h4><a name="api:mono_g_hash_table_steal">mono_g_hash_table_steal</a></h4>
<h3>Memory Pools</h3>
@@ -67,7 +62,6 @@
<h4><a name="api:mono_mempool_destroy">mono_mempool_destroy</a></h4>
<h4><a name="api:mono_mempool_alloc">mono_mempool_alloc</a></h4>
<h4><a name="api:mono_mempool_alloc0">mono_mempool_alloc0</a></h4>
<h4><a name="api:mono_mempool_empty">mono_mempool_empty</a></h4>
<h4><a name="api:mono_mempool_invalidate">mono_mempool_invalidate</a></h4>
<h4><a name="api:mono_mempool_stats">mono_mempool_stats</a></h4>
<h4><a name="api:mono_mempool_contains_addr">mono_mempool_contains_addr</a></h4>
@@ -153,6 +147,4 @@
<h4><a name="api:mono_profiler_startup">mono_profiler_startup</a></h4>
<h4><a name="api:mono_profiler_gc_event">mono_profiler_gc_event</a></h4>
<h4><a name="api:mono_profiler_gc_heap_resize">mono_profiler_gc_heap_resize</a></h4>
<h4><a name="api:mono_profiler_gc_event">mono_profiler_gc_event</a></h4>
<h4><a name="api:mono_profiler_gc_heap_resize">mono_profiler_gc_heap_resize</a></h4>
<h4><a name="api:mono_profiler_stat_hit">mono_profiler_stat_hit</a></h4>
-3
View File
@@ -669,15 +669,12 @@ MONO_TYPESPEC_SIZE
<h4><a name="api:mono_metadata_parse_method_signature">mono_metadata_parse_method_signature</a></h4>
<h4><a name="api:mono_metadata_parse_mh">mono_metadata_parse_mh</a></h4>
<h4><a name="api:mono_metadata_parse_param">mono_metadata_parse_param</a></h4>
<h4><a name="api:mono_metadata_parse_ret_type">mono_metadata_parse_ret_type</a></h4>
<h4><a name="api:mono_metadata_parse_signature">mono_metadata_parse_signature</a></h4>
<h4><a name="api:mono_metadata_parse_typedef_or_ref">mono_metadata_parse_typedef_or_ref</a></h4>
<h4><a name="api:mono_metadata_parse_type">mono_metadata_parse_type</a></h4>
<h2>Generics Support</h2>
<h4><a name="api:mono_metadata_generic_class_equal">mono_metadata_generic_class_equal</a></h4>
<h4><a name="api:mono_metadata_generic_class_hash">mono_metadata_generic_class_hash</a></h4>
<h4><a name="api:mono_metadata_generic_class_is_valuetype">mono_metadata_generic_class_is_valuetype</a></h4>
<h2>Tokens</h2>
+3
View File
@@ -94,6 +94,9 @@ arm*-darwin*|aarch64*-*)
i*86-*-darwin*)
ORDER=G_LITTLE_ENDIAN
;;
*-*-haiku*)
LDFLAGS="$LDFLAGS -ltextencoding"
;;
*-*-openbsd*)
CFLAGS="$CFLAGS -pthread"
LDFLAGS="$LDFLAGS -pthread"
+1 -1
View File
@@ -5,7 +5,7 @@ AM_CFLAGS = $(WERROR_CFLAGS)
win_files = \
eglib-config.hw \
gdate-win32.c gdir-win32.c gfile-win32.c gmisc-win32.c \
gmodule-win32.c gtimer-win32.c gunicode-win32.c
gmodule-win32.c gmodule-win32-internals.h gtimer-win32.c gunicode-win32.c
unix_files = \
gdate-unix.c gdir-unix.c gfile-unix.c gmisc-unix.c \
+7
View File
@@ -15,6 +15,8 @@
#define g_byte_array_append monoeg_g_byte_array_append
#define g_byte_array_free monoeg_g_byte_array_free
#define g_byte_array_new monoeg_g_byte_array_new
#define g_byte_array_set_size monoeg_g_byte_array_set_size
#define g_calloc monoeg_g_calloc
#define g_clear_error monoeg_g_clear_error
#define g_convert monoeg_g_convert
#define g_convert_error_quark monoeg_g_convert_error_quark
@@ -25,6 +27,7 @@
#define g_mkdir_with_parents monoeg_g_mkdir_with_parents
#define g_direct_equal monoeg_g_direct_equal
#define g_direct_hash monoeg_g_direct_hash
#define g_ensure_directory_exists monoeg_g_ensure_directory_exists
#define g_error_free monoeg_g_error_free
#define g_error_new monoeg_g_error_new
#define g_error_vnew monoeg_g_error_vnew
@@ -48,6 +51,7 @@
#define g_get_tmp_dir monoeg_g_get_tmp_dir
#define g_get_user_name monoeg_g_get_user_name
#define g_getenv monoeg_g_getenv
#define g_hasenv monoeg_g_hasenv
#define g_hash_table_destroy monoeg_g_hash_table_destroy
#define g_hash_table_find monoeg_g_hash_table_find
#define g_hash_table_foreach monoeg_g_hash_table_foreach
@@ -107,6 +111,8 @@
#define g_markup_parse_context_new monoeg_g_markup_parse_context_new
#define g_markup_parse_context_parse monoeg_g_markup_parse_context_parse
#define g_memdup monoeg_g_memdup
#define g_mem_set_vtable monoeg_g_mem_set_vtable
#define g_mkdtemp monoeg_g_mkdtemp
#define g_module_build_path monoeg_g_module_build_path
#define g_module_close monoeg_g_module_close
#define g_module_error monoeg_g_module_error
@@ -251,6 +257,7 @@
#define g_utf8_offset_to_pointer monoeg_g_utf8_offset_to_pointer
#define g_utf8_pointer_to_offset monoeg_g_utf8_pointer_to_offset
#define g_utf8_to_ucs4_fast monoeg_g_utf8_to_ucs4_fast
#define g_vasprintf monoeg_g_vasprintf
#define g_win32_getlocale monoeg_g_win32_getlocale
#define g_assertion_message monoeg_assertion_message
#define g_malloc monoeg_malloc
+26 -26
View File
@@ -5,6 +5,32 @@
#include "cygconfig.h"
#else
#ifndef HAVE_WINAPI_FAMILY_SUPPORT
#define HAVE_WINAPI_FAMILY_SUPPORT
/* WIN API Family support */
#include <winapifamily.h>
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
#define HAVE_CLASSIC_WINAPI_SUPPORT 1
#define HAVE_UWP_WINAPI_SUPPORT 0
#elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
#define HAVE_CLASSIC_WINAPI_SUPPORT 0
#define HAVE_UWP_WINAPI_SUPPORT 1
#ifndef HAVE_EXTERN_DEFINED_WINAPI_SUPPORT
#error Unsupported WINAPI family
#endif
#else
#define HAVE_CLASSIC_WINAPI_SUPPORT 0
#define HAVE_UWP_WINAPI_SUPPORT 0
#ifndef HAVE_EXTERN_DEFINED_WINAPI_SUPPORT
#error Unsupported WINAPI family
#endif
#endif
#endif
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
@@ -78,30 +104,4 @@
#define VERSION "0.1"
#define HAVE_STRTOK_R 1
#ifndef HAVE_WINAPI_FAMILY_SUPPORT
#define HAVE_WINAPI_FAMILY_SUPPORT
/* WIN API Family support */
#include <winapifamily.h>
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
#define HAVE_CLASSIC_WINAPI_SUPPORT 1
#define HAVE_UWP_WINAPI_SUPPORT 0
#elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
#define HAVE_CLASSIC_WINAPI_SUPPORT 0
#define HAVE_UWP_WINAPI_SUPPORT 1
#ifndef HAVE_EXTERN_DEFINED_WINAPI_SUPPORT
#error Unsupported WINAPI family
#endif
#else
#define HAVE_CLASSIC_WINAPI_SUPPORT 0
#define HAVE_UWP_WINAPI_SUPPORT 0
#ifndef HAVE_EXTERN_DEFINED_WINAPI_SUPPORT
#error Unsupported WINAPI family
#endif
#endif
#endif
#endif
Vendored Submodule
+1
Submodule external/api-doc-tools added at d03e819838.
Vendored Submodule
+1
Submodule external/api-snapshot added at 366b5e92d7.
+1 -1
+1 -1
+1 -1
+1 -1
+1 -1
+1 -1
Vendored Submodule
+1
Submodule external/xunit-binaries added at b8e20d265b.
+1 -1
View File
@@ -21,7 +21,7 @@
* See the definition of page_hash_table in gc_private.h.
* False hits from the stack(s) are much more dangerous than false hits
* from elsewhere, since the former can pin a large object that spans the
* block, eventhough it does not start on the dangerous block.
* block, even though it does not start on the dangerous block.
*/
/*
+1 -1
View File
@@ -1872,7 +1872,7 @@ Since 6.2alpha6:
- Fixed Makefile.direct for DARWIN. (Thanks to Manuel Serrano.)
- There was a race between GC_pthread_detach and thread exit that could
result in a thread structure being deallocated by GC_pthread_detach
eventhough it was still needed by the thread exit code. (Thanks to
even though it was still needed by the thread exit code. (Thanks to
Dick Porter for the small test case that allowed this to be debugged.)
- Fixed version parsing for non-alpha versions in acinclude.m4 and
version checking in version.h.
+1 -1
View File
@@ -19,7 +19,7 @@ relatively easy to adapt to new compilers with a different set of predefined
macros. Currently these macros generally identify platforms instead of
features. In many cases, this is a mistake.
3) The code currently avoids #elif, eventhough that would make it more
3) The code currently avoids #elif, even though that would make it more
readable. This was done since #elif would need to be understood by ALL
compilers used to build the collector, and that hasn't always been the case.
It makes sense to reconsider this decision at some point, since #elif has been
+1 -1
View File
@@ -936,7 +936,7 @@ void GC_do_local_mark(mse *local_mark_stack, mse *local_top)
/* Try to share the load, since the main stack is empty, */
/* and helper threads are waiting for a refill. */
/* The entries near the bottom of the stack are likely */
/* to require more work. Thus we return those, eventhough */
/* to require more work. Thus we return those, even though */
/* it's harder. */
mse * p;
mse * new_bottom = local_mark_stack
+1 -1
View File
@@ -765,7 +765,7 @@ Refers to a namespace, e.g. \fIN:System\fR.
.I "P:"
Refers to a property. If the property is an indexer or takes parameters,
the parameter types are appended to the property name and enclosed with
paranthesis:
parenthesis:
\fIP:System.String.Length\fR,
\fIP:System.String.Chars(System.Int32)\fR.
.TP
+51 -25
View File
@@ -19,14 +19,6 @@ mono \- Mono's ECMA-CLI native code generator (Just-in-Time and Ahead-of-Time)
\fImono\fP is a runtime implementation of the ECMA Common Language
Infrastructure. This can be used to run ECMA and .NET applications.
.PP
The runtime contains a native code generator that transforms the
Common Intermediate Language into native code.
.PP
The code generator can operate in two modes: just in time compilation
(JIT) or ahead of time compilation (AOT). Since code can be
dynamically loaded, the runtime environment and the JIT are always
present, even if code is compiled ahead of time.
.PP
The runtime loads the specified
.I file
and optionally passes
@@ -36,12 +28,26 @@ to it. The
.I file
is an ECMA assembly. They typically have a .exe or .dll extension.
.PP
These executables can reference additionaly functionality in the form
of assembly references. By default those assembly references are
resolved as follows: the \fBmscorlib.dll\fR is resolved from the
system profile that is configured by Mono, and other assemblies are
loaded from the Global Assembly Cache (GAC).
.PP
The runtime contains a native code generator that transforms the
Common Intermediate Language into native code.
.PP
The code generator can operate in two modes: just in time compilation
(JIT) or ahead of time compilation (AOT). Since code can be
dynamically loaded, the runtime environment and the JIT are always
present, even if code is compiled ahead of time.
.PP
The runtime provides a number of configuration options for running
applications, for developing and debugging, and for testing and
debugging the runtime itself.
.PP
The \fImono\fP command uses the Boehm conservative garbage collector
while the \fImono-sgen\fP command uses a moving and generational
The \fImono\fP command uses the moving and generational SGen garbage collector
while the \fImono-boehm\fP command uses the conservative Boehm
garbage collector.
.SH PORTABILITY
On Unix-based systems, Mono provides a mechanism to emulate the
@@ -87,7 +93,7 @@ information which is not available on the generated file. When
precompiling code, you might want to compile with all optimizations
(-O=all). Pre-compiled code is position independent code.
.Sp
Pre compilation is just a mechanism to reduce startup time, increase
Precompilation is just a mechanism to reduce startup time, increase
code sharing across multiple mono processes and avoid just-in-time
compilation program startup costs. The original assembly must still
be present, as the metadata is contained there.
@@ -305,6 +311,26 @@ Instructs the AOT compiler to emit (or not emit) debug symbol information.
For more information about AOT, see: http://www.mono-project.com/docs/advanced/aot/
.RE
.TP
\fB--aot-path=PATH\fR
List of additional directories to search for AOT images.
.TP
\fB--apply-bindings=FILE\fR
Apply the assembly bindings from the specified configuration file when running
the AOT compiler. This is useful when compiling an auxiliary assembly that is
referenced by a main assembly that provides a configuration file. For example,
if app.exe uses lib.dll then in order to make the assembly bindings from
app.exe.config available when compiling lib.dll ahead of time, use:
.nf
mono --apply-bindings=app.exe.config --aot lib.dll
.fi
.TP
\fB--assembly-loader=MODE\fR
If mode is \fBstrict\fR, Mono will check that the public key token, culture and version
of a candidate assembly matches the requested strong name. If mode is \fBlegacy\fR, as
long as the name matches, the candidate will be allowed. \fBstrict\fR is the behavior
consistent with .NET Framework but may break some existing mono-based applications.
The default is \fBlegacy\fR.
.TP
\fB--attach=[options]\fR
Currently the only option supported by this command line argument is
\fBdisable\fR which disables the attach functionality.
@@ -315,15 +341,12 @@ The default files are /etc/mono/config and ~/.mono/config or the file
specified in the MONO_CONFIG environment variable, if set. See the
mono-config(5) man page for details on the format of this file.
.TP
\fB--aot-path=PATH\fR
List of additional directories to search for AOT images.
.TP
\fB--debugger-agent=[options]\fR
This instructs the Mono runtime to
start a debugging agent inside the Mono runtime and connect it to a
client user interface will control the Mono process.
This option is typically used by IDEs, like the MonoDevelop IDE.
.PP
This option is typically used by IDEs, like the MonoDevelop or Visual Studio IDEs.
.RS
The configuration is specified using one of more of the following options:
.RS
.ne 8
@@ -350,10 +373,10 @@ actively waits for the debugger front end to connect to the Mono process.
Mono will print out to stdout the IP address and port where it is listening.
.TP
.I setpgid=[y/n]
If set to yes, Mono will call \fBsetpgid(0, 0)\fB on startup, if that function
If set to yes, Mono will call \fBsetpgid(0, 0)\fR on startup, if that function
is available on the system. This is useful for ensuring that signals delivered
to a process that is executing the debuggee are not propagated to the debuggee,
e.g. when Ctrl-C sends \fBSIGINT\fB to the \fBsdb\fB tool.
e.g. when Ctrl-C sends \fBSIGINT\fR to the \fBsdb\fR tool.
.TP
.I suspend=[y/n]
Defaults to yes, with the default option Mono will suspend the vm on startup
@@ -596,7 +619,7 @@ platforms, and only when using gdb 7.0 or later.
Turns on profiling. For more information about profiling applications
and code coverage see the sections "PROFILING" and "CODE COVERAGE"
below.
.TP
.Sp
This option can be used multiple times, each time will load an
additional profiler. This allows developers to use modules that
extend the JIT through the Mono profiling interface.
@@ -677,7 +700,7 @@ Finally, namespaces can be specified using the N: prefix:
Don't align stack frames on the x86 architecture. By default, Mono
aligns stack frames to 16 bytes on x86, so that local floating point
and SIMD variables can be properly aligned. This option turns off the
alignment, which usually saves one intruction per call, but might
alignment, which usually saves one instruction per call, but might
result in significantly lower floating point and SIMD performance.
.TP
\fB--jitmap\fR
@@ -1760,7 +1783,7 @@ Captures the interrupt signal (Control-C) and displays a stack trace
when pressed. Useful to find out where the program is executing at a
given point. This only displays the stack trace of a single thread.
.TP
\fBinit-stacks\FR
\fBinit-stacks\fR
Instructs the runtime to initialize the stack with
some known values (0x2a on x86-64) at the start of a method to assist
in debuggin the JIT engine.
@@ -1800,11 +1823,14 @@ values.
This option allows using single-steps and breakpoints in hardware
where we cannot do it with signals.
.TP
\fBsuspend-on-sigsegv\fR
This option will suspend the program when a native SIGSEGV is received.
\fBsuspend-on-native-crash\fR
This option will suspend the program when a native crash occurs (SIGSEGV, SIGILL, ...).
This is useful for debugging crashes which do not happen under gdb,
since a live process contains more information than a core file.
.TP
\fBsuspend-on-sigsegv\fR
Same as \fBsuspend-on-native-crash\fR.
.TP
\fBsuspend-on-exception\fR
This option will suspend the program when an exception occurs.
.TP
@@ -2007,8 +2033,8 @@ http://www.mono-project.com/community/help/mailing-lists/
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), mprof-report(1), pdb2mdb(1), xsp(1), mod_mono(8).
certmgr(1), cert-sync(1), csharp(1), gacutil(1), mcs(1), mdb(1), monocov(1), monodis(1),
mono-config(5), mprof-report(1), pdb2mdb(1), xsp(1), mod_mono(8).
.PP
For more information on AOT:
http://www.mono-project.com/docs/advanced/aot/
+2 -2
View File
@@ -237,7 +237,7 @@ to the type name, while methods append the method name (with an optional count
of the number of generic parameters).
.Sp
If the constructor or method take arguments, these are listed within
paranthesis after the constructor/method name:
parenthesis after the constructor/method name:
.Sp
.I M:System.Object..ctor
,
@@ -259,7 +259,7 @@ Refers to a namespace, e.g.
.I "P:"
Refers to a property. If the property is an indexer or takes parameters,
the parameter types are appended to the property name and enclosed with
paranthesis:
parenthesis:
.I P:System.String.Length
,
.I P:System.String.Chars(System.Int32)
+1 -1
View File
@@ -407,7 +407,7 @@ mysql MySQL AB MySql.Data.MySqlClient MySql.Data
NOTES:
Ngsql is the .Net Data Provider for PosgreSQL. The
latest verison can be downloaded from
latest version can be downloaded from
http://npgsql.projects.postgresql.org/
MySql.Data is the MySQL Connector/Net for connecting to MySql databases.
+3 -1
View File
@@ -11,6 +11,7 @@ TestResult-*.log
TestResult-*.xml
TestResult*.xml
.dep_dirs-*
apidiff/*
errors/*.log
errors/dummy.xml
class/Mono.Data.Sqlite/test.db
@@ -20,7 +21,7 @@ class/RabbitMQ.Client/docs/specs/autogenerated-api-qpid-0-8.cs
class/System.Web.Mvc/System.Web.Mvc/Resources/MvcResources.resources
class/System.Web.Mvc2/System.Web.Mvc/Resources/MvcResources.resources
XmlWriter
obj-net_4_x
obj-net_4_x*
obj-bare
obj-plainweb
obj-Facades
@@ -29,3 +30,4 @@ obj-plaindesign
obj-plainservice
obj-secxml
obj-mcs-net_4_x
obj-legacy
+1 -3
View File
@@ -1,7 +1,5 @@
This list of authors is outdated. For a full list of contributors
see:
http://www.go-mono.com/archive/mono-1.0.html
check out the git history.
C# Compiler:
Miguel de Icaza ([email protected])
+1 -340
View File
@@ -1,340 +1 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
See LICENSE file in the project root for full license information.
+1 -477
View File
@@ -1,477 +1 @@
* Coding Style for the Mono C# source code.
* Class Libraries and Assembly Layout
The class libraries are grouped together in the assemblies
they belong.
Each directory here represents an assembly, and inside each
directory we divide the code based on the namespace they
implement.
In addition, each assembly directory contains a Test directory
that holds the NUnit tests for that assembly.
We use a new build system which is described by various README
files in mcs/build
The build process typically builds an assembly, but in some
cases it also builds special versions of the assemblies
intended to be used for testing.
* Missing implementation bits
If you implement a class and you are missing implementation bits,
please use the attribute [MonoTODO]. This attribute can be used
to programatically generate our status web pages:
[MonoTODO("My Function is not available on Mono")]
int MyFunction ()
{
throw new NotImplementedException ();
}
Ideally, write a human description of the reason why there is
a MonoTODO, this will be useful in the future for our
automated tools that can assist in developers porting their code.
* Tagging buggy code
If there is a bug in your implementation tag the problem by using
the word "FIXME" in the code, together with a description of the
problem.
Do not use XXX or obscure descriptions, because otherwise people
will not be able to understand what you mean.
* Tagging Problematic specs.
If the documentation and the Microsoft implementation do
differ (you wrote a test case to prove this), I suggest that you edit
the file `mcs/class/doc/API-notes' so we can keep track of these problems
and submit our comments to ECMA or Microsoft and seek clarification.
Sometimes the documentation might be buggy, and sometimes the implementation
might be buggy. Lets try to identify and pinpoint which one
is the correct one.
Sometimes the specification will be lame (consider Version.ToString (fieldCount)
where there is no way of knowing how many fields are available, making the API
not only stupid, but leading to unreliable code).
In those cases, use the keyword "LAMESPEC".
* Coding considerations and style.
In order to keep the code consistent, please use the following
conventions. From here on `good' and `bad' are used to attribute
things that would make the coding style match, or not match. It is not
a judgement call on your coding abilities, but more of a style and
look call. Please try to follow these guidelines to ensure prettiness.
Use 8 space tabs for writing your code (hopefully we can keep
this consistent). If you are modifying someone else's code, try
to keep the coding style similar.
Since we are using 8-space tabs, you might want to consider the Linus
Torvals trick to reduce code nesting. Many times in a loop, you will
find yourself doing a test, and if the test is true, you will nest.
Many times this can be changed. Example:
for (i = 0; i < 10; i++) {
if (something (i)) {
do_more ();
}
}
This take precious space, instead write it like this:
for (i = 0; i < 10; i++) {
if (!something (i))
continue;
do_more ();
}
* Performance and readability
It is more important to be correct than to be fast.
It is more important to be maintainable than to be fast.
Fast code that is difficult to maintain is likely going to
be looked down upon.
* Style Guidelines
* Use a space before an opening parenthesis when calling
functions, or indexing, like this:
method (a);
b [10];
* Do not put a space after the opening parenthesis and the
closing one, ie:
good: method (a); array [10];
bad: method ( a ); array[ 10 ];
* Inside a code block, put the opening brace on the same line
as the statement:
good:
if (a) {
code ();
code ();
}
bad:
if (a)
{
code ();
code ();
}
* Avoid using unecessary open/close braces, vertical space
is usually limited:
good:
if (a)
code ();
bad:
if (a) {
code ();
}
* When defining a method, use the C style for brace placement,
that means, use a new line for the brace, like this:
good:
void Method ()
{
}
bad:
void Method () {
}
* Properties and indexers are an exception, keep the
brace on the same line as the property declaration.
Rationale: this makes it visually
simple to distinguish them.
good:
int Property {
get {
return value;
}
}
bad:
int Property
{
get {
return value;
}
}
Notice how the accessor "get" also keeps its brace on the same
line.
For very small properties, you can compress things:
ok:
int Property {
get { return value; }
set { x = value; }
}
* Use white space in expressions liberally, except in the presence
of parenthesis:
good:
if (a + 5 > method (blah () + 4))
bad:
if (a+5>method(blah()+4))
* For any new files, please use a descriptive introduction, like
this:
//
// System.Comment.cs: Handles comments in System files.
//
// Author:
// Juan Perez ([email protected])
//
// (C) 2002 Address, Inc (http://www.address.com)
//
* If you are modyfing someone else's code, and your contribution
is significant, please add yourself to the Authors list.
* Switch statements have the case at the same indentation as the
switch:
switch (x) {
case 'a':
...
case 'b':
...
}
* Argument names should use the camel casing for
identifiers, like this:
good:
void Method (string myArgument)
bad:
void Method (string lpstrArgument)
void Method (string my_string)
* Empty methods: They should have the body of code using two
lines, in consistency with the rest:
good:
void EmptyMethod ()
{
}
bad:
void EmptyMethod () {}
void EmptyMethod ()
{}
* Line length: The line length for C# source code is 134 columns.
If your function declaration arguments go beyond
this point, please align your arguments to match the
opening brace, like this:
void Function (int arg, string argb,
int argc)
{
}
When invoking functions, the rule is different, the
arguments are not aligned with the previous
argument, instead they begin at the tabbed position,
like this:
void M ()
{
MethodCall ("Very long string that will force",
"Next argument on the 8-tab pos",
"Just like this one")
}
* Variable declaration indentation.
Sometimes it is convenient to indent the variables to make the code
look pretier, but do not add gratuitous space, try to use the minimally
necessary space, for example:
Good:
void Method ()
{
string b;
int a;
byte c;
}
Bad:
void Method ()
{
string b;
int a;
byte c;
}
* Braces and the `else' clause
If there are braces closing or opening next to the else clause,
they go on the same line as the word `else', for example:
Good:
if (..) {
} else {
}
Bad:
if (..) {
}
else {
}
Bad:
if (..) {
} else
{
}
Bad:
if (..) {
}
else
{
}
* RCS and CVS tags
Some users like to use the special RCS/CVS tags in their
source code: $id$, $log$ and so on.
The use of these is not permitted on the Mono source code
repository. This metadata belongs on a ChangeLog or in the
SVN metadata.
* File formats
Historically our repository has used a mix of line-endings,
this is a mistake that we are trying hard to fix.
For existing files, please make sure that you do not convert
the file, as that causes us to loose precious history (the
full file is commited).
For new files that you create, please make sure that you use
Subversion's support for mapping the line endings
automatically, after adding your file:
$ svn add file.cs
Execute this command:
$ svn propset svn:eol-style native file.cs
Which will make the file automatically receive the proper
treatment from that point on.
Please verify before commiting that your changes wont loose
history, you can do this by running:
$ svn diff
And examining the output.
* Warnings
Avoid commiting code with warnings to the repository, the use
of #pragmas to disable warnings is strongly discouraged, but
can be used on unique cases. Please justify the use of the
warning ignore clause on a comment.
Do not commit changes to the Makefiles that removes warnings,
if anything warnings should be eliminated one at a time, and
if not possible, they must be flagged.
* Examples:
class X : Y {
bool Method (int argument_1, int argument_2)
{
if (argument_1 == argument_2)
throw new Exception (Locale.GetText ("They are equal!");
if (argument_1 < argument_2) {
if (argument_1 * 3 > 4)
return true;
else
return false;
}
//
// This sample helps keep your sanity while using 8-spaces for tabs
//
VeryLongIdentifierWhichTakesManyArguments (
Argument1, Argument2, Argument3,
NestedCallHere (
MoreNested));
}
bool MyProperty {
get {
return x;
}
set {
x = value;
}
}
void AnotherMethod ()
{
if ((a + 5) != 4) {
}
while (blah) {
if (a)
continue;
b++;
}
}
}
* Conditional compilation
Ideally we would not need conditional compilation, and the use
of #ifdef is strongly discouraged. But due to our support for
old C# 1.0 compilers we have to use it in a few places.
Try to avoid negative tests that have an else clause, for
example:
#if !NET_2_0
CODE_FOR_1_0
#else
CODE_FOR_2_0
#endif
Instead use:
#if NET_2_0
CODE_FOR_2_0
#else
CODE_FOR_1_0
#endif
When a major feature differs across compilation targets, try
to factor out the code into a separate class, a helper class
or a separate file, and include that in your profile while
surrounding that helper file/class with the ifdefs to reduce
the amount of ifdefs in the code.
For instance, this is used for some parts of Grasshopper where
the code is ifdefed out, when large parts of a file would have
been ifdefed out, we moved the code into a MyOtherFile.jvm.cs
For 2.0 classes, this is even simpler as code can be trivially
factored out into
MyHelperClass.cli.cs
MyHelperClass.jvm.cs
By using partial classes.
Please see http://www.mono-project.com/community/contributing/coding-guidelines/ for latest guidelines.
+4 -108
View File
@@ -23,7 +23,7 @@ compilers and tools.
* *
*********************************************************************
If you only want to build a snapshot or a fresh CVS checkout of the
If you only want to build a snapshot or a fresh checkout of the
sources, you should go into the `mono' sibling directory and issue the
make command, like this:
@@ -35,72 +35,6 @@ make command, like this:
The compilation is bundled with the build due to dependencies on the
class libraries on the runtime.
Build Features for Developers of Mono.
======================================
These instructions apply to both Linux and Windows. To build this
package, you must already have a C# compiler installed. This means
that to build on Linux, you need to get a distribution of the MCS
binaries; these are called monocharges. They can be found at
www.go-mono.com/daily. On Windows, you can just use the
Microsoft compiler. You also need GNU make to build the software (on
Windows, you will need for example the Cygwin environment setup).
You can customize your MCS configuration by using:
./configure [--prefix=PREFIX] [--profile=PROFILE]
If you do not run the above, the defaults are /usr/local for the
prefix, and `default' for the profile.
To build the compiler and class libraries, run:
make
The libraries will be placed in the directory class/lib/ and the mcs
compiler executable in mcs/.
To install them, run the following:
make install
If you get "corlib out of sync" errors, try
make PROFILE="atomic"
A better alternative would be to fire off a 'make' from a sibling or
parent 'mono/' tree.
Troubleshooting
===============
We try to maintain the CVS tree such that it is bootstrapable from the
latest released version of mono and mcs. Occasionally, something in the
compiler or runtime changes enough that an existing installation cannot
complete a bootstrap from cvs. In this case, go to
http://go-mono.com/daily and download a monocharge or monolite tarball.
Unpack and copy the .dlls to $prefix/lib and .exes to $prefix/bin/.
Then you should be able to complete the build normally (i.e. using make
bootstrap).
wget http://go-mono.com/daily/monolite-20040505.tar.gz
tar -zxvf monolite-20040505.tar.gz
cd monolite-20040505
env prefix=/usr/local sh recharge.sh
Monocharges
===========
If you are tracking Mono's development, you may sometimes need to share
the compiled libraries with others, you can do:
make monocharge
Or a light version, which contains only the essential libraries and
results in a much smaller file:
make monocharge-lite
Configuration
=============
@@ -110,48 +44,15 @@ place your configuration options in build/config.make
A list of variables that control the build are listed in the file
build/config-default.make.
Build profiles? What?
======================
Don't worry about them too much. If you're wondering which to use:
use the default if you can (that's why it's the default!) and use
the atomic if you have to.
The default profile uses the C# compiler and class libaries as they
are built. This lets you build MCS without needing to have already
installed it, but can fail if the libraries change significantly.
(This is the source of the dreaded "corlib out of sync" warning, most
of the time.)
The atomic profile tries to use the system compiler and preexisting
MCS libraries. New libaries are built against this constant reference
point, so if a newly built library has a binary incompatibility, the
rest of your build can proceed.
If you want to always use the atomic profile, run this command:
./configure --profile=atomic
More About the Build System
===========================
More information is found in build/README.*. Here's a quick rundown
of the features:
* Unified build system for Windows and Linux. Windows is still
fairly untested, but "should work." Unfortunately I don't
have a Windows machine to test on, but Gonzalo can get
corlib to build I think and that's about as complicated as
it gets.
* Profile support. 'make PROFILE=profilename' or 'export
PROFILE=profilename ; make' will work. Profiles are defined
in build/profiles/profilename.make ; right now there isn't
too much going on. The 'bootstrap' profile will build the
way makefile.gnu did on Linux, by setting MONO_PATH and
using mcs/mcs.exe; the default profile will build against
the existing system libraries and compile with 'mcs', which
should reduce a lot of 'corlib out of sync' warnings.
in build/profiles/profilename.make ;
* Important variables are shared among makefiles now; you can
edit build/config.make (see build/config-default.make for a
@@ -164,16 +65,11 @@ of the features:
* Test libraries now live in class/Library/Library_test.dll,
not class/Library/Test. 'make test' will build the test DLL,
'make run-test' will actually run the nunit tests. Set the
variable TEST_HARNESS to run with a program other than
nunit-console (for example, nunit-gtk).
'make run-test' will actually run the nunit tests.
* Standardized recursive targets: all, clean, install, test,
run-test. Read build/README.makefiles for definitions of
what they should do
* (Relatively) sane 'make dist' target; 'make distcheck'
support; cute 'make monocharge' and 'make monocharge-lite'
targets. They're made possible because 'make install' now
supports DESTDIR a la automake, which I'm sure someone cares
about.
support;
+31 -21
View File
@@ -95,8 +95,7 @@ DISTFILES = \
mkinstalldirs \
MonoIcon.png \
README \
ScalableMonoIcon.svg \
winexe.in
ScalableMonoIcon.svg
dist-local: dist-default
@@ -138,24 +137,35 @@ distcheck: dist-tarball
rm -f before.list after.list distdist.list ; \
rm -rf $(package) InstallTest
monocharge:
chargedir=monocharge-`date -u +%Y%m%d` ; \
mkdir "$$chargedir" ; \
DESTDIR=`cd "$$chargedir" && pwd` ; \
$(MAKE) install DESTDIR="$$DESTDIR" || exit 1 ; \
tar cvjf "$$chargedir".tar.bz2 "$$chargedir" ; \
rm -rf "$$chargedir"
# Targets for creating API diffs of the framework
# A bare-bones monocharge.
MONO_API_SNAPSHOT_PATH := $(topdir)../external/api-snapshot/
GENAPI := $(MONO_API_SNAPSHOT_PATH)tools/genapi/GenAPI.exe
MONO_API_SNAPSHOT_PROFILE_PATH := $(MONO_API_SNAPSHOT_PATH)profiles/$(PROFILE)/
MONO_API_ASSEMBLIES_IGNORED := $(addprefix $(topdir)class/lib/$(PROFILE)/, Mono.CSharp.dll SystemWebTestShim.dll standalone-runner-support.dll nunit.core.dll nunit.core.extensions.dll nunit.core.interfaces.dll nunit.framework.dll nunit.framework.extensions.dll nunit.mocks.dll nunit.util.dll nunit-console-runner.dll nunitlite.dll)
MONO_API_ASSEMBLIES := $(filter-out $(MONO_API_ASSEMBLIES_IGNORED), $(wildcard $(topdir)class/lib/$(PROFILE)/*.dll)) $(wildcard $(topdir)class/lib/$(PROFILE)/Facades/*.dll)
MONO_API_ASSEMBLIES_CS := $(MONO_API_ASSEMBLIES:$(topdir)class/lib/$(PROFILE)/%.dll=$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs)
monocharge-lite:
chargedir=monocharge-lite-`date -u +%Y%m%d` ; \
mkdir "$$chargedir" ; \
DESTDIR=`cd "$$chargedir" && pwd` ; \
$(MAKE) -C mcs install DESTDIR="$$DESTDIR" || exit 1; \
$(MAKE) -C class/corlib install DESTDIR="$$DESTDIR" || exit 1; \
$(MAKE) -C class/System install DESTDIR="$$DESTDIR" || exit 1; \
$(MAKE) -C class/System.XML install DESTDIR="$$DESTDIR" || exit 1; \
$(MAKE) -C class/Mono.CSharp.Debugger install DESTDIR="$$DESTDIR" || exit 1; \
tar cvjf "$$chargedir".tar.bz2 "$$chargedir" ; \
rm -rf "$$chargedir"
$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs: $(topdir)class/lib/$(PROFILE)/%.dll $(GENAPI) $(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt
@mkdir -p $(dir $@)
$(Q) MONO_PATH=$(topdir)class/lib/$(BUILD_PROFILE) $(RUNTIME) $(GENAPI) -libPath:$(topdir)class/lib/$(PROFILE),$(topdir)class/lib/$(PROFILE)/Facades -out:$(dir $@) -headerFile:$(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt -assemblyAttributes -typeForwardedTo -assemblyVersion -assembly:$< || echo "Couldn't process assembly." > $@
mono-api-current: $(MONO_API_ASSEMBLIES_CS)
mono-api-current-clean:
$(Q) rm -rf "$(MONO_API_SNAPSHOT_PROFILE_PATH)"
mono-api-diff:
@echo "Regenerating API snapshot..."
$(Q) $(MAKE) mono-api-current-clean PROFILE=net_4_x
$(Q) $(MAKE) mono-api-current-clean PROFILE=monotouch
$(Q) $(MAKE) mono-api-current-clean PROFILE=monodroid
$(Q) $(MAKE) mono-api-current PROFILE=net_4_x
$(Q) $(MAKE) mono-api-current PROFILE=monotouch
$(Q) $(MAKE) mono-api-current PROFILE=monodroid
@echo "Checking public API differences..."
$(Q) cd $(MONO_API_SNAPSHOT_PATH); git add -A .
$(Q) cd $(MONO_API_SNAPSHOT_PATH); git diff --no-renames HEAD > $(abspath $(topdir))/temp.patch
@mkdir -p apidiff
$(Q) sed -e "/@diffdata@/r temp.patch" -e "/@diffdata@/d" -e "s/@title@/Public API Diff/g" -e "s/@description@/If the changes are intentional, run <code>make -C mcs mono-api-diff<\/code> locally and commit changes in external\/api-snapshot./g" diff.html.in > apidiff/index.html
$(Q) if [ -s temp.patch ]; then echo "Error: Found public API differences, see mcs/apidiff/index.html. If the changes are intentional, please go to external/api-snapshot and commit them."; rm -f temp.patch; exit 1; else echo "No differences found."; rm -f temp.patch; fi
+20 -19
View File
@@ -19,31 +19,34 @@ package module which drives the compilation of this directory.
class/
The class libraries.
docs/
Some notes on the compiler and the class libraries.
errors/
Sample programs that should generate errors by the C# compiler.
ilasm/
The IL assembler.
jay/
Yacc-based parser generator.
mcs/
The Mono C# compiler
nunit24/
An old copy of the NUnit 2.4 library that we ship for historical reasons.
packages/
Integrates some packages from NuGet (like Roslyn) into the build system.
tests/
Regression test suite for the C# compiler
docs/
Some notes on the compiler and the class libraries.
nant/
A copy of nant source code, used during the build process
on Windows.
tools/
Various small development tools: CorCompare used to compare
two assemblies for differences in the API; TypeReflector is
a tool used to introspect types from assemblies from the
command line; MonoStyle helps you keep your code indendented
with the Mono programming style.
two assemblies for differences in the API; csharp is a C# REPL;
cil-strip trims IL from assemblies.
* Building Individual Directories
=================================
@@ -51,14 +54,14 @@ package module which drives the compilation of this directory.
You can build individual components in the hierarchy by running the command
"make", and to install it use "make install".
By default, the 2.x profile is built, if you want to build the net 1.1 profile,
By default, the 4.x profile is built, if you want to build other profiles,
use the following command:
make PROFILE=net_1_1
make PROFILE=<profilename>
And to install:
make PROFILE=net_1_1 install
make PROFILE=<profilename> install
To turn on verbose mode in the build (for example to diagnose a
problem), you can use the V=1 flag, like this:
@@ -68,16 +71,14 @@ problem), you can use the V=1 flag, like this:
* Running Unit tests
====================
You can run unit tests in individual components by running the command
"make run-test". If you want to run tests for a different profile (say
'net_1_1')
You can run unit tests in individual components by running the command:
make run-test PROFILE=net_1_1
make run-test
If you want to only run the tests in a single fixture (say
'MonoTests.System.TypeTest'), you can use
make run-test TEST_HARNESS_FLAGS=/fixture:MonoTests.System.TypeTest
make run-test TEST_FIXTURE=System.TypeTest
* Acknowledgements
==================
+2 -2
View File
@@ -6,12 +6,12 @@ Peter Williams <[email protected]>
It's pretty easy. You can create two files in this directory to tweak
settings: pre-config.make and config.make.
pre-config.make is included before $(PLATFORM).make and
pre-config.make is included before $(BUILD_PLATFORM).make and
$(PROFILE).make, so you can set either of these variables if you want
to change the default.
Just about any other change should go in config.make, which is
included after $(PLATFORM).make and $(PROFILE).make, so you can use
included after $(BUILD_PLATFORM).make and $(PROFILE).make, so you can use
the values defined in those files if you wish. For example,
MCS_FLAGS = $(DEFAULT_MCS_FLAGS) /my-experimental-optimizer-flag
+12 -11
View File
@@ -119,8 +119,8 @@ Configuration variables are given defaults in `config-default.make';
`rules.make' optionally includes `$(topdir)/build/config.make', so you
can customize your build without CVS trying to commit your modified
`config-default.make' all the time. Platform-specific variables are
defined in `$(topdir)/build/platforms/$(PLATFORM).make', where
$(PLATFORM) is detected in config-default.make. (Currently, the only
defined in `$(topdir)/build/platforms/$(BUILD_PLATFORM).make', where
$(BUILD_PLATFORM) is detected in config-default.make. (Currently, the only
choices are linux.make and win32.make.)
The best way to learn what the configuration variables are is to read
@@ -320,9 +320,8 @@ include ../../build/library.make
Where you library is called $(LIBRARY); it will be put into
$(topdir)/class/lib. LIB_MCS_FLAGS is the set of MCS flags to use when
compiling the library; in addition, a global set of flags called
$(LIBRARY_FLAGS) is added (that variable is defined in
config-defaults.make), as well as the usual $(LOCAL_MCS_FLAGS).
compiling the library; in addition, a set of flags called
$(LOCAL_MCS_FLAGS) is added.
As in executable.make, the sources for your library are listed in
$(LIBRARY).sources. Note: these source lists should have Unix forward
@@ -418,13 +417,15 @@ just "mono --debug".
* Calling the compiler directly? Use $(MCS).
* Calling the compiler directly? Use $(BUILD_MCS).
Really, you should use $(CSCOMPILE) whenever possible, but $(MCS) is
out there. $(BOOTSTRAP_MCS) is the C# compiler that we use to build
mcs.exe; on Linux, we then use mcs.exe to build everything else, but
on Windows, we use csc.exe to build everything. Only use
$(BOOTSTRAP_MCS) if you know what you're doing.
Really, you should use $(CSCOMPILE) whenever possible, but $(BUILD_MCS) is
out there. For the `basic` profile, $(BUILD_MCS) is the C# compiler that we
use to build mcs.exe; on Linux, we then use mcs.exe to build everything else,
but on Windows, we use csc.exe to build everything. For the `build` profile,
$(BUILD_MCS) is the C# compiler we built in the `basic` profile. For the
other profiles, $(BUILD_MCS) is the C# compiler we built in the `build`
profile.
+1 -1
View File
@@ -28,7 +28,7 @@ PLATFORM_CHANGE_SEPARATOR_CMD
A command to change filename separators given on stdin. Leave undefined
if Unixy filenames will work. See win32.make.
BOOTSTRAP_MCS
BUILD_MCS
The C# compiler used to compile mcs/mcs.exe, and possibly other
assemblies if the user is doing a standalone build (that is, not
a bootstrap).
-8
View File
@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\ExtensionPack\MSBuild.ExtensionPack.tasks"/>
<Target Name="Build">
<Copy SourceFiles="common\Consts.cs.in" DestinationFiles="common\Consts.cs"/>
<MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" RegexPattern="@MONO_VERSION@" Replacement="2.7.0.0" Files="common\Consts.cs"/>
</Target>
</Project>
+2 -3
View File
@@ -10,11 +10,10 @@
CODEPAGE = 65001
RUNTIME_FLAGS =
TEST_HARNESS = $(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)nunit-lite-console.exe
TEST_HARNESS = $(topdir)/class/lib/$(PROFILE_DIRECTORY)/$(PARENT_PROFILE)nunit-lite-console.exe
PLATFORM_DEBUG_FLAGS = /debug:portable
MCS_FLAGS =
MBAS_FLAGS = -debug
LIBRARY_FLAGS =
ifndef CFLAGS
CFLAGS = -g -O2
endif
@@ -24,7 +23,7 @@ mono_libdir = $(exec_prefix)/lib
sysconfdir = $(prefix)/etc
#RUNTIME = mono
RUNTIME = false
TEST_RUNTIME = MONO_PATH="./$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug
TEST_RUNTIME = MONO_PATH="./$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/$(PROFILE_DIRECTORY)$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug
# In case you want to add MCS_FLAGS, this lets you not have to
# keep track of the default value
+17 -26
View File
@@ -19,31 +19,24 @@ executable_CLEAN_FILES += $(response)
endif
ifndef the_libdir
the_libdir = $(topdir)/class/lib/$(PROFILE)/
ifdef PROGRAM_USE_INTERMEDIATE_FILE
build_libdir = $(the_libdir)tmp/
else
build_libdir = $(the_libdir)
endif
the_libdir = $(topdir)/class/lib/$(PROFILE_DIRECTORY)/
endif
ifdef base_prog_config
PROGRAM_config := $(build_libdir)$(PROGRAM).config
PROGRAM_config := $(the_libdir)$(PROGRAM).config
endif
sn = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/sn.exe
SN = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn) -q
sn = $(topdir)/class/lib/$(BUILD_PROFILE)/sn.exe
SN = MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn) -q
the_lib = $(the_libdir)$(base_prog)
build_lib = $(build_libdir)$(base_prog)
executable_CLEAN_FILES += $(the_lib) $(the_lib).so $(the_lib).mdb $(the_lib:.exe=.pdb)
executable_CLEAN_FILES += $(build_lib) $(build_lib).so $(build_lib).mdb $(build_lib:.exe=.pdb)
executable_CLEAN_FILES += $(the_lib) $(the_lib).so $(the_lib).mdb $(the_lib:.exe=.pdb)
makefrag = $(depsdir)/$(PROFILE)_$(base_prog).makefrag
MCS_REFERENCES = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(LIB_REFS))
MCS_REFERENCES += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.exe,$(EXE_REFS))
MCS_REFERENCES = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS))
MCS_REFERENCES += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.exe,$(EXE_REFS))
ifndef NO_BUILD
all-local: $(the_lib) $(PROGRAM_config)
@@ -117,21 +110,19 @@ ifndef PROGRAM_COMPILE
PROGRAM_COMPILE = $(CSCOMPILE)
endif
$(the_lib): $(the_libdir)/.stamp
$(the_lib): $(the_libdir)/.stamp $(if $(PROFILE_PLATFORM),$(if $(filter $(HOST_PLATFORM),$(BUILD_PLATFORM)),$(topdir)/class/lib/$(PROFILE)/.stamp))
$(build_lib): $(BUILT_SOURCES) $(EXTRA_SOURCES) $(response) $(build_libdir:=/.stamp)
ifdef PROFILE_PLATFORM
$(topdir)/class/lib/$(PROFILE)/.stamp: | $(topdir)/class/lib/$(PROFILE)-$(HOST_PLATFORM)/.stamp
$(if $(filter $(HOST_PLATFORM),$(BUILD_PLATFORM)),$(if $(filter $(BUILD_PLATFORM),win32),CYGWIN=winsymlinks:nativestrict) ln -s $(abspath $(topdir)/class/lib/$(PROFILE)-$(BUILD_PLATFORM)) $(abspath $(topdir)/class/lib/$(PROFILE)))
endif
$(the_lib): $(BUILT_SOURCES) $(EXTRA_SOURCES) $(response) $(the_libdir:=/.stamp)
$(PROGRAM_COMPILE) $(MCS_REFERENCES) -target:exe -out:$@ $(BUILT_SOURCES) $(EXTRA_SOURCES) @$(response)
ifdef PROGRAM_SNK
$(Q) $(SN) -R $@ $(PROGRAM_SNK)
endif
ifdef PROGRAM_USE_INTERMEDIATE_FILE
$(the_lib): $(build_lib)
$(Q) cp $(build_lib) $@
$(Q) test ! -f $(build_lib).mdb || mv $(build_lib).mdb [email protected]
$(Q) test ! -f $(build_lib:.exe=.pdb) || mv $(build_lib:.exe=.pdb) $(the_lib:.exe=.pdb)
endif
ifdef PROGRAM_config
ifneq ($(base_prog_config),$(PROGRAM_config))
executable_CLEAN_FILES += $(PROGRAM_config)
@@ -142,7 +133,7 @@ endif
$(makefrag): $(sourcefile)
# @echo Creating $@ ...
@sed 's,^,$(build_lib): ,' $< >$@
@sed 's,^,$(the_lib): ,' $< >$@
@if test ! -f $(sourcefile).makefrag; then :; else \
cat $(sourcefile).makefrag >> $@ ; \
echo '$@: $(sourcefile).makefrag' >> $@; \
@@ -171,10 +162,10 @@ csproj-local:
config_file=`basename $(PROGRAM) .exe`-$(PROFILE).input; \
echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
(echo $(is_boot); \
echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(patsubst %,-r:%,$(LIB_REFS)); \
echo $(USE_MCS_FLAGS) $(LIB_MCS_FLAGS) $(patsubst %,-r:%,$(LIB_REFS)); \
echo $(PROGRAM); \
echo $(BUILT_SOURCES_cmdline); \
echo $(build_lib); \
echo $(the_lib); \
echo $(FRAMEWORK_VERSION); \
echo $(PROFILE); \
echo $(RESOURCE_DEFS); \
+11
View File
@@ -29,6 +29,17 @@ process_includes() {
rm -f $t
}
check_newline_eof() {
file=$1
if ! test -f "$file"; then return; fi
if ! test -z "$(tail -c 1 "$file")"; then echo "$file: missing newline at end of file."; exit 1; fi
}
check_newline_eof $incfile
check_newline_eof $excfile
check_newline_eof $extfile
check_newline_eof $extexcfile
rm -f $outfile.makefrag
process_includes $incfile $outfile.inc
+74 -117
View File
@@ -23,37 +23,8 @@ _FILTER_OUT = $(foreach x,$(2),$(if $(findstring $(1),$(x)),,$(x)))
LIB_REFS_FULL = $(call _FILTER_OUT,=, $(LIB_REFS))
LIB_REFS_ALIAS = $(filter-out $(LIB_REFS_FULL),$(LIB_REFS))
LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(LIB_REFS_FULL))
LIB_MCS_FLAGS += $(patsubst %,-r:%.dll, $(subst =,=$(topdir)/class/lib/$(PROFILE)/,$(LIB_REFS_ALIAS)))
sourcefile = $(LIBRARY).sources
# If the directory contains the per profile include file, generate list file.
PROFILE_sources := $(wildcard $(PROFILE)_$(LIBRARY).sources)
ifdef PROFILE_sources
PROFILE_excludes = $(wildcard $(PROFILE)_$(LIBRARY).exclude.sources)
sourcefile = $(depsdir)/$(PROFILE)_$(LIBRARY).sources
library_CLEAN_FILES += $(sourcefile)
# Note, gensources.sh can create a $(sourcefile).makefrag if it sees any '#include's
# We don't include it in the dependencies since it isn't always created
$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(topdir)/build/gensources.sh
@echo Creating the per profile list $@ ...
$(SHELL) $(topdir)/build/gensources.sh $@ '$(PROFILE_sources)' '$(PROFILE_excludes)'
endif
PLATFORM_excludes := $(wildcard $(LIBRARY).$(PLATFORM)-excludes)
ifndef PLATFORM_excludes
ifeq (cat,$(PLATFORM_CHANGE_SEPARATOR_CMD))
response = $(sourcefile)
endif
endif
ifndef response
response = $(depsdir)/$(PROFILE)_$(LIBRARY_SUBDIR)_$(LIBRARY).response
library_CLEAN_FILES += $(response)
endif
LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_FULL))
LIB_MCS_FLAGS += $(patsubst %,-r:%.dll, $(subst =,=$(topdir)/class/lib/$(PROFILE_DIRECTORY)/,$(LIB_REFS_ALIAS)))
ifndef LIBRARY_NAME
LIBRARY_NAME = $(LIBRARY)
@@ -65,17 +36,10 @@ else
lib_dir = lib
endif
ifdef LIBRARY_SUBDIR
the_libdir_base = $(topdir)/class/$(lib_dir)/$(PROFILE)/$(LIBRARY_SUBDIR)/
else
the_libdir_base = $(topdir)/class/$(lib_dir)/$(PROFILE)/
endif
the_libdir_base = $(topdir)/class/$(lib_dir)/$(PROFILE_DIRECTORY)/$(if $(LIBRARY_SUBDIR),$(LIBRARY_SUBDIR)/)
ifdef RESOURCE_STRINGS
ifneq (basic, $(PROFILE))
RESOURCE_STRINGS_FILES += $(RESOURCE_STRINGS:%=--resourcestrings:%)
endif
endif
the_libdir = $(the_libdir_base)$(intermediate)
the_lib = $(the_libdir)$(LIBRARY_NAME)
#
# The bare directory contains the plain versions of System and System.Xml
@@ -88,29 +52,22 @@ bare_libdir = $(the_libdir_base)bare
#
secxml_libdir = $(the_libdir_base)secxml
the_libdir = $(the_libdir_base)$(intermediate)
ifdef LIBRARY_USE_INTERMEDIATE_FILE
build_libdir = $(the_libdir)tmp/
else
build_libdir = $(the_libdir)
ifdef RESOURCE_STRINGS
ifneq (basic, $(PROFILE))
RESOURCE_STRINGS_FILES += $(RESOURCE_STRINGS:%=--resourcestrings:%)
endif
endif
the_lib = $(the_libdir)$(LIBRARY_NAME)
build_lib = $(build_libdir)$(LIBRARY_NAME)
library_CLEAN_FILES += $(the_lib) $(the_lib).so $(the_lib).mdb $(the_lib:.dll=.pdb)
library_CLEAN_FILES += $(build_lib) $(build_lib).so $(build_lib).mdb $(build_lib:.dll=.pdb)
ifdef NO_SIGN_ASSEMBLY
SN = :
else
ifeq ("$(SN)","")
sn = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/sn.exe
SN = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn) -q
sn = $(topdir)/class/lib/$(BUILD_PROFILE)/sn.exe
SN = MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn) -q
endif
endif
ifeq ($(PLATFORM), win32)
ifeq ($(BUILD_PLATFORM), win32)
GACDIR = `cygpath -w $(mono_libdir)`
GACROOT = `cygpath -w $(DESTDIR)$(mono_libdir)`
test_flags += -d:WINDOWS
@@ -123,24 +80,18 @@ ifndef NO_BUILD
all-local: $(the_lib) $(extra_targets)
endif
ifeq ($(LIBRARY_COMPILE),$(BOOT_COMPILE))
is_boot=true
else
is_boot=false
endif
csproj-local: csproj-library csproj-test
intermediate_clean=$(subst /,-,$(intermediate))
csproj-library:
config_file=`basename $(LIBRARY) .dll`-$(intermediate_clean)$(PROFILE).input; \
case "$(thisdir)" in *"Facades"*) config_file=Facades_$$config_file;; esac; \
case "$(thisdir)" in *"Facades"*) config_file=Facades_$$config_file;; *"legacy"*) config_file=legacy_$$config_file;; esac; \
echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
(echo $(is_boot); \
echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS); \
(echo $(if $(filter $(PROFILE),basic),true,false); \
echo $(USE_MCS_FLAGS) $(LIB_MCS_FLAGS); \
echo $(LIBRARY_NAME); \
echo $(BUILT_SOURCES_cmdline); \
echo $(build_lib); \
echo $(the_lib); \
echo $(FRAMEWORK_VERSION); \
echo $(PROFILE); \
echo $(RESOURCE_DEFS); \
@@ -266,7 +217,7 @@ endif
# make dist will collect files in .sources files from all profiles
dist-local: dist-default
subs=' ' ; \
for f in `$(topdir)/tools/removecomments.sh $(filter-out $(wildcard *_test.dll.sources) $(wildcard *exclude.sources),$(wildcard *.sources))` $(TEST_FILES) ; do \
for f in `$(topdir)/tools/removecomments.sh $(filter-out $(wildcard *_test.dll.sources) $(wildcard *_xtest.dll.sources) $(wildcard *exclude.sources),$(wildcard *.sources))` $(TEST_FILES) ; do \
case $$f in \
../*) : ;; \
*.g.cs) : ;; \
@@ -277,10 +228,6 @@ dist-local: dist-default
for d in . $$subs ; do \
case $$d in .) : ;; *) test ! -f $$d/ChangeLog || cp -p $$d/ChangeLog $(distdir)/$$d ;; esac ; done
ifndef LIBRARY_COMPILE
LIBRARY_COMPILE = $(CSCOMPILE)
endif
ifndef LIBRARY_SNK
LIBRARY_SNK = $(topdir)/class/mono.snk
endif
@@ -296,84 +243,94 @@ endif
# The library
$(the_lib): $(the_libdir)/.stamp
# If the directory contains the per profile include file, generate list file.
PROFILE_sources := $(firstword $(if $(PROFILE_PLATFORM),$(wildcard $(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY).sources)) $(wildcard $(PROFILE)_$(LIBRARY).sources) $(wildcard $(LIBRARY).sources))
PROFILE_excludes = $(firstword $(if $(PROFILE_PLATFORM),$(wildcard $(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY).exclude.sources)) $(wildcard $(PROFILE)_$(LIBRARY).exclude.sources))
$(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir:=/.stamp) $(GEN_RESOURCE_DEPS)
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(GEN_RESOURCE_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
ifdef RESOURCE_STRINGS_FILES
$(Q) $(STRING_REPLACER) $(RESOURCE_STRINGS_FILES) $@
endif
$(Q) $(SN) -R $@ $(LIBRARY_SNK)
# Note, gensources.sh can create a $(sourcefile).makefrag if it sees any '#include's
# We don't include it in the dependencies since it isn't always created
sourcefile = $(depsdir)/$(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY_SUBDIR)_$(LIBRARY).sources
$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(topdir)/build/gensources.sh $(depsdir)/.stamp
$(SHELL) $(topdir)/build/gensources.sh $@ '$(PROFILE_sources)' '$(PROFILE_excludes)'
ifdef LIBRARY_USE_INTERMEDIATE_FILE
$(the_lib): $(build_lib)
$(Q) cp $(build_lib) $@
$(Q) $(SN) -v $@
$(Q) test ! -f $(build_lib).mdb || mv $(build_lib).mdb [email protected]
$(Q) test ! -f $(build_lib:.dll=.pdb) || mv $(build_lib:.dll=.pdb) $(the_lib:.dll=.pdb)
endif
library_CLEAN_FILES += $(sourcefile)
library_CLEAN_FILES += $(PROFILE)_aot.log
response = $(depsdir)/$(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY_SUBDIR)_$(LIBRARY).response
$(response): $(sourcefile) $(topdir)/build/library.make $(depsdir)/.stamp
$(PLATFORM_CHANGE_SEPARATOR_CMD) <$(sourcefile) >$@
ifdef PLATFORM_AOT_SUFFIX
$(the_lib)$(PLATFORM_AOT_SUFFIX): $(the_lib)
$(Q_AOT) MONO_PATH='$(the_libdir_base)' > $(PROFILE)_$(LIBRARY_NAME)_aot.log 2>&1 $(RUNTIME) $(AOT_BUILD_FLAGS) --debug $(the_lib)
library_CLEAN_FILES += $(response)
all-local-aot: $(the_lib)$(PLATFORM_AOT_SUFFIX)
endif
makefrag = $(depsdir)/$(PROFILE)_$(LIBRARY_SUBDIR)_$(LIBRARY).makefrag
library_CLEAN_FILES += $(makefrag)
$(makefrag): $(sourcefile)
makefrag = $(depsdir)/$(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY_SUBDIR)_$(LIBRARY).makefrag
$(makefrag): $(sourcefile) $(topdir)/build/library.make $(depsdir)/.stamp
# @echo Creating $@ ...
@sed 's,^,$(build_lib): ,' $< >$@
@sed 's,^,$(the_lib): ,' $< >$@
@if test ! -f $(sourcefile).makefrag; then :; else \
cat $(sourcefile).makefrag >> $@ ; \
echo '$@: $(sourcefile).makefrag' >> $@; \
echo '$(sourcefile).makefrag:' >> $@; fi
ifneq ($(response),$(sourcefile))
ifdef PLATFORM_excludes
$(response): $(sourcefile) $(PLATFORM_excludes)
@echo Filtering $(sourcefile) to $@ ...
@sort $(sourcefile) $(PLATFORM_excludes) | uniq -u | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
else
$(response): $(sourcefile)
@echo Converting $(sourcefile) to $@ ...
@cat $(sourcefile) | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
endif
library_CLEAN_FILES += $(makefrag)
ifndef NO_BUILD
all-local: $(makefrag)
endif
-include $(makefrag)
$(the_lib): $(the_libdir)/.stamp $(if $(PROFILE_PLATFORM),$(if $(filter $(HOST_PLATFORM),$(BUILD_PLATFORM)),$(topdir)/class/$(lib_dir)/$(PROFILE)/.stamp))
ifdef PROFILE_PLATFORM
$(topdir)/class/$(lib_dir)/$(PROFILE)/.stamp: | $(topdir)/class/$(lib_dir)/$(PROFILE)-$(HOST_PLATFORM)/.stamp
$(if $(filter $(HOST_PLATFORM),$(BUILD_PLATFORM)),$(if $(filter $(BUILD_PLATFORM),win32),CYGWIN=winsymlinks:nativestrict) ln -s $(abspath $(topdir)/class/$(lib_dir)/$(PROFILE)-$(BUILD_PLATFORM)) $(abspath $(topdir)/class/$(lib_dir)/$(PROFILE)))
endif
ifndef NO_BUILD
$(the_lib): $(response) $(sn) $(BUILT_SOURCES) $(the_libdir)/.stamp $(GEN_RESOURCE_DEPS)
$(CSCOMPILE) $(LIB_MCS_FLAGS) $(GEN_RESOURCE_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
ifdef RESOURCE_STRINGS_FILES
$(Q) $(STRING_REPLACER) $(RESOURCE_STRINGS_FILES) $@
endif
echo $(Q) $(SN) -R $@ $(LIBRARY_SNK)
library_CLEAN_FILES += $(the_lib) $(the_lib).mdb $(the_lib:.dll=.pdb)
ifdef PLATFORM_AOT_SUFFIX
$(the_lib)$(PLATFORM_AOT_SUFFIX): $(the_lib)
$(Q_AOT) MONO_PATH='$(the_libdir_base)' > $(PROFILE)_$(LIBRARY_NAME)_aot.log 2>&1 $(RUNTIME) $(AOT_BUILD_FLAGS) --debug $(the_lib)
all-local-aot: $(the_lib)$(PLATFORM_AOT_SUFFIX)
library_CLEAN_FILES += $(the_lib)$(PLATFORM_AOT_SUFFIX) $(PROFILE)_$(LIBRARY_NAME)_aot.log
endif
endif
# for now, don't give any /lib flags or set MONO_PATH, since we
# give a full path to the assembly.
## Include corcompare stuff
include $(topdir)/build/corcompare.make
all-local: $(makefrag) $(test_makefrag) $(btest_makefrag)
ifneq ($(response),$(sourcefile))
$(response): $(topdir)/build/library.make $(depsdir)/.stamp
ifndef NO_BUILD
all-local: $(test_makefrag) $(btest_makefrag)
endif
$(makefrag) $(test_response) $(test_makefrag) $(btest_response) $(btest_makefrag): $(topdir)/build/library.make $(depsdir)/.stamp
$(test_response) $(test_makefrag) $(btest_response) $(btest_makefrag): $(topdir)/build/library.make $(depsdir)/.stamp
## Documentation stuff
Q_MDOC_UP=$(if $(V),,@echo "MDOC-UP [$(PROFILE)] $(notdir $(@))";)
MDOC_UP =$(Q_MDOC_UP) \
MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe \
update --delete -o Documentation/en $(the_lib)
doc-update-local: $(the_libdir)/.doc-stamp
$(the_libdir)/.doc-stamp: $(the_lib)
$(MDOC_UP)
$(MDOC_UP) $(the_lib)
@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)
update-corefx-sr: $(RESX_RESOURCE_STRING)
MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_PROFILE)/resx2sr.exe $(RESX_RESOURCE_STRING) >corefx/SR.cs
+162
View File
@@ -0,0 +1,162 @@
# -*- makefile -*-
#
# The rules for building with msbuild.
#
# The NO_TEST stuff is not too pleasant but whatcha
# gonna do.
ifndef ASSEMBLY_NAME
ASSEMBLY_NAME = $(ASSEMBLY)
endif
the_assemblydir_base = $(topdir)/class/lib/$(PROFILE_DIRECTORY)/$(if $(ASSEMBLY_SUBDIR),$(ASSEMBLY_SUBDIR)/)
the_assemblydir = $(the_assemblydir_base)$(intermediate)
the_assembly = $(the_assemblydir)$(ASSEMBLY_NAME)
ifeq ($(BUILD_PLATFORM), win32)
GACDIR = `cygpath -w $(mono_libdir)`
GACROOT = `cygpath -w $(DESTDIR)$(mono_libdir)`
test_flags += -d:WINDOWS
else
GACDIR = $(mono_libdir)
GACROOT = $(DESTDIR)$(mono_libdir)
endif
ifndef NO_BUILD
all-local: $(extra_targets)
endif
csproj-local:
install-local: all-local
test-local: all-local
uninstall-local:
ifdef NO_INSTALL
install-local uninstall-local:
@:
else
aot_lib = $(the_assembly)$(PLATFORM_AOT_SUFFIX)
aot_libname = $(ASSEMBLY_NAME)$(PLATFORM_AOT_SUFFIX)
ifdef ASSEMBLY_INSTALL_DIR
install-local:
$(MKINSTALLDIRS) $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)
$(INSTALL_LIB) $(the_assembly) $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)/$(ASSEMBLY_NAME)
test ! -f $(the_assembly).mdb || $(INSTALL_LIB) $(the_assembly).mdb $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)/$(ASSEMBLY_NAME).mdb
test ! -f $(the_assembly:.dll=.pdb) || $(INSTALL_LIB) $(the_assembly:.dll=.pdb) $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)/$(ASSEMBLY_NAME:.dll=.pdb)
ifdef PLATFORM_AOT_SUFFIX
test ! -f $(aot_lib) || $(INSTALL_LIB) $(aot_lib) $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)
endif
uninstall-local:
-rm -f $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)/$(ASSEMBLY_NAME) $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)/$(ASSEMBLY_NAME).mdb $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)/$(ASSEMBLY_NAME:.dll=.pdb)
else
# If RUNTIME_HAS_CONSISTENT_GACDIR is set, it implies that the internal GACDIR
# of the runtime is the same as the GACDIR we want. So, we don't need to pass it
# to gacutil. Note that the GACDIR we want may not be the same as the value of
# GACDIR set above, since the user could have overridden the value of $(prefix).
#
# This makes a difference only when we're building from the mono/ tree, since we
# have to ensure that the internal GACDIR of the in-tree runtime matches where we
# install the DLLs.
ifndef RUNTIME_HAS_CONSISTENT_GACDIR
gacdir_flag = /gacdir $(GACDIR)
endif
ifndef ASSEMBLY_PACKAGE
ifdef ASSEMBLY_COMPAT
ASSEMBLY_PACKAGE = compat-$(FRAMEWORK_VERSION)
else
ASSEMBLY_PACKAGE = $(FRAMEWORK_VERSION)
endif
endif
ifneq (none, $(ASSEMBLY_PACKAGE))
package_flag = /package $(ASSEMBLY_PACKAGE)
endif
install-local: $(gacutil)
$(GACUTIL) /i $(the_assembly) /f $(gacdir_flag) /root $(GACROOT) $(package_flag)
uninstall-local: $(gacutil)
-$(GACUTIL) /u $(ASSEMBLY_NAME:.dll=) $(gacdir_flag) /root $(GACROOT) $(package_flag)
endif # ASSEMBLY_INSTALL_DIR
endif # NO_INSTALL
clean-local:
-rm -rf $(tests_CLEAN_FILES) $(assembly_CLEAN_FILES) $(CLEAN_FILES)
test-local run-test-local run-test-ondotnet-local:
@:
DISTFILES = $(wildcard $(ASSEMBLY:$(ASSEMBLY_EXT)=.csproj)) $(EXTRA_DISTFILES)
ASSEMBLY_EXT = $(suffix $(ASSEMBLY))
include $(topdir)/build/tests.make
ifdef HAVE_CS_TESTS
DISTFILES += $(test_sourcefile)
endif
# make dist will collect files in .sources files from all profiles
dist-local: dist-default
subs=' ' ; \
for f in `$(topdir)/tools/removecomments.sh $(filter-out $(wildcard *_test.dll.sources) $(wildcard *_xtest.dll.sources) $(wildcard *exclude.sources),$(wildcard *.sources))` $(TEST_FILES) ; do \
case $$f in \
../*) : ;; \
*.g.cs) : ;; \
*) dest=`dirname "$$f"` ; \
case $$subs in *" $$dest "*) : ;; *) subs=" $$dest$$subs" ; $(MKINSTALLDIRS) $(distdir)/$$dest ;; esac ; \
cp -p "$$f" $(distdir)/$$dest || exit 1 ;; \
esac ; done ; \
for d in . $$subs ; do \
case $$d in .) : ;; *) test ! -f $$d/ChangeLog || cp -p $$d/ChangeLog $(distdir)/$$d ;; esac ; done
# The assembly
ifndef NO_BUILD
ifdef PLATFORM_AOT_SUFFIX
$(the_assembly)$(PLATFORM_AOT_SUFFIX): $(the_assembly)
$(Q_AOT) MONO_PATH='$(the_assemblydir_base)' > $(PROFILE)_$(ASSEMBLY_NAME)_aot.log 2>&1 $(RUNTIME) $(AOT_BUILD_FLAGS) --debug $(the_assembly)
all-local-aot: $(the_assembly)$(PLATFORM_AOT_SUFFIX)
assembly_CLEAN_FILES += $(the_assembly)$(PLATFORM_AOT_SUFFIX) $(PROFILE)_$(ASSEMBLY_NAME)_aot.log
endif
endif
# for now, don't give any /lib flags or set MONO_PATH, since we
# give a full path to the assembly.
## Include corcompare stuff
include $(topdir)/build/corcompare.make
ifndef NO_BUILD
all-local: $(test_makefrag) $(btest_makefrag)
endif
$(test_response) $(test_makefrag) $(btest_response) $(btest_makefrag): $(topdir)/build/msbuild.make $(depsdir)/.stamp
## Documentation stuff
doc-update-local: $(the_assemblydir)/.doc-stamp
$(the_assemblydir)/.doc-stamp: $(the_assembly)
$(MDOC_UP) $(the_assembly)
@echo "doc-stamp" > $@
gen-deps:
update-corefx-sr: $(RESX_RESOURCE_STRING)
MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_PROFILE)/resx2sr.exe $(RESX_RESOURCE_STRING) >corefx/SR.cs
+188
View File
@@ -0,0 +1,188 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Choose>
<When Condition="'$(BuildPlatform)' == 'darwin'">
</When>
<When Condition="'$(BuildPlatform)' == 'linux'">
</When>
<When Condition="'$(BuildPlatform)' == 'win32'">
</When>
</Choose>
<Choose>
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'basic'">
<PropertyGroup>
<Profile>basic</Profile>
<HostPlatform>$(BuildPlatform)</HostPlatform>
</PropertyGroup>
</When>
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'build-darwin'">
<PropertyGroup>
<Profile>build</Profile>
<HostPlatform>darwin</HostPlatform>
</PropertyGroup>
</When>
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'build-linux'">
<PropertyGroup>
<Profile>build</Profile>
<HostPlatform>linux</HostPlatform>
</PropertyGroup>
</When>
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'build-win32'">
<PropertyGroup>
<Profile>build</Profile>
<HostPlatform>win32</HostPlatform>
</PropertyGroup>
</When>
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'net_4_x-darwin'">
<PropertyGroup>
<Profile>net_4_x</Profile>
<HostPlatform>darwin</HostPlatform>
</PropertyGroup>
</When>
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'net_4_x-linux'">
<PropertyGroup>
<Profile>net_4_x</Profile>
<HostPlatform>linux</HostPlatform>
</PropertyGroup>
</When>
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'net_4_x-win32'">
<PropertyGroup>
<Profile>net_4_x</Profile>
<HostPlatform>win32</HostPlatform>
</PropertyGroup>
</When>
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'binary_reference_assemblies'">
<PropertyGroup>
<Profile>binary_reference_assemblies</Profile>
<HostPlatform>$(BuildPlatform)</HostPlatform>
</PropertyGroup>
</When>
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'xbuild_12-darwin'">
<PropertyGroup>
<Profile>xbuild_12</Profile>
<HostPlatform>darwin</HostPlatform>
</PropertyGroup>
</When>
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'xbuild_12-linux'">
<PropertyGroup>
<Profile>xbuild_12</Profile>
<HostPlatform>linux</HostPlatform>
</PropertyGroup>
</When>
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'xbuild_12-win32'">
<PropertyGroup>
<Profile>xbuild_12</Profile>
<HostPlatform>win32</HostPlatform>
</PropertyGroup>
</When>
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'xbuild_14-darwin'">
<PropertyGroup>
<Profile>xbuild_14</Profile>
<HostPlatform>darwin</HostPlatform>
</PropertyGroup>
</When>
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'xbuild_14-linux'">
<PropertyGroup>
<Profile>xbuild_14</Profile>
<HostPlatform>linux</HostPlatform>
</PropertyGroup>
</When>
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'xbuild_14-win32'">
<PropertyGroup>
<Profile>xbuild_14</Profile>
<HostPlatform>win32</HostPlatform>
</PropertyGroup>
</When>
</Choose>
<Import Project="$(MSBuildThisFileDirectory)\profiles\$(Profile).props" />
<PropertyGroup>
<BuildPlatform Condition="'$(BuildPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</BuildPlatform>
<BuildPlatform Condition="'$(BuildPlatform)' == '' and '$(OS)' == 'Unix'">linux</BuildPlatform>
<BuildPlatform Condition="'$(BuildPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</BuildPlatform>
<HostPlatform Condition="'$(HostPlatform)' == ''">$(BuildPlatform)</HostPlatform>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
<ProductVersion>9.0.30729</ProductVersion>
</PropertyGroup>
<PropertyGroup>
<CodePage Condition="'$(CodePage)' == ''">65001</CodePage>
</PropertyGroup>
<PropertyGroup>
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == '' AND '$(BuildIntermediate)' == ''">obj-$(ProfileDirectory)</IntermediateOutputPath>
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == '' AND '$(BuildIntermediate)' != ''">obj-$(ProfileDirectory)-$(BuildIntermediate)</IntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)' == '' AND '$(BuildIntermediate)' == ''">$(MSBuildThisFileDirectory)\..\class\lib\$(ProfileDirectory)</OutputPath>
<OutputPath Condition="'$(OutputPath)' == '' AND '$(BuildIntermediate)' != ''">$(MSBuildThisFileDirectory)\..\class\lib\$(ProfileDirectory)\$(BuildIntermediate)</OutputPath>
</PropertyGroup>
<PropertyGroup>
<NoConfig>true</NoConfig>
<NoLogo>true</NoLogo>
<NoWarn>$(NoWarn),1699</NoWarn>
</PropertyGroup>
<PropertyGroup>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<AppDesignerFolder>Properties</AppDesignerFolder>
</PropertyGroup>
<PropertyGroup>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup>
<BypassFrameworkInstallChecks>true</BypassFrameworkInstallChecks>
</PropertyGroup>
<PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<PropertyGroup>
<NoStdLib>true</NoStdLib>
<NoExplicitReferenceToStdLib>true</NoExplicitReferenceToStdLib>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<CopyNuGetImplementations>false</CopyNuGetImplementations>
</PropertyGroup>
<PropertyGroup>
<!-- <SignAssembly>true</SignAssembly> -->
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\..\class\mono.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<Choose>
<When Condition="'$(Configuration)' == 'Debug'">
<PropertyGroup>
<DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
<Optimize Condition="'$(Optimize)' == ''">false</Optimize>
<DebugType Condition="'$(DebugType)' == ''">full</DebugType>
</PropertyGroup>
</When>
<When Condition="'$(Configuration)' == 'Release'">
<PropertyGroup>
<DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
<Optimize Condition="'$(Optimize)' == ''">true</Optimize>
<!-- <DebugType Condition="'$(DebugType)' == ''">pdbonly</DebugType> -->
</PropertyGroup>
</When>
</Choose>
<PropertyGroup>
<!-- Build library by default -->
<OutputType>Library</OutputType>
</PropertyGroup>
</Project>
-2
View File
@@ -1,2 +0,0 @@
/Mono.Common.targets -crlf
/Mono.Default.targets -crlf
-28
View File
@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\ExtensionPack\MSBuild.ExtensionPack.tasks"/>
<PropertyGroup Condition=" '$(USE_MONO_COMPILER)' == '1' ">
<CscToolExe>gmcs.bat</CscToolExe>
<CscToolPath>C:\MonoExperimental2.5.0\bin</CscToolPath>
</PropertyGroup>
<PropertyGroup Condition=" ('$(Configuration)' == 'basic' Or '$(Configuration)' == 'basic_XML_DEP') ">
<OutputPath Condition=" '$(OutputPath)' == '' ">$(MSBuildProjectDirectory)\..\lib\basic\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'net_2_0_bootstrap' ">
<OutputPath Condition=" '$(OutputPath)' == '' ">$(MSBuildProjectDirectory)\..\lib\net_2_0_bootstrap\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<OutputPath Condition=" '$(OutputPath)' == '' ">$(MSBuildProjectDirectory)\..\lib\$(Configuration)\</OutputPath>
</PropertyGroup>
<Target Name="SetupProject">
<Copy SourceFiles="$(ResponseFile)" DestinationFiles="$(ResponseFile).msbuild"/>
<MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" RegexPattern="/" Replacement="\" Files="$(ResponseFile).msbuild"/>
<MakeDir Directories="$(OutputDirectory)"/>
</Target>
<PropertyGroup Condition=" '$(ResponseFile)' == '' ">
<ResponseFile>$(MSBuildProjectName).dll.sources</ResponseFile>
</PropertyGroup>
<PropertyGroup>
<CompilerResponseFile>$(ResponseFile).msbuild</CompilerResponseFile>
</PropertyGroup>
</Project>
-7
View File
@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">net_2_0</Configuration>
<Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
</PropertyGroup>
</Project>
+21 -21
View File
@@ -1,6 +1,6 @@
# -*- makefile -*-
monolite_path := $(topdir)/class/lib/monolite/$(MONO_CORLIB_VERSION)
monolite_path := $(topdir)/class/lib/monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)
with_mono_path_monolite = MONO_PATH="$(monolite_path)$(PLATFORM_PATH_SEPARATOR)$(monolite_path)/Facades$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
@@ -10,23 +10,26 @@ use_monolite := $(wildcard $(monolite_flag))
MONOLITE_MSCORLIB = $(monolite_path)/mscorlib.dll
ifdef use_monolite
ifdef MCS_MODE
CSC_LOCATION = $(monolite_path)/mcs.exe
endif
PROFILE_RUNTIME = $(with_mono_path_monolite) $(RUNTIME)
BOOTSTRAP_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
else
PROFILE_RUNTIME = $(EXTERNAL_RUNTIME)
ifdef MCS_MODE
BOOTSTRAP_MCS = mcs
else
BOOTSTRAP_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
endif
endif
MCS = $(BOOTSTRAP_MCS)
# ifdef use_monolite
# BUILD_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
# else
# ifdef MCS_MODE
# BUILD_MCS = mcs
# else
# BUILD_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
# endif
# endif
BUILD_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
ifdef MCS_MODE
CSC_LOCATION = $(if $(use_monolite),$(monolite_path)/)mcs.exe
endif
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
@@ -36,9 +39,6 @@ NO_TEST = yes
NO_INSTALL = yes
FRAMEWORK_VERSION = 4.0
# Compiler all using same bootstrap compiler
LIBRARY_COMPILE = $(BOOT_COMPILE)
# Verbose basic only
# V = 1
@@ -90,7 +90,7 @@ ifdef use_monolite
do-get-monolite:
do-profile-check-monolite:
@echo "*** The contents of your 'monolite/$(MONO_CORLIB_VERSION)' directory may be out-of-date" 1>&2
@echo "*** The contents of your 'monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)' directory may be out-of-date" 1>&2
@echo "*** You may want to try 'make get-monolite-latest'" 1>&2
rm -f $(monolite_flag)
exit 1
@@ -98,12 +98,12 @@ do-profile-check-monolite:
else
do-get-monolite:
@echo "*** Downloading bootstrap required 'monolite/$(MONO_CORLIB_VERSION)'" 1>&2
$(MAKE) $(MAKE_Q) -C $(mono_build_root) get-monolite-latest
@echo "*** Downloading bootstrap required 'monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)'" 1>&2
$(MAKE) $(MAKE_Q) -C $(topdir)/class get-monolite-latest
do-profile-check-monolite: $(depsdir)/.stamp
@echo "*** The runtime '$(PROFILE_RUNTIME)' doesn't appear to be usable." 1>&2
@echo "*** Trying the 'monolite/$(MONO_CORLIB_VERSION)' directory." 1>&2
@echo "*** Trying the 'monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)' directory." 1>&2
@echo dummy > $(monolite_flag)
$(MAKE) do-profile-check
@@ -111,7 +111,7 @@ endif
$(PROFILE_EXE): $(topdir)/build/common/basic-profile-check.cs
$(MAKE) $(MAKE_Q) -C $(topdir)/packages
$(BOOTSTRAP_MCS) /warn:0 /noconfig /r:System.dll /r:mscorlib.dll /out:$@ $<
$(BUILD_MCS) /warn:0 /noconfig /r:System.dll /r:mscorlib.dll /out:$@ $<
$(PROFILE_OUT): $(PROFILE_EXE)
$(PROFILE_RUNTIME) $< > $@ 2>&1
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProfileDirectory>$(Profile)</ProfileDirectory>
<DefineConstants>$(DefineConstants);NET_4_0;NET_4_5;MONO;WIN_PLATFORM;BOOTSTRAP_BASIC</DefineConstants>
<FrameworkVersion>4.0</FrameworkVersion>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
</ItemGroup>
</Project>
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProfileDirectory>$(Profile)</ProfileDirectory>
<DefineConstants>$(DefineConstants);</DefineConstants>
</PropertyGroup>
<PropertyGroup>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
</ItemGroup>
</Project>
+3 -5
View File
@@ -1,17 +1,15 @@
# -*- makefile -*-
BOOTSTRAP_PROFILE = basic
BUILD_TOOLS_PROFILE = basic
BUILD_PROFILE = basic
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
PLATFORMS = darwin linux win32
# nuttzing!
profile-check:
@:
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES)
NO_SIGN_ASSEMBLY = yes
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProfileDirectory>$(Profile)-$(HostPlatform)</ProfileDirectory>
<DefineConstants>$(DefineConstants);NET_4_0;NET_4_5;MONO;WIN_PLATFORM</DefineConstants>
<FrameworkVersion>4.5</FrameworkVersion>
</PropertyGroup>
<PropertyGroup>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
</ItemGroup>
</Project>
-10
View File
@@ -1,13 +1,5 @@
#! -*- makefile -*-
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN = resgen2
profile-check:
@:
@@ -25,14 +17,12 @@ PROFILE_MCS_FLAGS = \
-d:MOBILE_DYNAMIC \
-d:MONODROID \
-d:ANDROID \
-d:NETSTANDARD \
-nowarn:1699 \
-nostdlib \
$(DEFAULT_REFERENCES) \
$(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.1
NO_TEST = yes
# the tuner takes care of the install
NO_INSTALL = yes
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProfileDirectory>$(Profile)</ProfileDirectory>
<DefineConstants>$(DefineConstants);NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID</DefineConstants>
<FrameworkVersion>2.1</FrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<ProfileIsMobile>true</ProfileIsMobile>
<ProfileIsMobileDynamic>true</ProfileIsMobileDynamic>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
</ItemGroup>
</Project>
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisFileDirectory)\monotouch_runtime.props" />
<PropertyGroup>
<DefineConstants>$(DefineConstants);FULL_AOT_RUNTIME</DefineConstants>
</PropertyGroup>
</Project>
-11
View File
@@ -1,15 +1,5 @@
# -*- makefile -*-
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN := $(dir $(shell which $(EXTERNAL_MCS)))resgen2
# nuttzing!
profile-check:
@:
@@ -27,7 +17,6 @@ PROFILE_MCS_FLAGS = \
-d:DISABLE_REMOTING \
-d:DISABLE_COM \
-d:FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK \
-d:NETSTANDARD \
-nowarn:1699 \
-nostdlib \
$(DEFAULT_REFERENCES) \
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProfileDirectory>$(Profile)</ProfileDirectory>
<DefineConstants>$(DefineConstants);NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE,MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK</DefineConstants>
<FrameworkVersion>2.1</FrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<ProfileIsAotFriendly>true</ProfileIsAotFriendly>
<ProfileIsMobile>true</ProfileIsMobile>
<DisableConsole>true</DisableConsole>
<DisableBoringTls>true</DisableBoringTls>
<EnableAppleTls>true</EnableAppleTls>
<EnableAppleTlsOnly>true</EnableAppleTlsOnly>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
</ItemGroup>
</Project>
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisFileDirectory)\monotouch.props" />
<PropertyGroup>
<DefineConstants>$(DefineConstants);MONOTOUCH_TV</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<DisableThreadAbort>true</DisableThreadAbort>
<DisableThreadSuspendResume>true</DisableThreadSuspendResume>
<DisableAppDomains>true</DisableAppDomains>
<DisableProcessStart>true</DisableProcessStart>
</PropertyGroup>
</Project>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisFileDirectory)\monotouch_runtime.props" />
<PropertyGroup>
<DefineConstants>$(DefineConstants);MONOTOUCH_TV</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<DisableThreadAbort>true</DisableThreadAbort>
<DisableThreadSuspendResume>true</DisableThreadSuspendResume>
<!-- The binding generator (btv) still needs to execute processes, so we need a System.dll that can do that -->
<!-- <DisableProcessStart>true</DisableProcessStart> -->
</PropertyGroup>
</Project>
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisFileDirectory)\monotouch.props" />
<PropertyGroup>
<DefineConstants>$(DefineConstants);FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<DisableThreadAbort>true</DisableThreadAbort>
<DisableThreadSuspendResume>true</DisableThreadSuspendResume>
<DisableAppDomains>true</DisableAppDomains>
<DisableProcessStart>true</DisableProcessStart>
<DisableMonoSecurity>true</DisableMonoSecurity>
<EnableAppleTls>true</EnableAppleTls>
<EnableAppleTlsOnly>true</EnableAppleTlsOnly>
<EnableAppleX509>true</EnableAppleX509>
</PropertyGroup>
</Project>
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisFileDirectory)\monotouch_runtime.props" />
<PropertyGroup>
<DefineConstants>$(DefineConstants);FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<DisableThreadAbort>true</DisableThreadAbort>
<DisableThreadSuspendResume>true</DisableThreadSuspendResume>
<DisableAppDomains>true</DisableAppDomains>
<!-- The binding generator (btv) still needs to execute processes, so we need a System.dll that can do that -->
<!-- <DisableProcessStart>true</DisableProcessStart> -->
<DisableMonoSecurity>true</DisableMonoSecurity>
<EnableAppleTls>true</EnableAppleTls>
<EnableAppleTlsOnly>true</EnableAppleTlsOnly>
<EnableAppleX509>true</EnableAppleX509>
</PropertyGroup>
</Project>
+3 -6
View File
@@ -1,17 +1,14 @@
# -*- makefile -*-
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
PLATFORMS = darwin linux win32
# nuttzing!
profile-check:
@:
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -d:MULTIPLEX_OS -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 4.5
XBUILD_VERSION = 4.0
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProfileDirectory>$(Profile)-$(HostPlatform)</ProfileDirectory>
<DefineConstants>$(DefineConstants);NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
<FrameworkVersion>4.5</FrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<EnableAppleTls>true</EnableAppleTls>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
</ItemGroup>
</Project>
-9
View File
@@ -1,13 +1,5 @@
#! -*- makefile -*-
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN = resgen2
profile-check:
@:
@@ -21,7 +13,6 @@ PROFILE_MCS_FLAGS = \
-d:NET_4_0 \
-d:NET_4_5 \
-d:MONO \
-d:NETSTANDARD \
-d:MOBILE,MOBILE_LEGACY \
-d:FULL_AOT_DESKTOP \
-d:FULL_AOT_RUNTIME \
+21
View File
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProfileDirectory>$(Profile)</ProfileDirectory>
<DefineConstants>$(DefineConstants);NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;ORBIS;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
<FrameworkVersion>2.1</FrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<ProfileIsAotFriendly>true</ProfileIsAotFriendly>
<ProfileIsMobile>true</ProfileIsMobile>
<EnableAotTesting>true</EnableAotTesting>
<DisableConsole>true</DisableConsole>
<DisableBorintTls>true</DisableBorintTls>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
</ItemGroup>
</Project>
-9
View File
@@ -1,13 +1,5 @@
#! -*- makefile -*-
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN = resgen2
profile-check:
@:
@@ -21,7 +13,6 @@ PROFILE_MCS_FLAGS = \
-d:NET_4_0 \
-d:NET_4_5 \
-d:MONO \
-d:NETSTANDARD \
-d:MOBILE,MOBILE_LEGACY \
-d:FULL_AOT_DESKTOP \
-d:FULL_AOT_RUNTIME \
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProfileDirectory>$(Profile)</ProfileDirectory>
<DefineConstants>$(DefineConstants);NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
<FrameworkVersion>2.1</FrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<ProfileIsAotFriendly>true</ProfileIsAotFriendly>
<ProfileIsMobile>true</ProfileIsMobile>
<DisableConsole>true</DisableConsole>
<EnableAotTesting>true</EnableAotTesting>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
</ItemGroup>
</Project>
@@ -1,13 +1,5 @@
#! -*- makefile -*-
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN = resgen2
profile-check:
@:
@@ -23,7 +15,6 @@ PROFILE_MCS_FLAGS = \
-d:NET_4_0 \
-d:NET_4_5 \
-d:MONO \
-d:NETSTANDARD \
-nowarn:1699 \
-nostdlib \
$(DEFAULT_REFERENCES) \
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProfileDirectory>$(Profile)</ProfileDirectory>
<DefineConstants>$(DefineConstants);NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO</DefineConstants>
<FrameworkVersion>2.1</FrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<ProfileIsMobile>true</ProfileIsMobile>
<ProfileIsMobileDynamic>true</ProfileIsMobileDynamic>
<DisableConsole>true</DisableConsole>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
</ItemGroup>
</Project>
-9
View File
@@ -1,13 +1,5 @@
#! -*- makefile -*-
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN = resgen2
profile-check:
@:
@@ -21,7 +13,6 @@ PROFILE_MCS_FLAGS = \
-d:NET_4_0 \
-d:NET_4_5 \
-d:MONO \
-d:NETSTANDARD \
-d:MOBILE,MOBILE_LEGACY \
-d:FULL_AOT_DESKTOP \
-d:FULL_AOT_RUNTIME \
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProfileDirectory>$(Profile)</ProfileDirectory>
<DefineConstants>$(DefineConstants);NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM;WIN_PLATFORM</DefineConstants>
<FrameworkVersion>2.1</FrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<ProfileIsAotFriendly>true</ProfileIsAotFriendly>
<ProfileIsMobile>true</ProfileIsMobile>
<EnableAotTesting>true</EnableAotTesting>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
</ItemGroup>
</Project>
-8
View File
@@ -1,10 +1,3 @@
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
MCS = $(BOOTSTRAP_MCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN := $(dir $(shell which $(EXTERNAL_MCS)))resgen2
profile-check:
@:
@@ -24,7 +17,6 @@ PROFILE_MCS_FLAGS = \
-d:XAMMAC \
-d:FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK \
-d:XAMARIN_MODERN \
-d:NETSTANDARD \
-nowarn:1699 \
-nostdlib \
$(DEFAULT_REFERENCES) \
+22
View File
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProfileDirectory>$(Profile)</ProfileDirectory>
<DefineConstants>$(DefineConstants);NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
<FrameworkVersion>2.1</FrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<ProfileIsMobile>true</ProfileIsMobile>
<ProfileIsMobileDynamic>true</ProfileIsMobileDynamic>
<DisableConsole>true</DisableConsole>
<DisableBoringTls>true</DisableBoringTls>
<EnableAppleTls>true</EnableAppleTls>
<EnableAppleTlsOnly>true</EnableAppleTlsOnly>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
</ItemGroup>
</Project>
+1 -1
View File
@@ -1,6 +1,6 @@
include $(topdir)/build/profiles/net_4_x.make
PROFILE_MCS_FLAGS += \
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS) \
-d:FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK \
-d:NO_SYSTEM_DRAWING_DEPENDENCY \
-d:NO_WINFORMS_DEPENDENCY \
+27
View File
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProfileDirectory>$(Profile)</ProfileDirectory>
<DefineConstants>$(DefineConstants);NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
<FrameworkVersion>4.5</FrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<DisableWindowsBase>true</DisableWindowsBase>
<DisableSystemWebDependency>true</DisableSystemWebDependency>
<DisableSystemWebAppServicesDependency>true</DisableSystemWebAppServicesDependency>
<DisableSystemWinformsDependency>true</DisableSystemWinformsDependency>
<DisableSystemDrawingDependency>true</DisableSystemDrawingDependency>
<DisableSystemServiceModelActivationDependency>true</DisableSystemServiceModelActivationDependency>
<DisableSystemDesignDependency>true</DisableSystemDesignDependency>
<DisableSystemDirectoryServicesDependency>true</DisableSystemDirectoryServicesDependency>
<DisableBoringTls>true</DisableBoringTls>
<EnableAppleTls>true</EnableAppleTls>
<EnableAppleTlsOnly>true</EnableAppleTlsOnly>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
</ItemGroup>
</Project>
+4 -2
View File
@@ -2,8 +2,10 @@
include $(topdir)/build/profiles/net_4_x.make
PARENT_PROFILE = ../net_4_x/
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/net_4_x/mscorlib.dll
PLATFORMS:=
PARENT_PROFILE = ../net_4_x$(if $(PROFILE_PLATFORM),-$(PROFILE_PLATFORM))/
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/net_4_x$(if $(PROFILE_PLATFORM),-$(PROFILE_PLATFORM))/mscorlib.dll
PROFILE_MCS_FLAGS += -d:XBUILD_12
XBUILD_VERSION = 12.0
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProfileDirectory>$(Profile)</ProfileDirectory>
<DefineConstants>$(DefineConstants);NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;XBUILD_12</DefineConstants>
<FrameworkVersion>4.5</FrameworkVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib">
<HintPath>$(MSBuildThisFileDirectory)\..\..\class\lib\net_4_x-$(HostPlatform)\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProfileDirectory>$(Profile)</ProfileDirectory>
<DefineConstants>$(DefineConstants);NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;XBUILD_12;XBUILD_14</DefineConstants>
<FrameworkVersion>4.5</FrameworkVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib">
<HintPath>$(MSBuildThisFileDirectory)\..\..\class\lib\net_4_x-$(HostPlatform)\mscorlib.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
+41 -72
View File
@@ -22,21 +22,17 @@ VERSION = 0.93
Q=$(if $(V),,@)
# echo -e "\\t" does not work on some systems, so use 5 spaces
Q_MCS=$(if $(V),,@echo "$(if $(MCS_MODE),MCS,CSC) [$(intermediate)$(PROFILE)] $(notdir $(@))";)
Q_AOT=$(if $(V),,@echo "AOT [$(intermediate)$(PROFILE)] $(notdir $(@))";)
Q_MCS=$(if $(V),,@echo "$(if $(MCS_MODE),MCS,CSC) [$(intermediate)$(PROFILE_DIRECTORY)] $(notdir $(@))";)
Q_AOT=$(if $(V),,@echo "AOT [$(intermediate)$(PROFILE_DIRECTORY)] $(notdir $(@))";)
ifndef BUILD_TOOLS_PROFILE
BUILD_TOOLS_PROFILE = build
endif
USE_MCS_FLAGS = /codepage:$(CODEPAGE) /nologo /noconfig /deterministic $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll
USE_MCS_FLAGS = /codepage:$(CODEPAGE) /nologo /noconfig /deterministic $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS) $(DEFAULT_REFERENCES)
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)
CSC_RUNTIME_FLAGS = --aot-path=$(abspath $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)) --gc-params=nursery-size=64m
CSCOMPILE = $(Q_MCS) $(BUILD_MCS) $(USE_MCS_FLAGS)
CSC_RUNTIME_FLAGS = --aot-path=$(abspath $(topdir)/class/lib/$(BUILD_PROFILE)) --gc-params=nursery-size=64m
BASCOMPILE = $(MBAS) $(USE_MBAS_FLAGS)
CCOMPILE = $(CC) $(USE_CFLAGS)
BOOT_COMPILE = $(Q_MCS) $(BOOTSTRAP_MCS) $(USE_MCS_FLAGS)
INSTALL = $(SHELL) $(topdir)/../mono/install-sh
INSTALL_DATA = $(INSTALL) -c -m 644
INSTALL_BIN = $(INSTALL) -c -m 755
@@ -44,29 +40,25 @@ INSTALL_LIB = $(INSTALL_BIN)
MKINSTALLDIRS = $(SHELL) $(topdir)/mkinstalldirs
INTERNAL_MBAS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/mbas/mbas.exe
INTERNAL_ILASM = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/ilasm.exe
INTERNAL_CSC_LOCATION = $(CSC_LOCATION)
BUILD_PROFILE = build
# Using CSC_SDK_PATH_DISABLED for sanity check that all references have path specified
INTERNAL_CSC = CSC_SDK_PATH_DISABLED= $(RUNTIME) $(RUNTIME_FLAGS) $(CSC_RUNTIME_FLAGS) $(INTERNAL_CSC_LOCATION)
BUILD_MCS = MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" CSC_SDK_PATH_DISABLED= \
$(RUNTIME) $(RUNTIME_FLAGS) $(CSC_RUNTIME_FLAGS) $(CSC_LOCATION)
RESGEN_EXE = $(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)resgen.exe
INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(RESGEN_EXE)
RESGEN = MONO_PATH="$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN)
STRING_REPLACER = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/cil-stringreplacer.exe
RESGEN = MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(RESGEN_EXE) $(topdir)/class/lib/$(BUILD_PROFILE)/resgen.exe
STRING_REPLACER = MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_PROFILE)/cil-stringreplacer.exe
depsdir = $(topdir)/build/deps
# Make sure these propagate if set manually
export PLATFORM
export PROFILE
export MCS
export MCS_FLAGS
export CC
export CFLAGS
export INSTALL
export MKINSTALLDIRS
export BOOTSTRAP_MCS
export DESTDIR
export RESGEN
@@ -77,31 +69,18 @@ export RESGEN
default: all
# Get initial configuration. pre-config is so that the builder can
# override PLATFORM or PROFILE
# override BUILD_PLATFORM or PROFILE
include $(topdir)/build/config-default.make
-include $(topdir)/build/pre-config.make
-include $(topdir)/build/config.make
# Default PLATFORM and PROFILE if they're not already defined.
ifndef PLATFORM
ifeq ($(OS),Windows_NT)
ifneq ($(V),)
$(info *** Assuming PLATFORM is 'win32'.)
endif
PLATFORM = win32
else
ifneq ($(V),)
$(info *** Assuming PLATFORM is 'linux'.)
endif
PLATFORM = linux
endif
endif
# Platform config
include $(topdir)/build/platforms/$(PLATFORM).make
include $(topdir)/build/platforms/$(BUILD_PLATFORM).make
PROFILE_PLATFORM = $(if $(PLATFORMS),$(if $(filter $(PLATFORMS),$(HOST_PLATFORM)),$(HOST_PLATFORM),$(error Unknown platform "$(HOST_PLATFORM)" for profile "$(PROFILE)")))
PROFILE_DIRECTORY = $(PROFILE)$(if $(PROFILE_PLATFORM),-$(PROFILE_PLATFORM))
ifdef PLATFORM_CORLIB
corlib = $(PLATFORM_CORLIB)
@@ -114,6 +93,10 @@ endif
# Rest of the configuration
ifdef MCS_MODE
CSC_LOCATION = $(topdir)/class/lib/$(BUILD_PROFILE)/mcs.exe
endif
ifndef PROFILE
PROFILE = $(DEFAULT_PROFILE)
endif
@@ -125,12 +108,9 @@ PROFILE_MCS_FLAGS += -optimize
endif
ifdef MCS_MODE
INTERNAL_CSC_LOCATION = $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/mcs.exe
ifdef PLATFORM_DEBUG_FLAGS
PLATFORM_DEBUG_FLAGS = /debug:full
endif
endif
# Design:
@@ -167,8 +147,8 @@ endif
ifdef NO_INSTALL
GACUTIL = :
else
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)
gacutil = $(topdir)/class/lib/$(BUILD_PROFILE)/gacutil.exe
GACUTIL = MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
endif
STD_TARGETS = test run-test run-test-ondotnet clean install uninstall doc-update
@@ -226,37 +206,34 @@ csproj: do-csproj
# be listed _before_ including rules.make. However, the default
# SUBDIRS list can come after, so don't use the eager := syntax when
# using the defaults.
PROFILE_SUBDIRS := $($(PROFILE)_SUBDIRS)
ifndef PROFILE_SUBDIRS
PROFILE_SUBDIRS = $(SUBDIRS)
endif
PROFILE_SUBDIRS = $(or $($(PROFILE)_SUBDIRS),$(SUBDIRS))
# These subdirs can be built in parallel
PROFILE_PARALLEL_SUBDIRS := $($(PROFILE)_PARALLEL_SUBDIRS)
ifndef PROFILE_PARALLEL_SUBDIRS
PROFILE_PARALLEL_SUBDIRS = $(PARALLEL_SUBDIRS)
endif
PROFILE_PARALLEL_SUBDIRS = $(or $($(PROFILE)_PARALLEL_SUBDIRS),$(PARALLEL_SUBDIRS))
ifndef FRAMEWORK_VERSION_MAJOR
FRAMEWORK_VERSION_MAJOR = $(basename $(FRAMEWORK_VERSION))
endif
%-recursive:
@set . $$MAKEFLAGS; final_exit=:; \
@set . $$MAKEFLAGS; \
case $$2 in --unix) shift ;; esac; \
case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \
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=:; \
$(foreach subdir,$(PROFILE_SUBDIRS),$(MAKE) -C $(subdir) $* || { final_exit="exit 1"; $$dk; };) \
$(if $(PROFILE_PARALLEL_SUBDIRS), \
$(if $(filter $*,all), \
$(MAKE) $(PROFILE_PARALLEL_SUBDIRS) ENABLE_PARALLEL_SUBDIR_BUILD=1 || { final_exit="exit 1"; $$dk; };, \
$(foreach subdir,$(PROFILE_PARALLEL_SUBDIRS),$(MAKE) -C $(subdir) $* || { final_exit="exit 1"; $$dk; };))) \
$$final_exit
ifdef ENABLE_PARALLEL_SUBDIR_BUILD
.PHONY: $(PROFILE_PARALLEL_SUBDIRS)
$(PROFILE_PARALLEL_SUBDIRS):
@set . $$MAKEFLAGS; \
$(MAKE) -C $@ all
endif
#
# Parallel build support
#
@@ -289,16 +266,6 @@ clean-dep-dir:
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
@@ -339,6 +306,8 @@ dist-default:
## Documentation stuff
Q_MDOC =$(if $(V),,@echo "MDOC [$(PROFILE)] $(notdir $(@))";)
Q_MDOC =$(if $(V),,@echo "MDOC [$(PROFILE_DIRECTORY)] $(notdir $(@))";)
MDOC =$(Q_MDOC) MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe
Q_MDOC_UP=$(if $(V),,@echo "MDOC-UP [$(PROFILE_DIRECTORY)] $(notdir $(@))";)
MDOC_UP =$(Q_MDOC_UP) MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe update --delete -o Documentation/en
+83 -1
View File
@@ -20,8 +20,18 @@ TEST_RUNTIME_WRAPPERS_PATH = $(shell dirname $(RUNTIME))/_tmpinst/bin
ifndef NO_TEST
test_nunit_lib = nunitlite.dll
xunit_core := xunit.core xunit.abstractions xunit.assert
xunit_deps := System.Runtime
xunit_class_deps := Xunit.NetCore.Extensions
xunit_libs_ref = $(patsubst %,-r:$(topdir)/../external/xunit-binaries/%.dll,$(xunit_core))
xunit_libs_ref += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/Facades/%.dll,$(xunit_deps))
xunit_libs_dep = $(xunit_class_deps:%=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)%.dll)
xunit_libs_ref += $(xunit_libs_dep:%=-r:%)
TEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(TEST_LIB_REFS))
XTEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(XTEST_LIB_REFS))
test_nunit_dep = $(test_nunit_lib:%=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)%)
test_nunit_ref = $(test_nunit_dep:%=-r:%)
@@ -34,6 +44,7 @@ test_sourcefile = $(ASSEMBLY:$(ASSEMBLY_EXT)=_test.dll.sources)
endif
test_lib = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_test.dll)
test_sourcefile_excludes = $(test_lib).exclude.sources
test_pdb = $(test_lib:.dll=.pdb)
@@ -42,12 +53,28 @@ test_makefrag = $(depsdir)/$(test_lib).makefrag
test_flags = -r:$(the_assembly) $(test_nunit_ref) $(TEST_MCS_FLAGS) $(TEST_LIB_MCS_FLAGS)
tests_CLEAN_FILES += $(ASSEMBLY:$(ASSEMBLY_EXT)=_test*.dll) $(ASSEMBLY:$(ASSEMBLY_EXT)=_test*.pdb) $(test_response) $(test_makefrag)
xtest_sourcefile = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.sources)
xunit_test_lib = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xunit-test.dll)
xtest_response = $(depsdir)/$(xunit_test_lib).response
xtest_makefrag = $(depsdir)/$(xunit_test_lib).makefrag
xtest_flags = -r:$(the_assembly) $(xunit_libs_ref) $(XTEST_MCS_FLAGS) $(XTEST_LIB_MCS_FLAGS)
ifeq ($(wildcard $(xtest_sourcefile)),)
xtest_sourcefile = $(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.sources)
tests_CLEAN_FILES += $(xunit_test_lib) $(xtest_response) $(xtest_makefrag)
endif
ifndef HAVE_CS_TESTS
HAVE_CS_TESTS := $(wildcard $(test_sourcefile))
endif
HAVE_SOURCE_EXCLUDES := $(wildcard $(test_sourcefile_excludes))
HAVE_CS_XTESTS := $(wildcard $(xtest_sourcefile))
endif # !NO_TEST
ifndef NO_TEST
@@ -61,6 +88,10 @@ endif
echo "stamp" >$@
tests_CLEAN_FILES += $(topdir)/build/deps/nunit-$(PROFILE).stamp
$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)Xunit.NetCore.Extensions.dll:
$(MAKE) -C $(topdir)/class/Xunit.NetCore.Extensions
endif
test_assemblies :=
@@ -138,7 +169,7 @@ endif
ifdef HAVE_CS_TESTS
$(test_lib): $(the_assembly) $(test_response) $(test_nunit_dep)
$(TEST_COMPILE) $(LIBRARY_FLAGS) -target:library -out:$@ $(test_flags) $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response)
$(TEST_COMPILE) -target:library -out:$@ $(test_flags) $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response)
test_response_preprocessed = $(test_response)_preprocessed
@@ -157,6 +188,57 @@ $(test_makefrag): $(test_response)
-include $(test_makefrag)
build-test-lib: $(test_lib)
@echo Building testing lib
endif
ifdef HAVE_CS_XTESTS
XTEST_HARNESS_PATH = $(topdir)/../external/xunit-binaries
XTEST_HARNESS = $(XTEST_HARNESS_PATH)/xunit.console.exe
XTEST_HARNESS_FLAGS := -noappdomain -noshadow -parallel none -nunit TestResult-$(PROFILE)-xunit.xml
XTEST_TRAIT := -notrait category=failing -notrait category=nonnetcoreapptests -notrait Benchmark=true -notrait category=outerloop
ifdef FIXTURE
XTEST_HARNESS_FLAGS += -class $(FIXTURE)
endif
ifdef TESTNAME
XTEST_HARNESS_FLAGS += -method $(TESTNAME)
endif
check: run-xunit-test-local
run-xunit-test: run-xunit-test-local
xunit-test-local: $(xunit_test_lib)
run-xunit-test-local: run-xunit-test-lib
# ln -s is a HACK for xunit runner to require xunit.execution.desktop.dll file in local folder on .net only
run-xunit-test-lib: xunit-test-local
@ln -fs $(XTEST_HARNESS_PATH)/xunit.execution.desktop.dll xunit.execution.desktop.dll
ok=:; \
PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xunit_test_lib) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) || ok=false; \
$$ok
@rm -f xunit.execution.desktop.dll
$(xunit_test_lib): $(the_assembly) $(xtest_response) $(xunit_libs_dep)
$(TEST_COMPILE) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response)
xtest_response_preprocessed = $(xtest_response)_preprocessed
# This handles .excludes/.sources pairs, as well as resolving the
# includes that occur in .sources files
$(xtest_response): $(xtest_sourcefile)
$(SHELL) $(topdir)/build/gensources.sh $@ '$(xtest_sourcefile)' '$(xtest_sourcefile_excludes)'
$(xtest_makefrag): $(xtest_response)
@echo Creating $@ ...
@sed 's,^,$(xunit_test_lib): ,' $< >$@
-include $(xtest_makefrag)
endif
.PHONY: patch-nunitlite-appconfig
+1
View File
@@ -1,3 +1,4 @@
/lib
/compat/
monolite-*.tar.gz
/**/obj-*
@@ -9,8 +9,11 @@
<ProjectGuid>{E51283DC-7090-479E-B723-01C0953F18EA}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_x</OutputPath>
<IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>
<OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
<IntermediateOutputPath>obj-net_4_x-$(HostPlatform)</IntermediateOutputPath>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<NoStdLib>True</NoStdLib>
@@ -29,7 +32,7 @@
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -37,7 +40,7 @@
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -9,8 +9,11 @@
<ProjectGuid>{FFFE76FE-98EE-4FF7-81D9-35C0FE1D3718}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_x</OutputPath>
<IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>
<OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
<IntermediateOutputPath>obj-net_4_x-$(HostPlatform)</IntermediateOutputPath>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<NoStdLib>True</NoStdLib>
@@ -29,7 +32,7 @@
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -37,7 +40,7 @@
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+7 -4
View File
@@ -9,8 +9,11 @@
<ProjectGuid>{2AB43CEE-0BE1-46EF-971E-3678330BEA13}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_x</OutputPath>
<IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>
<OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
<IntermediateOutputPath>obj-net_4_x-$(HostPlatform)</IntermediateOutputPath>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<NoStdLib>True</NoStdLib>
@@ -29,7 +32,7 @@
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -37,7 +40,7 @@
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
Loaded 100 of 5674 files, more files were not shown because too many files have changed in this diff. Show more